303 files changed, 8190 insertions, 4837 deletions

diff --git a/CREDITS b/CREDITS
index 66e82466dde8..6c06ded9882b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -951,6 +951,12 @@ S: Brevia 1043
 S: S-114 79 Stockholm
 S: Sweden
 
+N: Pekka Enberg
+E: penberg@cs.helsinki.fi
+W: http://www.cs.helsinki.fi/u/penberg/
+D: Various kernel hacks, fixes, and cleanups.
+S: Finland
+
 N: David Engebretsen
 E: engebret@us.ibm.com
 D: Linux port to 64-bit PowerPC architecture
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 6d4b1ef5b6f1..49c745720f47 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -325,8 +325,13 @@ X!Ekernel/module.c
 !Ekernel/irq/manage.c
      </sect1>
 
+     <sect1><title>DMA Channels</title>
+!Ekernel/dma.c
+     </sect1>
+
      <sect1><title>Resources Management</title>
 !Ikernel/resource.c
+!Ekernel/resource.c
      </sect1>
 
      <sect1><title>MTRR Handling</title>
diff --git a/Documentation/IPMI.txt b/Documentation/IPMI.txt
index 7756e09ea759..9f08d73d90bf 100644
--- a/Documentation/IPMI.txt
+++ b/Documentation/IPMI.txt
@@ -364,6 +364,7 @@ You can change this at module load time (for a module) with:
        regspacings=<sp1>,<sp2>,... regsizes=<size1>,<size2>,...
        regshifts=<shift1>,<shift2>,...
        slave_addrs=<addr1>,<addr2>,...
+       force_kipmid=<enable1>,<enable2>,...
 
 Each of these except si_trydefaults is a list, the first item for the
 first interface, second item for the second interface, etc.
@@ -409,7 +410,13 @@ The slave_addrs specifies the IPMI address of the local BMC.  This is
 usually 0x20 and the driver defaults to that, but in case it's not, it
 can be specified when the driver starts up.
 
-When compiled into the kernel, the addresses can be specified on the
+The force_ipmid parameter forcefully enables (if set to 1) or disables
+(if set to 0) the kernel IPMI daemon.  Normally this is auto-detected
+by the driver, but systems with broken interrupts might need an enable,
+or users that don't want the daemon (don't need the performance, don't
+want the CPU hit) can disable it.
+
+When compiled into the kernel, the parameters can be specified on the
 kernel command line as:
 
   ipmi_si.type=<type1>,<type2>...
@@ -419,6 +426,7 @@ kernel command line as:
        ipmi_si.regsizes=<size1>,<size2>,...
        ipmi_si.regshifts=<shift1>,<shift2>,...
        ipmi_si.slave_addrs=<addr1>,<addr2>,...
+       ipmi_si.force_kipmid=<enable1>,<enable2>,...
 
 It works the same as the module parameters of the same names.
 
diff --git a/Documentation/fb/intel810.txt b/Documentation/fb/intel810.txt
index 4f0d6bc789ef..be3e7836abef 100644
--- a/Documentation/fb/intel810.txt
+++ b/Documentation/fb/intel810.txt
@@ -9,8 +9,9 @@ Intel 810/815 Framebuffer driver
 ================================================================
 
 A. Introduction
+
         This is a framebuffer driver for various Intel 810/815 compatible
-graphics devices.  These would include:
+        graphics devices.  These include:
 
         Intel 810
         Intel 810E
@@ -21,136 +22,136 @@ graphics devices.  These would include:
 
 B.  Features
 
-        - Choice of using Discrete Video Timings, VESA Generalized Timing
+        - Choice of using Discrete Video Timings, VESA Generalized Timing
           Formula, or a framebuffer specific database to set the video mode
 
-        - Supports a variable range of horizontal and vertical resolution, and
-          vertical refresh rates if the VESA Generalized Timing Formula is 
+        - Supports a variable range of horizontal and vertical resolution and
+          vertical refresh rates if the VESA Generalized Timing Formula is
           enabled.
 
-        - Supports color depths of 8, 16, 24 and 32 bits per pixel
+        - Supports color depths of 8, 16, 24 and 32 bits per pixel
 
         - Supports pseudocolor, directcolor, or truecolor visuals
 
-        - Full and optimized hardware acceleration at 8, 16 and 24 bpp
+        - Full and optimized hardware acceleration at 8, 16 and 24 bpp
 
         - Robust video state save and restore
 
-        - MTRR support 
+        - MTRR support
 
         - Utilizes user-entered monitor specifications to automatically
           calculate required video mode parameters.
 
-        - Can concurrently run with xfree86 running with native i810 drivers 
+        - Can concurrently run with xfree86 running with native i810 drivers
 
         - Hardware Cursor Support
  
         - Supports EDID probing either by DDC/I2C or through the BIOS
 
 C.  List of available options
-        
-   a. "video=i810fb"  
+
+   a. "video=i810fb"
         enables the i810 driver
 
         Recommendation: required
- 
-   b. "xres:<value>"  
+
+   b. "xres:<value>"
         select horizontal resolution in pixels. (This parameter will be
         ignored if 'mode_option' is specified.  See 'o' below).
 
-        Recommendation: user preference 
+        Recommendation: user preference
         (default = 640)
 
    c. "yres:<value>"
         select vertical resolution in scanlines. If Discrete Video Timings
         is enabled, this will be ignored and computed as 3*xres/4.  (This
         parameter will be ignored if 'mode_option' is specified.  See 'o'
-        below)  
+        below)
 
         Recommendation: user preference
         (default = 480)
-                
-   d. "vyres:<value>" 
+
+   d. "vyres:<value>"
         select virtual vertical resolution in scanlines. If (0) or none
-        is specified, this will be computed against maximum available memory. 
+        is specified, this will be computed against maximum available memory.
 
         Recommendation: do not set
         (default = 480)
 
    e. "vram:<value>"
-        select amount of system RAM in MB to allocate for the video memory 
+        select amount of system RAM in MB to allocate for the video memory
 
         Recommendation: 1 - 4 MB.
         (default = 4)
 
-   f. "bpp:<value>"   
-        select desired pixel depth 
+   f. "bpp:<value>"
+        select desired pixel depth
 
         Recommendation: 8
         (default = 8)
 
-   g. "hsync1/hsync2:<value>" 
-        select the minimum and maximum Horizontal Sync Frequency of the 
-        monitor in KHz.  If a using a fixed frequency monitor, hsync1 must 
+   g. "hsync1/hsync2:<value>"
+        select the minimum and maximum Horizontal Sync Frequency of the
+        monitor in kHz.  If using a fixed frequency monitor, hsync1 must
         be equal to hsync2. If EDID probing is successful, these will be
         ignored and values will be taken from the EDID block.
 
         Recommendation: check monitor manual for correct values
-        default (29/30)
+        (default = 29/30)
 
-   h. "vsync1/vsync2:<value>" 
+   h. "vsync1/vsync2:<value>"
         select the minimum and maximum Vertical Sync Frequency of the monitor
-        in Hz. You can also use this option to lock your monitor's refresh 
+        in Hz. You can also use this option to lock your monitor's refresh
         rate. If EDID probing is successful, these will be ignored and values
         will be taken from the EDID block.
 
         Recommendation: check monitor manual for correct values
         (default = 60/60)
 
-        IMPORTANT:  If you need to clamp your timings, try to give some 
-        leeway for computational errors (over/underflows).  Example: if 
+        IMPORTANT:  If you need to clamp your timings, try to give some
+        leeway for computational errors (over/underflows).  Example: if
         using vsync1/vsync2 = 60/60, make sure hsync1/hsync2 has at least
         a 1 unit difference, and vice versa.
 
-   i. "voffset:<value>" 
-        select at what offset in MB of the logical memory to allocate the 
+   i. "voffset:<value>"
+        select at what offset in MB of the logical memory to allocate the
         framebuffer memory.  The intent is to avoid the memory blocks
         used by standard graphics applications (XFree86).  The default
-        offset (16 MB for a 64MB aperture, 8 MB for a 32MB aperture) will
-        avoid XFree86's usage and allows up to 7MB/15MB of framebuffer
-        memory.  Depending on your usage, adjust the value up or down, 
-        (0 for maximum usage, 31/63 MB for the least amount).  Note, an 
+        offset (16 MB for a 64 MB aperture, 8 MB for a 32 MB aperture) will
+        avoid XFree86's usage and allows up to 7 MB/15 MB of framebuffer
+        memory.  Depending on your usage, adjust the value up or down
+        (0 for maximum usage, 31/63 MB for the least amount).  Note, an
         arbitrary setting may conflict with XFree86.
 
         Recommendation: do not set
         (default = 8 or 16 MB)
-      
-   j. "accel" 
-        enable text acceleration.  This can be enabled/reenabled anytime 
-        by using 'fbset -accel true/false'. 
+
+   j. "accel"
+        enable text acceleration.  This can be enabled/reenabled anytime
+        by using 'fbset -accel true/false'.
 
         Recommendation: enable
-        (default = not set) 
+        (default = not set)
 
-   k. "mtrr" 
+   k. "mtrr"
         enable MTRR.  This allows data transfers to the framebuffer memory
         to occur in bursts which can significantly increase performance.
-        Not very helpful with the i810/i815 because of 'shared memory'. 
+        Not very helpful with the i810/i815 because of 'shared memory'.
 
         Recommendation: do not set
-        (default = not set) 
+        (default = not set)
 
    l. "extvga"
         if specified, secondary/external VGA output will always be enabled.
         Useful if the BIOS turns off the VGA port when no monitor is attached.
-        The external VGA monitor can then be attached without rebooting. 
+        The external VGA monitor can then be attached without rebooting.
 
         Recommendation: do not set
         (default = not set)
-        
-   m. "sync" 
+
+   m. "sync"
         Forces the hardware engine to do a "sync" or wait for the hardware
-        to finish before starting another instruction. This will produce a 
+        to finish before starting another instruction. This will produce a
         more stable setup, but will be slower.
 
         Recommendation: do not set
@@ -162,6 +163,7 @@ C.  List of available options
 
         Recommendation: do not set
         (default = not set)
+
    o. <xres>x<yres>[-<bpp>][@<refresh>]
         The driver will now accept specification of boot mode option.  If this
         is specified, the options 'xres' and 'yres' will be ignored. See
@@ -183,8 +185,8 @@ append="video=i810fb:vram:2,xres:1024,yres:768,bpp:8,hsync1:30,hsync2:55, \
         vsync1:50,vsync2:85,accel,mtrr"
 
 This will initialize the framebuffer to 1024x768 at 8bpp.  The framebuffer
-will use 2 MB of System RAM. MTRR support will be enabled. The refresh rate 
-will be computed based on the hsync1/hsync2 and vsync1/vsync2 values.  
+will use 2 MB of System RAM. MTRR support will be enabled. The refresh rate
+will be computed based on the hsync1/hsync2 and vsync1/vsync2 values.
 
 IMPORTANT:
 You must include hsync1, hsync2, vsync1 and vsync2 to enable video modes
@@ -194,10 +196,10 @@ vsync1 and vsync2 parameters.  These parameters will be taken from the EDID
 block.
 
 E.  Module options
-        
-        The module parameters are essentially similar to the kernel 
-parameters. The main difference is that you need to include a Boolean value 
-(1 for TRUE, and 0 for FALSE) for those options which don't need a value. 
+
+The module parameters are essentially similar to the kernel
+parameters. The main difference is that you need to include a Boolean value
+(1 for TRUE, and 0 for FALSE) for those options which don't need a value.
 
 Example, to enable MTRR, include "mtrr=1".
 
@@ -214,62 +216,62 @@ Or just add the following to /etc/modprobe.conf
         options i810fb vram=2 xres=1024 bpp=16 hsync1=30 hsync2=55 vsync1=50 \
         vsync2=85 accel=1 mtrr=1
 
-and just do a 
+and just do a
 
         modprobe i810fb
 
 
 F.  Setup
 
-        a. Do your usual method of configuring the kernel. 
-        
+        a. Do your usual method of configuring the kernel.
+
         make menuconfig/xconfig/config
 
-        b. Under "Code Maturity Options", enable "Prompt for experimental/
-           incomplete code/drivers".
+        b. Under "Code maturity level options" enable "Prompt for development
+           and/or incomplete code/drivers".
 
         c. Enable agpgart support for the Intel 810/815 on-board graphics.
-           This is required.  The option is under "Character Devices"
+           This is required.  The option is under "Character Devices".
 
         d. Under "Graphics Support", select "Intel 810/815" either statically
            or as a module.  Choose "use VESA Generalized Timing Formula" if
-           you need to maximize the capability of your display.  To be on the 
-           safe side, you can leave this unselected.  
-  
+           you need to maximize the capability of your display.  To be on the
+           safe side, you can leave this unselected.
+
         e. If you want support for DDC/I2C probing (Plug and Play Displays),
            set 'Enable DDC Support' to 'y'. To make this option appear, set
            'use VESA Generalized Timing Formula' to 'y'.
 
-        f. If you want a framebuffer console, enable it under "Console 
-           Drivers"
+        f. If you want a framebuffer console, enable it under "Console
+           Drivers".
+
+        g. Compile your kernel.
+
+        h. Load the driver as described in sections D and E.
 
-        g. Compile your kernel. 
-                
-        h. Load the driver as described in section D and E.
-        
         i.  Try the DirectFB (http://www.directfb.org) + the i810 gfxdriver
             patch to see the chipset in action (or inaction :-).
 
 G.  Acknowledgment:
-        
+
         1.  Geert Uytterhoeven - his excellent howto and the virtual
-                                 framebuffer driver code made this possible.
+            framebuffer driver code made this possible.
 
-        2.  Jeff Hartmann for his agpgart code.  
+        2.  Jeff Hartmann for his agpgart code.
 
         3.  The X developers.  Insights were provided just by reading the
             XFree86 source code.
 
         4.  Intel(c).  For this value-oriented chipset driver and for
-            providing documentation.
+            providing documentation.
 
         5. Matt Sottek.  His inputs and ideas  helped in making some
-        optimizations possible.
+           optimizations possible.
 
 H.  Home Page:
 
         A more complete, and probably updated information is provided at
-http://i810fb.sourceforge.net.
+        http://i810fb.sourceforge.net.
 
 ###########################
 Tony
diff --git a/Documentation/fb/intelfb.txt b/Documentation/fb/intelfb.txt
index aa0d322db171..da5ee74219e8 100644
--- a/Documentation/fb/intelfb.txt
+++ b/Documentation/fb/intelfb.txt
@@ -88,12 +88,20 @@ Sample Usage
 
 In /etc/lilo.conf, add the line:
 
-append="video=intelfb:800x600-32@75,accel,hwcursor,vram=8"
+append="video=intelfb:mode=800x600-32@75,accel,hwcursor,vram=8"
 
 This will initialize the framebuffer to 800x600 at 32bpp and 75Hz. The
 framebuffer will use 8 MB of System RAM. hw acceleration of text and cursor
 will be enabled.
 
+Remarks
+-------
+
+If setting this parameter doesn't work (you stay in a 80x25 text-mode),
+you might need to set the "vga=<mode>" parameter too - see vesafb.txt
+in this directory.
+
+
 D.  Module options
 
         The module parameters are essentially similar to the kernel
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 9364f47c7116..b98f01fc14bf 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -122,15 +122,6 @@ Who:    Arjan van de Ven
 
 ---------------------------
 
-What:   START_ARRAY ioctl for md
-When:   July 2006
-Files:  drivers/md/md.c
-Why:    Not reliable by design - can fail when most needed.
-        Alternatives exist
-Who:    NeilBrown <neilb@suse.de>
-
----------------------------
-
 What:   eepro100 network driver
 When:   January 2007
 Why:    replaced by the e100 driver
@@ -325,3 +316,11 @@ Why:	i2c-isa is a non-sense and doesn't fit in the device driver
 Who:    Jean Delvare <khali@linux-fr.org>
 
 ---------------------------
+
+What:   ftape
+When:   2.6.20
+Why:    Orphaned for ages.  SMP bugs long unfixed.  Few users left
+        in the world.
+Who:    Jeff Garzik <jeff@garzik.org>
+
+---------------------------
diff --git a/Documentation/ia64/serial.txt b/Documentation/ia64/serial.txt
index f51eb4bc2ff1..040b9773209f 100644
--- a/Documentation/ia64/serial.txt
+++ b/Documentation/ia64/serial.txt
@@ -124,6 +124,13 @@ TROUBLESHOOTING SERIAL CONSOLE PROBLEMS
 
         - Add entry to /etc/securetty for console tty.
 
+    No ACPI serial devices found in 2.6.17 or later:
+
+        - Turn on CONFIG_PNP and CONFIG_PNPACPI.  Prior to 2.6.17, ACPI
+          serial devices were discovered by 8250_acpi.  In 2.6.17,
+          8250_acpi was replaced by the combination of 8250_pnp and
+          CONFIG_PNPACPI.
+
 
 
 [1] http://www.dig64.org/specifications/DIG64_PCDPv20.pdf
diff --git a/Documentation/kbuild/modules.txt b/Documentation/kbuild/modules.txt
index 2e7702e94a78..769ee05ee4d1 100644
--- a/Documentation/kbuild/modules.txt
+++ b/Documentation/kbuild/modules.txt
@@ -43,7 +43,7 @@ are not planned to be included in the kernel tree.
 What is covered within this file is mainly information to authors
 of modules. The author of an external module should supply
 a makefile that hides most of the complexity, so one only has to type
-'make' to build the module. A complete example will be present in
+'make' to build the module. A complete example will be presented in
 chapter 4, "Creating a kbuild file for an external module".
 
 
@@ -61,6 +61,7 @@ when building an external module.
                 make -C <path-to-kernel> M=`pwd`
 
         For the running kernel use:
+
                 make -C /lib/modules/`uname -r`/build M=`pwd`
 
         For the above command to succeed, the kernel must have been
@@ -130,10 +131,10 @@ when building an external module.
 
         To make sure the kernel contains the information required to
         build external modules the target 'modules_prepare' must be used.
-        'module_prepare' exists solely as a simple way to prepare
+        'modules_prepare' exists solely as a simple way to prepare
         a kernel source tree for building external modules.
         Note: modules_prepare will not build Module.symvers even if
-        CONFIG_MODULEVERSIONING is set. Therefore a full kernel build
+        CONFIG_MODVERSIONS is set. Therefore a full kernel build
         needs to be executed to make module versioning work.
 
 --- 2.5 Building separate files for a module
@@ -450,7 +451,7 @@ kernel refuses to load the module.
 
 Module.symvers contains a list of all exported symbols from a kernel build.
 
---- 7.1 Symbols fron the kernel (vmlinux + modules)
+--- 7.1 Symbols from the kernel (vmlinux + modules)
 
         During a kernel build, a file named Module.symvers will be generated.
         Module.symvers contains all exported symbols from the kernel and
diff --git a/Documentation/md.txt b/Documentation/md.txt
index 0668f9dc9d29..9ae9e4078985 100644
--- a/Documentation/md.txt
+++ b/Documentation/md.txt
@@ -154,11 +154,12 @@ contains further md-specific information about the device.
 
 All md devices contain:
   level
-     a text file indicating the 'raid level'.  This may be a standard
-     numerical level prefixed by "RAID-" - e.g. "RAID-5", or some
-     other name such as "linear" or "multipath".
+     a text file indicating the 'raid level'. e.g. raid0, raid1,
+     raid5, linear, multipath, faulty.
      If no raid level has been set yet (array is still being
-     assembled), this file will be empty.
+     assembled), the value will reflect whatever has been written
+     to it, which may be a name like the above, or may be a number
+     such as '0', '5', etc.
 
   raid_disks
      a text file with a simple number indicating the number of devices
@@ -192,14 +193,6 @@ All md devices contain:
      1.2 (newer format in varying locations) or "none" indicating that
      the kernel isn't managing metadata at all.
 
-  level
-     The raid 'level' for this array.  The name will often (but not
-     always) be the same as the name of the module that implements the
-     level.  To be auto-loaded the module must have an alias
-        md-$LEVEL  e.g. md-raid5
-     This can be written only while the array is being assembled, not
-     after it is started.
-
   layout
      The "layout" for the array for the particular level.  This is
      simply a number that is interpretted differently by different
@@ -410,6 +403,15 @@ also have
       than sectors, this my be larger than the number of actual errors
       by a factor of the number of sectors in a page.
 
+   bitmap_set_bits
+      If the array has a write-intent bitmap, then writing to this
+      attribute can set bits in the bitmap, indicating that a resync
+      would need to check the corresponding blocks. Either individual
+      numbers or start-end pairs can be written.  Multiple numbers
+      can be separated by a space.
+      Note that the numbers are 'bit' numbers, not 'block' numbers.
+      They should be scaled by the bitmap_chunksize.
+
 Each active md device may also have attributes specific to the
 personality module that manages it.
 These are specific to the implementation of the module and could
diff --git a/MAINTAINERS b/MAINTAINERS
index f0cd5a3f6de6..b62ab43c6094 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2711,14 +2711,6 @@ M:	chrisw@sous-sol.org
 L:      stable@kernel.org
 S:      Maintained
 
-STABLE BRANCH:
-P:      Greg Kroah-Hartman
-M:      greg@kroah.com
-P:      Chris Wright
-M:      chrisw@sous-sol.org
-L:      stable@kernel.org
-S:      Maintained
-
 TPM DEVICE DRIVER
 P:      Kylene Hall
 M:      kjhall@us.ibm.com
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 8a31fc1bfb15..ad6173651995 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -111,22 +111,26 @@ struct osf_dirent_callback {
 
 static int
 osf_filldir(void *__buf, const char *name, int namlen, loff_t offset,
-            ino_t ino, unsigned int d_type)
+            u64 ino, unsigned int d_type)
 {
         struct osf_dirent __user *dirent;
         struct osf_dirent_callback *buf = (struct osf_dirent_callback *) __buf;
         unsigned int reclen = ROUND_UP(NAME_OFFSET + namlen + 1);
+        unsigned int d_ino;
 
         buf->error = -EINVAL;   /* only used if we fail */
         if (reclen > buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         if (buf->basep) {
                 if (put_user(offset, buf->basep))
                         return -EFAULT;
                 buf->basep = NULL;
         }
         dirent = buf->dirent;
-        put_user(ino, &dirent->d_ino);
+        put_user(d_ino, &dirent->d_ino);
         put_user(namlen, &dirent->d_namlen);
         put_user(reclen, &dirent->d_reclen);
         if (copy_to_user(dirent->d_name, name, namlen) ||
diff --git a/arch/arm/mach-pnx4008/clock.c b/arch/arm/mach-pnx4008/clock.c
index f582ed2ec43c..daa8d3d98eff 100644
--- a/arch/arm/mach-pnx4008/clock.c
+++ b/arch/arm/mach-pnx4008/clock.c
@@ -735,6 +735,16 @@ static struct clk uart6_ck = {
         .enable_reg = UARTCLKCTRL_REG,
 };
 
+static struct clk wdt_ck = {
+        .name = "wdt_ck",
+        .parent = &per_ck,
+        .flags = NEEDS_INITIALIZATION,
+        .round_rate = &on_off_round_rate,
+        .set_rate = &on_off_set_rate,
+        .enable_shift = 0,
+        .enable_reg = TIMCLKCTRL_REG,
+};
+
 /* These clocks are visible outside this module
  * and can be initialized
  */
@@ -765,6 +775,7 @@ static struct clk *onchip_clks[] = {
         &uart4_ck,
         &uart5_ck,
         &uart6_ck,
+        &wdt_ck,
 };
 
 static int local_clk_enable(struct clk *clk)
diff --git a/arch/arm/vfp/vfpsingle.c b/arch/arm/vfp/vfpsingle.c
index ab5e9503bae5..0221ba3bc799 100644
--- a/arch/arm/vfp/vfpsingle.c
+++ b/arch/arm/vfp/vfpsingle.c
@@ -198,8 +198,10 @@ u32 vfp_single_normaliseround(int sd, struct vfp_single *vs, u32 fpscr, u32 exce
         vfp_single_dump("pack: final", vs);
         {
                 s32 d = vfp_single_pack(vs);
+#ifdef DEBUG
                 pr_debug("VFP: %s: d(s%d)=%08x exceptions=%08x\n", func,
                          sd, d, exceptions);
+#endif
                 vfp_put_float(d, sd);
         }
 
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index f7b171b92ea2..cf1c446e003a 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -86,6 +86,14 @@ config HIGHPTE
           with a lot of RAM, this can be wasteful of precious low memory.
           Setting this option will put user-space page tables in high memory.
 
+config LARGE_ALLOCS
+        bool "Allow allocating large blocks (> 1MB) of memory"
+        help
+          Allow the slab memory allocator to keep chains for very large memory
+          sizes - up to 32MB. You may need this if your system has a lot of
+          RAM, and you need to able to allocate very large contiguous chunks.
+          If unsure, say N.
+
 source "mm/Kconfig"
 
 choice
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index bddbd22706ed..9d6a3f210148 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -125,6 +125,7 @@ sys32_execve (char __user *name, compat_uptr_t __user *argv, compat_uptr_t __use
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
 {
+        compat_ino_t ino;
         int err;
 
         if ((u64) stat->size > MAX_NON_LFS ||
@@ -132,11 +133,15 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
             !old_valid_dev(stat->rdev))
                 return -EOVERFLOW;
 
+        ino = stat->ino;
+        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+                return -EOVERFLOW;
+
         if (clear_user(ubuf, sizeof(*ubuf)))
                 return -EFAULT;
 
         err  = __put_user(old_encode_dev(stat->dev), &ubuf->st_dev);
-        err |= __put_user(stat->ino, &ubuf->st_ino);
+        err |= __put_user(ino, &ubuf->st_ino);
         err |= __put_user(stat->mode, &ubuf->st_mode);
         err |= __put_user(stat->nlink, &ubuf->st_nlink);
         err |= __put_user(high2lowuid(stat->uid), &ubuf->st_uid);
@@ -1222,16 +1227,20 @@ struct readdir32_callback {
 };
 
 static int
-filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino,
+filldir32 (void *__buf, const char *name, int namlen, loff_t offset, u64 ino,
            unsigned int d_type)
 {
         struct compat_dirent __user * dirent;
         struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
         int reclen = ROUND_UP(offsetof(struct compat_dirent, d_name) + namlen + 1, 4);
+        u32 d_ino;
 
         buf->error = -EINVAL;   /* only used if we fail.. */
         if (reclen > buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         buf->error = -EFAULT;   /* only used if we fail.. */
         dirent = buf->previous;
         if (dirent)
@@ -1239,7 +1248,7 @@ filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino,
                         return -EFAULT;
         dirent = buf->current_dir;
         buf->previous = dirent;
-        if (put_user(ino, &dirent->d_ino)
+        if (put_user(d_ino, &dirent->d_ino)
             || put_user(reclen, &dirent->d_reclen)
             || copy_to_user(dirent->d_name, name, namlen)
             || put_user(0, dirent->d_name + namlen))
@@ -1287,17 +1296,21 @@ out:
 }
 
 static int
-fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, ino_t ino,
+fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, u64 ino,
               unsigned int d_type)
 {
         struct readdir32_callback * buf = (struct readdir32_callback *) __buf;
         struct old_linux32_dirent __user * dirent;
+        u32 d_ino;
 
         if (buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         buf->count++;
         dirent = buf->dirent;
-        if (put_user(ino, &dirent->d_ino)
+        if (put_user(d_ino, &dirent->d_ino)
             || put_user(offset, &dirent->d_offset)
             || put_user(namlen, &dirent->d_namlen)
             || copy_to_user(dirent->d_name, name, namlen)
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index 52cada45b353..53f4171fc188 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -77,6 +77,8 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
         memset(&tmp, 0, sizeof(tmp));
         tmp.st_dev = new_encode_dev(stat->dev);
         tmp.st_ino = stat->ino;
+        if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
+                return -EOVERFLOW;
         tmp.st_mode = stat->mode;
         tmp.st_nlink = stat->nlink;
         SET_UID(tmp.st_uid, stat->uid);
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c
index 11bb97174972..93c74fefff76 100644
--- a/arch/mips/kernel/sysirix.c
+++ b/arch/mips/kernel/sysirix.c
@@ -1739,12 +1739,13 @@ struct irix_dirent32_callback {
 #define ROUND_UP32(x) (((x)+sizeof(u32)-1) & ~(sizeof(u32)-1))
 
 static int irix_filldir32(void *__buf, const char *name,
-        int namlen, loff_t offset, ino_t ino, unsigned int d_type)
+        int namlen, loff_t offset, u64 ino, unsigned int d_type)
 {
         struct irix_dirent32 __user *dirent;
         struct irix_dirent32_callback *buf = __buf;
         unsigned short reclen = ROUND_UP32(NAME_OFFSET32(dirent) + namlen + 1);
         int err = 0;
+        u32 d_ino;
 
 #ifdef DEBUG_GETDENTS
         printk("\nirix_filldir32[reclen<%d>namlen<%d>count<%d>]",
@@ -1753,12 +1754,15 @@ static int irix_filldir32(void *__buf, const char *name,
         buf->error = -EINVAL;   /* only used if we fail.. */
         if (reclen > buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         dirent = buf->previous;
         if (dirent)
                 err = __put_user(offset, &dirent->d_off);
         dirent = buf->current_dir;
         err |= __put_user(dirent, &buf->previous);
-        err |= __put_user(ino, &dirent->d_ino);
+        err |= __put_user(d_ino, &dirent->d_ino);
         err |= __put_user(reclen, &dirent->d_reclen);
         err |= copy_to_user((char __user *)dirent->d_name, name, namlen) ? -EFAULT : 0;
         err |= __put_user(0, &dirent->d_name[namlen]);
@@ -1837,7 +1841,7 @@ struct irix_dirent64_callback {
 #define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
 
 static int irix_filldir64(void *__buf, const char *name,
-        int namlen, loff_t offset, ino_t ino, unsigned int d_type)
+        int namlen, loff_t offset, u64 ino, unsigned int d_type)
 {
         struct irix_dirent64 __user *dirent;
         struct irix_dirent64_callback * buf = __buf;
diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c
index d7c80edf4489..6e79dbf3f6bd 100644
--- a/arch/parisc/hpux/fs.c
+++ b/arch/parisc/hpux/fs.c
@@ -77,17 +77,21 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
 {
         struct hpux_dirent * dirent;
         struct getdents_callback * buf = (struct getdents_callback *) __buf;
+        ino_t d_ino;
         int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
 
         buf->error = -EINVAL;   /* only used if we fail.. */
         if (reclen > buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         dirent = buf->previous;
         if (dirent)
                 put_user(offset, &dirent->d_off);
         dirent = buf->current_dir;
         buf->previous = dirent;
-        put_user(ino, &dirent->d_ino);
+        put_user(d_ino, &dirent->d_ino);
         put_user(reclen, &dirent->d_reclen);
         put_user(namlen, &dirent->d_namlen);
         copy_to_user(dirent->d_name, name, namlen);
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index b74869803081..e3b30bc36453 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -237,14 +237,19 @@ int sys32_settimeofday(struct compat_timeval __user *tv, struct timezone __user
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
 {
+        compat_ino_t ino;
         int err;
 
         if (stat->size > MAX_NON_LFS || !new_valid_dev(stat->dev) ||
             !new_valid_dev(stat->rdev))
                 return -EOVERFLOW;
 
+        ino = stat->ino;
+        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+                return -EOVERFLOW;
+
         err  = put_user(new_encode_dev(stat->dev), &statbuf->st_dev);
-        err |= put_user(stat->ino, &statbuf->st_ino);
+        err |= put_user(ino, &statbuf->st_ino);
         err |= put_user(stat->mode, &statbuf->st_mode);
         err |= put_user(stat->nlink, &statbuf->st_nlink);
         err |= put_user(0, &statbuf->st_reserved1);
@@ -312,16 +317,20 @@ filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino,
         struct linux32_dirent __user * dirent;
         struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
         int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1, 4);
+        u32 d_ino;
 
         buf->error = -EINVAL;   /* only used if we fail.. */
         if (reclen > buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         dirent = buf->previous;
         if (dirent)
                 put_user(offset, &dirent->d_off);
         dirent = buf->current_dir;
         buf->previous = dirent;
-        put_user(ino, &dirent->d_ino);
+        put_user(d_ino, &dirent->d_ino);
         put_user(reclen, &dirent->d_reclen);
         copy_to_user(dirent->d_name, name, namlen);
         put_user(0, dirent->d_name + namlen);
@@ -371,12 +380,16 @@ fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, ino_t
 {
         struct readdir32_callback * buf = (struct readdir32_callback *) __buf;
         struct old_linux32_dirent __user * dirent;
+        u32 d_ino;
 
         if (buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         buf->count++;
         dirent = buf->dirent;
-        put_user(ino, &dirent->d_ino);
+        put_user(d_ino, &dirent->d_ino);
         put_user(offset, &dirent->d_offset);
         put_user(namlen, &dirent->d_namlen);
         copy_to_user(dirent->d_name, name, namlen);
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 01667d1d571d..a00fe7236555 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -20,6 +20,7 @@ CROSS32_COMPILE ?=
 CROSS32CC               := $(CROSS32_COMPILE)gcc
 CROSS32AS               := $(CROSS32_COMPILE)as
 CROSS32LD               := $(CROSS32_COMPILE)ld
+CROSS32AR               := $(CROSS32_COMPILE)ar
 CROSS32OBJCOPY          := $(CROSS32_COMPILE)objcopy
 
 ifeq ($(HAS_BIARCH),y)
@@ -28,10 +29,11 @@ CROSS32CC	:= $(CC) -m32
 CROSS32AS       := $(AS) -a32
 CROSS32LD       := $(LD) -m elf32ppc
 CROSS32OBJCOPY  := $(OBJCOPY)
+CROSS32AR       := $(AR)
 endif
 endif
 
-export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY
+export CROSS32CC CROSS32AS CROSS32LD CROSS32AR CROSS32OBJCOPY
 
 KBUILD_DEFCONFIG := $(shell uname -m)_defconfig
 
@@ -146,7 +148,7 @@ all: $(KBUILD_IMAGE)
 
 CPPFLAGS_vmlinux.lds    := -Upowerpc
 
-BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage vmlinux.bin
+BOOT_TARGETS = zImage zImage.initrd uImage
 
 PHONY += $(BOOT_TARGETS)
 
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index e73774136b55..c383d56bbe18 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -20,33 +20,34 @@
 #       CROSS32_COMPILE is setup as a prefix just like CROSS_COMPILE
 #       in the toplevel makefile.
 
+all: $(obj)/zImage
 
 HOSTCC          := gcc
 BOOTCFLAGS      := $(HOSTCFLAGS) -fno-builtin -nostdinc -isystem \
                    $(shell $(CROSS32CC) -print-file-name=include) -fPIC
 BOOTAFLAGS      := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc
-OBJCOPYFLAGS    := contents,alloc,load,readonly,data
-OBJCOPY_COFF_ARGS := -O aixcoff-rs6000 --set-start 0x500000
-OBJCOPY_MIB_ARGS  := -O aixcoff-rs6000 -R .stab -R .stabstr -R .comment
+
+ifeq ($(call cc-option-yn, -fstack-protector),y)
+BOOTCFLAGS      += -fno-stack-protector
+endif
+
+BOOTCFLAGS      += -I$(obj) -I$(srctree)/$(obj)
 
 zlib       := inffast.c inflate.c inftrees.c
 zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h
 zliblinuxheader := zlib.h zconf.h zutil.h
 
-$(addprefix $(obj)/,$(zlib) main.o): $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
-#$(addprefix $(obj)/,main.o): $(addprefix $(obj)/,zlib.h)
+$(addprefix $(obj)/,$(zlib) main.o): $(addprefix $(obj)/,$(zliblinuxheader)) \
+                $(addprefix $(obj)/,$(zlibheader))
+
+src-wlib := string.S stdio.c main.c div64.S $(zlib)
+src-plat := of.c
+src-boot := crt0.S $(src-wlib) $(src-plat) empty.c
 
-src-boot-$(CONFIG_PPC_MULTIPLATFORM) := of.c
-src-boot := crt0.S string.S stdio.c main.c div64.S $(src-boot-y)
-src-boot += $(zlib)
 src-boot := $(addprefix $(obj)/, $(src-boot))
 obj-boot := $(addsuffix .o, $(basename $(src-boot)))
-
-ifeq ($(call cc-option-yn, -fstack-protector),y)
-BOOTCFLAGS      += -fno-stack-protector
-endif
-
-BOOTCFLAGS      += -I$(obj) -I$(srctree)/$(obj)
+obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib))))
+obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat))))
 
 quiet_cmd_copy_zlib = COPY    $@
       cmd_copy_zlib = sed "s@__attribute_used__@@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@
@@ -66,8 +67,14 @@ $(addprefix $(obj)/,$(zlibheader)): $(obj)/%: $(srctree)/lib/zlib_inflate/%
 $(addprefix $(obj)/,$(zliblinuxheader)): $(obj)/%: $(srctree)/include/linux/%
         $(call cmd,copy_zliblinuxheader)
 
-clean-files := $(zlib) $(zlibheader) $(zliblinuxheader)
+$(obj)/empty.c:
+        @touch $@
+
+$(obj)/zImage.lds $(obj)/zImage.coff.lds: $(obj)/%: $(srctree)/$(src)/%.S
+        @cp $< $@
 
+clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \
+                $(obj)/empty.c
 
 quiet_cmd_bootcc = BOOTCC  $@
       cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
@@ -75,146 +82,97 @@ quiet_cmd_bootcc = BOOTCC  $@
 quiet_cmd_bootas = BOOTAS  $@
       cmd_bootas = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $<
 
-quiet_cmd_bootld = BOOTLD  $@
-      cmd_bootld = $(CROSS32LD) -T $(srctree)/$(src)/$(3) -o $@ $(2)
+quiet_cmd_bootar = BOOTAR  $@
+      cmd_bootar = $(CROSS32AR) -cr $@.$$$$ $^; mv $@.$$$$ $@
 
 $(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c
         $(call if_changed_dep,bootcc)
 $(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S
         $(call if_changed_dep,bootas)
 
-#-----------------------------------------------------------
-# ELF sections within the zImage bootloader/wrapper
-#-----------------------------------------------------------
-required := vmlinux.strip
-initrd   := initrd
+$(obj)/wrapper.a: $(obj-wlib)
+        $(call cmd,bootar)
 
-obj-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.o, $(section)))
-src-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.c, $(section)))
-gz-sec  = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.gz, $(section)))
+hostprogs-y     := addnote addRamDisk hack-coff
 
-hostprogs-y             := addnote addRamDisk hack-coff
+extra-y         := $(obj)/crt0.o $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \
+                   $(obj)/zImage.lds $(obj)/zImage.coff.lds
 
-targets += zImage.vmode zImage.initrd.vmode zImage zImage.initrd \
-           zImage.coff zImage.initrd.coff miboot.image miboot.initrd.image \
-           $(patsubst $(obj)/%,%, $(call obj-sec, $(required) $(initrd))) \
-           $(patsubst $(obj)/%,%, $(call src-sec, $(required) $(initrd))) \
-           $(patsubst $(obj)/%,%, $(call gz-sec, $(required) $(initrd))) \
-           vmlinux.initrd dummy.o
-extra-y                 := initrd.o
+wrapper         :=$(srctree)/$(src)/wrapper
+wrapperbits     := $(extra-y) $(addprefix $(obj)/,addnote hack-coff)
 
-quiet_cmd_ramdisk = RAMDISK $@
-      cmd_ramdisk = $(obj)/addRamDisk $(obj)/ramdisk.image.gz $< $@
+#############
+# Bits for building various flavours of zImage
 
-quiet_cmd_stripvm = STRIP   $@
-      cmd_stripvm = $(STRIP) -s -R .comment $< -o $@
+ifneq ($(CROSS32_COMPILE),)
+CROSSWRAP := -C $(CROSS32_COMPILE)
+else
+ifneq ($(CROSS_COMPILE),)
+CROSSWRAP := -C $(CROSS_COMPILE)
+endif
+endif
 
-vmlinux.strip: vmlinux
-        $(call if_changed,stripvm)
-$(obj)/vmlinux.initrd: vmlinux.strip $(obj)/addRamDisk $(obj)/ramdisk.image.gz
-        $(call if_changed,ramdisk)
+quiet_cmd_wrap  = WRAP    $@
+      cmd_wrap  =$(wrapper) -c -o $@ -p $2 $(CROSSWRAP) vmlinux
+quiet_cmd_wrap_initrd = WRAP    $@
+      cmd_wrap_initrd =$(wrapper) -c -o $@ -p $2 $(CROSSWRAP) \
+                                -i $(obj)/ramdisk.image.gz vmlinux
 
-quiet_cmd_addsection = ADDSEC  $@
-      cmd_addsection = $(CROSS32OBJCOPY) $@ \
-                --add-section=.kernel:$(strip $(patsubst $(obj)/kernel-%.o,%, $@))=$(patsubst %.o,%.gz, $@) \
-                --set-section-flags=.kernel:$(strip $(patsubst $(obj)/kernel-%.o,%, $@))=$(OBJCOPYFLAGS)
+$(obj)/zImage.chrp: vmlinux $(wrapperbits)
+        $(call cmd,wrap,chrp)
 
-quiet_cmd_addnote = ADDNOTE $@
-      cmd_addnote = $(obj)/addnote $@
+$(obj)/zImage.initrd.chrp: vmlinux $(wrapperbits)
+        $(call cmd,wrap_initrd,chrp)
 
-quiet_cmd_gen-miboot = GEN     $@
-      cmd_gen-miboot = $(OBJCOPY) $(OBJCOPY_MIB_ARGS) \
-                       --add-section=$1=$(word 2, $^) $< $@
+$(obj)/zImage.pseries:  vmlinux $(wrapperbits)
+        $(call cmd,wrap,pseries)
 
-quiet_cmd_gencoff = COFF    $@
-      cmd_gencoff = $(OBJCOPY) $(OBJCOPY_COFF_ARGS) $@ && \
-                    $(obj)/hack-coff $@
+$(obj)/zImage.initrd.pseries: vmlinux $(wrapperbits)
+        $(call cmd,wrap_initrd,pseries)
 
-$(call gz-sec, $(required)): $(obj)/kernel-%.gz: %
-        $(call if_changed,gzip)
+$(obj)/zImage.pmac: vmlinux $(wrapperbits)
+        $(call cmd,wrap,pmac)
 
-$(obj)/kernel-initrd.gz: $(obj)/ramdisk.image.gz
-        cp -f $(obj)/ramdisk.image.gz $@
+$(obj)/zImage.initrd.pmac: vmlinux $(wrapperbits)
+        $(call cmd,wrap_initrd,pmac)
 
-$(call src-sec, $(required) $(initrd)): $(obj)/kernel-%.c: $(obj)/kernel-%.gz
-        @touch $@
+$(obj)/zImage.coff: vmlinux $(wrapperbits)
+        $(call cmd,wrap,pmaccoff)
 
-$(call obj-sec, $(required) $(initrd)): $(obj)/kernel-%.o: $(obj)/kernel-%.c
-        $(call if_changed_dep,bootcc)
-        $(call cmd,addsection)
+$(obj)/zImage.initrd.coff: vmlinux $(wrapperbits)
+        $(call cmd,wrap_initrd,pmaccoff)
+
+$(obj)/zImage.miboot: vmlinux $(wrapperbits)
+        $(call cmd,wrap,miboot)
 
-$(obj)/zImage.vmode $(obj)/zImage.coff: obj-boot += $(call obj-sec, $(required))
-$(obj)/zImage.vmode: $(call obj-sec, $(required)) $(obj-boot) $(srctree)/$(src)/zImage.lds
-        $(call cmd,bootld,$(obj-boot),zImage.lds)
+$(obj)/zImage.initrd.miboot: vmlinux $(wrapperbits)
+        $(call cmd,wrap_initrd,miboot)
 
-$(obj)/zImage.initrd.vmode $(obj)/zImage.initrd.coff: obj-boot += $(call obj-sec, $(required) $(initrd))
-$(obj)/zImage.initrd.vmode: $(call obj-sec, $(required) $(initrd)) $(obj-boot) $(srctree)/$(src)/zImage.lds
-        $(call cmd,bootld,$(obj-boot),zImage.lds)
+$(obj)/uImage: vmlinux $(wrapperbits)
+        $(call cmd,wrap,uboot)
+
+image-$(CONFIG_PPC_PSERIES)     += zImage.pseries
+image-$(CONFIG_PPC_MAPLE)       += zImage.pseries
+image-$(CONFIG_PPC_CELL)        += zImage.pseries
+image-$(CONFIG_PPC_CHRP)        += zImage.chrp
+image-$(CONFIG_PPC_PMAC)        += zImage.pmac
+image-$(CONFIG_DEFAULT_UIMAGE)  += uImage
 
 # For 32-bit powermacs, build the COFF and miboot images
 # as well as the ELF images.
-coffimage-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/zImage.coff
-coffrdimg-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/zImage.initrd.coff
-mibootimg-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/miboot.image
-mibrdimg-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32)  := $(obj)/miboot.initrd.image
-
-$(obj)/zImage: $(obj)/zImage.vmode $(obj)/addnote $(coffimage-y-y) \
-                        $(mibootimg-y-y)
-        @cp -f $< $@
-        $(call if_changed,addnote)
-
-$(obj)/zImage.initrd: $(obj)/zImage.initrd.vmode $(obj)/addnote \
-                        $(coffrdimg-y-y) $(mibrdimg-y-y)
-        @cp -f $< $@
-        $(call if_changed,addnote)
-
-$(obj)/zImage.coff: $(call obj-sec, $(required)) $(obj-boot) \
-                        $(srctree)/$(src)/zImage.coff.lds $(obj)/hack-coff
-        $(call cmd,bootld,$(obj-boot),zImage.coff.lds)
-        $(call cmd,gencoff)
-
-$(obj)/zImage.initrd.coff: $(call obj-sec, $(required) $(initrd)) $(obj-boot) \
-                           $(srctree)/$(src)/zImage.coff.lds $(obj)/hack-coff
-        $(call cmd,bootld,$(obj-boot),zImage.coff.lds)
-        $(call cmd,gencoff)
-
-$(obj)/miboot.image: $(obj)/dummy.o $(obj)/vmlinux.gz
-        $(call cmd,gen-miboot,image)
-
-$(obj)/miboot.initrd.image: $(obj)/miboot.image $(images)/ramdisk.image.gz
-        $(call cmd,gen-miboot,initrd)
-
-#-----------------------------------------------------------
-# build u-boot images
-#-----------------------------------------------------------
-quiet_cmd_mygzip = GZIP $@
-cmd_mygzip = gzip -f -9 < $< > $@.$$$$ && mv $@.$$$$ $@
-
-quiet_cmd_objbin = OBJCOPY $@
-      cmd_objbin = $(OBJCOPY) -O binary $< $@
-
-quiet_cmd_uimage = UIMAGE $@
-      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A ppc -O linux -T kernel \
-               -C gzip -a 00000000 -e 00000000 -n 'Linux-$(KERNELRELEASE)' \
-               -d $< $@
-
-MKIMAGE         := $(srctree)/scripts/mkuboot.sh
-targets         += uImage
-extra-y         += vmlinux.bin vmlinux.gz
-
-$(obj)/vmlinux.bin: vmlinux FORCE
-        $(call if_changed,objbin)
-
-$(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE
-        $(call if_changed,mygzip)
-
-$(obj)/uImage: $(obj)/vmlinux.gz
-        $(Q)rm -f $@
-        $(call cmd,uimage)
-        @echo -n '  Image: $@ '
-        @if [ -f $@ ]; then echo 'is ready' ; else echo 'not made'; fi
-
-install: $(CONFIGURE) $(BOOTIMAGE)
-        sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" "$(BOOTIMAGE)"
-
-clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip)
+ifeq ($(CONFIG_PPC32),y)
+image-$(CONFIG_PPC_PMAC)        += zImage.coff zImage.miboot
+endif
+
+initrd-y := $(patsubst zImage%, zImage.initrd%, $(image-y))
+
+$(obj)/zImage:          $(addprefix $(obj)/, $(image-y))
+        @rm -f $@; ln $< $@
+$(obj)/zImage.initrd:   $(addprefix $(obj)/, $(initrd-y))
+        @rm -f $@; ln $< $@
+
+install: $(CONFIGURE) $(image-y)
+        sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $<
+
+clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip.gz)
+clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.bin.gz)
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
new file mode 100644
index 000000000000..2b168486aeba
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -0,0 +1,302 @@
+/*
+ * MPC8560 ADS Device Tree Source
+ *
+ * Copyright 2006 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+
+/ {
+        model = "MPC8560ADS";
+        compatible = "MPC85xxADS";
+        #address-cells = <1>;
+        #size-cells = <1>;
+        linux,phandle = <100>;
+
+        cpus {
+                #cpus = <1>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                linux,phandle = <200>;
+
+                PowerPC,8560@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <20>;       // 32 bytes
+                        i-cache-line-size = <20>;       // 32 bytes
+                        d-cache-size = <8000>;          // L1, 32K
+                        i-cache-size = <8000>;          // L1, 32K
+                        timebase-frequency = <04ead9a0>;
+                        bus-frequency = <13ab6680>;
+                        clock-frequency = <312c8040>;
+                        32-bit;
+                        linux,phandle = <201>;
+                        linux,boot-cpu;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                linux,phandle = <300>;
+                reg = <00000000 10000000>;
+        };
+
+        soc8560@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                #interrupt-cells = <2>;
+                device_type = "soc";
+                ranges = <0 e0000000 00100000>;
+                reg = <e0000000 00000200>;
+                bus-frequency = <13ab6680>;
+
+                mdio@24520 {
+                        device_type = "mdio";
+                        compatible = "gianfar";
+                        reg = <24520 20>;
+                        linux,phandle = <24520>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        ethernet-phy@0 {
+                                linux,phandle = <2452000>;
+                                interrupt-parent = <40000>;
+                                interrupts = <35 1>;
+                                reg = <0>;
+                                device_type = "ethernet-phy";
+                        };
+                        ethernet-phy@1 {
+                                linux,phandle = <2452001>;
+                                interrupt-parent = <40000>;
+                                interrupts = <35 1>;
+                                reg = <1>;
+                                device_type = "ethernet-phy";
+                        };
+                        ethernet-phy@2 {
+                                linux,phandle = <2452002>;
+                                interrupt-parent = <40000>;
+                                interrupts = <37 1>;
+                                reg = <2>;
+                                device_type = "ethernet-phy";
+                        };
+                        ethernet-phy@3 {
+                                linux,phandle = <2452003>;
+                                interrupt-parent = <40000>;
+                                interrupts = <37 1>;
+                                reg = <3>;
+                                device_type = "ethernet-phy";
+                        };
+                };
+
+                ethernet@24000 {
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <24000 1000>;
+                        address = [ 00 00 0C 00 00 FD ];
+                        interrupts = <d 2 e 2 12 2>;
+                        interrupt-parent = <40000>;
+                        phy-handle = <2452000>;
+                };
+
+                ethernet@25000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <25000 1000>;
+                        address = [ 00 00 0C 00 01 FD ];
+                        interrupts = <13 2 14 2 18 2>;
+                        interrupt-parent = <40000>;
+                        phy-handle = <2452001>;
+                };
+
+                pci@8000 {
+                        linux,phandle = <8000>;
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        compatible = "85xx";
+                        device_type = "pci";
+                        reg = <8000 400>;
+                        clock-frequency = <3f940aa>;
+                        interrupt-map-mask = <f800 0 0 7>;
+                        interrupt-map = <
+
+                                        /* IDSEL 0x2 */
+                                         1000 0 0 1 40000 31 1
+                                         1000 0 0 2 40000 32 1
+                                         1000 0 0 3 40000 33 1
+                                         1000 0 0 4 40000 34 1
+
+                                        /* IDSEL 0x3 */
+                                         1800 0 0 1 40000 34 1
+                                         1800 0 0 2 40000 31 1
+                                         1800 0 0 3 40000 32 1
+                                         1800 0 0 4 40000 33 1
+
+                                        /* IDSEL 0x4 */
+                                         2000 0 0 1 40000 33 1
+                                         2000 0 0 2 40000 34 1
+                                         2000 0 0 3 40000 31 1
+                                         2000 0 0 4 40000 32 1
+
+                                        /* IDSEL 0x5  */
+                                         2800 0 0 1 40000 32 1
+                                         2800 0 0 2 40000 33 1
+                                         2800 0 0 3 40000 34 1
+                                         2800 0 0 4 40000 31 1
+
+                                        /* IDSEL 12 */
+                                         6000 0 0 1 40000 31 1
+                                         6000 0 0 2 40000 32 1
+                                         6000 0 0 3 40000 33 1
+                                         6000 0 0 4 40000 34 1
+
+                                        /* IDSEL 13 */
+                                         6800 0 0 1 40000 34 1
+                                         6800 0 0 2 40000 31 1
+                                         6800 0 0 3 40000 32 1
+                                         6800 0 0 4 40000 33 1
+
+                                        /* IDSEL 14*/
+                                         7000 0 0 1 40000 33 1
+                                         7000 0 0 2 40000 34 1
+                                         7000 0 0 3 40000 31 1
+                                         7000 0 0 4 40000 32 1
+
+                                        /* IDSEL 15 */
+                                         7800 0 0 1 40000 32 1
+                                         7800 0 0 2 40000 33 1
+                                         7800 0 0 3 40000 34 1
+                                         7800 0 0 4 40000 31 1
+
+                                        /* IDSEL 18 */
+                                         9000 0 0 1 40000 31 1
+                                         9000 0 0 2 40000 32 1
+                                         9000 0 0 3 40000 33 1
+                                         9000 0 0 4 40000 34 1
+
+                                        /* IDSEL 19 */
+                                         9800 0 0 1 40000 34 1
+                                         9800 0 0 2 40000 31 1
+                                         9800 0 0 3 40000 32 1
+                                         9800 0 0 4 40000 33 1
+
+                                        /* IDSEL 20 */
+                                         a000 0 0 1 40000 33 1
+                                         a000 0 0 2 40000 34 1
+                                         a000 0 0 3 40000 31 1
+                                         a000 0 0 4 40000 32 1
+
+                                        /* IDSEL 21 */
+                                         a800 0 0 1 40000 32 1
+                                         a800 0 0 2 40000 33 1
+                                         a800 0 0 3 40000 34 1
+                                         a800 0 0 4 40000 31 1>;
+
+                        interrupt-parent = <40000>;
+                        interrupts = <42 0>;
+                        bus-range = <0 0>;
+                        ranges = <02000000 0 80000000 80000000 0 20000000
+                                  01000000 0 00000000 e2000000 0 01000000>;
+                };
+
+                pic@40000 {
+                        linux,phandle = <40000>;
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <40000 20100>;
+                        built-in;
+                        device_type = "open-pic";
+                };
+
+                cpm@e0000000 {
+                        linux,phandle = <e0000000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        #interrupt-cells = <2>;
+                        device_type = "cpm";
+                        model = "CPM2";
+                        ranges = <0 0 c0000>;
+                        reg = <80000 40000>;
+                        command-proc = <919c0>;
+                        brg-frequency = <9d5b340>;
+
+                        pic@90c00 {
+                                linux,phandle = <90c00>;
+                                interrupt-controller;
+                                #address-cells = <0>;
+                                #interrupt-cells = <2>;
+                                interrupts = <1e 0>;
+                                interrupt-parent = <40000>;
+                                reg = <90c00 80>;
+                                built-in;
+                                device_type = "cpm-pic";
+                        };
+
+                        scc@91a00 {
+                                device_type = "serial";
+                                compatible = "cpm_uart";
+                                model = "SCC";
+                                device-id = <1>;
+                                reg = <91a00 20 88000 100>;
+                                clock-setup = <00ffffff 0>;
+                                rx-clock = <1>;
+                                tx-clock = <1>;
+                                current-speed = <1c200>;
+                                interrupts = <64 1>;
+                                interrupt-parent = <90c00>;
+                        };
+
+                        scc@91a20 {
+                                device_type = "serial";
+                                compatible = "cpm_uart";
+                                model = "SCC";
+                                device-id = <2>;
+                                reg = <91a20 20 88100 100>;
+                                clock-setup = <ff00ffff 90000>;
+                                rx-clock = <2>;
+                                tx-clock = <2>;
+                                current-speed = <1c200>;
+                                interrupts = <65 1>;
+                                interrupt-parent = <90c00>;
+                        };
+
+                        fcc@91320 {
+                                device_type = "network";
+                                compatible = "fs_enet";
+                                model = "FCC";
+                                device-id = <2>;
+                                reg = <91320 20 88500 100 913a0 30>;
+                                mac-address = [ 00 00 0C 00 02 FD ];
+                                clock-setup = <ff00ffff 250000>;
+                                rx-clock = <15>;
+                                tx-clock = <16>;
+                                interrupts = <5d 1>;
+                                interrupt-parent = <90c00>;
+                                phy-handle = <2452002>;
+                        };
+
+                        fcc@91340 {
+                                device_type = "network";
+                                compatible = "fs_enet";
+                                model = "FCC";
+                                device-id = <3>;
+                                reg = <91340 20 88600 100 913d0 30>;
+                                mac-address = [ 00 00 0C 00 03 FD ];
+                                clock-setup = <ffff00ff 3700>;
+                                rx-clock = <17>;
+                                tx-clock = <18>;
+                                interrupts = <5e 1>;
+                                interrupt-parent = <90c00>;
+                                phy-handle = <2452003>;
+                        };
+                };
+        };
+};
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
new file mode 100755
index 000000000000..eab7318729e9
--- /dev/null
+++ b/arch/powerpc/boot/wrapper
@@ -0,0 +1,204 @@
+#!/bin/sh
+
+# Copyright (C) 2006 Paul Mackerras, IBM Corporation <paulus@samba.org>
+# This program may be used under the terms of version 2 of the GNU
+# General Public License.
+
+# This script takes a kernel binary and optionally an initrd image
+# and/or a device-tree blob, and creates a bootable zImage for a
+# given platform.
+
+# Options:
+# -o zImage     specify output file
+# -p platform   specify platform (links in $platform.o)
+# -i initrd     specify initrd file
+# -d devtree    specify device-tree blob
+# -s tree.dts   specify device-tree source file (needs dtc installed)
+# -c            cache $kernel.strip.gz (use if present & newer, else make)
+# -C prefix     specify command prefix for cross-building tools
+#               (strip, objcopy, ld)
+# -D dir        specify directory containing data files used by script
+#               (default ./arch/powerpc/boot)
+# -W dir        specify working directory for temporary files (default .)
+
+# defaults
+kernel=
+ofile=zImage
+platform=of
+initrd=
+dtb=
+dts=
+cacheit=
+
+# cross-compilation prefix
+CROSS=
+
+# directory for object and other files used by this script
+object=arch/powerpc/boot
+
+# directory for working files
+tmpdir=.
+
+usage() {
+    echo 'Usage: wrapper [-o output] [-p platform] [-i initrd]' >&2
+    echo '       [-d devtree] [-s tree.dts] [-c] [-C cross-prefix]' >&2
+    echo '       [-D datadir] [-W workingdir] [vmlinux]' >&2
+    exit 1
+}
+
+while [ "$#" -gt 0 ]; do
+    case "$1" in
+    -o)
+        shift
+        [ "$#" -gt 0 ] || usage
+        ofile="$1"
+        ;;
+    -p)
+        shift
+        [ "$#" -gt 0 ] || usage
+        platform="$1"
+        ;;
+    -i)
+        shift
+        [ "$#" -gt 0 ] || usage
+        initrd="$1"
+        ;;
+    -d)
+        shift
+        [ "$#" -gt 0 ] || usage
+        dtb="$1"
+        ;;
+    -s)
+        shift
+        [ "$#" -gt 0 ] || usage
+        dts="$1"
+        ;;
+    -c)
+        cacheit=y
+        ;;
+    -C)
+        shift
+        [ "$#" -gt 0 ] || usage
+        CROSS="$1"
+        ;;
+    -D)
+        shift
+        [ "$#" -gt 0 ] || usage
+        object="$1"
+        ;;
+    -W)
+        shift
+        [ "$#" -gt 0 ] || usage
+        tmpdir="$1"
+        ;;
+    -?)
+        usage
+        ;;
+    *)
+        [ -z "$kernel" ] || usage
+        kernel="$1"
+        ;;
+    esac
+    shift
+done
+
+if [ -n "$dts" ]; then
+    if [ -z "$dtb" ]; then
+        dtb="$platform.dtb"
+    fi
+    dtc -O dtb -o "$dtb" -b 0 -V 16 "$dts" || exit 1
+fi
+
+if [ -z "$kernel" ]; then
+    kernel=vmlinux
+fi
+
+platformo=$object/"$platform".o
+lds=$object/zImage.lds
+ext=strip
+objflags=-S
+tmp=$tmpdir/zImage.$$.o
+ksection=.kernel:vmlinux.strip
+isection=.kernel:initrd
+
+case "$platform" in
+pmac|pseries|chrp)
+    platformo=$object/of.o
+    ;;
+pmaccoff)
+    platformo=$object/of.o
+    lds=$object/zImage.coff.lds
+    ;;
+miboot|uboot)
+    # miboot and U-boot want just the bare bits, not an ELF binary
+    ext=bin
+    objflags="-O binary"
+    tmp="$ofile"
+    ksection=image
+    isection=initrd
+    ;;
+esac
+
+vmz="$tmpdir/`basename \"$kernel\"`.$ext"
+if [ -z "$cacheit" -o ! -f "$vmz.gz" -o "$vmz.gz" -ot "$kernel" ]; then
+    ${CROSS}objcopy $objflags "$kernel" "$vmz.$$"
+    gzip -f -9 "$vmz.$$"
+    if [ -n "$cacheit" ]; then
+        mv -f "$vmz.$$.gz" "$vmz.gz"
+    else
+        vmz="$vmz.$$"
+    fi
+fi
+
+case "$platform" in
+uboot)
+    rm -f "$ofile"
+    version=`${CROSS}strings "$kernel" | grep '^Linux version [-0-9.]' | \
+        cut -d' ' -f3`
+    if [ -n "$version" ]; then
+        version="-n Linux-$version"
+    fi
+    mkimage -A ppc -O linux -T kernel -C gzip -a 00000000 -e 00000000 \
+        $version -d "$vmz.gz" "$ofile"
+    if [ -z "$cacheit" ]; then
+        rm -f $vmz.gz
+    fi
+    exit 0
+    ;;
+esac
+
+addsec() {
+    ${CROSS}objcopy $4 $1 \
+        --add-section=$3="$2" \
+        --set-section-flags=$3=contents,alloc,load,readonly,data
+}
+
+addsec $tmp "$vmz.gz" $ksection $object/empty.o
+if [ -z "$cacheit" ]; then
+    rm -f "$vmz.gz"
+fi
+
+if [ -n "$initrd" ]; then
+    addsec $tmp "$initrd" initrd
+fi
+
+if [ -n "$dtb" ]; then
+    addsec $tmp "$dtb" dtb
+fi
+
+if [ "$platform" != "miboot" ]; then
+    ${CROSS}ld -m elf32ppc -T $lds -o "$ofile" \
+        $object/crt0.o $platformo $tmp $object/wrapper.a
+    rm $tmp
+fi
+
+# post-processing needed for some platforms
+case "$platform" in
+pseries|chrp)
+    $object/addnote "$ofile"
+    ;;
+pmaccoff)
+    ${CROSS}objcopy -O aixcoff-rs6000 --set-start 0x500000 "$ofile"
+    $object/hack-coff "$ofile"
+    ;;
+esac
diff --git a/arch/powerpc/boot/zImage.coff.lds b/arch/powerpc/boot/zImage.coff.lds.S
index 6016251a1a2c..6016251a1a2c 100644
--- a/arch/powerpc/boot/zImage.coff.lds
+++ b/arch/powerpc/boot/zImage.coff.lds.S
diff --git a/arch/powerpc/boot/zImage.lds b/arch/powerpc/boot/zImage.lds.S
index 4b6bb3ffe3dc..4b6bb3ffe3dc 100644
--- a/arch/powerpc/boot/zImage.lds
+++ b/arch/powerpc/boot/zImage.lds.S
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index bbf2b5f8a8cb..fee72f8a2fb7 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
@@ -492,7 +492,7 @@ CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_SATA is not set
+# CONFIG_ATA is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index 4b9c2ed925f5..92d0a9dd0b8f 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
@@ -490,23 +490,23 @@ CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_AHCI is not set
-CONFIG_SCSI_SATA_SVW=y
+CONFIG_ATA=y
+# CONFIG_SATA_AHCI is not set
+CONFIG_SATA_SVW=y
 # CONFIG_SCSI_ATA_PIIX is not set
-# CONFIG_SCSI_SATA_MV is not set
-# CONFIG_SCSI_SATA_NV is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
 # CONFIG_SCSI_PDC_ADMA is not set
 # CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_SATA_QSTOR is not set
-# CONFIG_SCSI_SATA_PROMISE is not set
-# CONFIG_SCSI_SATA_SX4 is not set
-# CONFIG_SCSI_SATA_SIL is not set
-# CONFIG_SCSI_SATA_SIL24 is not set
-# CONFIG_SCSI_SATA_SIS is not set
-# CONFIG_SCSI_SATA_ULI is not set
-# CONFIG_SCSI_SATA_VIA is not set
-# CONFIG_SCSI_SATA_VITESSE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_EATA is not set
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index eb0885ea0731..d58f82f836f8 100644
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_defconfig
@@ -475,7 +475,7 @@ CONFIG_SCSI_FC_ATTRS=y
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_SATA is not set
+# CONFIG_ATA is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index 719fba4eb421..d1811e754518 100644
--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig
+++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig
@@ -413,23 +413,23 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_AHCI is not set
-# CONFIG_SCSI_SATA_SVW is not set
+CONFIG_ATA=y
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_SVW is not set
 # CONFIG_SCSI_ATA_PIIX is not set
-CONFIG_SCSI_SATA_MV=y
-# CONFIG_SCSI_SATA_NV is not set
+CONFIG_SATA_MV=y
+# CONFIG_SATA_NV is not set
 # CONFIG_SCSI_PDC_ADMA is not set
 # CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_SATA_QSTOR is not set
-# CONFIG_SCSI_SATA_PROMISE is not set
-# CONFIG_SCSI_SATA_SX4 is not set
-# CONFIG_SCSI_SATA_SIL is not set
-# CONFIG_SCSI_SATA_SIL24 is not set
-# CONFIG_SCSI_SATA_SIS is not set
-# CONFIG_SCSI_SATA_ULI is not set
-# CONFIG_SCSI_SATA_VIA is not set
-# CONFIG_SCSI_SATA_VITESSE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_EATA is not set
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig
index 8da6a47f0339..cd3535e1a095 100644
--- a/arch/powerpc/configs/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/mpc834x_itx_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-rc6
-# Sun Sep 10 10:28:05 2006
+# Linux kernel version: 2.6.18
+# Mon Sep 25 19:41:14 2006
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -21,6 +21,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
 CONFIG_DEFAULT_UIMAGE=y
 
 #
@@ -61,25 +62,25 @@ CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-CONFIG_SYSCTL=y
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EMBEDDED=y
+CONFIG_SYSCTL=y
 # CONFIG_KALLSYMS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
-CONFIG_RT_MUTEXES=y
 CONFIG_FUTEX=y
 # CONFIG_EPOLL is not set
 CONFIG_SHMEM=y
 CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -259,7 +260,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -313,6 +313,7 @@ CONFIG_MTD_CHAR=y
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -464,23 +465,23 @@ CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_AHCI is not set
-# CONFIG_SCSI_SATA_SVW is not set
+CONFIG_ATA=y
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_SVW is not set
 # CONFIG_SCSI_ATA_PIIX is not set
-# CONFIG_SCSI_SATA_MV is not set
-# CONFIG_SCSI_SATA_NV is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
 # CONFIG_SCSI_PDC_ADMA is not set
 # CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_SATA_QSTOR is not set
-# CONFIG_SCSI_SATA_PROMISE is not set
-# CONFIG_SCSI_SATA_SX4 is not set
-CONFIG_SCSI_SATA_SIL=y
-# CONFIG_SCSI_SATA_SIL24 is not set
-# CONFIG_SCSI_SATA_SIS is not set
-# CONFIG_SCSI_SATA_ULI is not set
-# CONFIG_SCSI_SATA_VIA is not set
-# CONFIG_SCSI_SATA_VITESSE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_SATA_SIL=y
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_EATA is not set
@@ -1277,11 +1278,11 @@ CONFIG_PLIST=y
 #
 # Kernel hacking
 #
-CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_TIME is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
@@ -1293,15 +1294,15 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set
-CONFIG_BOOTX_TEXT=y
-CONFIG_SERIAL_TEXT_DEBUG=y
+# CONFIG_BOOTX_TEXT is not set
+# CONFIG_SERIAL_TEXT_DEBUG is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
@@ -1314,6 +1315,8 @@ CONFIG_SERIAL_TEXT_DEBUG=y
 # Cryptographic options
 #
 CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+# CONFIG_CRYPTO_MANAGER is not set
 # CONFIG_CRYPTO_HMAC is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_MD4 is not set
@@ -1323,6 +1326,8 @@ CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_CBC is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
diff --git a/arch/powerpc/configs/mpc8560_ads_defconfig b/arch/powerpc/configs/mpc8560_ads_defconfig
new file mode 100644
index 000000000000..ddc2a7b07ba0
--- /dev/null
+++ b/arch/powerpc/configs/mpc8560_ads_defconfig
@@ -0,0 +1,854 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.18-rc4
+# Fri Aug 11 16:45:05 2006
+#
+# CONFIG_PPC64 is not set
+CONFIG_PPC32=y
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_IRQ_PER_CPU=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+# CONFIG_PPC_UDBG_16550 is not set
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_DEFAULT_UIMAGE=y
+
+#
+# Processor support
+#
+# CONFIG_CLASSIC32 is not set
+# CONFIG_PPC_52xx is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+CONFIG_PPC_85xx=y
+# CONFIG_PPC_86xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_8xx is not set
+# CONFIG_E200 is not set
+CONFIG_85xx=y
+CONFIG_E500=y
+CONFIG_BOOKE=y
+CONFIG_FSL_BOOKE=y
+# CONFIG_PHYS_64BIT is not set
+CONFIG_SPE=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_EMBEDDED=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_RT_MUTEXES=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+# CONFIG_MODULES is not set
+
+#
+# Block layer
+#
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_MPIC=y
+CONFIG_CPM2=y
+# CONFIG_WANT_EARLY_SERIAL is not set
+
+#
+# Platform support
+#
+# CONFIG_MPC8540_ADS is not set
+CONFIG_MPC8560_ADS=y
+# CONFIG_MPC85xx_CDS is not set
+CONFIG_MPC8560=y
+CONFIG_PPC_INDIRECT_PCI_BE=y
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=y
+# CONFIG_MATH_EMULATION is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+# CONFIG_PC_KEYBOARD is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PROC_DEVICETREE is not set
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+# CONFIG_SOFTWARE_SUSPEND is not set
+# CONFIG_SECCOMP is not set
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+# CONFIG_PPC_I8259 is not set
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_SOC=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_PCI_DEBUG=y
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_HIGHMEM_START=0xfe000000
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_TASK_SIZE=0x80000000
+CONFIG_BOOT_LOAD=0x00800000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=32768
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Macintosh device drivers
+#
+# CONFIG_WINDFARM is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# PHY device support
+#
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=y
+CONFIG_DAVICOM_PHY=y
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_FIXED_PHY is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_NET_PCI is not set
+CONFIG_FS_ENET=y
+# CONFIG_FS_ENET_HAS_SCC is not set
+CONFIG_FS_ENET_HAS_FCC=y
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+CONFIG_E1000=y
+CONFIG_E1000_NAPI=y
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+CONFIG_GIANFAR=y
+CONFIG_GFAR_NAPI=y
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_CPM=y
+CONFIG_SERIAL_CPM_CONSOLE=y
+CONFIG_SERIAL_CPM_SCC1=y
+CONFIG_SERIAL_CPM_SCC2=y
+# CONFIG_SERIAL_CPM_SCC3 is not set
+# CONFIG_SERIAL_CPM_SCC4 is not set
+# CONFIG_SERIAL_CPM_SMC1 is not set
+# CONFIG_SERIAL_CPM_SMC2 is not set
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_BRIQ_PANEL is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_NVRAM is not set
+CONFIG_GEN_RTC=y
+# CONFIG_GEN_RTC_X is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_V4L2=y
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+#
+
+#
+# Real Time Clock
+#
+# CONFIG_RTC_CLASS is not set
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+# CONFIG_NFS_V3 is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+# CONFIG_MSDOS_PARTITION is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_PLIST=y
+
+#
+# Instrumentation Support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_UNWIND_INFO is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_DEBUGGER is not set
+# CONFIG_KGDB_CONSOLE is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_BOOTX_TEXT is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Hardware crypto devices
+#
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 6861dde7d77b..765c8bb90ddd 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -682,7 +682,7 @@ CONFIG_SCSI_AIC7XXX_OLD=m
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_SATA is not set
+# CONFIG_ATA is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
@@ -1826,7 +1826,7 @@ CONFIG_OPROFILE=y
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=14
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 7517d0c5303f..be11df7c11aa 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -520,23 +520,23 @@ CONFIG_SCSI_ISCSI_ATTRS=m
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_AHCI is not set
-CONFIG_SCSI_SATA_SVW=y
+CONFIG_ATA=y
+# CONFIG_SATA_AHCI is not set
+CONFIG_SATA_SVW=y
 # CONFIG_SCSI_ATA_PIIX is not set
-# CONFIG_SCSI_SATA_MV is not set
-# CONFIG_SCSI_SATA_NV is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
 # CONFIG_SCSI_PDC_ADMA is not set
 # CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_SATA_QSTOR is not set
-# CONFIG_SCSI_SATA_PROMISE is not set
-# CONFIG_SCSI_SATA_SX4 is not set
-# CONFIG_SCSI_SATA_SIL is not set
-# CONFIG_SCSI_SATA_SIL24 is not set
-# CONFIG_SCSI_SATA_SIS is not set
-# CONFIG_SCSI_SATA_ULI is not set
-# CONFIG_SCSI_SATA_VIA is not set
-# CONFIG_SCSI_SATA_VITESSE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_EATA is not set
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index a8cdf312e1b0..44175fb7adec 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -506,7 +506,7 @@ CONFIG_SCSI_SAS_ATTRS=m
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_SATA is not set
+# CONFIG_ATA is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index b4432332341f..c3f58f2f9f52 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -777,7 +777,6 @@ unsigned int irq_alloc_virt(struct irq_host *host,
 {
         unsigned long flags;
         unsigned int i, j, found = NO_IRQ;
-        unsigned int limit = irq_virq_count - count;
 
         if (count == 0 || count > (irq_virq_count - NUM_ISA_INTERRUPTS))
                 return NO_IRQ;
@@ -794,14 +793,16 @@ unsigned int irq_alloc_virt(struct irq_host *host,
         /* Look for count consecutive numbers in the allocatable
          * (non-legacy) space
          */
-        for (i = NUM_ISA_INTERRUPTS; i <= limit; ) {
-                for (j = i; j < (i + count); j++)
-                        if (irq_map[j].host != NULL) {
-                                i = j + 1;
-                                continue;
-                        }
-                found = i;
-                break;
+        for (i = NUM_ISA_INTERRUPTS, j = 0; i < irq_virq_count; i++) {
+                if (irq_map[i].host != NULL)
+                        j = 0;
+                else
+                        j++;
+
+                if (j == count) {
+                        found = i - count + 1;
+                        break;
+                }
         }
         if (found == NO_IRQ) {
                 spin_unlock_irqrestore(&irq_big_lock, flags);
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index dea75d73f983..975102a020d9 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -526,9 +526,7 @@ static void do_syscall_trace(void)
 
 void do_syscall_trace_enter(struct pt_regs *regs)
 {
-#ifdef CONFIG_PPC64
         secure_computing(regs->gpr[0]);
-#endif
 
         if (test_thread_flag(TIF_SYSCALL_TRACE)
             && (current->ptrace & PT_PTRACED))
@@ -548,12 +546,8 @@ void do_syscall_trace_enter(struct pt_regs *regs)
 
 void do_syscall_trace_leave(struct pt_regs *regs)
 {
-#ifdef CONFIG_PPC32
-        secure_computing(regs->gpr[0]);
-#endif
-
         if (unlikely(current->audit_context))
-                audit_syscall_exit((regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
+                audit_syscall_exit((regs->ccr&0x10000000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
                                    regs->result);
 
         if ((test_thread_flag(TIF_SYSCALL_TRACE)
@@ -561,8 +555,3 @@ void do_syscall_trace_leave(struct pt_regs *regs)
             && (current->ptrace & PT_PTRACED))
                 do_syscall_trace();
 }
-
-#ifdef CONFIG_PPC32
-EXPORT_SYMBOL(do_syscall_trace_enter);
-EXPORT_SYMBOL(do_syscall_trace_leave);
-#endif
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index 5e391fc25340..d15c33e95959 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -69,16 +69,20 @@ struct readdir_callback32 {
 };
 
 static int fillonedir(void * __buf, const char * name, int namlen,
-                                  off_t offset, ino_t ino, unsigned int d_type)
+                                  off_t offset, u64 ino, unsigned int d_type)
 {
         struct readdir_callback32 * buf = (struct readdir_callback32 *) __buf;
         struct old_linux_dirent32 __user * dirent;
+        ino_t d_ino;
 
         if (buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         buf->count++;
         dirent = buf->dirent;
-        put_user(ino, &dirent->d_ino);
+        put_user(d_ino, &dirent->d_ino);
         put_user(offset, &dirent->d_offset);
         put_user(namlen, &dirent->d_namlen);
         copy_to_user(dirent->d_name, name, namlen);
@@ -120,15 +124,20 @@ asmlinkage long ppc32_select(u32 n, compat_ulong_t __user *inp,
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
 {
+        compat_ino_t ino;
         long err;
 
         if (stat->size > MAX_NON_LFS || !new_valid_dev(stat->dev) ||
             !new_valid_dev(stat->rdev))
                 return -EOVERFLOW;
 
+        ino = stat->ino;
+        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+                return -EOVERFLOW;
+
         err  = access_ok(VERIFY_WRITE, statbuf, sizeof(*statbuf)) ? 0 : -EFAULT;
         err |= __put_user(new_encode_dev(stat->dev), &statbuf->st_dev);
-        err |= __put_user(stat->ino, &statbuf->st_ino);
+        err |= __put_user(ino, &statbuf->st_ino);
         err |= __put_user(stat->mode, &statbuf->st_mode);
         err |= __put_user(stat->nlink, &statbuf->st_nlink);
         err |= __put_user(stat->uid, &statbuf->st_uid);
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 406f308ddead..d45a168bdaca 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -25,8 +25,8 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);
 /* SMT stuff */
 
 #ifdef CONFIG_PPC_MULTIPLATFORM
-/* default to snooze disabled */
-DEFINE_PER_CPU(unsigned long, smt_snooze_delay);
+/* Time in microseconds we delay before sleeping in the idle loop */
+DEFINE_PER_CPU(unsigned long, smt_snooze_delay) = { 100 };
 
 static ssize_t store_smt_snooze_delay(struct sys_device *dev, const char *buf,
                                       size_t count)
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 8b278d85ca4e..85b9244a098c 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -1041,6 +1041,48 @@ void __init time_init(void)
         set_dec(tb_ticks_per_jiffy);
 }
 
+#ifdef CONFIG_RTC_CLASS
+static int set_rtc_class_time(struct rtc_time *tm)
+{
+        int err;
+        struct class_device *class_dev =
+                rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
+
+        if (class_dev == NULL)
+                return -ENODEV;
+
+        err = rtc_set_time(class_dev, tm);
+
+        rtc_class_close(class_dev);
+
+        return 0;
+}
+
+static void get_rtc_class_time(struct rtc_time *tm)
+{
+        int err;
+        struct class_device *class_dev =
+                rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
+
+        if (class_dev == NULL)
+                return;
+
+        err = rtc_read_time(class_dev, tm);
+
+        rtc_class_close(class_dev);
+
+        return;
+}
+
+int __init rtc_class_hookup(void)
+{
+        ppc_md.get_rtc_time = get_rtc_class_time;
+        ppc_md.set_rtc_time = set_rtc_class_time;
+
+        return 0;
+}
+#endif /* CONFIG_RTC_CLASS */
+
 
 #define FEBRUARY        2
 #define STARTOFTIME     1970
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 336dd191f768..a0360ae10d0c 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -14,9 +14,15 @@ endif
 obj-$(CONFIG_PPC64)     += checksum_64.o copypage_64.o copyuser_64.o \
                            memcpy_64.o usercopy_64.o mem_64.o string.o \
                            strcase.o
+obj-$(CONFIG_QUICC_ENGINE) += rheap.o
 obj-$(CONFIG_XMON)      += sstep.o
 
 ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_SMP)       += locks.o
 obj-$(CONFIG_DEBUG_KERNEL) += sstep.o
 endif
+
+# Temporary hack until we have migrated to asm-powerpc
+ifeq ($(CONFIG_PPC_MERGE),y)
+obj-$(CONFIG_CPM2)      += rheap.o
+endif
diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c
index 31e511856dc5..57bf991ccd6e 100644
--- a/arch/powerpc/lib/rheap.c
+++ b/arch/powerpc/lib/rheap.c
@@ -423,17 +423,21 @@ void *rh_detach_region(rh_info_t * info, void *start, int size)
         return (void *)s;
 }
 
-void *rh_alloc(rh_info_t * info, int size, const char *owner)
+void *rh_alloc_align(rh_info_t * info, int size, int alignment, const char *owner)
 {
         struct list_head *l;
         rh_block_t *blk;
         rh_block_t *newblk;
         void *start;
 
-        /* Validate size */
-        if (size <= 0)
+        /* Validate size, (must be power of two) */
+        if (size <= 0 || (alignment & (alignment - 1)) != 0)
                 return ERR_PTR(-EINVAL);
 
+        /* given alignment larger that default rheap alignment */
+        if (alignment > info->alignment)
+                size += alignment - 1;
+
         /* Align to configured alignment */
         size = (size + (info->alignment - 1)) & ~(info->alignment - 1);
 
@@ -476,15 +480,27 @@ void *rh_alloc(rh_info_t * info, int size, const char *owner)
 
         attach_taken_block(info, newblk);
 
+        /* for larger alignment return fixed up pointer  */
+        /* this is no problem with the deallocator since */
+        /* we scan for pointers that lie in the blocks   */
+        if (alignment > info->alignment)
+                start = (void *)(((unsigned long)start + alignment - 1) &
+                                ~(alignment - 1));
+
         return start;
 }
 
+void *rh_alloc(rh_info_t * info, int size, const char *owner)
+{
+        return rh_alloc_align(info, size, info->alignment, owner);
+}
+
 /* allocate at precisely the given address */
 void *rh_alloc_fixed(rh_info_t * info, void *start, int size, const char *owner)
 {
         struct list_head *l;
         rh_block_t *blk, *newblk1, *newblk2;
-        unsigned long s, e, m, bs, be;
+        unsigned long s, e, m, bs = 0, be = 0;
 
         /* Validate size */
         if (size <= 0)
diff --git a/arch/powerpc/math-emu/Makefile b/arch/powerpc/math-emu/Makefile
index 754143e8936b..29bc9126241b 100644
--- a/arch/powerpc/math-emu/Makefile
+++ b/arch/powerpc/math-emu/Makefile
@@ -11,3 +11,6 @@ obj-$(CONFIG_MATH_EMULATION)	+= fabs.o fadd.o fadds.o fcmpo.o fcmpu.o \
                                         mcrfs.o mffs.o mtfsb0.o mtfsb1.o \
                                         mtfsf.o mtfsfi.o stfiwx.o stfs.o \
                                         udivmodti4.o
+
+CFLAGS_fabs.o = -fno-builtin-fabs
+CFLAGS_math.o = -fno-builtin-fabs
diff --git a/arch/powerpc/oprofile/backtrace.c b/arch/powerpc/oprofile/backtrace.c
index 75f57bc96b40..b4278cfd1f80 100644
--- a/arch/powerpc/oprofile/backtrace.c
+++ b/arch/powerpc/oprofile/backtrace.c
@@ -11,6 +11,7 @@
 #include <linux/sched.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
+#include <asm/compat.h>
 
 #define STACK_SP(STACK)         *(STACK)
 
@@ -26,8 +27,9 @@
 static unsigned int user_getsp32(unsigned int sp, int is_first)
 {
         unsigned int stack_frame[2];
+        void __user *p = compat_ptr(sp);
 
-        if (!access_ok(VERIFY_READ, sp, sizeof(stack_frame)))
+        if (!access_ok(VERIFY_READ, p, sizeof(stack_frame)))
                 return 0;
 
         /*
@@ -35,8 +37,7 @@ static unsigned int user_getsp32(unsigned int sp, int is_first)
          * which means that we've done all that we can do from
          * interrupt context.
          */
-        if (__copy_from_user_inatomic(stack_frame, (void *)(long)sp,
-                                        sizeof(stack_frame)))
+        if (__copy_from_user_inatomic(stack_frame, p, sizeof(stack_frame)))
                 return 0;
 
         if (!is_first)
@@ -54,10 +55,10 @@ static unsigned long user_getsp64(unsigned long sp, int is_first)
 {
         unsigned long stack_frame[3];
 
-        if (!access_ok(VERIFY_READ, sp, sizeof(stack_frame)))
+        if (!access_ok(VERIFY_READ, (void __user *)sp, sizeof(stack_frame)))
                 return 0;
 
-        if (__copy_from_user_inatomic(stack_frame, (void *)sp,
+        if (__copy_from_user_inatomic(stack_frame, (void __user *)sp,
                                         sizeof(stack_frame)))
                 return 0;
 
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index 969fbb6d8c46..8c676d763bb0 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -109,6 +109,10 @@ static int __init mpc834x_itx_probe(void)
         return 1;
 }
 
+#ifdef CONFIG_RTC_CLASS
+late_initcall(rtc_class_hookup);
+#endif
+
 define_machine(mpc834x_itx) {
         .name                   = "MPC834x ITX",
         .probe                  = mpc834x_itx_probe,
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index c3268d9877e4..0584f3c7e884 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -11,6 +11,12 @@ config MPC8540_ADS
         help
           This option enables support for the MPC 8540 ADS board
 
+config MPC8560_ADS
+        bool "Freescale MPC8560 ADS"
+        select DEFAULT_UIMAGE
+        help
+          This option enables support for the MPC 8560 ADS board
+
 config MPC85xx_CDS
         bool "Freescale MPC85xx CDS"
         select DEFAULT_UIMAGE
@@ -25,6 +31,11 @@ config MPC8540
         select PPC_INDIRECT_PCI
         default y if MPC8540_ADS || MPC85xx_CDS
 
+config MPC8560
+        bool
+        select PPC_INDIRECT_PCI
+        default y if MPC8560_ADS
+
 config PPC_INDIRECT_PCI_BE
         bool
         depends on PPC_85xx
@@ -34,4 +45,14 @@ config MPIC
         bool
         default y
 
+config CPM2
+        bool
+        depends on MPC8560
+        default y
+        help
+          The CPM2 (Communications Processor Module) is a coprocessor on
+          embedded CPUs made by Motorola.  Selecting this option means that
+          you wish to build a kernel for a machine with a CPM2 coprocessor
+          on it.
+
 endmenu
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index 7615aa59c78b..282f5d0d0152 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -3,4 +3,5 @@
 #
 obj-$(CONFIG_PPC_85xx)  += misc.o pci.o
 obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o
+obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index cae6b73357d5..28070e7ae507 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -32,6 +32,13 @@
 #include <sysdev/fsl_soc.h>
 #include "mpc85xx.h"
 
+#ifdef CONFIG_CPM2
+#include <linux/fs_enet_pd.h>
+#include <asm/cpm2.h>
+#include <sysdev/cpm2_pic.h>
+#include <asm/fs_pd.h>
+#endif
+
 #ifndef CONFIG_PCI
 unsigned long isa_io_base = 0;
 unsigned long isa_mem_base = 0;
@@ -57,12 +64,29 @@ mpc85xx_pcibios_fixup(void)
 }
 #endif /* CONFIG_PCI */
 
+#ifdef CONFIG_CPM2
+
+static void cpm2_cascade(unsigned int irq, struct irq_desc *desc,
+                         struct pt_regs *regs)
+{
+        int cascade_irq;
+
+        while ((cascade_irq = cpm2_get_irq(regs)) >= 0) {
+                generic_handle_irq(cascade_irq, regs);
+        }
+        desc->chip->eoi(irq);
+}
+
+#endif /* CONFIG_CPM2 */
 
 void __init mpc85xx_ads_pic_init(void)
 {
         struct mpic *mpic;
         struct resource r;
         struct device_node *np = NULL;
+#ifdef CONFIG_CPM2
+        int irq;
+#endif
 
         np = of_find_node_by_type(np, "open-pic");
 
@@ -104,11 +128,103 @@ void __init mpc85xx_ads_pic_init(void)
         mpic_assign_isu(mpic, 14, r.start + 0x10100);
 
         mpic_init(mpic);
+
+#ifdef CONFIG_CPM2
+        /* Setup CPM2 PIC */
+        np = of_find_node_by_type(NULL, "cpm-pic");
+        if (np == NULL) {
+                printk(KERN_ERR "PIC init: can not find cpm-pic node\n");
+                return;
+        }
+        irq = irq_of_parse_and_map(np, 0);
+
+        cpm2_pic_init(np);
+        set_irq_chained_handler(irq, cpm2_cascade);
+#endif
 }
 
 /*
  * Setup the architecture
  */
+#ifdef CONFIG_CPM2
+void init_fcc_ioports(struct fs_platform_info *fpi)
+{
+        struct io_port *io = cpm2_map(im_ioport);
+        int fcc_no = fs_get_fcc_index(fpi->fs_no);
+        int target;
+        u32 tempval;
+
+        switch(fcc_no) {
+        case 1:
+                tempval = in_be32(&io->iop_pdirb);
+                tempval &= ~PB2_DIRB0;
+                tempval |= PB2_DIRB1;
+                out_be32(&io->iop_pdirb, tempval);
+
+                tempval = in_be32(&io->iop_psorb);
+                tempval &= ~PB2_PSORB0;
+                tempval |= PB2_PSORB1;
+                out_be32(&io->iop_psorb, tempval);
+
+                tempval = in_be32(&io->iop_pparb);
+                tempval |= (PB2_DIRB0 | PB2_DIRB1);
+                out_be32(&io->iop_pparb, tempval);
+
+                target = CPM_CLK_FCC2;
+                break;
+        case 2:
+                tempval = in_be32(&io->iop_pdirb);
+                tempval &= ~PB3_DIRB0;
+                tempval |= PB3_DIRB1;
+                out_be32(&io->iop_pdirb, tempval);
+
+                tempval = in_be32(&io->iop_psorb);
+                tempval &= ~PB3_PSORB0;
+                tempval |= PB3_PSORB1;
+                out_be32(&io->iop_psorb, tempval);
+
+                tempval = in_be32(&io->iop_pparb);
+                tempval |= (PB3_DIRB0 | PB3_DIRB1);
+                out_be32(&io->iop_pparb, tempval);
+
+                tempval = in_be32(&io->iop_pdirc);
+                tempval |= PC3_DIRC1;
+                out_be32(&io->iop_pdirc, tempval);
+
+                tempval = in_be32(&io->iop_pparc);
+                tempval |= PC3_DIRC1;
+                out_be32(&io->iop_pparc, tempval);
+
+                target = CPM_CLK_FCC3;
+                break;
+        default:
+                printk(KERN_ERR "init_fcc_ioports: invalid FCC number\n");
+                return;
+        }
+
+        /* Port C has clocks......  */
+        tempval = in_be32(&io->iop_psorc);
+        tempval &= ~(PC_CLK(fpi->clk_rx - 8) | PC_CLK(fpi->clk_tx - 8));
+        out_be32(&io->iop_psorc, tempval);
+
+        tempval = in_be32(&io->iop_pdirc);
+        tempval &= ~(PC_CLK(fpi->clk_rx - 8) | PC_CLK(fpi->clk_tx - 8));
+        out_be32(&io->iop_pdirc, tempval);
+        tempval = in_be32(&io->iop_pparc);
+        tempval |= (PC_CLK(fpi->clk_rx - 8) | PC_CLK(fpi->clk_tx - 8));
+        out_be32(&io->iop_pparc, tempval);
+
+        cpm2_unmap(io);
+
+        /* Configure Serial Interface clock routing.
+         * First,  clear FCC bits to zero,
+         * then set the ones we want.
+         */
+        cpm2_clk_setup(target, fpi->clk_rx, CPM_CLK_RX);
+        cpm2_clk_setup(target, fpi->clk_tx, CPM_CLK_TX);
+}
+#endif
+
 static void __init mpc85xx_ads_setup_arch(void)
 {
         struct device_node *cpu;
@@ -131,6 +247,10 @@ static void __init mpc85xx_ads_setup_arch(void)
                 of_node_put(cpu);
         }
 
+#ifdef CONFIG_CPM2
+        cpm2_reset();
+#endif
+
 #ifdef CONFIG_PCI
         for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
                 add_bridge(np);
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.h b/arch/powerpc/platforms/85xx/mpc85xx_ads.h
new file mode 100644
index 000000000000..effcbf78f851
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.h
@@ -0,0 +1,61 @@
+/*
+ * MPC85xx ADS board definitions
+ *
+ * Maintainer: Kumar Gala <galak@kernel.crashing.org>
+ *
+ * Copyright 2004 Freescale Semiconductor Inc.
+ *
+ * 2006 (c) MontaVista Software, Inc.
+ * Vitaly Bordug <vbordug@ru.mvista.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 __MACH_MPC85XXADS_H
+#define __MACH_MPC85XXADS_H
+
+#include <linux/config.h>
+#include <linux/initrd.h>
+#include <sysdev/fsl_soc.h>
+
+#define BCSR_ADDR               ((uint)0xf8000000)
+#define BCSR_SIZE               ((uint)(32 * 1024))
+
+#ifdef CONFIG_CPM2
+
+#define MPC85xx_CPM_OFFSET      (0x80000)
+
+#define CPM_MAP_ADDR            (get_immrbase() + MPC85xx_CPM_OFFSET)
+#define CPM_IRQ_OFFSET          60
+
+#define SIU_INT_SMC1            ((uint)0x04+CPM_IRQ_OFFSET)
+#define SIU_INT_SMC2            ((uint)0x05+CPM_IRQ_OFFSET)
+#define SIU_INT_SCC1            ((uint)0x28+CPM_IRQ_OFFSET)
+#define SIU_INT_SCC2            ((uint)0x29+CPM_IRQ_OFFSET)
+#define SIU_INT_SCC3            ((uint)0x2a+CPM_IRQ_OFFSET)
+#define SIU_INT_SCC4            ((uint)0x2b+CPM_IRQ_OFFSET)
+
+/* FCC1 Clock Source Configuration.  These can be
+ * redefined in the board specific file.
+ *    Can only choose from CLK9-12 */
+#define F1_RXCLK       12
+#define F1_TXCLK       11
+
+/* FCC2 Clock Source Configuration.  These can be
+ * redefined in the board specific file.
+ *    Can only choose from CLK13-16 */
+#define F2_RXCLK       13
+#define F2_TXCLK       14
+
+/* FCC3 Clock Source Configuration.  These can be
+ * redefined in the board specific file.
+ *    Can only choose from CLK13-16 */
+#define F3_RXCLK       15
+#define F3_TXCLK       16
+
+#endif  /* CONFIG_CPM2 */
+#endif  /* __MACH_MPC85XXADS_H */
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 3bd36d46ab4a..0f5c8ebc7fc3 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -538,7 +538,7 @@ static void __iomem * __init map_spe_prop(struct spu *spu,
 
         const void *p;
         int proplen;
-        void* ret = NULL;
+        void __iomem *ret = NULL;
         int err = 0;
 
         p = get_property(n, name, &proplen);
@@ -562,7 +562,7 @@ static void spu_unmap(struct spu *spu)
         iounmap(spu->priv2);
         iounmap(spu->priv1);
         iounmap(spu->problem);
-        iounmap((u8 __iomem *)spu->local_store);
+        iounmap((__force u8 __iomem *)spu->local_store);
 }
 
 /* This function shall be abstracted for HV platforms */
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 58e794f9da1b..51fd197ab5dd 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -1342,7 +1342,7 @@ static u64 spufs_id_get(void *data)
 
         return num;
 }
-DEFINE_SIMPLE_ATTRIBUTE(spufs_id_ops, spufs_id_get, 0, "0x%llx\n")
+DEFINE_SIMPLE_ATTRIBUTE(spufs_id_ops, spufs_id_get, NULL, "0x%llx\n")
 
 struct tree_descr spufs_dir_contents[] = {
         { "mem",  &spufs_mem_fops,  0666, },
diff --git a/arch/powerpc/platforms/cell/spufs/hw_ops.c b/arch/powerpc/platforms/cell/spufs/hw_ops.c
index c8670f519734..efc452e71ab0 100644
--- a/arch/powerpc/platforms/cell/spufs/hw_ops.c
+++ b/arch/powerpc/platforms/cell/spufs/hw_ops.c
@@ -234,7 +234,7 @@ static void spu_hw_runcntl_stop(struct spu_context *ctx)
 
 static int spu_hw_set_mfc_query(struct spu_context * ctx, u32 mask, u32 mode)
 {
-        struct spu_problem *prob = ctx->spu->problem;
+        struct spu_problem __iomem *prob = ctx->spu->problem;
         int ret;
 
         spin_lock_irq(&ctx->spu->register_lock);
@@ -263,7 +263,7 @@ static int spu_hw_send_mfc_command(struct spu_context *ctx,
                                         struct mfc_dma_command *cmd)
 {
         u32 status;
-        struct spu_problem *prob = ctx->spu->problem;
+        struct spu_problem __iomem *prob = ctx->spu->problem;
 
         spin_lock_irq(&ctx->spu->register_lock);
         out_be32(&prob->mfc_lsa_W, cmd->lsa);
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index c3aa46b8e2b9..1b827618e05f 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -96,14 +96,14 @@ static unsigned long u3_agp_cfa1(u8 bus, u8 devfn, u8 off)
                 1UL;
 }
 
-static unsigned long u3_agp_cfg_access(struct pci_controller* hose,
+static volatile void __iomem *u3_agp_cfg_access(struct pci_controller* hose,
                                        u8 bus, u8 dev_fn, u8 offset)
 {
         unsigned int caddr;
 
         if (bus == hose->first_busno) {
                 if (dev_fn < (11 << 3))
-                        return 0;
+                        return NULL;
                 caddr = u3_agp_cfa0(dev_fn, offset);
         } else
                 caddr = u3_agp_cfa1(bus, dev_fn, offset);
@@ -114,14 +114,14 @@ static unsigned long u3_agp_cfg_access(struct pci_controller* hose,
         } while (in_le32(hose->cfg_addr) != caddr);
 
         offset &= 0x07;
-        return ((unsigned long)hose->cfg_data) + offset;
+        return hose->cfg_data + offset;
 }
 
 static int u3_agp_read_config(struct pci_bus *bus, unsigned int devfn,
                               int offset, int len, u32 *val)
 {
         struct pci_controller *hose;
-        unsigned long addr;
+        volatile void __iomem *addr;
 
         hose = pci_bus_to_host(bus);
         if (hose == NULL)
@@ -136,13 +136,13 @@ static int u3_agp_read_config(struct pci_bus *bus, unsigned int devfn,
          */
         switch (len) {
         case 1:
-                *val = in_8((u8 *)addr);
+                *val = in_8(addr);
                 break;
         case 2:
-                *val = in_le16((u16 *)addr);
+                *val = in_le16(addr);
                 break;
         default:
-                *val = in_le32((u32 *)addr);
+                *val = in_le32(addr);
                 break;
         }
         return PCIBIOS_SUCCESSFUL;
@@ -152,7 +152,7 @@ static int u3_agp_write_config(struct pci_bus *bus, unsigned int devfn,
                                int offset, int len, u32 val)
 {
         struct pci_controller *hose;
-        unsigned long addr;
+        volatile void __iomem *addr;
 
         hose = pci_bus_to_host(bus);
         if (hose == NULL)
@@ -167,16 +167,16 @@ static int u3_agp_write_config(struct pci_bus *bus, unsigned int devfn,
          */
         switch (len) {
         case 1:
-                out_8((u8 *)addr, val);
-                (void) in_8((u8 *)addr);
+                out_8(addr, val);
+                (void) in_8(addr);
                 break;
         case 2:
-                out_le16((u16 *)addr, val);
-                (void) in_le16((u16 *)addr);
+                out_le16(addr, val);
+                (void) in_le16(addr);
                 break;
         default:
-                out_le32((u32 *)addr, val);
-                (void) in_le32((u32 *)addr);
+                out_le32(addr, val);
+                (void) in_le32(addr);
                 break;
         }
         return PCIBIOS_SUCCESSFUL;
@@ -198,22 +198,22 @@ static unsigned long u3_ht_cfa1(u8 bus, u8 devfn, u8 off)
         return u3_ht_cfa0(devfn, off) + (bus << 16) + 0x01000000UL;
 }
 
-static unsigned long u3_ht_cfg_access(struct pci_controller* hose,
+static volatile void __iomem *u3_ht_cfg_access(struct pci_controller* hose,
                                       u8 bus, u8 devfn, u8 offset)
 {
         if (bus == hose->first_busno) {
                 if (PCI_SLOT(devfn) == 0)
-                        return 0;
-                return ((unsigned long)hose->cfg_data) + u3_ht_cfa0(devfn, offset);
+                        return NULL;
+                return hose->cfg_data + u3_ht_cfa0(devfn, offset);
         } else
-                return ((unsigned long)hose->cfg_data) + u3_ht_cfa1(bus, devfn, offset);
+                return hose->cfg_data + u3_ht_cfa1(bus, devfn, offset);
 }
 
 static int u3_ht_read_config(struct pci_bus *bus, unsigned int devfn,
                              int offset, int len, u32 *val)
 {
         struct pci_controller *hose;
-        unsigned long addr;
+        volatile void __iomem *addr;
 
         hose = pci_bus_to_host(bus);
         if (hose == NULL)
@@ -232,13 +232,13 @@ static int u3_ht_read_config(struct pci_bus *bus, unsigned int devfn,
          */
         switch (len) {
         case 1:
-                *val = in_8((u8 *)addr);
+                *val = in_8(addr);
                 break;
         case 2:
-                *val = in_le16((u16 *)addr);
+                *val = in_le16(addr);
                 break;
         default:
-                *val = in_le32((u32 *)addr);
+                *val = in_le32(addr);
                 break;
         }
         return PCIBIOS_SUCCESSFUL;
@@ -248,7 +248,7 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn,
                               int offset, int len, u32 val)
 {
         struct pci_controller *hose;
-        unsigned long addr;
+        volatile void __iomem *addr;
 
         hose = pci_bus_to_host(bus);
         if (hose == NULL)
@@ -266,16 +266,16 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn,
          */
         switch (len) {
         case 1:
-                out_8((u8 *)addr, val);
-                (void) in_8((u8 *)addr);
+                out_8(addr, val);
+                (void) in_8(addr);
                 break;
         case 2:
-                out_le16((u16 *)addr, val);
-                (void) in_le16((u16 *)addr);
+                out_le16(addr, val);
+                (void) in_le16(addr);
                 break;
         default:
-                out_le32((u32 *)addr, val);
-                (void) in_le32((u32 *)addr);
+                out_le32(addr, val);
+                (void) in_le32(addr);
                 break;
         }
         return PCIBIOS_SUCCESSFUL;
@@ -315,7 +315,7 @@ static void __init setup_u3_ht(struct pci_controller* hose)
          * the reg address cell, we shall fix that by killing struct
          * reg_property and using some accessor functions instead
          */
-        hose->cfg_data = (volatile unsigned char *)ioremap(0xf2000000, 0x02000000);
+        hose->cfg_data = ioremap(0xf2000000, 0x02000000);
 
         hose->first_busno = 0;
         hose->last_busno = 0xef;
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 84bc8f7e17ef..3c2d63ebf787 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -225,6 +225,7 @@ static void __eeh_mark_slot (struct device_node *dn, int mode_flag)
 
 void eeh_mark_slot (struct device_node *dn, int mode_flag)
 {
+        struct pci_dev *dev;
         dn = find_device_pe (dn);
 
         /* Back up one, since config addrs might be shared */
@@ -232,6 +233,12 @@ void eeh_mark_slot (struct device_node *dn, int mode_flag)
                 dn = dn->parent;
 
         PCI_DN(dn)->eeh_mode |= mode_flag;
+
+        /* Mark the pci device too */
+        dev = PCI_DN(dn)->pcidev;
+        if (dev)
+                dev->error_state = pci_channel_io_frozen;
+
         __eeh_mark_slot (dn->child, mode_flag);
 }
 
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 98189d8efaca..43dbf737698c 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -415,12 +415,6 @@ static int pSeries_check_legacy_ioport(unsigned int baseport)
                         return -ENODEV;
                 of_node_put(np);
                 break;
-        case PARALLEL_BASE:
-                np = of_find_node_by_type(NULL, "parallel");
-                if (np == NULL)
-                        return -ENODEV;
-                of_node_put(np);
-                break;
         }
         return 0;
 }
@@ -483,7 +477,6 @@ static void pseries_dedicated_idle_sleep(void)
 { 
         unsigned int cpu = smp_processor_id();
         unsigned long start_snooze;
-        unsigned long *smt_snooze_delay = &__get_cpu_var(smt_snooze_delay);
 
         /*
          * Indicate to the HV that we are idle. Now would be
@@ -496,9 +489,9 @@ static void pseries_dedicated_idle_sleep(void)
          * has been checked recently.  If we should poll for a little
          * while, do so.
          */
-        if (*smt_snooze_delay) {
+        if (__get_cpu_var(smt_snooze_delay)) {
                 start_snooze = get_tb() +
-                        *smt_snooze_delay * tb_ticks_per_usec;
+                        __get_cpu_var(smt_snooze_delay) * tb_ticks_per_usec;
                 local_irq_enable();
                 set_thread_flag(TIF_POLLING_NRFLAG);
 
@@ -518,24 +511,7 @@ static void pseries_dedicated_idle_sleep(void)
                         goto out;
         }
 
-        /*
-         * If not SMT, cede processor.  If CPU is running SMT
-         * cede if the other thread is not idle, so that it can
-         * go single-threaded.  If the other thread is idle,
-         * we ask the hypervisor if it has pending work it
-         * wants to do and cede if it does.  Otherwise we keep
-         * polling in order to reduce interrupt latency.
-         *
-         * Doing the cede when the other thread is active will
-         * result in this thread going dormant, meaning the other
-         * thread gets to run in single-threaded (ST) mode, which
-         * is slightly faster than SMT mode with this thread at
-         * very low priority.  The cede enables interrupts, which
-         * doesn't matter here.
-         */
-        if (!cpu_has_feature(CPU_FTR_SMT) || !lppaca[cpu ^ 1].idle
-            || poll_pending() == H_PENDING)
-                cede_processor();
+        cede_processor();
 
 out:
         HMT_medium();
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index e5e999ea891a..f15f4d78aee9 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -17,3 +17,8 @@ ifeq ($(CONFIG_PPC_MERGE),y)
 obj-$(CONFIG_PPC_I8259)         += i8259.o
 obj-$(CONFIG_PPC_83xx)          += ipic.o
 endif
+
+# Temporary hack until we have migrated to asm-powerpc
+ifeq ($(ARCH),powerpc)
+obj-$(CONFIG_CPM2)              += cpm2_common.o cpm2_pic.o
+endif
diff --git a/arch/powerpc/sysdev/cpm2_common.c b/arch/powerpc/sysdev/cpm2_common.c
new file mode 100644
index 000000000000..ec265995d5d8
--- /dev/null
+++ b/arch/powerpc/sysdev/cpm2_common.c
@@ -0,0 +1,309 @@
+/*
+ * General Purpose functions for the global management of the
+ * 8260 Communication Processor Module.
+ * Copyright (c) 1999-2001 Dan Malek <dan@embeddedalley.com>
+ * Copyright (c) 2000 MontaVista Software, Inc (source@mvista.com)
+ *      2.3.99 Updates
+ *
+ * 2006 (c) MontaVista Software, Inc.
+ * Vitaly Bordug <vbordug@ru.mvista.com>
+ *      Merged to arch/powerpc from arch/ppc/syslib/cpm2_common.c
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/*
+ *
+ * In addition to the individual control of the communication
+ * channels, there are a few functions that globally affect the
+ * communication processor.
+ *
+ * Buffer descriptors must be allocated from the dual ported memory
+ * space.  The allocator for that is here.  When the communication
+ * process is reset, we reclaim the memory available.  There is
+ * currently no deallocator for this memory.
+ */
+#include <linux/errno.h>
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/param.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mpc8260.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+#include <asm/cpm2.h>
+#include <asm/rheap.h>
+#include <asm/fs_pd.h>
+
+#include <sysdev/fsl_soc.h>
+
+static void cpm2_dpinit(void);
+cpm_cpm2_t      *cpmp;          /* Pointer to comm processor space */
+
+/* We allocate this here because it is used almost exclusively for
+ * the communication processor devices.
+ */
+cpm2_map_t *cpm2_immr;
+intctl_cpm2_t *cpm2_intctl;
+
+#define CPM_MAP_SIZE    (0x40000)       /* 256k - the PQ3 reserve this amount
+                                           of space for CPM as it is larger
+                                           than on PQ2 */
+
+void
+cpm2_reset(void)
+{
+        cpm2_immr = (cpm2_map_t *)ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE);
+        cpm2_intctl = cpm2_map(im_intctl);
+
+        /* Reclaim the DP memory for our use.
+         */
+        cpm2_dpinit();
+
+        /* Tell everyone where the comm processor resides.
+         */
+        cpmp = &cpm2_immr->im_cpm;
+}
+
+/* Set a baud rate generator.  This needs lots of work.  There are
+ * eight BRGs, which can be connected to the CPM channels or output
+ * as clocks.  The BRGs are in two different block of internal
+ * memory mapped space.
+ * The baud rate clock is the system clock divided by something.
+ * It was set up long ago during the initial boot phase and is
+ * is given to us.
+ * Baud rate clocks are zero-based in the driver code (as that maps
+ * to port numbers).  Documentation uses 1-based numbering.
+ */
+#define BRG_INT_CLK     (get_brgfreq())
+#define BRG_UART_CLK    (BRG_INT_CLK/16)
+
+/* This function is used by UARTS, or anything else that uses a 16x
+ * oversampled clock.
+ */
+void
+cpm_setbrg(uint brg, uint rate)
+{
+        volatile uint   *bp;
+
+        /* This is good enough to get SMCs running.....
+        */
+        if (brg < 4) {
+                bp = cpm2_map_size(im_brgc1, 16);
+        } else {
+                bp = cpm2_map_size(im_brgc5, 16);
+                brg -= 4;
+        }
+        bp += brg;
+        *bp = ((BRG_UART_CLK / rate) << 1) | CPM_BRG_EN;
+
+        cpm2_unmap(bp);
+}
+
+/* This function is used to set high speed synchronous baud rate
+ * clocks.
+ */
+void
+cpm2_fastbrg(uint brg, uint rate, int div16)
+{
+        volatile uint   *bp;
+
+        if (brg < 4) {
+                bp = cpm2_map_size(im_brgc1, 16);
+        }
+        else {
+                bp = cpm2_map_size(im_brgc5, 16);
+                brg -= 4;
+        }
+        bp += brg;
+        *bp = ((BRG_INT_CLK / rate) << 1) | CPM_BRG_EN;
+        if (div16)
+                *bp |= CPM_BRG_DIV16;
+
+        cpm2_unmap(bp);
+}
+
+int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode)
+{
+        int ret = 0;
+        int shift;
+        int i, bits = 0;
+        cpmux_t *im_cpmux;
+        u32 *reg;
+        u32 mask = 7;
+        u8 clk_map [24][3] = {
+                {CPM_CLK_FCC1, CPM_BRG5, 0},
+                {CPM_CLK_FCC1, CPM_BRG6, 1},
+                {CPM_CLK_FCC1, CPM_BRG7, 2},
+                {CPM_CLK_FCC1, CPM_BRG8, 3},
+                {CPM_CLK_FCC1, CPM_CLK9, 4},
+                {CPM_CLK_FCC1, CPM_CLK10, 5},
+                {CPM_CLK_FCC1, CPM_CLK11, 6},
+                {CPM_CLK_FCC1, CPM_CLK12, 7},
+                {CPM_CLK_FCC2, CPM_BRG5, 0},
+                {CPM_CLK_FCC2, CPM_BRG6, 1},
+                {CPM_CLK_FCC2, CPM_BRG7, 2},
+                {CPM_CLK_FCC2, CPM_BRG8, 3},
+                {CPM_CLK_FCC2, CPM_CLK13, 4},
+                {CPM_CLK_FCC2, CPM_CLK14, 5},
+                {CPM_CLK_FCC2, CPM_CLK15, 6},
+                {CPM_CLK_FCC2, CPM_CLK16, 7},
+                {CPM_CLK_FCC3, CPM_BRG5, 0},
+                {CPM_CLK_FCC3, CPM_BRG6, 1},
+                {CPM_CLK_FCC3, CPM_BRG7, 2},
+                {CPM_CLK_FCC3, CPM_BRG8, 3},
+                {CPM_CLK_FCC3, CPM_CLK13, 4},
+                {CPM_CLK_FCC3, CPM_CLK14, 5},
+                {CPM_CLK_FCC3, CPM_CLK15, 6},
+                {CPM_CLK_FCC3, CPM_CLK16, 7}
+                };
+
+        im_cpmux = cpm2_map(im_cpmux);
+
+        switch (target) {
+        case CPM_CLK_SCC1:
+                reg = &im_cpmux->cmx_scr;
+                shift = 24;
+        case CPM_CLK_SCC2:
+                reg = &im_cpmux->cmx_scr;
+                shift = 16;
+                break;
+        case CPM_CLK_SCC3:
+                reg = &im_cpmux->cmx_scr;
+                shift = 8;
+                break;
+        case CPM_CLK_SCC4:
+                reg = &im_cpmux->cmx_scr;
+                shift = 0;
+                break;
+        case CPM_CLK_FCC1:
+                reg = &im_cpmux->cmx_fcr;
+                shift = 24;
+                break;
+        case CPM_CLK_FCC2:
+                reg = &im_cpmux->cmx_fcr;
+                shift = 16;
+                break;
+        case CPM_CLK_FCC3:
+                reg = &im_cpmux->cmx_fcr;
+                shift = 8;
+                break;
+        default:
+                printk(KERN_ERR "cpm2_clock_setup: invalid clock target\n");
+                return -EINVAL;
+        }
+
+        if (mode == CPM_CLK_RX)
+                shift +=3;
+
+        for (i=0; i<24; i++) {
+                if (clk_map[i][0] == target && clk_map[i][1] == clock) {
+                        bits = clk_map[i][2];
+                        break;
+                }
+        }
+        if (i == sizeof(clk_map)/3)
+            ret = -EINVAL;
+
+        bits <<= shift;
+        mask <<= shift;
+        out_be32(reg, (in_be32(reg) & ~mask) | bits);
+
+        cpm2_unmap(im_cpmux);
+        return ret;
+}
+
+/*
+ * dpalloc / dpfree bits.
+ */
+static spinlock_t cpm_dpmem_lock;
+/* 16 blocks should be enough to satisfy all requests
+ * until the memory subsystem goes up... */
+static rh_block_t cpm_boot_dpmem_rh_block[16];
+static rh_info_t cpm_dpmem_info;
+static u8* im_dprambase;
+
+static void cpm2_dpinit(void)
+{
+        spin_lock_init(&cpm_dpmem_lock);
+
+        im_dprambase = ioremap(CPM_MAP_ADDR, CPM_DATAONLY_BASE + CPM_DATAONLY_SIZE);
+
+        /* initialize the info header */
+        rh_init(&cpm_dpmem_info, 1,
+                        sizeof(cpm_boot_dpmem_rh_block) /
+                        sizeof(cpm_boot_dpmem_rh_block[0]),
+                        cpm_boot_dpmem_rh_block);
+
+        /* Attach the usable dpmem area */
+        /* XXX: This is actually crap. CPM_DATAONLY_BASE and
+         * CPM_DATAONLY_SIZE is only a subset of the available dpram. It
+         * varies with the processor and the microcode patches activated.
+         * But the following should be at least safe.
+         */
+        rh_attach_region(&cpm_dpmem_info, (void *)CPM_DATAONLY_BASE,
+                        CPM_DATAONLY_SIZE);
+}
+
+/* This function returns an index into the DPRAM area.
+ */
+uint cpm_dpalloc(uint size, uint align)
+{
+        void *start;
+        unsigned long flags;
+
+        spin_lock_irqsave(&cpm_dpmem_lock, flags);
+        cpm_dpmem_info.alignment = align;
+        start = rh_alloc(&cpm_dpmem_info, size, "commproc");
+        spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
+
+        return (uint)start;
+}
+EXPORT_SYMBOL(cpm_dpalloc);
+
+int cpm_dpfree(uint offset)
+{
+        int ret;
+        unsigned long flags;
+
+        spin_lock_irqsave(&cpm_dpmem_lock, flags);
+        ret = rh_free(&cpm_dpmem_info, (void *)offset);
+        spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
+
+        return ret;
+}
+EXPORT_SYMBOL(cpm_dpfree);
+
+/* not sure if this is ever needed */
+uint cpm_dpalloc_fixed(uint offset, uint size, uint align)
+{
+        void *start;
+        unsigned long flags;
+
+        spin_lock_irqsave(&cpm_dpmem_lock, flags);
+        cpm_dpmem_info.alignment = align;
+        start = rh_alloc_fixed(&cpm_dpmem_info, (void *)offset, size, "commproc");
+        spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
+
+        return (uint)start;
+}
+EXPORT_SYMBOL(cpm_dpalloc_fixed);
+
+void cpm_dpdump(void)
+{
+        rh_dump(&cpm_dpmem_info);
+}
+EXPORT_SYMBOL(cpm_dpdump);
+
+void *cpm_dpram_addr(uint offset)
+{
+        return (void *)(im_dprambase + offset);
+}
+EXPORT_SYMBOL(cpm_dpram_addr);
diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c
new file mode 100644
index 000000000000..51752990f7b9
--- /dev/null
+++ b/arch/powerpc/sysdev/cpm2_pic.c
@@ -0,0 +1,256 @@
+/*
+ * Platform information definitions.
+ *
+ * Copied from arch/ppc/syslib/cpm2_pic.c with minor subsequent updates
+ * to make in work in arch/powerpc/. Original (c) belongs to Dan Malek.
+ *
+ * Author:  Vitaly Bordug <vbordug@ru.mvista.com>
+ *
+ * 1999-2001 (c) Dan Malek <dan@embeddedalley.com>
+ * 2006 (c) MontaVista Software, Inc.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/* The CPM2 internal interrupt controller.  It is usually
+ * the only interrupt controller.
+ * There are two 32-bit registers (high/low) for up to 64
+ * possible interrupts.
+ *
+ * Now, the fun starts.....Interrupt Numbers DO NOT MAP
+ * in a simple arithmetic fashion to mask or pending registers.
+ * That is, interrupt 4 does not map to bit position 4.
+ * We create two tables, indexed by vector number, to indicate
+ * which register to use and which bit in the register to use.
+ */
+
+#include <linux/stddef.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/signal.h>
+#include <linux/irq.h>
+
+#include <asm/immap_cpm2.h>
+#include <asm/mpc8260.h>
+#include <asm/io.h>
+#include <asm/prom.h>
+
+#include "cpm2_pic.h"
+
+static struct device_node *cpm2_pic_node;
+static struct irq_host *cpm2_pic_host;
+#define NR_MASK_WORDS   ((NR_IRQS + 31) / 32)
+static unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];
+
+static const u_char irq_to_siureg[] = {
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/* bit numbers do not match the docs, these are precomputed so the bit for
+ * a given irq is (1 << irq_to_siubit[irq]) */
+static const u_char irq_to_siubit[] = {
+         0, 15, 14, 13, 12, 11, 10,  9,
+         8,  7,  6,  5,  4,  3,  2,  1,
+         2,  1,  0, 14, 13, 12, 11, 10,
+         9,  8,  7,  6,  5,  4,  3,  0,
+        31, 30, 29, 28, 27, 26, 25, 24,
+        23, 22, 21, 20, 19, 18, 17, 16,
+        16, 17, 18, 19, 20, 21, 22, 23,
+        24, 25, 26, 27, 28, 29, 30, 31,
+};
+
+static void cpm2_mask_irq(unsigned int irq_nr)
+{
+        int     bit, word;
+        volatile uint   *simr;
+
+        irq_nr -= CPM_IRQ_OFFSET;
+
+        bit = irq_to_siubit[irq_nr];
+        word = irq_to_siureg[irq_nr];
+
+        simr = &(cpm2_intctl->ic_simrh);
+        ppc_cached_irq_mask[word] &= ~(1 << bit);
+        simr[word] = ppc_cached_irq_mask[word];
+}
+
+static void cpm2_unmask_irq(unsigned int irq_nr)
+{
+        int     bit, word;
+        volatile uint   *simr;
+
+        irq_nr -= CPM_IRQ_OFFSET;
+
+        bit = irq_to_siubit[irq_nr];
+        word = irq_to_siureg[irq_nr];
+
+        simr = &(cpm2_intctl->ic_simrh);
+        ppc_cached_irq_mask[word] |= 1 << bit;
+        simr[word] = ppc_cached_irq_mask[word];
+}
+
+static void cpm2_mask_and_ack(unsigned int irq_nr)
+{
+        int     bit, word;
+        volatile uint   *simr, *sipnr;
+
+        irq_nr -= CPM_IRQ_OFFSET;
+
+        bit = irq_to_siubit[irq_nr];
+        word = irq_to_siureg[irq_nr];
+
+        simr = &(cpm2_intctl->ic_simrh);
+        sipnr = &(cpm2_intctl->ic_sipnrh);
+        ppc_cached_irq_mask[word] &= ~(1 << bit);
+        simr[word] = ppc_cached_irq_mask[word];
+        sipnr[word] = 1 << bit;
+}
+
+static void cpm2_end_irq(unsigned int irq_nr)
+{
+        int     bit, word;
+        volatile uint   *simr;
+
+        if (!(irq_desc[irq_nr].status & (IRQ_DISABLED|IRQ_INPROGRESS))
+                        && irq_desc[irq_nr].action) {
+
+                irq_nr -= CPM_IRQ_OFFSET;
+                bit = irq_to_siubit[irq_nr];
+                word = irq_to_siureg[irq_nr];
+
+                simr = &(cpm2_intctl->ic_simrh);
+                ppc_cached_irq_mask[word] |= 1 << bit;
+                simr[word] = ppc_cached_irq_mask[word];
+                /*
+                 * Work around large numbers of spurious IRQs on PowerPC 82xx
+                 * systems.
+                 */
+                mb();
+        }
+}
+
+static struct irq_chip cpm2_pic = {
+        .typename = " CPM2 SIU ",
+        .enable = cpm2_unmask_irq,
+        .disable = cpm2_mask_irq,
+        .unmask = cpm2_unmask_irq,
+        .mask_ack = cpm2_mask_and_ack,
+        .end = cpm2_end_irq,
+};
+
+int cpm2_get_irq(struct pt_regs *regs)
+{
+        int irq;
+        unsigned long bits;
+
+       /* For CPM2, read the SIVEC register and shift the bits down
+         * to get the irq number.         */
+        bits = cpm2_intctl->ic_sivec;
+        irq = bits >> 26;
+
+        if (irq == 0)
+                return(-1);
+        return irq+CPM_IRQ_OFFSET;
+}
+
+static int cpm2_pic_host_match(struct irq_host *h, struct device_node *node)
+{
+        return cpm2_pic_node == NULL || cpm2_pic_node == node;
+}
+
+static int cpm2_pic_host_map(struct irq_host *h, unsigned int virq,
+                          irq_hw_number_t hw)
+{
+        pr_debug("cpm2_pic_host_map(%d, 0x%lx)\n", virq, hw);
+
+        get_irq_desc(virq)->status |= IRQ_LEVEL;
+        set_irq_chip_and_handler(virq, &cpm2_pic, handle_level_irq);
+        return 0;
+}
+
+static void cpm2_host_unmap(struct irq_host *h, unsigned int virq)
+{
+        /* Make sure irq is masked in hardware */
+        cpm2_mask_irq(virq);
+
+        /* remove chip and handler */
+        set_irq_chip_and_handler(virq, NULL, NULL);
+}
+
+static int cpm2_pic_host_xlate(struct irq_host *h, struct device_node *ct,
+                            u32 *intspec, unsigned int intsize,
+                            irq_hw_number_t *out_hwirq, unsigned int *out_flags)
+{
+        static const unsigned char map_cpm2_senses[4] = {
+                IRQ_TYPE_LEVEL_LOW,
+                IRQ_TYPE_LEVEL_HIGH,
+                IRQ_TYPE_EDGE_FALLING,
+                IRQ_TYPE_EDGE_RISING,
+        };
+
+        *out_hwirq = intspec[0];
+        if (intsize > 1 && intspec[1] < 4)
+                *out_flags = map_cpm2_senses[intspec[1]];
+        else
+                *out_flags = IRQ_TYPE_NONE;
+
+        return 0;
+}
+
+static struct irq_host_ops cpm2_pic_host_ops = {
+        .match = cpm2_pic_host_match,
+        .map = cpm2_pic_host_map,
+        .unmap = cpm2_host_unmap,
+        .xlate = cpm2_pic_host_xlate,
+};
+
+void cpm2_pic_init(struct device_node *node)
+{
+        int i;
+
+        /* Clear the CPM IRQ controller, in case it has any bits set
+         * from the bootloader
+         */
+
+        /* Mask out everything */
+
+        cpm2_intctl->ic_simrh = 0x00000000;
+        cpm2_intctl->ic_simrl = 0x00000000;
+
+        wmb();
+
+        /* Ack everything */
+        cpm2_intctl->ic_sipnrh = 0xffffffff;
+        cpm2_intctl->ic_sipnrl = 0xffffffff;
+        wmb();
+
+        /* Dummy read of the vector */
+        i = cpm2_intctl->ic_sivec;
+        rmb();
+
+        /* Initialize the default interrupt mapping priorities,
+         * in case the boot rom changed something on us.
+         */
+        cpm2_intctl->ic_sicr = 0;
+        cpm2_intctl->ic_scprrh = 0x05309770;
+        cpm2_intctl->ic_scprrl = 0x05309770;
+
+        /* create a legacy host */
+        if (node)
+                cpm2_pic_node = of_node_get(node);
+
+        cpm2_pic_host = irq_alloc_host(IRQ_HOST_MAP_LINEAR, 64, &cpm2_pic_host_ops, 64);
+        if (cpm2_pic_host == NULL) {
+                printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n");
+                return;
+        }
+}
diff --git a/arch/powerpc/sysdev/cpm2_pic.h b/arch/powerpc/sysdev/cpm2_pic.h
new file mode 100644
index 000000000000..d63e45d4df58
--- /dev/null
+++ b/arch/powerpc/sysdev/cpm2_pic.h
@@ -0,0 +1,10 @@
+#ifndef _PPC_KERNEL_CPM2_H
+#define _PPC_KERNEL_CPM2_H
+
+extern intctl_cpm2_t *cpm2_intctl;
+
+extern int cpm2_get_irq(struct pt_regs *regs);
+
+extern void cpm2_pic_init(struct device_node*);
+
+#endif /* _PPC_KERNEL_CPM2_H */
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 92ba378b7990..022ed275ea68 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -3,6 +3,9 @@
  *
  * Maintained by Kumar Gala (see MAINTAINERS for contact information)
  *
+ * 2006 (c) MontaVista Software, Inc.
+ * Vitaly Bordug <vbordug@ru.mvista.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
@@ -20,15 +23,20 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/fsl_devices.h>
+#include <linux/fs_enet_pd.h>
+#include <linux/fs_uart_pd.h>
 
 #include <asm/system.h>
 #include <asm/atomic.h>
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/time.h>
 #include <asm/prom.h>
 #include <sysdev/fsl_soc.h>
 #include <mm/mmu_decl.h>
+#include <asm/cpm2.h>
 
+extern void init_fcc_ioports(struct fs_platform_info*);
 static phys_addr_t immrbase = -1;
 
 phys_addr_t get_immrbase(void)
@@ -42,7 +50,9 @@ phys_addr_t get_immrbase(void)
         if (soc) {
                 unsigned int size;
                 const void *prop = get_property(soc, "reg", &size);
-                immrbase = of_translate_address(soc, prop);
+
+                if (prop)
+                        immrbase = of_translate_address(soc, prop);
                 of_node_put(soc);
         };
 
@@ -51,6 +61,59 @@ phys_addr_t get_immrbase(void)
 
 EXPORT_SYMBOL(get_immrbase);
 
+#ifdef CONFIG_CPM2
+
+static u32 brgfreq = -1;
+
+u32 get_brgfreq(void)
+{
+        struct device_node *node;
+
+        if (brgfreq != -1)
+                return brgfreq;
+
+        node = of_find_node_by_type(NULL, "cpm");
+        if (node) {
+                unsigned int size;
+                const unsigned int *prop = get_property(node, "brg-frequency",
+                                        &size);
+
+                if (prop)
+                        brgfreq = *prop;
+                of_node_put(node);
+        };
+
+        return brgfreq;
+}
+
+EXPORT_SYMBOL(get_brgfreq);
+
+static u32 fs_baudrate = -1;
+
+u32 get_baudrate(void)
+{
+        struct device_node *node;
+
+        if (fs_baudrate != -1)
+                return fs_baudrate;
+
+        node = of_find_node_by_type(NULL, "serial");
+        if (node) {
+                unsigned int size;
+                const unsigned int *prop = get_property(node, "current-speed",
+                                &size);
+
+                if (prop)
+                        fs_baudrate = *prop;
+                of_node_put(node);
+        };
+
+        return fs_baudrate;
+}
+
+EXPORT_SYMBOL(get_baudrate);
+#endif /* CONFIG_CPM2 */
+
 static int __init gfar_mdio_of_init(void)
 {
         struct device_node *np;
@@ -85,8 +148,11 @@ static int __init gfar_mdio_of_init(void)
                         mdio_data.irq[k] = -1;
 
                 while ((child = of_get_next_child(np, child)) != NULL) {
-                        const u32 *id = get_property(child, "reg", NULL);
-                        mdio_data.irq[*id] = irq_of_parse_and_map(child, 0);
+                        int irq = irq_of_parse_and_map(child, 0);
+                        if (irq != NO_IRQ) {
+                                const u32 *id = get_property(child, "reg", NULL);
+                                mdio_data.irq[*id] = irq;
+                        }
                 }
 
                 ret =
@@ -128,7 +194,7 @@ static int __init gfar_of_init(void)
                 const char *model;
                 const void *mac_addr;
                 const phandle *ph;
-                int n_res = 1;
+                int n_res = 2;
 
                 memset(r, 0, sizeof(r));
                 memset(&gfar_data, 0, sizeof(gfar_data));
@@ -159,7 +225,7 @@ static int __init gfar_of_init(void)
 
                 gfar_dev =
                     platform_device_register_simple("fsl-gianfar", i, &r[0],
-                                                    n_res + 1);
+                                                    n_res);
 
                 if (IS_ERR(gfar_dev)) {
                         ret = PTR_ERR(gfar_dev);
@@ -478,3 +544,208 @@ err:
 }
 
 arch_initcall(fsl_usb_of_init);
+
+#ifdef CONFIG_CPM2
+
+static const char fcc_regs[] = "fcc_regs";
+static const char fcc_regs_c[] = "fcc_regs_c";
+static const char fcc_pram[] = "fcc_pram";
+static char bus_id[9][BUS_ID_SIZE];
+
+static int __init fs_enet_of_init(void)
+{
+        struct device_node *np;
+        unsigned int i;
+        struct platform_device *fs_enet_dev;
+        struct resource res;
+        int ret;
+
+        for (np = NULL, i = 0;
+             (np = of_find_compatible_node(np, "network", "fs_enet")) != NULL;
+             i++) {
+                struct resource r[4];
+                struct device_node *phy, *mdio;
+                struct fs_platform_info fs_enet_data;
+                const unsigned int *id, *phy_addr;
+                const void *mac_addr;
+                const phandle *ph;
+                const char *model;
+
+                memset(r, 0, sizeof(r));
+                memset(&fs_enet_data, 0, sizeof(fs_enet_data));
+
+                ret = of_address_to_resource(np, 0, &r[0]);
+                if (ret)
+                        goto err;
+                r[0].name = fcc_regs;
+
+                ret = of_address_to_resource(np, 1, &r[1]);
+                if (ret)
+                        goto err;
+                r[1].name = fcc_pram;
+
+                ret = of_address_to_resource(np, 2, &r[2]);
+                if (ret)
+                        goto err;
+                r[2].name = fcc_regs_c;
+
+                r[3].start = r[3].end = irq_of_parse_and_map(np, 0);
+                r[3].flags = IORESOURCE_IRQ;
+
+                fs_enet_dev =
+                    platform_device_register_simple("fsl-cpm-fcc", i, &r[0], 4);
+
+                if (IS_ERR(fs_enet_dev)) {
+                        ret = PTR_ERR(fs_enet_dev);
+                        goto err;
+                }
+
+                model = get_property(np, "model", NULL);
+                if (model == NULL) {
+                        ret = -ENODEV;
+                        goto unreg;
+                }
+
+                mac_addr = get_property(np, "mac-address", NULL);
+                memcpy(fs_enet_data.macaddr, mac_addr, 6);
+
+                ph = get_property(np, "phy-handle", NULL);
+                phy = of_find_node_by_phandle(*ph);
+
+                if (phy == NULL) {
+                        ret = -ENODEV;
+                        goto unreg;
+                }
+
+                phy_addr = get_property(phy, "reg", NULL);
+                fs_enet_data.phy_addr = *phy_addr;
+
+                id = get_property(np, "device-id", NULL);
+                fs_enet_data.fs_no = *id;
+                strcpy(fs_enet_data.fs_type, model);
+
+                mdio = of_get_parent(phy);
+                ret = of_address_to_resource(mdio, 0, &res);
+                if (ret) {
+                        of_node_put(phy);
+                        of_node_put(mdio);
+                        goto unreg;
+                }
+
+                fs_enet_data.clk_rx = *((u32 *) get_property(np, "rx-clock", NULL));
+                fs_enet_data.clk_tx = *((u32 *) get_property(np, "tx-clock", NULL));
+
+                if (strstr(model, "FCC")) {
+                        int fcc_index = *id - 1;
+
+                        fs_enet_data.dpram_offset = (u32)cpm_dpram_addr(0);
+                        fs_enet_data.rx_ring = 32;
+                        fs_enet_data.tx_ring = 32;
+                        fs_enet_data.rx_copybreak = 240;
+                        fs_enet_data.use_napi = 0;
+                        fs_enet_data.napi_weight = 17;
+                        fs_enet_data.mem_offset = FCC_MEM_OFFSET(fcc_index);
+                        fs_enet_data.cp_page = CPM_CR_FCC_PAGE(fcc_index);
+                        fs_enet_data.cp_block = CPM_CR_FCC_SBLOCK(fcc_index);
+
+                        snprintf((char*)&bus_id[(*id)], BUS_ID_SIZE, "%x:%02x",
+                                                        (u32)res.start, fs_enet_data.phy_addr);
+                        fs_enet_data.bus_id = (char*)&bus_id[(*id)];
+                        fs_enet_data.init_ioports = init_fcc_ioports;
+                }
+
+                of_node_put(phy);
+                of_node_put(mdio);
+
+                ret = platform_device_add_data(fs_enet_dev, &fs_enet_data,
+                                             sizeof(struct
+                                                    fs_platform_info));
+                if (ret)
+                        goto unreg;
+        }
+        return 0;
+
+unreg:
+        platform_device_unregister(fs_enet_dev);
+err:
+        return ret;
+}
+
+arch_initcall(fs_enet_of_init);
+
+static const char scc_regs[] = "regs";
+static const char scc_pram[] = "pram";
+
+static int __init cpm_uart_of_init(void)
+{
+        struct device_node *np;
+        unsigned int i;
+        struct platform_device *cpm_uart_dev;
+        int ret;
+
+        for (np = NULL, i = 0;
+             (np = of_find_compatible_node(np, "serial", "cpm_uart")) != NULL;
+             i++) {
+                struct resource r[3];
+                struct fs_uart_platform_info cpm_uart_data;
+                const int *id;
+                const char *model;
+
+                memset(r, 0, sizeof(r));
+                memset(&cpm_uart_data, 0, sizeof(cpm_uart_data));
+
+                ret = of_address_to_resource(np, 0, &r[0]);
+                if (ret)
+                        goto err;
+
+                r[0].name = scc_regs;
+
+                ret = of_address_to_resource(np, 1, &r[1]);
+                if (ret)
+                        goto err;
+                r[1].name = scc_pram;
+
+                r[2].start = r[2].end = irq_of_parse_and_map(np, 0);
+                r[2].flags = IORESOURCE_IRQ;
+
+                cpm_uart_dev =
+                    platform_device_register_simple("fsl-cpm-scc:uart", i, &r[0], 3);
+
+                if (IS_ERR(cpm_uart_dev)) {
+                        ret = PTR_ERR(cpm_uart_dev);
+                        goto err;
+                }
+
+                id = get_property(np, "device-id", NULL);
+                cpm_uart_data.fs_no = *id;
+
+                model = (char*)get_property(np, "model", NULL);
+                strcpy(cpm_uart_data.fs_type, model);
+
+                cpm_uart_data.uart_clk = ppc_proc_freq;
+
+                cpm_uart_data.tx_num_fifo = 4;
+                cpm_uart_data.tx_buf_size = 32;
+                cpm_uart_data.rx_num_fifo = 4;
+                cpm_uart_data.rx_buf_size = 32;
+                cpm_uart_data.clk_rx = *((u32 *) get_property(np, "rx-clock", NULL));
+                cpm_uart_data.clk_tx = *((u32 *) get_property(np, "tx-clock", NULL));
+
+                ret =
+                    platform_device_add_data(cpm_uart_dev, &cpm_uart_data,
+                                             sizeof(struct
+                                                    fs_uart_platform_info));
+                if (ret)
+                        goto unreg;
+        }
+
+        return 0;
+
+unreg:
+        platform_device_unregister(cpm_uart_dev);
+err:
+        return ret;
+}
+
+arch_initcall(cpm_uart_of_init);
+#endif /* CONFIG_CPM2 */
diff --git a/arch/powerpc/sysdev/fsl_soc.h b/arch/powerpc/sysdev/fsl_soc.h
index 5a3dd480d2fd..04e145b5fc32 100644
--- a/arch/powerpc/sysdev/fsl_soc.h
+++ b/arch/powerpc/sysdev/fsl_soc.h
@@ -5,6 +5,8 @@
 #include <asm/mmu.h>
 
 extern phys_addr_t get_immrbase(void);
+extern u32 get_brgfreq(void);
+extern u32 get_baudrate(void);
 
 #endif
 #endif
diff --git a/arch/ppc/boot/utils/mkbugboot.c b/arch/ppc/boot/utils/mkbugboot.c
index 29115e01f60a..1640c4199ca6 100644
--- a/arch/ppc/boot/utils/mkbugboot.c
+++ b/arch/ppc/boot/utils/mkbugboot.c
@@ -19,36 +19,13 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <netinet/in.h>
 #ifdef __sun__
 #include <inttypes.h>
 #else
 #include <stdint.h>
 #endif
 
-#ifdef __i386__
-#define cpu_to_be32(x) le32_to_cpu(x)
-#define cpu_to_be16(x) le16_to_cpu(x)
-#else
-#define cpu_to_be32(x) (x)
-#define cpu_to_be16(x) (x)
-#endif
-
-#define cpu_to_le32(x) le32_to_cpu((x))
-unsigned long le32_to_cpu(unsigned long x)
-{
-        return (((x & 0x000000ffU) << 24) |
-                ((x & 0x0000ff00U) <<  8) |
-                ((x & 0x00ff0000U) >>  8) |
-                ((x & 0xff000000U) >> 24));
-}
-
-#define cpu_to_le16(x) le16_to_cpu((x))
-unsigned short le16_to_cpu(unsigned short x)
-{
-        return (((x & 0x00ff) << 8) |
-                ((x & 0xff00) >> 8));
-}
-
 /* size of read buffer */
 #define SIZE 0x1000
 
@@ -62,124 +39,109 @@ typedef struct bug_boot_header {
 
 #define HEADER_SIZE     sizeof(bug_boot_header_t)
 
-uint32_t copy_image(int32_t in_fd, int32_t out_fd)
+void update_checksum(void *buf, size_t size, uint16_t *sum)
 {
-  uint8_t buf[SIZE];
-  int n;
-  uint32_t image_size = 0;
-  uint8_t zero = 0;
-
-  lseek(in_fd, ELF_HEADER_SIZE, SEEK_SET);
-
-  /* Copy an image while recording its size */
-  while ( (n = read(in_fd, buf, SIZE)) > 0 )
-    {
-    image_size = image_size + n;
-    write(out_fd, buf, n);
-    }
-
-  /* BUG romboot requires that our size is divisible by 2 */
-  /* align image to 2 byte boundary */
-  if (image_size % 2)
-    {
-    image_size++;
-    write(out_fd, &zero, 1);
-    }
-
-  return image_size;
+        uint32_t csum = *sum;
+
+        while (size) {
+                csum += *(uint16_t *)buf;
+                if (csum > 0xffff)
+                        csum -= 0xffff;
+                buf = (uint16_t *)buf + 1;
+                size -= 2;
+        }
+        *sum = csum;
 }
 
-void write_bugboot_header(int32_t out_fd, uint32_t boot_size)
+uint32_t copy_image(int in_fd, int out_fd, uint16_t *sum)
 {
-  uint8_t header_block[HEADER_SIZE];
-  bug_boot_header_t *bbh = (bug_boot_header_t *)&header_block[0];
-
-  memset(header_block, 0, HEADER_SIZE);
-
-  /* Fill in the PPCBUG ROM boot header */
-  strncpy(bbh->magic_word, "BOOT", 4);          /* PPCBUG magic word */
-  bbh->entry_offset = cpu_to_be32(HEADER_SIZE); /* Entry address */
-  bbh->routine_length= cpu_to_be32(HEADER_SIZE+boot_size+2);    /* Routine length */
-  strncpy(bbh->routine_name, "LINUXROM", 8);            /* Routine name   */
-
-  /* Output the header and bootloader to the file */
-  write(out_fd, header_block, HEADER_SIZE);
+        uint8_t buf[SIZE];
+        int offset = 0;
+        int n;
+        uint32_t image_size = 0;
+
+        lseek(in_fd, ELF_HEADER_SIZE, SEEK_SET);
+
+        /* Copy an image while recording its size */
+        while ( (n = read(in_fd, buf + offset, SIZE - offset)) > 0 ) {
+                n += offset;
+                offset = n & 1;
+                n -= offset;
+                image_size = image_size + n;
+                /* who's going to deal with short writes? */
+                write(out_fd, buf, n);
+                update_checksum(buf, n, sum);
+                if (offset)
+                        buf[0] = buf[n];
+        }
+
+        /* BUG romboot requires that our size is divisible by 2 */
+        /* align image to 2 byte boundary */
+        if (offset) {
+                image_size += 2;
+                buf[1] = '\0';
+                write(out_fd, buf, 2);
+                update_checksum(buf, 2, sum);
+        }
+        return image_size;
 }
 
-uint16_t calc_checksum(int32_t bug_fd)
+void write_bugboot_header(int out_fd, uint32_t boot_size, uint16_t *sum)
 {
-  uint32_t checksum_var = 0;
-  uint8_t buf[2];
-  int n;
-
-  /* Checksum loop */
-  while ( (n = read(bug_fd, buf, 2) ) )
-  {
-    checksum_var = checksum_var + *(uint16_t *)buf;
-
-    /* If we carry out, mask it and add one to the checksum */
-    if (checksum_var >> 16)
-      checksum_var = (checksum_var & 0x0000ffff) + 1;
-  }
-
-  return checksum_var;
+        static bug_boot_header_t bbh = {
+                .magic_word = "BOOT",
+                .routine_name = "LINUXROM"
+        };
+
+        /* Fill in the PPCBUG ROM boot header */
+        bbh.entry_offset = htonl(HEADER_SIZE);  /* Entry address */
+        bbh.routine_length= htonl(HEADER_SIZE+boot_size+2);     /* Routine length */
+
+        /* Output the header and bootloader to the file */
+        write(out_fd, &bbh, sizeof(bug_boot_header_t));
+        update_checksum(&bbh, sizeof(bug_boot_header_t), sum);
 }
 
 int main(int argc, char *argv[])
 {
-  int32_t image_fd, bugboot_fd;
-  int argptr = 1;
-  uint32_t kernel_size = 0;
-  uint16_t checksum = 0;
-  uint8_t bugbootname[256];
-
-  if ( (argc != 3) )
-  {
-    fprintf(stderr, "usage: %s <kernel_image> <bugboot>\n",argv[0]);
-    exit(-1);
-  }
-
-  /* Get file args */
-
-  /* kernel image file */
-    if ((image_fd = open( argv[argptr] , 0)) < 0)
-      exit(-1);
-  argptr++;
+        int image_fd, bugboot_fd;
+        uint32_t kernel_size = 0;
+        uint16_t checksum = 0;
 
-  /* bugboot file */
-  if ( !strcmp( argv[argptr], "-" ) )
-    bugboot_fd = 1;                     /* stdout */
-  else
-    if ((bugboot_fd = creat( argv[argptr] , 0755)) < 0)
-      exit(-1);
-    else
-      strcpy(bugbootname, argv[argptr]);
-  argptr++;
+        if (argc != 3) {
+                fprintf(stderr, "usage: %s <kernel_image> <bugboot>\n",argv[0]);
+                exit(-1);
+        }
 
-  /* Set file position after ROM header block where zImage will be written */
-  lseek(bugboot_fd, HEADER_SIZE, SEEK_SET);
+        /* Get file args */
 
-  /* Copy kernel image into bugboot image */
-  kernel_size = copy_image(image_fd, bugboot_fd);
-  close(image_fd);
+        /* kernel image file */
+        if ((image_fd = open(argv[1] , 0)) < 0)
+                exit(-1);
 
-  /* Set file position to beginning where header/romboot will be written */
-  lseek(bugboot_fd, 0, SEEK_SET);
+        /* bugboot file */
+        if (!strcmp(argv[2], "-"))
+                bugboot_fd = 1;                 /* stdout */
+        else if ((bugboot_fd = creat(argv[2] , 0755)) < 0)
+                exit(-1);
 
-  /* Write out BUG header/romboot */
-  write_bugboot_header(bugboot_fd, kernel_size);
+        /* Set file position after ROM header block where zImage will be written */
+        lseek(bugboot_fd, HEADER_SIZE, SEEK_SET);
 
-  /* Close bugboot file */
-  close(bugboot_fd);
+        /* Copy kernel image into bugboot image */
+        kernel_size = copy_image(image_fd, bugboot_fd, &checksum);
 
-  /* Reopen it as read/write */
-  bugboot_fd = open(bugbootname, O_RDWR);
+        /* Set file position to beginning where header/romboot will be written */
+        lseek(bugboot_fd, 0, SEEK_SET);
 
-  /* Calculate checksum */
-  checksum = calc_checksum(bugboot_fd);
+        /* Write out BUG header/romboot */
+        write_bugboot_header(bugboot_fd, kernel_size, &checksum);
 
-  /* Write out the calculated checksum */
-  write(bugboot_fd, &checksum, 2);
+        /* Write out the calculated checksum */
+        lseek(bugboot_fd, 0, SEEK_END);
+        write(bugboot_fd, &checksum, 2);
 
-  return 0;
+        /* Close bugboot file */
+        close(bugboot_fd);
+        return 0;
 }
diff --git a/arch/ppc/boot/utils/mkprep.c b/arch/ppc/boot/utils/mkprep.c
index f6d5a2f2fcf6..192bb397126f 100644
--- a/arch/ppc/boot/utils/mkprep.c
+++ b/arch/ppc/boot/utils/mkprep.c
@@ -15,279 +15,227 @@
  * Modified for Sparc hosted builds by Peter Wahl <PeterWahl@web.de>
  */
 
-#include <fcntl.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <strings.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#define cpu_to_le32(x) le32_to_cpu((x))
-unsigned long le32_to_cpu(unsigned long x)
-{
-        return (((x & 0x000000ffU) << 24) |
-                ((x & 0x0000ff00U) <<  8) |
-                ((x & 0x00ff0000U) >>  8) |
-                ((x & 0xff000000U) >> 24));
-}
-
-
-#define cpu_to_le16(x) le16_to_cpu((x))
-unsigned short le16_to_cpu(unsigned short x)
-{
-        return (((x & 0x00ff) << 8) |
-                ((x & 0xff00) >> 8));
-}
-
-#define cpu_to_be32(x) (x)
-#define be32_to_cpu(x) (x)
-#define cpu_to_be16(x) (x)
-#define be16_to_cpu(x) (x)
+#include <stdlib.h>
 
 /* size of read buffer */
 #define SIZE 0x1000
 
-
-typedef unsigned long dword_t;
-typedef unsigned short word_t;
-typedef unsigned char byte_t;
-typedef byte_t block_t[512];
-typedef byte_t page_t[4096];
-
-
 /*
  * Partition table entry
  *  - from the PReP spec
  */
 typedef struct partition_entry {
-  byte_t        boot_indicator;
-  byte_t        starting_head;
-  byte_t        starting_sector;
-  byte_t        starting_cylinder;
-
-  byte_t        system_indicator;
-  byte_t        ending_head;
-  byte_t        ending_sector;
-  byte_t        ending_cylinder;
-
-  dword_t       beginning_sector;
-  dword_t       number_of_sectors;
+        unsigned char boot_indicator;
+        unsigned char starting_head;
+        unsigned char starting_sector;
+        unsigned char starting_cylinder;
+
+        unsigned char system_indicator;
+        unsigned char ending_head;
+        unsigned char ending_sector;
+        unsigned char ending_cylinder;
+
+        unsigned char beginning_sector[4];
+        unsigned char number_of_sectors[4];
 } partition_entry_t;
 
 #define BootActive      0x80
 #define SystemPrep      0x41
 
-void copy_image(int , int);
-void write_prep_partition(int , int );
-void write_asm_data( int in, int out );
+void copy_image(FILE *, FILE *);
+void write_prep_partition(FILE *, FILE *);
+void write_asm_data(FILE *, FILE *);
 
 unsigned int elfhdr_size = 65536;
 
 int main(int argc, char *argv[])
 {
-  int in_fd, out_fd;
-  int argptr = 1;
-  unsigned int prep = 0;
-  unsigned int asmoutput = 0;
-
-  if ( (argc < 3) || (argc > 4) )
-  {
-    fprintf(stderr, "usage: %s [-pbp] [-asm] <boot-file> <image>\n",argv[0]);
-    exit(-1);
-  }
-
-  /* needs to handle args more elegantly -- but this is a small/simple program */
-
-  /* check for -pbp */
-  if ( !strcmp( argv[argptr], "-pbp" ) )
-  {
-    prep = 1;
-    argptr++;
-  }
-
-  /* check for -asm */
-  if ( !strcmp( argv[argptr], "-asm" ) )
-  {
-    asmoutput = 1;
-    argptr++;
-  }
-
-  /* input file */
-  if ( !strcmp( argv[argptr], "-" ) )
-    in_fd = 0;                  /* stdin */
-  else
-    if ((in_fd = open( argv[argptr] , 0)) < 0)
-      exit(-1);
-  argptr++;
-
-  /* output file */
-  if ( !strcmp( argv[argptr], "-" ) )
-    out_fd = 1;                 /* stdout */
-  else
-    if ((out_fd = creat( argv[argptr] , 0755)) < 0)
-      exit(-1);
-  argptr++;
-
-  /* skip elf header in input file */
-  /*if ( !prep )*/
-  lseek(in_fd, elfhdr_size, SEEK_SET);
-
-  /* write prep partition if necessary */
-  if ( prep )
-          write_prep_partition( in_fd, out_fd );
-
-  /* write input image to bootimage */
-  if ( asmoutput )
-          write_asm_data( in_fd, out_fd );
-  else
-          copy_image(in_fd, out_fd);
-
-  return 0;
+        FILE *in, *out;
+        int argptr = 1;
+        int prep = 0;
+        int asmoutput = 0;
+
+        if (argc < 3 || argc > 4) {
+                fprintf(stderr, "usage: %s [-pbp] [-asm] <boot-file> <image>\n",
+                        argv[0]);
+                exit(-1);
+        }
+
+/* needs to handle args more elegantly -- but this is a small/simple program */
+
+        /* check for -pbp */
+        if (!strcmp(argv[argptr], "-pbp")) {
+                prep = 1;
+                argptr++;
+        }
+
+        /* check for -asm */
+        if (!strcmp(argv[argptr], "-asm")) {
+                asmoutput = 1;
+                argptr++;
+        }
+
+        /* input file */
+        if (!strcmp(argv[argptr], "-"))
+                in = stdin;
+        else if (!(in = fopen(argv[argptr], "r")))
+                exit(-1);
+        argptr++;
+
+        /* output file */
+        if (!strcmp(argv[argptr], "-"))
+                out = stdout;
+        else if (!(out = fopen(argv[argptr], "w")))
+                exit(-1);
+        argptr++;
+
+        /* skip elf header in input file */
+        /*if ( !prep )*/
+        fseek(in, elfhdr_size, SEEK_SET);
+
+        /* write prep partition if necessary */
+        if (prep)
+                write_prep_partition(in, out);
+
+        /* write input image to bootimage */
+        if (asmoutput)
+                write_asm_data(in, out);
+        else
+                copy_image(in, out);
+
+        return 0;
 }
 
-void write_prep_partition(int in, int out)
+void store_le32(unsigned int v, unsigned char *p)
 {
-  unsigned char block[512];
-  partition_entry_t pe;
-  dword_t *entry  = (dword_t *)&block[0];
-  dword_t *length = (dword_t *)&block[sizeof(long)];
-  struct stat info;
-
-  if (fstat(in, &info) < 0)
-  {
-    fprintf(stderr,"info failed\n");
-    exit(-1);
-  }
-
-  bzero( block, sizeof block );
-
-  /* set entry point and boot image size skipping over elf header */
-#ifdef __i386__
-  *entry = 0x400/*+65536*/;
-  *length = info.st_size-elfhdr_size+0x400;
-#else
-  *entry = cpu_to_le32(0x400/*+65536*/);
-  *length = cpu_to_le32(info.st_size-elfhdr_size+0x400);
-#endif /* __i386__ */
-
-  /* sets magic number for msdos partition (used by linux) */
-  block[510] = 0x55;
-  block[511] = 0xAA;
-
-  /*
-   * Build a "PReP" partition table entry in the boot record
-   *  - "PReP" may only look at the system_indicator
-   */
-  pe.boot_indicator   = BootActive;
-  pe.system_indicator = SystemPrep;
-  /*
-   * The first block of the diskette is used by this "boot record" which
-   * actually contains the partition table. (The first block of the
-   * partition contains the boot image, but I digress...)  We'll set up
-   * one partition on the diskette and it shall contain the rest of the
-   * diskette.
-   */
-  pe.starting_head     = 0;     /* zero-based                        */
-  pe.starting_sector   = 2;     /* one-based                         */
-  pe.starting_cylinder = 0;     /* zero-based                        */
-  pe.ending_head       = 1;     /* assumes two heads                 */
-  pe.ending_sector     = 18;    /* assumes 18 sectors/track          */
-  pe.ending_cylinder   = 79;    /* assumes 80 cylinders/diskette     */
-
-  /*
-   * The "PReP" software ignores the above fields and just looks at
-   * the next two.
-   *   - size of the diskette is (assumed to be)
-   *     (2 tracks/cylinder)(18 sectors/tracks)(80 cylinders/diskette)
-   *   - unlike the above sector numbers, the beginning sector is zero-based!
-   */
+        p[0] = v;
+        p[1] = v >>= 8;
+        p[2] = v >>= 8;
+        p[3] = v >> 8;
+}
+
+void write_prep_partition(FILE *in, FILE *out)
+{
+        unsigned char block[512];
+        partition_entry_t pe;
+        unsigned char *entry  = block;
+        unsigned char *length = block + 4;
+        long pos = ftell(in), size;
+
+        if (fseek(in, 0, SEEK_END) < 0) {
+                fprintf(stderr,"info failed\n");
+                exit(-1);
+        }
+        size = ftell(in);
+        if (fseek(in, pos, SEEK_SET) < 0) {
+                fprintf(stderr,"info failed\n");
+                exit(-1);
+        }
+
+        memset(block, '\0', sizeof(block));
+
+        /* set entry point and boot image size skipping over elf header */
+        store_le32(0x400/*+65536*/, entry);
+        store_le32(size-elfhdr_size+0x400, length);
+
+        /* sets magic number for msdos partition (used by linux) */
+        block[510] = 0x55;
+        block[511] = 0xAA;
+
+        /*
+        * Build a "PReP" partition table entry in the boot record
+        *  - "PReP" may only look at the system_indicator
+        */
+        pe.boot_indicator   = BootActive;
+        pe.system_indicator = SystemPrep;
+        /*
+        * The first block of the diskette is used by this "boot record" which
+        * actually contains the partition table. (The first block of the
+        * partition contains the boot image, but I digress...)  We'll set up
+        * one partition on the diskette and it shall contain the rest of the
+        * diskette.
+        */
+        pe.starting_head     = 0;       /* zero-based                        */
+        pe.starting_sector   = 2;       /* one-based                         */
+        pe.starting_cylinder = 0;       /* zero-based                        */
+        pe.ending_head       = 1;       /* assumes two heads                 */
+        pe.ending_sector     = 18;      /* assumes 18 sectors/track          */
+        pe.ending_cylinder   = 79;      /* assumes 80 cylinders/diskette     */
+
+        /*
+        * The "PReP" software ignores the above fields and just looks at
+        * the next two.
+        *   - size of the diskette is (assumed to be)
+        *     (2 tracks/cylinder)(18 sectors/tracks)(80 cylinders/diskette)
+        *   - unlike the above sector numbers, the beginning sector is zero-based!
+        */
 #if 0
-  pe.beginning_sector  = cpu_to_le32(1);
-#else
-  /* This has to be 0 on the PowerStack? */
-#ifdef __i386__
-  pe.beginning_sector  = 0;
+        store_le32(1, pe.beginning_sector);
 #else
-  pe.beginning_sector  = cpu_to_le32(0);
-#endif /* __i386__ */
+        /* This has to be 0 on the PowerStack? */
+        store_le32(0, pe.beginning_sector);
 #endif
 
-#ifdef __i386__
-  pe.number_of_sectors = 2*18*80-1;
-#else
-  pe.number_of_sectors = cpu_to_le32(2*18*80-1);
-#endif /* __i386__ */
+        store_le32(2*18*80-1, pe.number_of_sectors);
 
-  memcpy(&block[0x1BE], &pe, sizeof(pe));
+        memcpy(&block[0x1BE], &pe, sizeof(pe));
 
-  write( out, block, sizeof(block) );
-  write( out, entry, sizeof(*entry) );
-  write( out, length, sizeof(*length) );
-  /* set file position to 2nd sector where image will be written */
-  lseek( out, 0x400, SEEK_SET );
+        fwrite(block, sizeof(block), 1, out);
+        fwrite(entry, 4, 1, out);
+        fwrite(length, 4, 1, out);
+        /* set file position to 2nd sector where image will be written */
+        fseek( out, 0x400, SEEK_SET );
 }
 
 
 
-void
-copy_image(int in, int out)
+void copy_image(FILE *in, FILE *out)
 {
-  char buf[SIZE];
-  int n;
+        char buf[SIZE];
+        int n;
 
-  while ( (n = read(in, buf, SIZE)) > 0 )
-    write(out, buf, n);
+        while ( (n = fread(buf, 1, SIZE, in)) > 0 )
+                fwrite(buf, 1, n, out);
 }
 
 
 void
-write_asm_data( int in, int out )
+write_asm_data(FILE *in, FILE *out)
 {
-  int i, cnt, pos, len;
-  unsigned int cksum, val;
-  unsigned char *lp;
-  unsigned char buf[SIZE];
-  unsigned char str[256];
-
-  write( out, "\t.data\n\t.globl input_data\ninput_data:\n",
-         strlen( "\t.data\n\t.globl input_data\ninput_data:\n" ) );
-  pos = 0;
-  cksum = 0;
-  while ((len = read(in, buf, sizeof(buf))) > 0)
-  {
-    cnt = 0;
-    lp = (unsigned char *)buf;
-    len = (len + 3) & ~3;  /* Round up to longwords */
-    for (i = 0;  i < len;  i += 4)
-    {
-      if (cnt == 0)
-      {
-        write( out, "\t.long\t", strlen( "\t.long\t" ) );
-      }
-      sprintf( str, "0x%02X%02X%02X%02X", lp[0], lp[1], lp[2], lp[3]);
-      write( out, str, strlen(str) );
-      val = *(unsigned long *)lp;
-      cksum ^= val;
-      lp += 4;
-      if (++cnt == 4)
-      {
-        cnt = 0;
-        sprintf( str, " # %x \n", pos+i-12);
-        write( out, str, strlen(str) );
-      } else
-      {
-        write( out, ",", 1 );
-      }
-    }
-    if (cnt)
-    {
-      write( out, "0\n", 2 );
-    }
-    pos += len;
-  }
-  sprintf(str, "\t.globl input_len\ninput_len:\t.long\t0x%x\n", pos);
-  write( out, str, strlen(str) );
-
-  fprintf(stderr, "cksum = %x\n", cksum);
+        int i, cnt, pos = 0;
+        unsigned int cksum = 0, val;
+        unsigned char *lp;
+        unsigned char buf[SIZE];
+        size_t len;
+
+        fputs("\t.data\n\t.globl input_data\ninput_data:\n", out);
+        while ((len = fread(buf, 1, sizeof(buf), in)) > 0) {
+                cnt = 0;
+                lp = buf;
+                /* Round up to longwords */
+                while (len & 3)
+                        buf[len++] = '\0';
+                for (i = 0;  i < len;  i += 4) {
+                        if (cnt == 0)
+                                fputs("\t.long\t", out);
+                        fprintf(out, "0x%02X%02X%02X%02X",
+                                lp[0], lp[1], lp[2], lp[3]);
+                        val = *(unsigned long *)lp;
+                        cksum ^= val;
+                        lp += 4;
+                        if (++cnt == 4) {
+                                cnt = 0;
+                                fprintf(out, " # %x \n", pos+i-12);
+                        } else {
+                                fputs(",", out);
+                        }
+                }
+                if (cnt)
+                        fputs("0\n", out);
+                pos += len;
+        }
+        fprintf(out, "\t.globl input_len\ninput_len:\t.long\t0x%x\n", pos);
+        fprintf(stderr, "cksum = %x\n", cksum);
 }
diff --git a/arch/ppc/platforms/mpc8272ads_setup.c b/arch/ppc/platforms/mpc8272ads_setup.c
index 2a35fe2b9b96..d5d36c372c8e 100644
--- a/arch/ppc/platforms/mpc8272ads_setup.c
+++ b/arch/ppc/platforms/mpc8272ads_setup.c
@@ -103,7 +103,7 @@ static struct fs_platform_info mpc82xx_enet_pdata[] = {
         },
 };
 
-static void init_fcc1_ioports(void)
+static void init_fcc1_ioports(struct fs_platform_info*)
 {
         struct io_port *io;
         u32 tempval;
@@ -144,7 +144,7 @@ static void init_fcc1_ioports(void)
         iounmap(immap);
 }
 
-static void init_fcc2_ioports(void)
+static void init_fcc2_ioports(struct fs_platform_info*)
 {
         cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t));
         u32 *bcsr = ioremap(BCSR_ADDR+12, sizeof(u32));
@@ -229,7 +229,7 @@ static void mpc8272ads_fixup_uart_pdata(struct platform_device *pdev,
         }
 }
 
-static void init_scc1_uart_ioports(void)
+static void init_scc1_uart_ioports(struct fs_uart_platform_info*)
 {
         cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t));
 
@@ -246,7 +246,7 @@ static void init_scc1_uart_ioports(void)
         iounmap(immap);
 }
 
-static void init_scc4_uart_ioports(void)
+static void init_scc4_uart_ioports(struct fs_uart_platform_info*)
 {
         cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t));
 
diff --git a/arch/ppc/platforms/mpc866ads_setup.c b/arch/ppc/platforms/mpc866ads_setup.c
index e12cece4c9fd..5f130dca3770 100644
--- a/arch/ppc/platforms/mpc866ads_setup.c
+++ b/arch/ppc/platforms/mpc866ads_setup.c
@@ -137,7 +137,7 @@ void __init board_init(void)
         iounmap(bcsr_io);
 }
 
-static void setup_fec1_ioports(void)
+static void setup_fec1_ioports(struct fs_platform_info*)
 {
         immap_t *immap = (immap_t *) IMAP_ADDR;
 
@@ -145,7 +145,7 @@ static void setup_fec1_ioports(void)
         setbits16(&immap->im_ioport.iop_pddir, 0x1fff);
 }
 
-static void setup_scc1_ioports(void)
+static void setup_scc1_ioports(struct fs_platform_info*)
 {
         immap_t *immap = (immap_t *) IMAP_ADDR;
         unsigned *bcsr_io;
@@ -194,7 +194,7 @@ static void setup_scc1_ioports(void)
 
 }
 
-static void setup_smc1_ioports(void)
+static void setup_smc1_ioports(struct fs_uart_platform_info*)
 {
         immap_t *immap = (immap_t *) IMAP_ADDR;
         unsigned *bcsr_io;
@@ -216,7 +216,7 @@ static void setup_smc1_ioports(void)
 
 }
 
-static void setup_smc2_ioports(void)
+static void setup_smc2_ioports(struct fs_uart_platform_info*)
 {
         immap_t *immap = (immap_t *) IMAP_ADDR;
         unsigned *bcsr_io;
diff --git a/arch/ppc/platforms/mpc885ads_setup.c b/arch/ppc/platforms/mpc885ads_setup.c
index 5dfa4e6c2af0..bf388ed04d46 100644
--- a/arch/ppc/platforms/mpc885ads_setup.c
+++ b/arch/ppc/platforms/mpc885ads_setup.c
@@ -161,7 +161,7 @@ void __init board_init(void)
 #endif
 }
 
-static void setup_fec1_ioports(void)
+static void setup_fec1_ioports(struct fs_platform_info*)
 {
         immap_t *immap = (immap_t *) IMAP_ADDR;
 
@@ -181,7 +181,7 @@ static void setup_fec1_ioports(void)
         clrbits32(&immap->im_cpm.cp_cptr, 0x00000100);
 }
 
-static void setup_fec2_ioports(void)
+static void setup_fec2_ioports(struct fs_platform_info*)
 {
         immap_t *immap = (immap_t *) IMAP_ADDR;
 
@@ -193,7 +193,7 @@ static void setup_fec2_ioports(void)
         clrbits32(&immap->im_cpm.cp_cptr, 0x00000080);
 }
 
-static void setup_scc3_ioports(void)
+static void setup_scc3_ioports(struct fs_platform_info*)
 {
         immap_t *immap = (immap_t *) IMAP_ADDR;
         unsigned *bcsr_io;
@@ -315,7 +315,7 @@ static void __init mpc885ads_fixup_scc_enet_pdata(struct platform_device *pdev,
         mpc885ads_fixup_enet_pdata(pdev, fsid_scc1 + pdev->id - 1);
 }
 
-static void setup_smc1_ioports(void)
+static void setup_smc1_ioports(struct fs_uart_platform_info*)
 {
         immap_t *immap = (immap_t *) IMAP_ADDR;
         unsigned *bcsr_io;
@@ -335,7 +335,7 @@ static void setup_smc1_ioports(void)
         clrbits16(&immap->im_cpm.cp_pbodr, iobits);
 }
 
-static void setup_smc2_ioports(void)
+static void setup_smc2_ioports(struct fs_uart_platform_info*)
 {
         immap_t *immap = (immap_t *) IMAP_ADDR;
         unsigned *bcsr_io;
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index c46e3d48e410..e15e1489aef5 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -357,11 +357,16 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
 {
+        compat_ino_t ino;
         int err;
 
         if (!old_valid_dev(stat->dev) || !old_valid_dev(stat->rdev))
                 return -EOVERFLOW;
 
+        ino = stat->ino;
+        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+                return -EOVERFLOW;
+
         err = put_user(old_encode_dev(stat->dev), &statbuf->st_dev);
         err |= put_user(stat->ino, &statbuf->st_ino);
         err |= put_user(stat->mode, &statbuf->st_mode);
diff --git a/arch/sparc/kernel/sys_sunos.c b/arch/sparc/kernel/sys_sunos.c
index 9d2cd97d1c3a..6f3ac548ee66 100644
--- a/arch/sparc/kernel/sys_sunos.c
+++ b/arch/sparc/kernel/sys_sunos.c
@@ -325,21 +325,25 @@ struct sunos_dirent_callback {
 #define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
 
 static int sunos_filldir(void * __buf, const char * name, int namlen,
-                         loff_t offset, ino_t ino, unsigned int d_type)
+                         loff_t offset, u64 ino, unsigned int d_type)
 {
         struct sunos_dirent __user *dirent;
         struct sunos_dirent_callback * buf = __buf;
+        unsigned long d_ino;
         int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
 
         buf->error = -EINVAL;   /* only used if we fail.. */
         if (reclen > buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         dirent = buf->previous;
         if (dirent)
                 put_user(offset, &dirent->d_off);
         dirent = buf->curr;
         buf->previous = dirent;
-        put_user(ino, &dirent->d_ino);
+        put_user(d_ino, &dirent->d_ino);
         put_user(namlen, &dirent->d_namlen);
         put_user(reclen, &dirent->d_reclen);
         copy_to_user(dirent->d_name, name, namlen);
@@ -406,19 +410,23 @@ struct sunos_direntry_callback {
 };
 
 static int sunos_filldirentry(void * __buf, const char * name, int namlen,
-                              loff_t offset, ino_t ino, unsigned int d_type)
+                              loff_t offset, u64 ino, unsigned int d_type)
 {
         struct sunos_direntry __user *dirent;
         struct sunos_direntry_callback *buf = __buf;
+        unsigned long d_ino;
         int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
 
         buf->error = -EINVAL;   /* only used if we fail.. */
         if (reclen > buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         dirent = buf->previous;
         dirent = buf->curr;
         buf->previous = dirent;
-        put_user(ino, &dirent->d_ino);
+        put_user(d_ino, &dirent->d_ino);
         put_user(namlen, &dirent->d_namlen);
         put_user(reclen, &dirent->d_reclen);
         copy_to_user(dirent->d_name, name, namlen);
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index 7c6499ce1767..e27cb71bd8e2 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -338,12 +338,17 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
 {
+        compat_ino_t ino;
         int err;
 
         if (stat->size > MAX_NON_LFS || !old_valid_dev(stat->dev) ||
             !old_valid_dev(stat->rdev))
                 return -EOVERFLOW;
 
+        ino = stat->ino;
+        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+                return -EOVERFLOW;
+
         err  = put_user(old_encode_dev(stat->dev), &statbuf->st_dev);
         err |= put_user(stat->ino, &statbuf->st_ino);
         err |= put_user(stat->mode, &statbuf->st_mode);
diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c
index b21e8dd41a66..7da72d3b322a 100644
--- a/arch/sparc64/kernel/sys_sunos32.c
+++ b/arch/sparc64/kernel/sys_sunos32.c
@@ -281,16 +281,20 @@ static int sunos_filldir(void * __buf, const char * name, int namlen,
         struct sunos_dirent __user *dirent;
         struct sunos_dirent_callback * buf = (struct sunos_dirent_callback *) __buf;
         int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
+        u32 d_ino;
 
         buf->error = -EINVAL;   /* only used if we fail.. */
         if (reclen > buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         dirent = buf->previous;
         if (dirent)
                 put_user(offset, &dirent->d_off);
         dirent = buf->curr;
         buf->previous = dirent;
-        put_user(ino, &dirent->d_ino);
+        put_user(d_ino, &dirent->d_ino);
         put_user(namlen, &dirent->d_namlen);
         put_user(reclen, &dirent->d_reclen);
         if (copy_to_user(dirent->d_name, name, namlen))
@@ -364,14 +368,18 @@ static int sunos_filldirentry(void * __buf, const char * name, int namlen,
         struct sunos_direntry_callback * buf =
                 (struct sunos_direntry_callback *) __buf;
         int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
+        u32 d_ino;
 
         buf->error = -EINVAL;   /* only used if we fail.. */
         if (reclen > buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         dirent = buf->previous;
         dirent = buf->curr;
         buf->previous = dirent;
-        put_user(ino, &dirent->d_ino);
+        put_user(d_ino, &dirent->d_ino);
         put_user(namlen, &dirent->d_namlen);
         put_user(reclen, &dirent->d_reclen);
         if (copy_to_user(dirent->d_name, name, namlen))
diff --git a/arch/sparc64/solaris/fs.c b/arch/sparc64/solaris/fs.c
index 0f0eb6aa1c40..12a940cc791f 100644
--- a/arch/sparc64/solaris/fs.c
+++ b/arch/sparc64/solaris/fs.c
@@ -82,12 +82,17 @@ struct sol_stat64 {
 
 static inline int putstat(struct sol_stat __user *ubuf, struct kstat *kbuf)
 {
+        u32 ino;
+
         if (kbuf->size > MAX_NON_LFS ||
             !sysv_valid_dev(kbuf->dev) ||
             !sysv_valid_dev(kbuf->rdev))
                 return -EOVERFLOW;
+        ino = kbuf->ino;
+        if (sizeof(ino) < sizeof(kbuf->ino) && ino != kbuf->ino)
+                return -EOVERFLOW;
         if (put_user (sysv_encode_dev(kbuf->dev), &ubuf->st_dev)        ||
-            __put_user (kbuf->ino, &ubuf->st_ino)               ||
+            __put_user (ino, &ubuf->st_ino)                             ||
             __put_user (kbuf->mode, &ubuf->st_mode)             ||
             __put_user (kbuf->nlink, &ubuf->st_nlink)   ||
             __put_user (kbuf->uid, &ubuf->st_uid)               ||
diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
index 26a01717cc1a..c9bac3af29d6 100644
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86_64/ia32/sys_ia32.c
@@ -76,6 +76,8 @@
 
 int cp_compat_stat(struct kstat *kbuf, struct compat_stat __user *ubuf)
 {
+        compat_ino_t ino;
+
         typeof(ubuf->st_uid) uid = 0;
         typeof(ubuf->st_gid) gid = 0;
         SET_UID(uid, kbuf->uid);
@@ -84,9 +86,12 @@ int cp_compat_stat(struct kstat *kbuf, struct compat_stat __user *ubuf)
                 return -EOVERFLOW;
         if (kbuf->size >= 0x7fffffff)
                 return -EOVERFLOW;
+        ino = kbuf->ino;
+        if (sizeof(ino) < sizeof(kbuf->ino) && ino != kbuf->ino)
+                return -EOVERFLOW;
         if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct compat_stat)) ||
             __put_user (old_encode_dev(kbuf->dev), &ubuf->st_dev) ||
-            __put_user (kbuf->ino, &ubuf->st_ino) ||
+            __put_user (ino, &ubuf->st_ino) ||
             __put_user (kbuf->mode, &ubuf->st_mode) ||
             __put_user (kbuf->nlink, &ubuf->st_nlink) ||
             __put_user (uid, &ubuf->st_uid) ||
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index 135ff25e6b44..6472e321cad7 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -25,7 +25,6 @@
 #include <linux/kernel_stat.h>
 #include <linux/sysdev.h>
 #include <linux/module.h>
-#include <linux/ioport.h>
 
 #include <asm/atomic.h>
 #include <asm/smp.h>
@@ -46,11 +45,6 @@ int apic_calibrate_pmtmr __initdata;
 
 int disable_apic_timer __initdata;
 
-static struct resource lapic_resource = {
-        .name = "Local APIC",
-        .flags = IORESOURCE_MEM | IORESOURCE_BUSY,
-};
-
 /*
  * cpu_mask that denotes the CPUs that needs timer interrupt coming in as
  * IPIs in place of local APIC timers
@@ -591,40 +585,6 @@ static int __init detect_init_APIC (void)
         return 0;
 }
 
-#ifdef CONFIG_X86_IO_APIC
-static struct resource * __init ioapic_setup_resources(void)
-{
-#define IOAPIC_RESOURCE_NAME_SIZE 11
-        unsigned long n;
-        struct resource *res;
-        char *mem;
-        int i;
-
-        if (nr_ioapics <= 0)
-                return NULL;
-
-        n = IOAPIC_RESOURCE_NAME_SIZE + sizeof(struct resource);
-        n *= nr_ioapics;
-
-        res = alloc_bootmem(n);
-
-        if (!res)
-                return NULL;
-
-        memset(res, 0, n);
-        mem = (void *)&res[nr_ioapics];
-
-        for (i = 0; i < nr_ioapics; i++) {
-                res[i].name = mem;
-                res[i].flags = IORESOURCE_MEM | IORESOURCE_BUSY;
-                snprintf(mem, IOAPIC_RESOURCE_NAME_SIZE, "IOAPIC %u", i);
-                mem += IOAPIC_RESOURCE_NAME_SIZE;
-        }
-
-        return res;
-}
-#endif
-
 void __init init_apic_mappings(void)
 {
         unsigned long apic_phys;
@@ -644,11 +604,6 @@ void __init init_apic_mappings(void)
         apic_mapped = 1;
         apic_printk(APIC_VERBOSE,"mapped APIC to %16lx (%16lx)\n", APIC_BASE, apic_phys);
 
-        /* Put local APIC into the resource map. */
-        lapic_resource.start = apic_phys;
-        lapic_resource.end = lapic_resource.start + PAGE_SIZE - 1;
-        insert_resource(&iomem_resource, &lapic_resource);
-
         /*
          * Fetch the APIC ID of the BSP in case we have a
          * default configuration (or the MP table is broken).
@@ -658,9 +613,7 @@ void __init init_apic_mappings(void)
         {
                 unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0;
                 int i;
-                struct resource *ioapic_res;
 
-                ioapic_res = ioapic_setup_resources();
                 for (i = 0; i < nr_ioapics; i++) {
                         if (smp_found_config) {
                                 ioapic_phys = mp_ioapics[i].mpc_apicaddr;
@@ -672,13 +625,6 @@ void __init init_apic_mappings(void)
                         apic_printk(APIC_VERBOSE,"mapped IOAPIC to %016lx (%016lx)\n",
                                         __fix_to_virt(idx), ioapic_phys);
                         idx++;
-
-                        if (ioapic_res) {
-                                ioapic_res->start = ioapic_phys;
-                                ioapic_res->end = ioapic_phys + (4 * 1024) - 1;
-                                insert_resource(&iomem_resource, ioapic_res);
-                                ioapic_res++;
-                        }
                 }
         }
 }
diff --git a/block/ioctl.c b/block/ioctl.c
index 309760b7e37f..58aab630dfc1 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -199,8 +199,8 @@ static int blkdev_locked_ioctl(struct file *file, struct block_device *bdev,
         return -ENOIOCTLCMD;
 }
 
-static int blkdev_driver_ioctl(struct inode *inode, struct file *file,
-                struct gendisk *disk, unsigned cmd, unsigned long arg)
+int blkdev_driver_ioctl(struct inode *inode, struct file *file,
+                        struct gendisk *disk, unsigned cmd, unsigned long arg)
 {
         int ret;
         if (disk->fops->unlocked_ioctl)
@@ -215,6 +215,7 @@ static int blkdev_driver_ioctl(struct inode *inode, struct file *file,
 
         return -ENOTTY;
 }
+EXPORT_SYMBOL_GPL(blkdev_driver_ioctl);
 
 int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
                         unsigned long arg)
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index cf656ecbe507..8c757438f350 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -429,7 +429,7 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 
         /* PCI clocking determines the ATA timing values to use */
         /* info_hpt366 is safe against re-entry so we can scribble on it */
-        switch(reg1 & 0x700) {
+        switch((reg1 & 0x700) >> 8) {
                 case 5:
                         info_hpt366.private_data = &hpt366_40;
                         break;
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 5d8925bd9045..cbb9d0f21acc 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -552,7 +552,8 @@ static void process_page(unsigned long data)
 static int mm_make_request(request_queue_t *q, struct bio *bio)
 {
         struct cardinfo *card = q->queuedata;
-        pr_debug("mm_make_request %ld %d\n", bh->b_rsector, bh->b_size);
+        pr_debug("mm_make_request %llu %u\n",
+                 (unsigned long long)bio->bi_sector, bio->bi_size);
 
         bio->bi_phys_segments = bio->bi_idx; /* count of completed segments*/
         spin_lock_irq(&card->lock);
diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c
index 4747729459c7..8b6f197e5f8c 100644
--- a/drivers/char/hvc_iseries.c
+++ b/drivers/char/hvc_iseries.c
@@ -153,9 +153,7 @@ static int put_chars(uint32_t vtermno, const char *buf, int count)
         spin_lock_irqsave(&consolelock, flags);
 
         if (viochar_is_console(pi) && !viopath_isactive(pi->lp)) {
-                spin_lock_irqsave(&consoleloglock, flags);
                 HvCall_writeLogBuffer(buf, count);
-                spin_unlock_irqrestore(&consoleloglock, flags);
                 sent = count;
                 goto done;
         }
@@ -171,11 +169,8 @@ static int put_chars(uint32_t vtermno, const char *buf, int count)
 
                 len = (count > VIOCHAR_MAX_DATA) ? VIOCHAR_MAX_DATA : count;
 
-                if (viochar_is_console(pi)) {
-                        spin_lock_irqsave(&consoleloglock, flags);
+                if (viochar_is_console(pi))
                         HvCall_writeLogBuffer(buf, len);
-                        spin_unlock_irqrestore(&consoleloglock, flags);
-                }
 
                 init_data_event(viochar, pi->lp);
 
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 4828bc914ce3..62ef511d143b 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -779,8 +779,6 @@ retry:
         ip2trace (ITRC_NO_PORT, ITRC_INIT, ITRC_RETURN, 0 );
         goto out;
 
-out_class:
-        class_destroy(ip2_class);
 out_chrdev:
         unregister_chrdev(IP2_IPL_MAJOR, "ip2");
 out:
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 908521e36d81..b106c45abfc9 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -217,6 +217,11 @@ struct smi_info
         struct list_head link;
 };
 
+#define SI_MAX_PARMS 4
+
+static int force_kipmid[SI_MAX_PARMS];
+static int num_force_kipmid;
+
 static int try_smi_init(struct smi_info *smi);
 
 static ATOMIC_NOTIFIER_HEAD(xaction_notifier_list);
@@ -908,6 +913,7 @@ static int smi_start_processing(void       *send_info,
                                 ipmi_smi_t intf)
 {
         struct smi_info *new_smi = send_info;
+        int             enable = 0;
 
         new_smi->intf = intf;
 
@@ -917,10 +923,18 @@ static int smi_start_processing(void       *send_info,
         mod_timer(&new_smi->si_timer, jiffies + SI_TIMEOUT_JIFFIES);
 
         /*
+         * Check if the user forcefully enabled the daemon.
+         */
+        if (new_smi->intf_num < num_force_kipmid)
+                enable = force_kipmid[new_smi->intf_num];
+        /*
          * The BT interface is efficient enough to not need a thread,
          * and there is no need for a thread if we have interrupts.
          */
-        if ((new_smi->si_type != SI_BT) && (!new_smi->irq)) {
+        else if ((new_smi->si_type != SI_BT) && (!new_smi->irq))
+                enable = 1;
+
+        if (enable) {
                 new_smi->thread = kthread_run(ipmi_thread, new_smi,
                                               "kipmi%d", new_smi->intf_num);
                 if (IS_ERR(new_smi->thread)) {
@@ -948,7 +962,6 @@ static struct ipmi_smi_handlers handlers =
 /* There can be 4 IO ports passed in (with or without IRQs), 4 addresses,
    a default IO port, and 1 ACPI/SPMI address.  That sets SI_MAX_DRIVERS */
 
-#define SI_MAX_PARMS 4
 static LIST_HEAD(smi_infos);
 static DEFINE_MUTEX(smi_infos_lock);
 static int smi_num; /* Used to sequence the SMIs */
@@ -1021,6 +1034,10 @@ MODULE_PARM_DESC(slave_addrs, "Set the default IPMB slave address for"
                  " the controller.  Normally this is 0x20, but can be"
                  " overridden by this parm.  This is an array indexed"
                  " by interface number.");
+module_param_array(force_kipmid, int, &num_force_kipmid, 0);
+MODULE_PARM_DESC(force_kipmid, "Force the kipmi daemon to be enabled (1) or"
+                 " disabled(0).  Normally the IPMI driver auto-detects"
+                 " this, but the value may be overridden by this parm.");
 
 
 #define IPMI_IO_ADDR_SPACE  0
@@ -1734,6 +1751,7 @@ static void __devinit dmi_find_bmc(void)
         int                  rv;
 
         while ((dev = dmi_find_device(DMI_DEV_TYPE_IPMI, NULL, dev))) {
+                memset(&data, 0, sizeof(data));
                 rv = decode_dmi((struct dmi_header *) dev->device_data, &data);
                 if (!rv)
                         try_init_dmi(&data);
diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
index d30dc09dbbc9..9df0ca1be0e3 100644
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
@@ -224,14 +224,16 @@ probe_ti_parallel(int minor)
 {
         int i;
         int seq[] = { 0x00, 0x20, 0x10, 0x30 };
+        int data;
 
         for (i = 3; i >= 0; i--) {
                 outbyte(3, minor);
                 outbyte(i, minor);
                 udelay(delay);
+                data = inbyte(minor) & 0x30;
                 pr_debug("tipar: Probing -> %i: 0x%02x 0x%02x\n", i,
-                        data & 0x30, seq[i]);
-                if ((inbyte(minor) & 0x30) != seq[i]) {
+                        data, seq[i]);
+                if (data != seq[i]) {
                         outbyte(3, minor);
                         return -1;
                 }
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index ec0c070bf15f..8e4413f6fbaf 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -106,7 +106,8 @@
 #define MAX_NR_CON_DRIVER 16
 
 #define CON_DRIVER_FLAG_MODULE 1
-#define CON_DRIVER_FLAG_INIT 2
+#define CON_DRIVER_FLAG_INIT   2
+#define CON_DRIVER_FLAG_ATTR   4
 
 struct con_driver {
         const struct consw *con;
@@ -138,14 +139,6 @@ const struct consw *conswitchp;
 extern void vcs_make_sysfs(struct tty_struct *tty);
 extern void vcs_remove_sysfs(struct tty_struct *tty);
 
-extern void console_map_init(void);
-#ifdef CONFIG_PROM_CONSOLE
-extern void prom_con_init(void);
-#endif
-#ifdef CONFIG_MDA_CONSOLE
-extern int mda_console_init(void);
-#endif
-
 struct vc vc_cons [MAX_NR_CONSOLES];
 
 #ifndef VT_SINGLE_DRIVER
@@ -3070,22 +3063,37 @@ static struct class_device_attribute class_device_attrs[] = {
 static int vtconsole_init_class_device(struct con_driver *con)
 {
         int i;
+        int error = 0;
 
+        con->flag |= CON_DRIVER_FLAG_ATTR;
         class_set_devdata(con->class_dev, con);
-        for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
-                class_device_create_file(con->class_dev,
+        for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) {
+                error = class_device_create_file(con->class_dev,
+                                         &class_device_attrs[i]);
+                if (error)
+                        break;
+        }
+
+        if (error) {
+                while (--i >= 0)
+                        class_device_remove_file(con->class_dev,
                                          &class_device_attrs[i]);
+                con->flag &= ~CON_DRIVER_FLAG_ATTR;
+        }
 
-        return 0;
+        return error;
 }
 
 static void vtconsole_deinit_class_device(struct con_driver *con)
 {
         int i;
 
-        for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
-                class_device_remove_file(con->class_dev,
-                                         &class_device_attrs[i]);
+        if (con->flag & CON_DRIVER_FLAG_ATTR) {
+                for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
+                        class_device_remove_file(con->class_dev,
+                                                 &class_device_attrs[i]);
+                con->flag &= ~CON_DRIVER_FLAG_ATTR;
+        }
 }
 
 /**
@@ -3184,6 +3192,7 @@ int register_con_driver(const struct consw *csw, int first, int last)
         } else {
                 vtconsole_init_class_device(con_driver);
         }
+
 err:
         release_console_sem();
         module_put(owner);
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index 77ab7e020da0..06f3fa2fe877 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -172,6 +172,17 @@ config OMAP_WATCHDOG
           Support for TI OMAP1610/OMAP1710/OMAP2420 watchdog.  Say 'Y' here to
           enable the OMAP1610/OMAP1710 watchdog timer.
 
+config PNX4008_WATCHDOG
+        tristate "PNX4008 Watchdog"
+        depends on WATCHDOG && ARCH_PNX4008
+        help
+          Say Y here if to include support for the watchdog timer
+          in the PNX4008 processor.
+          This driver can be built as a module by choosing M. The module
+          will be called pnx4008_wdt.
+
+          Say N if you are unsure.
+
 # X86 (i386 + ia64 + x86_64) Architecture
 
 config ACQUIRE_WDT
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index 5099f8be8cc5..6ffca7cb56ab 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
 obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
 obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
 obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o
+obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o
 
 # X86 (i386 + ia64 + x86_64) Architecture
 obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
diff --git a/drivers/char/watchdog/acquirewdt.c b/drivers/char/watchdog/acquirewdt.c
index c77fe3cf2852..154d67e591e5 100644
--- a/drivers/char/watchdog/acquirewdt.c
+++ b/drivers/char/watchdog/acquirewdt.c
@@ -183,7 +183,7 @@ static int acq_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         }
 
         default:
-          return -ENOIOCTLCMD;
+          return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/advantechwdt.c b/drivers/char/watchdog/advantechwdt.c
index 8069be445edc..9d732769ba01 100644
--- a/drivers/char/watchdog/advantechwdt.c
+++ b/drivers/char/watchdog/advantechwdt.c
@@ -176,7 +176,7 @@ advwdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         }
 
         default:
-          return -ENOIOCTLCMD;
+          return -ENOTTY;
         }
         return 0;
 }
diff --git a/drivers/char/watchdog/alim1535_wdt.c b/drivers/char/watchdog/alim1535_wdt.c
index c5c94e4c9495..01b0d132ee41 100644
--- a/drivers/char/watchdog/alim1535_wdt.c
+++ b/drivers/char/watchdog/alim1535_wdt.c
@@ -236,7 +236,7 @@ static int ali_ioctl(struct inode *inode, struct file *file,
                         return put_user(timeout, p);
 
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 }
 
@@ -330,17 +330,20 @@ static int __init ali_find_watchdog(void)
         u32 wdog;
 
         /* Check for a 1535 series bridge */
-        pdev = pci_find_device(PCI_VENDOR_ID_AL, 0x1535, NULL);
+        pdev = pci_get_device(PCI_VENDOR_ID_AL, 0x1535, NULL);
         if(pdev == NULL)
                 return -ENODEV;
+        pci_dev_put(pdev);
 
         /* Check for the a 7101 PMU */
-        pdev = pci_find_device(PCI_VENDOR_ID_AL, 0x7101, NULL);
+        pdev = pci_get_device(PCI_VENDOR_ID_AL, 0x7101, NULL);
         if(pdev == NULL)
                 return -ENODEV;
 
-        if(pci_enable_device(pdev))
+        if(pci_enable_device(pdev)) {
+                pci_dev_put(pdev);
                 return -EIO;
+        }
 
         ali_pci = pdev;
 
@@ -447,6 +450,7 @@ static void __exit watchdog_exit(void)
         /* Deregister */
         unregister_reboot_notifier(&ali_notifier);
         misc_deregister(&ali_miscdev);
+        pci_dev_put(ali_pci);
 }
 
 module_init(watchdog_init);
diff --git a/drivers/char/watchdog/alim7101_wdt.c b/drivers/char/watchdog/alim7101_wdt.c
index ffd7684f999b..5948863b592b 100644
--- a/drivers/char/watchdog/alim7101_wdt.c
+++ b/drivers/char/watchdog/alim7101_wdt.c
@@ -277,7 +277,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
                 case WDIOC_GETTIMEOUT:
                         return put_user(timeout, p);
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 }
 
@@ -333,6 +333,7 @@ static void __exit alim7101_wdt_unload(void)
         /* Deregister */
         misc_deregister(&wdt_miscdev);
         unregister_reboot_notifier(&wdt_notifier);
+        pci_dev_put(alim7101_pmu);
 }
 
 static int __init alim7101_wdt_init(void)
@@ -342,7 +343,8 @@ static int __init alim7101_wdt_init(void)
         char tmp;
 
         printk(KERN_INFO PFX "Steve Hill <steve@navaho.co.uk>.\n");
-        alim7101_pmu = pci_find_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,NULL);
+        alim7101_pmu = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,
+                NULL);
         if (!alim7101_pmu) {
                 printk(KERN_INFO PFX "ALi M7101 PMU not present - WDT not set\n");
                 return -EBUSY;
@@ -351,21 +353,23 @@ static int __init alim7101_wdt_init(void)
         /* Set the WDT in the PMU to 1 second */
         pci_write_config_byte(alim7101_pmu, ALI_7101_WDT, 0x02);
 
-        ali1543_south = pci_find_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
+        ali1543_south = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533,
+                NULL);
         if (!ali1543_south) {
                 printk(KERN_INFO PFX "ALi 1543 South-Bridge not present - WDT not set\n");
-                return -EBUSY;
+                goto err_out;
         }
         pci_read_config_byte(ali1543_south, 0x5e, &tmp);
+        pci_dev_put(ali1543_south);
         if ((tmp & 0x1e) == 0x00) {
                 if (!use_gpio) {
                         printk(KERN_INFO PFX "Detected old alim7101 revision 'a1d'.  If this is a cobalt board, set the 'use_gpio' module parameter.\n");
-                        return -EBUSY;
+                        goto err_out;
                 } 
                 nowayout = 1;
         } else if ((tmp & 0x1e) != 0x12 && (tmp & 0x1e) != 0x00) {
                 printk(KERN_INFO PFX "ALi 1543 South-Bridge does not have the correct revision number (???1001?) - WDT not set\n");
-                return -EBUSY;
+                goto err_out;
         }
 
         if(timeout < 1 || timeout > 3600) /* arbitrary upper limit */
@@ -404,6 +408,7 @@ static int __init alim7101_wdt_init(void)
 err_out_miscdev:
         misc_deregister(&wdt_miscdev);
 err_out:
+        pci_dev_put(alim7101_pmu);
         return rc;
 }
 
diff --git a/drivers/char/watchdog/at91_wdt.c b/drivers/char/watchdog/at91_wdt.c
index cc266715ea32..4e7a1145e78f 100644
--- a/drivers/char/watchdog/at91_wdt.c
+++ b/drivers/char/watchdog/at91_wdt.c
@@ -168,7 +168,7 @@ static int at91_wdt_ioctl(struct inode *inode, struct file *file,
                         return 0;
 
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c
index e3cefc538b40..488902231cc2 100644
--- a/drivers/char/watchdog/booke_wdt.c
+++ b/drivers/char/watchdog/booke_wdt.c
@@ -125,7 +125,7 @@ static int booke_wdt_ioctl (struct inode *inode, struct file *file,
                         return -EINVAL;
                 return 0;
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
 
         return 0;
diff --git a/drivers/char/watchdog/cpu5wdt.c b/drivers/char/watchdog/cpu5wdt.c
index 04c7e49918db..00bdabb90f27 100644
--- a/drivers/char/watchdog/cpu5wdt.c
+++ b/drivers/char/watchdog/cpu5wdt.c
@@ -183,7 +183,7 @@ static int cpu5wdt_ioctl(struct inode *inode, struct file *file, unsigned int cm
                         }
                         break;
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
         return 0;
 }
diff --git a/drivers/char/watchdog/ep93xx_wdt.c b/drivers/char/watchdog/ep93xx_wdt.c
index 77c8a955ae9e..01cf123b1616 100644
--- a/drivers/char/watchdog/ep93xx_wdt.c
+++ b/drivers/char/watchdog/ep93xx_wdt.c
@@ -144,7 +144,7 @@ static int
 ep93xx_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                  unsigned long arg)
 {
-        int ret = -ENOIOCTLCMD;
+        int ret = -ENOTTY;
 
         switch (cmd) {
         case WDIOC_GETSUPPORT:
diff --git a/drivers/char/watchdog/eurotechwdt.c b/drivers/char/watchdog/eurotechwdt.c
index 62dbccb2f6df..4f4269754c46 100644
--- a/drivers/char/watchdog/eurotechwdt.c
+++ b/drivers/char/watchdog/eurotechwdt.c
@@ -240,7 +240,7 @@ static int eurwdt_ioctl(struct inode *inode, struct file *file,
 
         switch(cmd) {
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
 
         case WDIOC_GETSUPPORT:
                 return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
diff --git a/drivers/char/watchdog/i6300esb.c b/drivers/char/watchdog/i6300esb.c
index 870539eabbf3..fb64df4d7c87 100644
--- a/drivers/char/watchdog/i6300esb.c
+++ b/drivers/char/watchdog/i6300esb.c
@@ -315,7 +315,7 @@ static int esb_ioctl (struct inode *inode, struct file *file,
                         return put_user(heartbeat, p);
 
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/i8xx_tco.c b/drivers/char/watchdog/i8xx_tco.c
index 8385dd36eefe..e0627d79707b 100644
--- a/drivers/char/watchdog/i8xx_tco.c
+++ b/drivers/char/watchdog/i8xx_tco.c
@@ -356,7 +356,7 @@ static int i8xx_tco_ioctl (struct inode *inode, struct file *file,
                 }
 
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 }
 
@@ -406,18 +406,18 @@ static struct notifier_block i8xx_tco_notifier = {
  * want to register another driver on the same PCI id.
  */
 static struct pci_device_id i8xx_tco_pci_tbl[] = {
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0,   PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_0,   PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0,   PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_10,  PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0,   PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12,  PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0,   PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12,  PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801E_0,    PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0,   PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,       PCI_ANY_ID, PCI_ANY_ID, },
-        { 0, },                 /* End of list */
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_0) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_10) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801E_0) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1) },
+        { },                    /* End of list */
 };
 MODULE_DEVICE_TABLE (pci, i8xx_tco_pci_tbl);
 
@@ -434,12 +434,11 @@ static unsigned char __init i8xx_tco_getdevice (void)
          *      Find the PCI device
          */
 
-        while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+        for_each_pci_dev(dev)
                 if (pci_match_id(i8xx_tco_pci_tbl, dev)) {
                         i8xx_tco_pci = dev;
                         break;
                 }
-        }
 
         if (i8xx_tco_pci) {
                 /*
@@ -454,6 +453,7 @@ static unsigned char __init i8xx_tco_getdevice (void)
                 /* Something's wrong here, ACPIBASE has to be set */
                 if (badr == 0x0001 || badr == 0x0000) {
                         printk (KERN_ERR PFX "failed to get TCOBASE address\n");
+                        pci_dev_put(i8xx_tco_pci);
                         return 0;
                 }
 
@@ -465,6 +465,7 @@ static unsigned char __init i8xx_tco_getdevice (void)
                         pci_read_config_byte (i8xx_tco_pci, 0xd4, &val1);
                         if (val1 & 0x02) {
                                 printk (KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n");
+                                pci_dev_put(i8xx_tco_pci);
                                 return 0;       /* Cannot reset NO_REBOOT bit */
                         }
                 }
@@ -476,6 +477,7 @@ static unsigned char __init i8xx_tco_getdevice (void)
                 if (!request_region (SMI_EN + 1, 1, "i8xx TCO")) {
                         printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",
                                 SMI_EN + 1);
+                        pci_dev_put(i8xx_tco_pci);
                         return 0;
                 }
                 val1 = inb (SMI_EN + 1);
@@ -542,6 +544,7 @@ unreg_notifier:
 unreg_region:
         release_region (TCOBASE, 0x10);
 out:
+        pci_dev_put(i8xx_tco_pci);
         return ret;
 }
 
@@ -555,6 +558,8 @@ static void __exit watchdog_cleanup (void)
         misc_deregister (&i8xx_tco_miscdev);
         unregister_reboot_notifier(&i8xx_tco_notifier);
         release_region (TCOBASE, 0x10);
+
+        pci_dev_put(i8xx_tco_pci);
 }
 
 module_init(watchdog_init);
diff --git a/drivers/char/watchdog/ib700wdt.c b/drivers/char/watchdog/ib700wdt.c
index fd95f7327798..c1ed209a138c 100644
--- a/drivers/char/watchdog/ib700wdt.c
+++ b/drivers/char/watchdog/ib700wdt.c
@@ -199,7 +199,7 @@ ibwdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
           break;
 
         default:
-          return -ENOIOCTLCMD;
+          return -ENOTTY;
         }
         return 0;
 }
diff --git a/drivers/char/watchdog/ibmasr.c b/drivers/char/watchdog/ibmasr.c
index 26ceee7a4df0..dd6760f1a23b 100644
--- a/drivers/char/watchdog/ibmasr.c
+++ b/drivers/char/watchdog/ibmasr.c
@@ -295,7 +295,7 @@ static int asr_ioctl(struct inode *inode, struct file *file,
                 }
         }
 
-        return -ENOIOCTLCMD;
+        return -ENOTTY;
 }
 
 static int asr_open(struct inode *inode, struct file *file)
diff --git a/drivers/char/watchdog/indydog.c b/drivers/char/watchdog/indydog.c
index dacc1c20a310..0bc239308989 100644
--- a/drivers/char/watchdog/indydog.c
+++ b/drivers/char/watchdog/indydog.c
@@ -112,7 +112,7 @@ static int indydog_ioctl(struct inode *inode, struct file *file,
 
         switch (cmd) {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
                 case WDIOC_GETSUPPORT:
                         if (copy_to_user((struct watchdog_info *)arg,
                                          &ident, sizeof(ident)))
diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c
index 692908819e26..c91d9a660ec0 100644
--- a/drivers/char/watchdog/ixp2000_wdt.c
+++ b/drivers/char/watchdog/ixp2000_wdt.c
@@ -107,7 +107,7 @@ static int
 ixp2000_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                         unsigned long arg)
 {
-        int ret = -ENOIOCTLCMD;
+        int ret = -ENOTTY;
         int time;
 
         switch (cmd) {
diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c
index 9db5cf2c38c3..db477f712388 100644
--- a/drivers/char/watchdog/ixp4xx_wdt.c
+++ b/drivers/char/watchdog/ixp4xx_wdt.c
@@ -102,7 +102,7 @@ static int
 ixp4xx_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                         unsigned long arg)
 {
-        int ret = -ENOIOCTLCMD;
+        int ret = -ENOTTY;
         int time;
 
         switch (cmd) {
diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c
index 23734e07fb22..276577d08fba 100644
--- a/drivers/char/watchdog/machzwd.c
+++ b/drivers/char/watchdog/machzwd.c
@@ -329,7 +329,7 @@ static int zf_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                         break;
 
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 
         return 0;
@@ -426,8 +426,7 @@ static int __init zf_init(void)
         printk(KERN_INFO PFX ": MachZ ZF-Logic Watchdog driver initializing.\n");
 
         ret = zf_get_ZFL_version();
-        printk("%#x\n", ret);
-        if((!ret) || (ret != 0xffff)){
+        if ((!ret) || (ret == 0xffff)) {
                 printk(KERN_WARNING PFX ": no ZF-Logic found\n");
                 return -ENODEV;
         }
diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c
index ae943324d251..c2dac0aa1d62 100644
--- a/drivers/char/watchdog/mixcomwd.c
+++ b/drivers/char/watchdog/mixcomwd.c
@@ -185,7 +185,7 @@ static int mixcomwd_ioctl(struct inode *inode, struct file *file,
                         mixcomwd_ping();
                         break;
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
         return 0;
 }
diff --git a/drivers/char/watchdog/mpc83xx_wdt.c b/drivers/char/watchdog/mpc83xx_wdt.c
index a480903ee1a5..18ca752e2f90 100644
--- a/drivers/char/watchdog/mpc83xx_wdt.c
+++ b/drivers/char/watchdog/mpc83xx_wdt.c
@@ -125,7 +125,7 @@ static int mpc83xx_wdt_ioctl(struct inode *inode, struct file *file,
         case WDIOC_GETTIMEOUT:
                 return put_user(timeout_sec, p);
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/mpc8xx_wdt.c b/drivers/char/watchdog/mpc8xx_wdt.c
index 35dd9e6e1140..8aaed10dd499 100644
--- a/drivers/char/watchdog/mpc8xx_wdt.c
+++ b/drivers/char/watchdog/mpc8xx_wdt.c
@@ -126,7 +126,7 @@ static int mpc8xx_wdt_ioctl(struct inode *inode, struct file *file,
                 break;
 
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
 
         return 0;
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c
index 54b3c56ead0d..02d336ace504 100644
--- a/drivers/char/watchdog/mpcore_wdt.c
+++ b/drivers/char/watchdog/mpcore_wdt.c
@@ -221,7 +221,7 @@ static int mpcore_wdt_ioctl(struct inode *inode, struct file *file,
         } uarg;
 
         if (_IOC_DIR(cmd) && _IOC_SIZE(cmd) > sizeof(uarg))
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
 
         if (_IOC_DIR(cmd) & _IOC_WRITE) {
                 ret = copy_from_user(&uarg, (void __user *)arg, _IOC_SIZE(cmd));
@@ -271,7 +271,7 @@ static int mpcore_wdt_ioctl(struct inode *inode, struct file *file,
                 break;
 
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
 
         if (ret == 0 && _IOC_DIR(cmd) & _IOC_READ) {
diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c
index 5c8fab345b40..b887cdb01334 100644
--- a/drivers/char/watchdog/mv64x60_wdt.c
+++ b/drivers/char/watchdog/mv64x60_wdt.c
@@ -160,7 +160,7 @@ static int mv64x60_wdt_ioctl(struct inode *inode, struct file *file,
                 break;
 
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
 
         return 0;
diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c
index cd7d1b6a5d9f..6f8515db5b07 100644
--- a/drivers/char/watchdog/pcwd.c
+++ b/drivers/char/watchdog/pcwd.c
@@ -572,7 +572,7 @@ static int pcwd_ioctl(struct inode *inode, struct file *file,
 
         switch(cmd) {
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
 
         case WDIOC_GETSUPPORT:
                 if(copy_to_user(argp, &ident, sizeof(ident)))
diff --git a/drivers/char/watchdog/pcwd_pci.c b/drivers/char/watchdog/pcwd_pci.c
index c7cfd6dbfe1b..2de6e497c140 100644
--- a/drivers/char/watchdog/pcwd_pci.c
+++ b/drivers/char/watchdog/pcwd_pci.c
@@ -541,7 +541,7 @@ static int pcipcwd_ioctl(struct inode *inode, struct file *file,
                 }
 
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/pcwd_usb.c b/drivers/char/watchdog/pcwd_usb.c
index b7ae73dcdd08..77662cb0ac46 100644
--- a/drivers/char/watchdog/pcwd_usb.c
+++ b/drivers/char/watchdog/pcwd_usb.c
@@ -445,7 +445,7 @@ static int usb_pcwd_ioctl(struct inode *inode, struct file *file,
                 }
 
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/pnx4008_wdt.c b/drivers/char/watchdog/pnx4008_wdt.c
new file mode 100644
index 000000000000..e7f0450a939d
--- /dev/null
+++ b/drivers/char/watchdog/pnx4008_wdt.c
@@ -0,0 +1,362 @@
+/*
+ * drivers/char/watchdog/pnx4008_wdt.c
+ *
+ * Watchdog driver for PNX4008 board
+ *
+ * Authors: Dmitry Chigirev <source@mvista.com>,
+ *          Vitaly Wool <vitalywool@gmail.com>
+ * Based on sa1100 driver,
+ * Copyright (C) 2000 Oleg Drokin <green@crimea.edu>
+ *
+ * 2005-2006 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/init.h>
+#include <linux/bitops.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/spinlock.h>
+
+#include <asm/hardware.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+
+#define MODULE_NAME "PNX4008-WDT: "
+
+/* WatchDog Timer - Chapter 23 Page 207 */
+
+#define DEFAULT_HEARTBEAT 19
+#define MAX_HEARTBEAT     60
+
+/* Watchdog timer register set definition */
+#define WDTIM_INT(p)     ((p) + 0x0)
+#define WDTIM_CTRL(p)    ((p) + 0x4)
+#define WDTIM_COUNTER(p) ((p) + 0x8)
+#define WDTIM_MCTRL(p)   ((p) + 0xC)
+#define WDTIM_MATCH0(p)  ((p) + 0x10)
+#define WDTIM_EMR(p)     ((p) + 0x14)
+#define WDTIM_PULSE(p)   ((p) + 0x18)
+#define WDTIM_RES(p)     ((p) + 0x1C)
+
+/* WDTIM_INT bit definitions */
+#define MATCH_INT      1
+
+/* WDTIM_CTRL bit definitions */
+#define COUNT_ENAB     1
+#define RESET_COUNT    (1<<1)
+#define DEBUG_EN       (1<<2)
+
+/* WDTIM_MCTRL bit definitions */
+#define MR0_INT        1
+#undef  RESET_COUNT0
+#define RESET_COUNT0   (1<<2)
+#define STOP_COUNT0    (1<<2)
+#define M_RES1         (1<<3)
+#define M_RES2         (1<<4)
+#define RESFRC1        (1<<5)
+#define RESFRC2        (1<<6)
+
+/* WDTIM_EMR bit definitions */
+#define EXT_MATCH0      1
+#define MATCH_OUTPUT_HIGH (2<<4)        /*a MATCH_CTRL setting */
+
+/* WDTIM_RES bit definitions */
+#define WDOG_RESET      1       /* read only */
+
+#define WDOG_COUNTER_RATE 13000000      /*the counter clock is 13 MHz fixed */
+
+static int nowayout = WATCHDOG_NOWAYOUT;
+static int heartbeat = DEFAULT_HEARTBEAT;
+
+static spinlock_t io_lock;
+static unsigned long wdt_status;
+#define WDT_IN_USE        0
+#define WDT_OK_TO_CLOSE   1
+#define WDT_REGION_INITED 2
+#define WDT_DEVICE_INITED 3
+
+static unsigned long boot_status;
+
+static struct resource  *wdt_mem;
+static void __iomem     *wdt_base;
+struct clk              *wdt_clk;
+
+static void wdt_enable(void)
+{
+        spin_lock(&io_lock);
+
+        if (wdt_clk)
+                clk_set_rate(wdt_clk, 1);
+
+        /* stop counter, initiate counter reset */
+        __raw_writel(RESET_COUNT, WDTIM_CTRL(wdt_base));
+        /*wait for reset to complete. 100% guarantee event */
+        while (__raw_readl(WDTIM_COUNTER(wdt_base)))
+                cpu_relax();
+        /* internal and external reset, stop after that */
+        __raw_writel(M_RES2 | STOP_COUNT0 | RESET_COUNT0,
+                WDTIM_MCTRL(wdt_base));
+        /* configure match output */
+        __raw_writel(MATCH_OUTPUT_HIGH, WDTIM_EMR(wdt_base));
+        /* clear interrupt, just in case */
+        __raw_writel(MATCH_INT, WDTIM_INT(wdt_base));
+        /* the longest pulse period 65541/(13*10^6) seconds ~ 5 ms. */
+        __raw_writel(0xFFFF, WDTIM_PULSE(wdt_base));
+        __raw_writel(heartbeat * WDOG_COUNTER_RATE, WDTIM_MATCH0(wdt_base));
+        /*enable counter, stop when debugger active */
+        __raw_writel(COUNT_ENAB | DEBUG_EN, WDTIM_CTRL(wdt_base));
+
+        spin_unlock(&io_lock);
+}
+
+static void wdt_disable(void)
+{
+        spin_lock(&io_lock);
+
+        __raw_writel(0, WDTIM_CTRL(wdt_base));  /*stop counter */
+        if (wdt_clk)
+                clk_set_rate(wdt_clk, 0);
+
+        spin_unlock(&io_lock);
+}
+
+static int pnx4008_wdt_open(struct inode *inode, struct file *file)
+{
+        if (test_and_set_bit(WDT_IN_USE, &wdt_status))
+                return -EBUSY;
+
+        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
+
+        wdt_enable();
+
+        return nonseekable_open(inode, file);
+}
+
+static ssize_t
+pnx4008_wdt_write(struct file *file, const char *data, size_t len,
+                  loff_t * ppos)
+{
+        /*  Can't seek (pwrite) on this device  */
+        if (ppos != &file->f_pos)
+                return -ESPIPE;
+
+        if (len) {
+                if (!nowayout) {
+                        size_t i;
+
+                        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
+
+                        for (i = 0; i != len; i++) {
+                                char c;
+
+                                if (get_user(c, data + i))
+                                        return -EFAULT;
+                                if (c == 'V')
+                                        set_bit(WDT_OK_TO_CLOSE, &wdt_status);
+                        }
+                }
+                wdt_enable();
+        }
+
+        return len;
+}
+
+static struct watchdog_info ident = {
+        .options = WDIOF_CARDRESET | WDIOF_MAGICCLOSE |
+            WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+        .identity = "PNX4008 Watchdog",
+};
+
+static int
+pnx4008_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
+                  unsigned long arg)
+{
+        int ret = -ENOIOCTLCMD;
+        int time;
+
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                ret = copy_to_user((struct watchdog_info *)arg, &ident,
+                                   sizeof(ident)) ? -EFAULT : 0;
+                break;
+
+        case WDIOC_GETSTATUS:
+                ret = put_user(0, (int *)arg);
+                break;
+
+        case WDIOC_GETBOOTSTATUS:
+                ret = put_user(boot_status, (int *)arg);
+                break;
+
+        case WDIOC_SETTIMEOUT:
+                ret = get_user(time, (int *)arg);
+                if (ret)
+                        break;
+
+                if (time <= 0 || time > MAX_HEARTBEAT) {
+                        ret = -EINVAL;
+                        break;
+                }
+
+                heartbeat = time;
+                wdt_enable();
+                /* Fall through */
+
+        case WDIOC_GETTIMEOUT:
+                ret = put_user(heartbeat, (int *)arg);
+                break;
+
+        case WDIOC_KEEPALIVE:
+                wdt_enable();
+                ret = 0;
+                break;
+        }
+        return ret;
+}
+
+static int pnx4008_wdt_release(struct inode *inode, struct file *file)
+{
+        if (!test_bit(WDT_OK_TO_CLOSE, &wdt_status))
+                printk(KERN_WARNING "WATCHDOG: Device closed unexpectdly\n");
+
+        wdt_disable();
+        clear_bit(WDT_IN_USE, &wdt_status);
+        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
+
+        return 0;
+}
+
+static struct file_operations pnx4008_wdt_fops = {
+        .owner = THIS_MODULE,
+        .llseek = no_llseek,
+        .write = pnx4008_wdt_write,
+        .ioctl = pnx4008_wdt_ioctl,
+        .open = pnx4008_wdt_open,
+        .release = pnx4008_wdt_release,
+};
+
+static struct miscdevice pnx4008_wdt_miscdev = {
+        .minor = WATCHDOG_MINOR,
+        .name = "watchdog",
+        .fops = &pnx4008_wdt_fops,
+};
+
+static int pnx4008_wdt_probe(struct platform_device *pdev)
+{
+        int ret = 0, size;
+        struct resource *res;
+
+        spin_lock_init(&io_lock);
+
+        if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
+                heartbeat = DEFAULT_HEARTBEAT;
+
+        printk(KERN_INFO MODULE_NAME
+                "PNX4008 Watchdog Timer: heartbeat %d sec\n", heartbeat);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (res == NULL) {
+                printk(KERN_INFO MODULE_NAME
+                        "failed to get memory region resouce\n");
+                return -ENOENT;
+        }
+
+        size = res->end - res->start + 1;
+        wdt_mem = request_mem_region(res->start, size, pdev->name);
+
+        if (wdt_mem == NULL) {
+                printk(KERN_INFO MODULE_NAME "failed to get memory region\n");
+                return -ENOENT;
+        }
+        wdt_base = (void __iomem *)IO_ADDRESS(res->start);
+
+        wdt_clk = clk_get(&pdev->dev, "wdt_ck");
+        if (!wdt_clk) {
+                release_resource(wdt_mem);
+                kfree(wdt_mem);
+                goto out;
+        } else
+                clk_set_rate(wdt_clk, 1);
+
+        ret = misc_register(&pnx4008_wdt_miscdev);
+        if (ret < 0) {
+                printk(KERN_ERR MODULE_NAME "cannot register misc device\n");
+                release_resource(wdt_mem);
+                kfree(wdt_mem);
+                clk_set_rate(wdt_clk, 0);
+        } else {
+                boot_status = (__raw_readl(WDTIM_RES(wdt_base)) & WDOG_RESET) ?
+                    WDIOF_CARDRESET : 0;
+                wdt_disable();          /*disable for now */
+                set_bit(WDT_DEVICE_INITED, &wdt_status);
+        }
+
+out:
+        return ret;
+}
+
+static int pnx4008_wdt_remove(struct platform_device *pdev)
+{
+        misc_deregister(&pnx4008_wdt_miscdev);
+        if (wdt_clk) {
+                clk_set_rate(wdt_clk, 0);
+                clk_put(wdt_clk);
+                wdt_clk = NULL;
+        }
+        if (wdt_mem) {
+                release_resource(wdt_mem);
+                kfree(wdt_mem);
+                wdt_mem = NULL;
+        }
+        return 0;
+}
+
+static struct platform_driver platform_wdt_driver = {
+        .driver = {
+                .name = "watchdog",
+        },
+        .probe = pnx4008_wdt_probe,
+        .remove = pnx4008_wdt_remove,
+};
+
+static int __init pnx4008_wdt_init(void)
+{
+        return platform_driver_register(&platform_wdt_driver);
+}
+
+static void __exit pnx4008_wdt_exit(void)
+{
+        return platform_driver_unregister(&platform_wdt_driver);
+}
+
+module_init(pnx4008_wdt_init);
+module_exit(pnx4008_wdt_exit);
+
+MODULE_AUTHOR("MontaVista Software, Inc. <source@mvista.com>");
+MODULE_DESCRIPTION("PNX4008 Watchdog Driver");
+
+module_param(heartbeat, int, 0);
+MODULE_PARM_DESC(heartbeat,
+                 "Watchdog heartbeat period in seconds from 1 to "
+                 __MODULE_STRING(MAX_HEARTBEAT) ", default "
+                 __MODULE_STRING(DEFAULT_HEARTBEAT));
+
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout,
+                 "Set to 1 to keep watchdog running after device release");
+
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c
index be978e8ed754..b36a04ae9ab8 100644
--- a/drivers/char/watchdog/s3c2410_wdt.c
+++ b/drivers/char/watchdog/s3c2410_wdt.c
@@ -62,7 +62,7 @@
 #define CONFIG_S3C2410_WATCHDOG_ATBOOT          (0)
 #define CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME    (15)
 
-static int nowayout = WATCHDOG_NOWAYOUT;
+static int nowayout     = WATCHDOG_NOWAYOUT;
 static int tmr_margin   = CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME;
 static int tmr_atboot   = CONFIG_S3C2410_WATCHDOG_ATBOOT;
 static int soft_noboot  = 0;
@@ -213,11 +213,10 @@ static int s3c2410wdt_open(struct inode *inode, struct file *file)
         if(down_trylock(&open_lock))
                 return -EBUSY;
 
-        if (nowayout) {
+        if (nowayout)
                 __module_get(THIS_MODULE);
-        } else {
-                allow_close = CLOSE_STATE_ALLOW;
-        }
+
+        allow_close = CLOSE_STATE_NOT;
 
         /* start the timer */
         s3c2410wdt_start();
@@ -230,6 +229,7 @@ static int s3c2410wdt_release(struct inode *inode, struct file *file)
          *      Shut off the timer.
          *      Lock it in if it's a module and we set nowayout
          */
+
         if (allow_close == CLOSE_STATE_ALLOW) {
                 s3c2410wdt_stop();
         } else {
@@ -288,7 +288,7 @@ static int s3c2410wdt_ioctl(struct inode *inode, struct file *file,
 
         switch (cmd) {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
 
                 case WDIOC_GETSUPPORT:
                         return copy_to_user(argp, &s3c2410_wdt_ident,
diff --git a/drivers/char/watchdog/sa1100_wdt.c b/drivers/char/watchdog/sa1100_wdt.c
index 1fc16d995788..33c1137f17d6 100644
--- a/drivers/char/watchdog/sa1100_wdt.c
+++ b/drivers/char/watchdog/sa1100_wdt.c
@@ -90,7 +90,7 @@ static struct watchdog_info ident = {
 static int sa1100dog_ioctl(struct inode *inode, struct file *file,
         unsigned int cmd, unsigned long arg)
 {
-        int ret = -ENOIOCTLCMD;
+        int ret = -ENOTTY;
         int time;
         void __user *argp = (void __user *)arg;
         int __user *p = argp;
diff --git a/drivers/char/watchdog/sbc60xxwdt.c b/drivers/char/watchdog/sbc60xxwdt.c
index 4663c2fd53cd..c7b2045bc76b 100644
--- a/drivers/char/watchdog/sbc60xxwdt.c
+++ b/drivers/char/watchdog/sbc60xxwdt.c
@@ -235,7 +235,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         switch(cmd)
         {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
                 case WDIOC_GETSUPPORT:
                         return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
                 case WDIOC_GETSTATUS:
diff --git a/drivers/char/watchdog/sbc_epx_c3.c b/drivers/char/watchdog/sbc_epx_c3.c
index bfc475dabe6d..8882b427d24f 100644
--- a/drivers/char/watchdog/sbc_epx_c3.c
+++ b/drivers/char/watchdog/sbc_epx_c3.c
@@ -141,7 +141,7 @@ static int epx_c3_ioctl(struct inode *inode, struct file *file,
 
                 return retval;
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/sc1200wdt.c b/drivers/char/watchdog/sc1200wdt.c
index 7c3cf293a5af..d8d0f28e0acf 100644
--- a/drivers/char/watchdog/sc1200wdt.c
+++ b/drivers/char/watchdog/sc1200wdt.c
@@ -180,7 +180,7 @@ static int sc1200wdt_ioctl(struct inode *inode, struct file *file, unsigned int
 
         switch (cmd) {
                 default:
-                        return -ENOIOCTLCMD;    /* Keep Pavel Machek amused ;) */
+                        return -ENOTTY;
 
                 case WDIOC_GETSUPPORT:
                         if (copy_to_user(argp, &ident, sizeof ident))
diff --git a/drivers/char/watchdog/sc520_wdt.c b/drivers/char/watchdog/sc520_wdt.c
index 2c7c9db71be8..caec37ba750a 100644
--- a/drivers/char/watchdog/sc520_wdt.c
+++ b/drivers/char/watchdog/sc520_wdt.c
@@ -290,7 +290,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         switch(cmd)
         {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
                 case WDIOC_GETSUPPORT:
                         return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
                 case WDIOC_GETSTATUS:
diff --git a/drivers/char/watchdog/scx200_wdt.c b/drivers/char/watchdog/scx200_wdt.c
index c561299a5537..fc0e0347f9d2 100644
--- a/drivers/char/watchdog/scx200_wdt.c
+++ b/drivers/char/watchdog/scx200_wdt.c
@@ -166,7 +166,7 @@ static int scx200_wdt_ioctl(struct inode *inode, struct file *file,
 
         switch (cmd) {
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         case WDIOC_GETSUPPORT:
                 if(copy_to_user(argp, &ident, sizeof(ident)))
                         return -EFAULT;
diff --git a/drivers/char/watchdog/shwdt.c b/drivers/char/watchdog/shwdt.c
index e5b8c64f1d65..dc403629aeb3 100644
--- a/drivers/char/watchdog/shwdt.c
+++ b/drivers/char/watchdog/shwdt.c
@@ -360,7 +360,7 @@ static int sh_wdt_ioctl(struct inode *inode, struct file *file,
 
                         return retval;
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
         }
 
         return 0;
diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c
index ef8da517545a..4067e1f8a368 100644
--- a/drivers/char/watchdog/softdog.c
+++ b/drivers/char/watchdog/softdog.c
@@ -203,7 +203,7 @@ static int softdog_ioctl(struct inode *inode, struct file *file,
         };
         switch (cmd) {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
                 case WDIOC_GETSUPPORT:
                         return copy_to_user(argp, &ident,
                                 sizeof(ident)) ? -EFAULT : 0;
diff --git a/drivers/char/watchdog/w83627hf_wdt.c b/drivers/char/watchdog/w83627hf_wdt.c
index 13f16d41c2fd..b4adc527e687 100644
--- a/drivers/char/watchdog/w83627hf_wdt.c
+++ b/drivers/char/watchdog/w83627hf_wdt.c
@@ -223,7 +223,7 @@ wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         }
 
         default:
-          return -ENOIOCTLCMD;
+          return -ENOTTY;
         }
         return 0;
 }
diff --git a/drivers/char/watchdog/w83877f_wdt.c b/drivers/char/watchdog/w83877f_wdt.c
index ccf6c0915945..b0e5f84d6baf 100644
--- a/drivers/char/watchdog/w83877f_wdt.c
+++ b/drivers/char/watchdog/w83877f_wdt.c
@@ -252,7 +252,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         switch(cmd)
         {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
                 case WDIOC_GETSUPPORT:
                         return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
                 case WDIOC_GETSTATUS:
diff --git a/drivers/char/watchdog/w83977f_wdt.c b/drivers/char/watchdog/w83977f_wdt.c
index 98f4e17db70a..2c8d5d8bd4e8 100644
--- a/drivers/char/watchdog/w83977f_wdt.c
+++ b/drivers/char/watchdog/w83977f_wdt.c
@@ -393,7 +393,7 @@ static int wdt_ioctl(struct inode *inode, struct file *file,
         switch(cmd)
         {
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
 
         case WDIOC_GETSUPPORT:
                 return copy_to_user(uarg.ident, &ident, sizeof(ident)) ? -EFAULT : 0;
diff --git a/drivers/char/watchdog/wafer5823wdt.c b/drivers/char/watchdog/wafer5823wdt.c
index 2bb6a9d6ad28..163e028ef9ed 100644
--- a/drivers/char/watchdog/wafer5823wdt.c
+++ b/drivers/char/watchdog/wafer5823wdt.c
@@ -174,7 +174,7 @@ static int wafwdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd
         }
 
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
         return 0;
 }
diff --git a/drivers/char/watchdog/wdrtas.c b/drivers/char/watchdog/wdrtas.c
index 5c38cdf41731..1d64e277567d 100644
--- a/drivers/char/watchdog/wdrtas.c
+++ b/drivers/char/watchdog/wdrtas.c
@@ -385,7 +385,7 @@ wdrtas_ioctl(struct inode *inode, struct file *file,
                 return put_user(wdrtas_interval, argp);
 
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
         }
 }
 
diff --git a/drivers/char/watchdog/wdt.c b/drivers/char/watchdog/wdt.c
index 70be81e39a61..13f23f4a2233 100644
--- a/drivers/char/watchdog/wdt.c
+++ b/drivers/char/watchdog/wdt.c
@@ -341,7 +341,7 @@ static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         switch(cmd)
         {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
                 case WDIOC_GETSUPPORT:
                         return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
 
diff --git a/drivers/char/watchdog/wdt285.c b/drivers/char/watchdog/wdt285.c
index 6555fb844f23..89a249e23fde 100644
--- a/drivers/char/watchdog/wdt285.c
+++ b/drivers/char/watchdog/wdt285.c
@@ -137,7 +137,7 @@ watchdog_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                unsigned long arg)
 {
         unsigned int new_margin;
-        int ret = -ENOIOCTLCMD;
+        int ret = -ENOTTY;
 
         switch(cmd) {
         case WDIOC_GETSUPPORT:
diff --git a/drivers/char/watchdog/wdt977.c b/drivers/char/watchdog/wdt977.c
index a0935bc775f8..6253041b235b 100644
--- a/drivers/char/watchdog/wdt977.c
+++ b/drivers/char/watchdog/wdt977.c
@@ -361,7 +361,7 @@ static int wdt977_ioctl(struct inode *inode, struct file *file,
         switch(cmd)
         {
         default:
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
 
         case WDIOC_GETSUPPORT:
                 return copy_to_user(uarg.ident, &ident,
diff --git a/drivers/char/watchdog/wdt_pci.c b/drivers/char/watchdog/wdt_pci.c
index 5918ca2c9c35..74d8cf836e13 100644
--- a/drivers/char/watchdog/wdt_pci.c
+++ b/drivers/char/watchdog/wdt_pci.c
@@ -386,7 +386,7 @@ static int wdtpci_ioctl(struct inode *inode, struct file *file, unsigned int cmd
         switch(cmd)
         {
                 default:
-                        return -ENOIOCTLCMD;
+                        return -ENOTTY;
                 case WDIOC_GETSUPPORT:
                         return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
 
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c
index 23b086685453..fc17599c905e 100644
--- a/drivers/firmware/dell_rbu.c
+++ b/drivers/firmware/dell_rbu.c
@@ -227,7 +227,7 @@ static int packetize_data(void *data, size_t length)
         int packet_length;
         u8 *temp;
         u8 *end = (u8 *) data + length;
-        pr_debug("packetize_data: data length %d\n", length);
+        pr_debug("packetize_data: data length %zd\n", length);
         if (!rbu_data.packetsize) {
                 printk(KERN_WARNING
                         "dell_rbu: packetsize not specified\n");
@@ -249,7 +249,7 @@ static int packetize_data(void *data, size_t length)
                 if ((rc = create_packet(temp, packet_length)))
                         return rc;
 
-                pr_debug("%lu:%lu\n", temp, (end - temp));
+                pr_debug("%p:%lu\n", temp, (end - temp));
                 temp += packet_length;
         }
 
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 69d627bd537a..abcabb295592 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -56,7 +56,7 @@ if IDE
 
 config IDE_MAX_HWIFS
         int "Max IDE interfaces"
-        depends on ALPHA || SUPERH || IA64
+        depends on ALPHA || SUPERH || IA64 || EMBEDDED
         default 4
         help
           This is the maximum number of IDE hardware interfaces that will
@@ -594,6 +594,12 @@ config BLK_DEV_HPT366
           ide-probe at boot. It is reported to support DVD II drives, by the
           manufacturer.
 
+config BLK_DEV_JMICRON
+        tristate "JMicron JMB36x support"
+        help
+          Basic support for the JMicron ATA controllers. For full support
+          use the libata drivers.
+
 config BLK_DEV_SC1200
         tristate "National SCx200 chipset support"
         help
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index c3546fe9af63..56efed6742d4 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -145,14 +145,12 @@ int ide_in_drive_list(struct hd_driveid *id, const struct drive_list_entry *driv
 {
         for ( ; drive_table->id_model ; drive_table++)
                 if ((!strcmp(drive_table->id_model, id->model)) &&
-                    ((strstr(drive_table->id_firmware, id->fw_rev)) ||
+                    ((strstr(id->fw_rev, drive_table->id_firmware)) ||
                      (!strcmp(drive_table->id_firmware, "ALL"))))
                         return 1;
         return 0;
 }
 
-EXPORT_SYMBOL_GPL(ide_in_drive_list);
-
 /**
  *      ide_dma_intr    -       IDE DMA interrupt handler
  *      @drive: the drive the interrupt is for
@@ -798,26 +796,23 @@ static int ide_release_dma_engine(ide_hwif_t *hwif)
 
 static int ide_release_iomio_dma(ide_hwif_t *hwif)
 {
-        if ((hwif->dma_extra) && (hwif->channel == 0))
-                release_region((hwif->dma_base + 16), hwif->dma_extra);
         release_region(hwif->dma_base, 8);
-        if (hwif->dma_base2)
-                release_region(hwif->dma_base, 8);
+        if (hwif->extra_ports)
+                release_region(hwif->extra_base, hwif->extra_ports);
         return 1;
 }
 
 /*
  * Needed for allowing full modular support of ide-driver
  */
-int ide_release_dma (ide_hwif_t *hwif)
+int ide_release_dma(ide_hwif_t *hwif)
 {
+        ide_release_dma_engine(hwif);
+
         if (hwif->mmio == 2)
                 return 1;
-        if (hwif->chipset == ide_etrax100)
-                return 1;
-
-        ide_release_dma_engine(hwif);
-        return ide_release_iomio_dma(hwif);
+        else
+                return ide_release_iomio_dma(hwif);
 }
 
 static int ide_allocate_dma_engine(ide_hwif_t *hwif)
@@ -829,10 +824,9 @@ static int ide_allocate_dma_engine(ide_hwif_t *hwif)
         if (hwif->dmatable_cpu)
                 return 0;
 
-        printk(KERN_ERR "%s: -- Error, unable to allocate%s DMA table(s).\n",
-                        hwif->cds->name, !hwif->dmatable_cpu ? " CPU" : "");
+        printk(KERN_ERR "%s: -- Error, unable to allocate DMA table.\n",
+               hwif->cds->name);
 
-        ide_release_dma_engine(hwif);
         return 1;
 }
 
@@ -840,9 +834,7 @@ static int ide_mapped_mmio_dma(ide_hwif_t *hwif, unsigned long base, unsigned in
 {
         printk(KERN_INFO "    %s: MMIO-DMA ", hwif->name);
 
-        hwif->dma_base = base;
-        if (hwif->cds->extra && hwif->channel == 0)
-                hwif->dma_extra = hwif->cds->extra;
+        hwif->dma_base = base;
 
         if(hwif->mate)
                 hwif->dma_master = (hwif->channel) ? hwif->mate->dma_base : base;
@@ -854,29 +846,33 @@ static int ide_mapped_mmio_dma(ide_hwif_t *hwif, unsigned long base, unsigned in
 static int ide_iomio_dma(ide_hwif_t *hwif, unsigned long base, unsigned int ports)
 {
         printk(KERN_INFO "    %s: BM-DMA at 0x%04lx-0x%04lx",
-                hwif->name, base, base + ports - 1);
+               hwif->name, base, base + ports - 1);
+
         if (!request_region(base, ports, hwif->name)) {
                 printk(" -- Error, ports in use.\n");
                 return 1;
         }
+
         hwif->dma_base = base;
-        if ((hwif->cds->extra) && (hwif->channel == 0)) {
-                request_region(base+16, hwif->cds->extra, hwif->cds->name);
-                hwif->dma_extra = hwif->cds->extra;
+
+        if (hwif->cds->extra) {
+                hwif->extra_base = base + (hwif->channel ? 8 : 16);
+
+                if (!hwif->mate || !hwif->mate->extra_ports) {
+                        if (!request_region(hwif->extra_base,
+                                            hwif->cds->extra, hwif->cds->name)) {
+                                printk(" -- Error, extra ports in use.\n");
+                                release_region(base, ports);
+                                return 1;
+                        }
+                        hwif->extra_ports = hwif->cds->extra;
+                }
         }
-        
+
         if(hwif->mate)
-                hwif->dma_master = (hwif->channel) ? hwif->mate->dma_base : base;
+                hwif->dma_master = (hwif->channel) ? hwif->mate->dma_base:base;
         else
                 hwif->dma_master = base;
-        if (hwif->dma_base2) {
-                if (!request_region(hwif->dma_base2, ports, hwif->name))
-                {
-                        printk(" -- Error, secondary ports in use.\n");
-                        release_region(base, ports);
-                        return 1;
-                }
-        }
         return 0;
 }
 
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 38479a29d3e1..ba6039b55b41 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -59,8 +59,6 @@ static int __ide_end_request(ide_drive_t *drive, struct request *rq,
 {
         int ret = 1;
 
-        BUG_ON(!blk_rq_started(rq));
-
         /*
          * if failfast is set on a request, override number of sectors and
          * complete the whole request right now
@@ -82,7 +80,8 @@ static int __ide_end_request(ide_drive_t *drive, struct request *rq,
 
         if (!end_that_request_first(rq, uptodate, nr_sectors)) {
                 add_disk_randomness(rq->rq_disk);
-                blkdev_dequeue_request(rq);
+                if (!list_empty(&rq->queuelist))
+                        blkdev_dequeue_request(rq);
                 HWGROUP(drive)->rq = NULL;
                 end_that_request_last(rq, uptodate);
                 ret = 0;
@@ -135,7 +134,8 @@ enum {
         ide_pm_flush_cache      = ide_pm_state_start_suspend,
         idedisk_pm_standby,
 
-        idedisk_pm_idle         = ide_pm_state_start_resume,
+        idedisk_pm_restore_pio  = ide_pm_state_start_resume,
+        idedisk_pm_idle,
         ide_pm_restore_dma,
 };
 
@@ -156,7 +156,10 @@ static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 s
         case idedisk_pm_standby:        /* Suspend step 2 (standby) complete */
                 pm->pm_step = ide_pm_state_completed;
                 break;
-        case idedisk_pm_idle:           /* Resume step 1 (idle) complete */
+        case idedisk_pm_restore_pio:    /* Resume step 1 complete */
+                pm->pm_step = idedisk_pm_idle;
+                break;
+        case idedisk_pm_idle:           /* Resume step 2 (idle) complete */
                 pm->pm_step = ide_pm_restore_dma;
                 break;
         }
@@ -170,8 +173,11 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
         memset(args, 0, sizeof(*args));
 
         if (drive->media != ide_disk) {
-                /* skip idedisk_pm_idle for ATAPI devices */
-                if (pm->pm_step == idedisk_pm_idle)
+                /*
+                 * skip idedisk_pm_restore_pio and idedisk_pm_idle for ATAPI
+                 * devices
+                 */
+                if (pm->pm_step == idedisk_pm_restore_pio)
                         pm->pm_step = ide_pm_restore_dma;
         }
 
@@ -198,13 +204,19 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
                 args->handler      = &task_no_data_intr;
                 return do_rw_taskfile(drive, args);
 
-        case idedisk_pm_idle:           /* Resume step 1 (idle) */
+        case idedisk_pm_restore_pio:    /* Resume step 1 (restore PIO) */
+                if (drive->hwif->tuneproc != NULL)
+                        drive->hwif->tuneproc(drive, 255);
+                ide_complete_power_step(drive, rq, 0, 0);
+                return ide_stopped;
+
+        case idedisk_pm_idle:           /* Resume step 2 (idle) */
                 args->tfRegister[IDE_COMMAND_OFFSET] = WIN_IDLEIMMEDIATE;
                 args->command_type = IDE_DRIVE_TASK_NO_DATA;
                 args->handler = task_no_data_intr;
                 return do_rw_taskfile(drive, args);
 
-        case ide_pm_restore_dma:        /* Resume step 2 (restore DMA) */
+        case ide_pm_restore_dma:        /* Resume step 3 (restore DMA) */
                 /*
                  * Right now, all we do is call hwif->ide_dma_check(drive),
                  * we could be smarter and check for current xfer_speed
@@ -1346,6 +1358,10 @@ static ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
          * make sure request is sane
          */
         rq = HWGROUP(drive)->rq;
+
+        if (!rq)
+                goto out;
+
         HWGROUP(drive)->rq = NULL;
 
         rq->errors = 0;
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 77703acaec17..badde6331775 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -998,6 +998,7 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive)
         }
         /* done polling */
         hwgroup->polling = 0;
+        hwgroup->resetting = 0;
         return ide_stopped;
 }
 
@@ -1057,6 +1058,7 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive)
                 }
         }
         hwgroup->polling = 0;   /* done polling */
+        hwgroup->resetting = 0; /* done reset attempt */
         return ide_stopped;
 }
 
@@ -1143,6 +1145,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
 
         /* For an ATAPI device, first try an ATAPI SRST. */
         if (drive->media != ide_disk && !do_not_try_atapi) {
+                hwgroup->resetting = 1;
                 pre_reset(drive);
                 SELECT_DRIVE(drive);
                 udelay (20);
@@ -1168,6 +1171,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
                 return ide_stopped;
         }
 
+        hwgroup->resetting = 1;
         /*
          * Note that we also set nIEN while resetting the device,
          * to mask unwanted interrupts from the interface during the reset.
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 850ef63cc986..8237d89eec6e 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -71,75 +71,96 @@ EXPORT_SYMBOL(ide_xfer_verbose);
 /**
  *      ide_dma_speed   -       compute DMA speed
  *      @drive: drive
- *      @mode; intended mode
+ *      @mode:  modes available
  *
  *      Checks the drive capabilities and returns the speed to use
- *      for the transfer. Returns -1 if the requested mode is unknown
- *      (eg PIO)
+ *      for the DMA transfer.  Returns 0 if the drive is incapable
+ *      of DMA transfers.
  */
  
 u8 ide_dma_speed(ide_drive_t *drive, u8 mode)
 {
         struct hd_driveid *id   = drive->id;
         ide_hwif_t *hwif        = HWIF(drive);
+        u8 ultra_mask, mwdma_mask, swdma_mask;
         u8 speed = 0;
 
         if (drive->media != ide_disk && hwif->atapi_dma == 0)
                 return 0;
 
-        switch(mode) {
-                case 0x04:
-                        if ((id->dma_ultra & 0x0040) &&
-                            (id->dma_ultra & hwif->ultra_mask))
-                                { speed = XFER_UDMA_6; break; }
-                case 0x03:
-                        if ((id->dma_ultra & 0x0020) &&
-                            (id->dma_ultra & hwif->ultra_mask))
-                                { speed = XFER_UDMA_5; break; }
-                case 0x02:
-                        if ((id->dma_ultra & 0x0010) &&
-                            (id->dma_ultra & hwif->ultra_mask))
-                                { speed = XFER_UDMA_4; break; }
-                        if ((id->dma_ultra & 0x0008) &&
-                            (id->dma_ultra & hwif->ultra_mask))
-                                { speed = XFER_UDMA_3; break; }
-                case 0x01:
-                        if ((id->dma_ultra & 0x0004) &&
-                            (id->dma_ultra & hwif->ultra_mask))
-                                { speed = XFER_UDMA_2; break; }
-                        if ((id->dma_ultra & 0x0002) &&
-                            (id->dma_ultra & hwif->ultra_mask))
-                                { speed = XFER_UDMA_1; break; }
-                        if ((id->dma_ultra & 0x0001) &&
-                            (id->dma_ultra & hwif->ultra_mask))
-                                { speed = XFER_UDMA_0; break; }
-                case 0x00:
-                        if ((id->dma_mword & 0x0004) &&
-                            (id->dma_mword & hwif->mwdma_mask))
-                                { speed = XFER_MW_DMA_2; break; }
-                        if ((id->dma_mword & 0x0002) &&
-                            (id->dma_mword & hwif->mwdma_mask))
-                                { speed = XFER_MW_DMA_1; break; }
-                        if ((id->dma_mword & 0x0001) &&
-                            (id->dma_mword & hwif->mwdma_mask))
-                                { speed = XFER_MW_DMA_0; break; }
-                        if ((id->dma_1word & 0x0004) &&
-                            (id->dma_1word & hwif->swdma_mask))
-                                { speed = XFER_SW_DMA_2; break; }
-                        if ((id->dma_1word & 0x0002) &&
-                            (id->dma_1word & hwif->swdma_mask))
-                                { speed = XFER_SW_DMA_1; break; }
-                        if ((id->dma_1word & 0x0001) &&
-                            (id->dma_1word & hwif->swdma_mask))
-                                { speed = XFER_SW_DMA_0; break; }
-        }
+        /* Capable of UltraDMA modes? */
+        ultra_mask = id->dma_ultra & hwif->ultra_mask;
+
+        if (!(id->field_valid & 4))
+                mode = 0;       /* fallback to MW/SW DMA if no UltraDMA */
+
+        switch (mode) {
+        case 4:
+                if (ultra_mask & 0x40) {
+                        speed = XFER_UDMA_6;
+                        break;
+                }
+        case 3:
+                if (ultra_mask & 0x20) {
+                        speed = XFER_UDMA_5;
+                        break;
+                }
+        case 2:
+                if (ultra_mask & 0x10) {
+                        speed = XFER_UDMA_4;
+                        break;
+                }
+                if (ultra_mask & 0x08) {
+                        speed = XFER_UDMA_3;
+                        break;
+                }
+        case 1:
+                if (ultra_mask & 0x04) {
+                        speed = XFER_UDMA_2;
+                        break;
+                }
+                if (ultra_mask & 0x02) {
+                        speed = XFER_UDMA_1;
+                        break;
+                }
+                if (ultra_mask & 0x01) {
+                        speed = XFER_UDMA_0;
+                        break;
+                }
+        case 0:
+                mwdma_mask = id->dma_mword & hwif->mwdma_mask;
 
-//      printk("%s: %s: mode 0x%02x, speed 0x%02x\n",
-//              __FUNCTION__, drive->name, mode, speed);
+                if (mwdma_mask & 0x04) {
+                        speed = XFER_MW_DMA_2;
+                        break;
+                }
+                if (mwdma_mask & 0x02) {
+                        speed = XFER_MW_DMA_1;
+                        break;
+                }
+                if (mwdma_mask & 0x01) {
+                        speed = XFER_MW_DMA_0;
+                        break;
+                }
+
+                swdma_mask = id->dma_1word & hwif->swdma_mask;
+
+                if (swdma_mask & 0x04) {
+                        speed = XFER_SW_DMA_2;
+                        break;
+                }
+                if (swdma_mask & 0x02) {
+                        speed = XFER_SW_DMA_1;
+                        break;
+                }
+                if (swdma_mask & 0x01) {
+                        speed = XFER_SW_DMA_0;
+                        break;
+                }
+        }
 
         return speed;
 }
-
 EXPORT_SYMBOL(ide_dma_speed);
 
 
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 9cadf0106c6c..dad9c47ebb69 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -623,6 +623,8 @@ static void hwif_release_dev (struct device *dev)
 
 static void hwif_register (ide_hwif_t *hwif)
 {
+        int ret;
+
         /* register with global device tree */
         strlcpy(hwif->gendev.bus_id,hwif->name,BUS_ID_SIZE);
         hwif->gendev.driver_data = hwif;
@@ -634,7 +636,10 @@ static void hwif_register (ide_hwif_t *hwif)
                         hwif->gendev.parent = NULL;
         }
         hwif->gendev.release = hwif_release_dev;
-        device_register(&hwif->gendev);
+        ret = device_register(&hwif->gendev);
+        if (ret < 0)
+                printk(KERN_WARNING "IDE: %s: device_register error: %d\n",
+                        __FUNCTION__, ret);
 }
 
 static int wait_hwif_ready(ide_hwif_t *hwif)
@@ -884,13 +889,19 @@ int probe_hwif_init_with_fixup(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif)
 
         if (hwif->present) {
                 u16 unit = 0;
+                int ret;
+
                 for (unit = 0; unit < MAX_DRIVES; ++unit) {
                         ide_drive_t *drive = &hwif->drives[unit];
                         /* For now don't attach absent drives, we may
                            want them on default or a new "empty" class
                            for hotplug reprobing ? */
                         if (drive->present) {
-                                device_register(&drive->gendev);
+                                ret = device_register(&drive->gendev);
+                                if (ret < 0)
+                                        printk(KERN_WARNING "IDE: %s: "
+                                                "device_register error: %d\n",
+                                                __FUNCTION__, ret);
                         }
                 }
         }
@@ -1409,8 +1420,14 @@ int ideprobe_init (void)
                         if (hwif->chipset == ide_unknown || hwif->chipset == ide_forced)
                                 hwif->chipset = ide_generic;
                         for (unit = 0; unit < MAX_DRIVES; ++unit)
-                                if (hwif->drives[unit].present)
-                                        device_register(&hwif->drives[unit].gendev);
+                                if (hwif->drives[unit].present) {
+                                        int ret = device_register(
+                                                &hwif->drives[unit].gendev);
+                                        if (ret < 0)
+                                                printk(KERN_WARNING "IDE: %s: "
+                                                        "device_register error: %d\n",
+                                                        __FUNCTION__, ret);
+                                }
                 }
         }
         return 0;
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index 41b74b13a00c..aa049dab3d95 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -326,15 +326,24 @@ static int ide_replace_subdriver(ide_drive_t *drive, const char *driver)
 {
         struct device *dev = &drive->gendev;
         int ret = 1;
+        int err;
 
         down_write(&dev->bus->subsys.rwsem);
         device_release_driver(dev);
         /* FIXME: device can still be in use by previous driver */
         strlcpy(drive->driver_req, driver, sizeof(drive->driver_req));
-        device_attach(dev);
+        err = device_attach(dev);
+        if (err < 0)
+                printk(KERN_WARNING "IDE: %s: device_attach error: %d\n",
+                        __FUNCTION__, err);
         drive->driver_req[0] = 0;
-        if (dev->driver == NULL)
-                device_attach(dev);
+        if (dev->driver == NULL) {
+                err = device_attach(dev);
+                if (err < 0)
+                        printk(KERN_WARNING
+                                "IDE: %s: device_attach(2) error: %d\n",
+                                __FUNCTION__, err);
+        }
         if (dev->driver && !strcmp(dev->driver->name, driver))
                 ret = 0;
         up_write(&dev->bus->subsys.rwsem);
@@ -526,7 +535,12 @@ static int proc_print_driver(struct device_driver *drv, void *data)
 
 static int ide_drivers_show(struct seq_file *s, void *p)
 {
-        bus_for_each_drv(&ide_bus_type, NULL, s, proc_print_driver);
+        int err;
+
+        err = bus_for_each_drv(&ide_bus_type, NULL, s, proc_print_driver);
+        if (err < 0)
+                printk(KERN_WARNING "IDE: %s: bus_for_each_drv error: %d\n",
+                        __FUNCTION__, err);
         return 0;
 }
 
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 2b1a1389c318..287a66201150 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -450,7 +450,7 @@ void ide_hwif_release_regions(ide_hwif_t *hwif)
  *      @hwif: hwif to update
  *      @tmp_hwif: template
  *
- *      Restore hwif to a previous state by copying most settngs
+ *      Restore hwif to a previous state by copying most settings
  *      from the template.
  */
 
@@ -539,9 +539,10 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->dma_vendor3               = tmp_hwif->dma_vendor3;
         hwif->dma_prdtable              = tmp_hwif->dma_prdtable;
 
-        hwif->dma_extra                 = tmp_hwif->dma_extra;
         hwif->config_data               = tmp_hwif->config_data;
         hwif->select_data               = tmp_hwif->select_data;
+        hwif->extra_base                = tmp_hwif->extra_base;
+        hwif->extra_ports               = tmp_hwif->extra_ports;
         hwif->autodma                   = tmp_hwif->autodma;
         hwif->udma_four                 = tmp_hwif->udma_four;
         hwif->no_dsc                    = tmp_hwif->no_dsc;
@@ -550,7 +551,7 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
 }
 
 /**
- *      ide_unregister          -       free an ide interface
+ *      ide_unregister          -       free an IDE interface
  *      @index: index of interface (will change soon to a pointer)
  *
  *      Perform the final unregister of an IDE interface. At the moment
@@ -563,8 +564,8 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
  *      deadlocking the IDE layer. The shutdown callback is called
  *      before we take the lock and free resources. It is up to the
  *      caller to be sure there is no pending I/O here, and that
- *      the interfce will not be reopened (present/vanishing locking
- *      isnt yet done btw). After we commit to the final kill we
+ *      the interface will not be reopened (present/vanishing locking
+ *      isn't yet done BTW). After we commit to the final kill we
  *      call the cleanup callback with the ide locks held.
  *
  *      Unregister restores the hwif structures to the default state.
@@ -674,6 +675,9 @@ void ide_unregister(unsigned int index)
                 hwif->dma_status = 0;
                 hwif->dma_vendor3 = 0;
                 hwif->dma_prdtable = 0;
+
+                hwif->extra_base  = 0;
+                hwif->extra_ports = 0;
         }
 
         /* copy original settings */
@@ -1360,6 +1364,11 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
 
                         spin_lock_irqsave(&ide_lock, flags);
 
+                        if (HWGROUP(drive)->resetting) {
+                                spin_unlock_irqrestore(&ide_lock, flags);
+                                return -EBUSY;
+                        }
+
                         ide_abort(drive, "drive reset");
 
                         BUG_ON(HWGROUP(drive)->handler);
@@ -1993,10 +2002,16 @@ EXPORT_SYMBOL_GPL(ide_bus_type);
  */
 static int __init ide_init(void)
 {
+        int ret;
+
         printk(KERN_INFO "Uniform Multi-Platform E-IDE driver " REVISION "\n");
         system_bus_speed = ide_system_bus_speed();
 
-        bus_register(&ide_bus_type);
+        ret = bus_register(&ide_bus_type);
+        if (ret < 0) {
+                printk(KERN_WARNING "IDE: bus_register error: %d\n", ret);
+                return ret;
+        }
 
         init_ide_data();
 
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index 602797a44208..bef4759f70e5 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -120,7 +120,7 @@ static int ide_probe(struct pcmcia_device *link)
     link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
     link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
     link->io.IOAddrLines = 3;
-    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
     link->irq.IRQInfo1 = IRQ_LEVEL_ID;
     link->conf.Attributes = CONF_ENABLE_IRQ;
     link->conf.IntType = INT_MEMORY_AND_IO;
@@ -398,12 +398,17 @@ static struct pcmcia_device_id ide_ids[] = {
         PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
         PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674),
         PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2      ", 0xe37be2b5, 0x8671043b),
+        PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c),
         PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79),
         PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591),
         PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728),
         PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1),
+        PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883),
+        PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
+        PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
         PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
         PCMCIA_DEVICE_PROD_ID1("TRANSCEND    512M   ", 0xd0909443),
+        PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
         PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
         PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
         PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
diff --git a/drivers/ide/pci/Makefile b/drivers/ide/pci/Makefile
index f35d684edc25..640a54b09b5a 100644
--- a/drivers/ide/pci/Makefile
+++ b/drivers/ide/pci/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_BLK_DEV_HPT366)		+= hpt366.o
 #obj-$(CONFIG_BLK_DEV_HPT37X)           += hpt37x.o
 obj-$(CONFIG_BLK_DEV_IT8172)            += it8172.o
 obj-$(CONFIG_BLK_DEV_IT821X)            += it821x.o
+obj-$(CONFIG_BLK_DEV_JMICRON)           += jmicron.o
 obj-$(CONFIG_BLK_DEV_NS87415)           += ns87415.o
 obj-$(CONFIG_BLK_DEV_OPTI621)           += opti621.o
 obj-$(CONFIG_BLK_DEV_PDC202XX_OLD)      += pdc202xx_old.o
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index 380bb28c7c54..ae405fa32236 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -222,23 +222,23 @@ static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const ch
         unsigned long flags;
 
         dev = NULL;
-        while ((dev = pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_ANY_ID, dev)) != NULL) {
+        while ((dev = pci_get_device(PCI_VENDOR_ID_CYRIX, PCI_ANY_ID, dev)) != NULL) {
                 switch (dev->device) {
                         case PCI_DEVICE_ID_CYRIX_PCI_MASTER:
-                                master_0 = dev;
+                                master_0 = pci_dev_get(dev);
                                 break;
                         case PCI_DEVICE_ID_CYRIX_5530_LEGACY:
-                                cs5530_0 = dev;
+                                cs5530_0 = pci_dev_get(dev);
                                 break;
                 }
         }
         if (!master_0) {
                 printk(KERN_ERR "%s: unable to locate PCI MASTER function\n", name);
-                return 0;
+                goto out;
         }
         if (!cs5530_0) {
                 printk(KERN_ERR "%s: unable to locate CS5530 LEGACY function\n", name);
-                return 0;
+                goto out;
         }
 
         spin_lock_irqsave(&ide_lock, flags);
@@ -296,6 +296,9 @@ static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const ch
 
         spin_unlock_irqrestore(&ide_lock, flags);
 
+out:
+        pci_dev_put(master_0);
+        pci_dev_put(cs5530_0);
         return 0;
 }
 
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index 120929fbe7a3..64330c459bd4 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -281,7 +281,7 @@ static void cy82c693_tune_drive (ide_drive_t *drive, u8 pio)
 
         /* select primary or secondary channel */
         if (hwif->index > 0) {  /* drive is on the secondary channel */
-                dev = pci_find_slot(dev->bus->number, dev->devfn+1);
+                dev = pci_get_slot(dev->bus, dev->devfn+1);
                 if (!dev) {
                         printk(KERN_ERR "%s: tune_drive: "
                                 "Cannot find secondary interface!\n",
@@ -500,8 +500,9 @@ static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_dev
            Function 1 is primary IDE channel, function 2 - secondary. */
         if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE &&
             PCI_FUNC(dev->devfn) == 1) {
-                dev2 = pci_find_slot(dev->bus->number, dev->devfn + 1);
+                dev2 = pci_get_slot(dev->bus, dev->devfn + 1);
                 ret = ide_setup_pci_devices(dev, dev2, d);
+                /* We leak pci refs here but thats ok - we can't be unloaded */
         }
         return ret;
 }
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 78810ba982e9..0cb7b9b520ea 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -41,15 +41,8 @@
 
 static int ide_generic_all;             /* Set to claim all devices */
 
-#ifndef MODULE
-static int __init ide_generic_all_on(char *unused)
-{
-        ide_generic_all = 1;
-        printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers.\n");
-        return 1;
-}
-__setup("all-generic-ide", ide_generic_all_on);
-#endif
+module_param_named(all_generic_ide, ide_generic_all, bool, 0444);
+MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers.");
 
 static void __devinit init_hwif_generic (ide_hwif_t *hwif)
 {
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
new file mode 100644
index 000000000000..68c74bbf8b06
--- /dev/null
+++ b/drivers/ide/pci/jmicron.c
@@ -0,0 +1,269 @@
+
+/*
+ * Copyright (C) 2006           Red Hat <alan@redhat.com>
+ *
+ *  May be copied or modified under the terms of the GNU General Public License
+ */
+
+#include <linux/config.h>
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/hdreg.h>
+#include <linux/ide.h>
+#include <linux/init.h>
+
+#include <asm/io.h>
+
+typedef enum {
+        PORT_PATA0 = 0,
+        PORT_PATA1 = 1,
+        PORT_SATA = 2,
+} port_type;
+
+/**
+ *      jmicron_ratemask        -       Compute available modes
+ *      @drive: IDE drive
+ *
+ *      Compute the available speeds for the devices on the interface. This
+ *      is all modes to ATA133 clipped by drive cable setup.
+ */
+
+static u8 jmicron_ratemask(ide_drive_t *drive)
+{
+        u8 mode = 4;
+        if (!eighty_ninty_three(drive))
+                mode = min(mode, (u8)1);
+        return mode;
+}
+
+/**
+ *      ata66_jmicron           -       Cable check
+ *      @hwif: IDE port
+ *
+ *      Return 1 if the cable is 80pin
+ */
+
+static int __devinit ata66_jmicron(ide_hwif_t *hwif)
+{
+        struct pci_dev *pdev = hwif->pci_dev;
+
+        u32 control;
+        u32 control5;
+
+        int port = hwif->channel;
+        port_type port_map[2];
+
+        pci_read_config_dword(pdev, 0x40, &control);
+
+        /* There are two basic mappings. One has the two SATA ports merged
+           as master/slave and the secondary as PATA, the other has only the
+           SATA port mapped */
+        if (control & (1 << 23)) {
+                port_map[0] = PORT_SATA;
+                port_map[1] = PORT_PATA0;
+        } else {
+                port_map[0] = PORT_SATA;
+                port_map[1] = PORT_SATA;
+        }
+
+        /* The 365/366 may have this bit set to map the second PATA port
+           as the internal primary channel */
+        pci_read_config_dword(pdev, 0x80, &control5);
+        if (control5 & (1<<24))
+                port_map[0] = PORT_PATA1;
+
+        /* The two ports may then be logically swapped by the firmware */
+        if (control & (1 << 22))
+                port = port ^ 1;
+
+        /*
+         *      Now we know which physical port we are talking about we can
+         *      actually do our cable checking etc. Thankfully we don't need
+         *      to do the plumbing for other cases.
+         */
+        switch (port_map[port])
+        {
+        case PORT_PATA0:
+                if (control & (1 << 3)) /* 40/80 pin primary */
+                        return 1;
+                return 0;
+        case PORT_PATA1:
+                if (control5 & (1 << 19))       /* 40/80 pin secondary */
+                        return 0;
+                return 1;
+        case PORT_SATA:
+                return 1;
+        }
+}
+
+static void jmicron_tuneproc (ide_drive_t *drive, byte mode_wanted)
+{
+        return;
+}
+
+/**
+ *      config_jmicron_chipset_for_pio  -       set drive timings
+ *      @drive: drive to tune
+ *      @speed we want
+ *
+ */
+
+static void config_jmicron_chipset_for_pio (ide_drive_t *drive, byte set_speed)
+{
+        u8 speed = XFER_PIO_0 + ide_get_best_pio_mode(drive, 255, 5, NULL);
+        if (set_speed)
+                (void) ide_config_drive_speed(drive, speed);
+}
+
+/**
+ *      jmicron_tune_chipset    -       set controller timings
+ *      @drive: Drive to set up
+ *      @xferspeed: speed we want to achieve
+ *
+ *      As the JMicron snoops for timings all we actually need to do is
+ *      make sure we don't set an invalid mode. We do need to honour
+ *      the cable detect here.
+ */
+
+static int jmicron_tune_chipset (ide_drive_t *drive, byte xferspeed)
+{
+
+        u8 speed                = ide_rate_filter(jmicron_ratemask(drive), xferspeed);
+
+        return ide_config_drive_speed(drive, speed);
+}
+
+/**
+ *      config_chipset_for_dma  -       configure for DMA
+ *      @drive: drive to configure
+ *
+ *      As the JMicron snoops for timings all we actually need to do is
+ *      make sure we don't set an invalid mode.
+ */
+
+static int config_chipset_for_dma (ide_drive_t *drive)
+{
+        u8 speed        = ide_dma_speed(drive, jmicron_ratemask(drive));
+
+        config_jmicron_chipset_for_pio(drive, !speed);
+        jmicron_tune_chipset(drive, speed);
+        return ide_dma_enable(drive);
+}
+
+/**
+ *      jmicron_configure_drive_for_dma -       set up for DMA transfers
+ *      @drive: drive we are going to set up
+ *
+ *      As the JMicron snoops for timings all we actually need to do is
+ *      make sure we don't set an invalid mode.
+ */
+
+static int jmicron_config_drive_for_dma (ide_drive_t *drive)
+{
+        ide_hwif_t *hwif        = drive->hwif;
+
+        if (ide_use_dma(drive)) {
+                if (config_chipset_for_dma(drive))
+                        return hwif->ide_dma_on(drive);
+        }
+        config_jmicron_chipset_for_pio(drive, 1);
+        return hwif->ide_dma_off_quietly(drive);
+}
+
+/**
+ *      init_hwif_jmicron       -       set up hwif structs
+ *      @hwif: interface to set up
+ *
+ *      Minimal set up is required for the Jmicron hardware.
+ */
+
+static void __devinit init_hwif_jmicron(ide_hwif_t *hwif)
+{
+        hwif->speedproc = &jmicron_tune_chipset;
+        hwif->tuneproc  = &jmicron_tuneproc;
+
+        hwif->drives[0].autotune = 1;
+        hwif->drives[1].autotune = 1;
+
+        if (!hwif->dma_base)
+                goto fallback;
+
+        hwif->atapi_dma = 1;
+        hwif->ultra_mask = 0x7f;
+        hwif->mwdma_mask = 0x07;
+
+        hwif->ide_dma_check = &jmicron_config_drive_for_dma;
+        if (!(hwif->udma_four))
+                hwif->udma_four = ata66_jmicron(hwif);
+
+        hwif->autodma = 1;
+        hwif->drives[0].autodma = hwif->autodma;
+        hwif->drives[1].autodma = hwif->autodma;
+        return;
+fallback:
+        hwif->autodma = 0;
+        return;
+}
+
+#define DECLARE_JMB_DEV(name_str)                       \
+        {                                               \
+                .name           = name_str,             \
+                .init_hwif      = init_hwif_jmicron,    \
+                .channels       = 2,                    \
+                .autodma        = AUTODMA,              \
+                .bootable       = ON_BOARD,             \
+                .enablebits     = { {0x40, 1, 1}, {0x40, 0x10, 0x10} }, \
+        }
+
+static ide_pci_device_t jmicron_chipsets[] __devinitdata = {
+        /* 0 */ DECLARE_JMB_DEV("JMB361"),
+        /* 1 */ DECLARE_JMB_DEV("JMB363"),
+        /* 2 */ DECLARE_JMB_DEV("JMB365"),
+        /* 3 */ DECLARE_JMB_DEV("JMB366"),
+        /* 4 */ DECLARE_JMB_DEV("JMB368"),
+};
+
+/**
+ *      jmicron_init_one        -       pci layer discovery entry
+ *      @dev: PCI device
+ *      @id: ident table entry
+ *
+ *      Called by the PCI code when it finds a Jmicron controller.
+ *      We then use the IDE PCI generic helper to do most of the work.
+ */
+
+static int __devinit jmicron_init_one(struct pci_dev *dev, const struct pci_device_id *id)
+{
+        ide_setup_pci_device(dev, &jmicron_chipsets[id->driver_data]);
+        return 0;
+}
+
+static struct pci_device_id jmicron_pci_tbl[] = {
+        { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361), 0},
+        { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363), 1},
+        { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365), 2},
+        { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366), 3},
+        { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368), 4},
+        { 0, },
+};
+
+MODULE_DEVICE_TABLE(pci, jmicron_pci_tbl);
+
+static struct pci_driver driver = {
+        .name           = "JMicron IDE",
+        .id_table       = jmicron_pci_tbl,
+        .probe          = jmicron_init_one,
+};
+
+static int __init jmicron_ide_init(void)
+{
+        return ide_pci_register_driver(&driver);
+}
+
+module_init(jmicron_ide_init);
+
+MODULE_AUTHOR("Alan Cox");
+MODULE_DESCRIPTION("PCI driver module for the JMicron in legacy modes");
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index b46022a11bef..184cdacddeb6 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -154,7 +154,8 @@ static int pdc202xx_tune_chipset (ide_drive_t *drive, u8 xferspeed)
         u8                      AP, BP, CP, DP;
         u8                      TA = 0, TB = 0, TC = 0;
 
-        if ((drive->media != ide_disk) && (speed < XFER_SW_DMA_0))
+        if (drive->media != ide_disk &&
+                drive->media != ide_cdrom && speed < XFER_SW_DMA_0)
                 return -1;
 
         pci_read_config_dword(dev, drive_pci, &drive_conf);
@@ -330,14 +331,12 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 
 chipset_is_set:
 
-        if (drive->media == ide_disk) {
-                pci_read_config_byte(dev, (drive_pci), &AP);
-                if (id->capability & 4) /* IORDY_EN */
-                        pci_write_config_byte(dev, (drive_pci), AP|IORDY_EN);
-                pci_read_config_byte(dev, (drive_pci), &AP);
-                if (drive->media == ide_disk)   /* PREFETCH_EN */
-                        pci_write_config_byte(dev, (drive_pci), AP|PREFETCH_EN);
-        }
+        pci_read_config_byte(dev, (drive_pci), &AP);
+        if (id->capability & 4) /* IORDY_EN */
+                pci_write_config_byte(dev, (drive_pci), AP|IORDY_EN);
+        pci_read_config_byte(dev, (drive_pci), &AP);
+        if (drive->media == ide_disk)   /* PREFETCH_EN */
+                pci_write_config_byte(dev, (drive_pci), AP|PREFETCH_EN);
 
         speed = ide_dma_speed(drive, pdc202xx_ratemask(drive));
 
@@ -385,7 +384,7 @@ static void pdc202xx_old_ide_dma_start(ide_drive_t *drive)
 {
         if (drive->current_speed > XFER_UDMA_2)
                 pdc_old_enable_66MHz_clock(drive->hwif);
-        if (drive->addressing == 1) {
+        if (drive->media != ide_disk || drive->addressing == 1) {
                 struct request *rq      = HWGROUP(drive)->rq;
                 ide_hwif_t *hwif        = HWIF(drive);
                 unsigned long high_16   = hwif->dma_master;
@@ -405,7 +404,7 @@ static void pdc202xx_old_ide_dma_start(ide_drive_t *drive)
 
 static int pdc202xx_old_ide_dma_end(ide_drive_t *drive)
 {
-        if (drive->addressing == 1) {
+        if (drive->media != ide_disk || drive->addressing == 1) {
                 ide_hwif_t *hwif        = HWIF(drive);
                 unsigned long high_16   = hwif->dma_master;
                 unsigned long atapi_reg = high_16 + (hwif->channel ? 0x24 : 0x20);
@@ -519,6 +518,7 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
         hwif->ultra_mask = 0x3f;
         hwif->mwdma_mask = 0x07;
         hwif->swdma_mask = 0x07;
+        hwif->atapi_dma = 1;
 
         hwif->err_stops_fifo = 1;
 
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index eb5bab1890cd..cdc3aab9ebcb 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -222,13 +222,15 @@ static void piix_tune_drive (ide_drive_t *drive, u8 pio)
         u16 master_data;
         u8 slave_data;
         static DEFINE_SPINLOCK(tune_lock);
+        int control = 0;
 
                                  /* ISP  RTC */
-        u8 timings[][2] = { { 0, 0 },
-                            { 0, 0 },
-                            { 1, 0 },
-                            { 2, 1 },
-                            { 2, 3 }, };
+        static const u8 timings[][2]= {
+                                        { 0, 0 },
+                                        { 0, 0 },
+                                        { 1, 0 },
+                                        { 2, 1 },
+                                        { 2, 3 }, };
 
         pio = ide_get_best_pio_mode(drive, pio, 5, NULL);
 
@@ -239,19 +241,30 @@ static void piix_tune_drive (ide_drive_t *drive, u8 pio)
          */
         spin_lock_irqsave(&tune_lock, flags);
         pci_read_config_word(dev, master_port, &master_data);
+
+        if (pio >= 2)
+                control |= 1;   /* Programmable timing on */
+        if (drive->media == ide_disk)
+                control |= 4;   /* Prefetch, post write */
+        if (pio >= 3)
+                control |= 2;   /* IORDY */
         if (is_slave) {
                 master_data = master_data | 0x4000;
-                if (pio > 1)
+                if (pio > 1) {
                         /* enable PPE, IE and TIME */
-                        master_data = master_data | 0x0070;
+                        master_data = master_data | (control << 4);
+                } else {
+                        master_data &= ~0x0070;
+                }
                 pci_read_config_byte(dev, slave_port, &slave_data);
                 slave_data = slave_data & (hwif->channel ? 0x0f : 0xf0);
                 slave_data = slave_data | (((timings[pio][0] << 2) | timings[pio][1]) << (hwif->channel ? 4 : 0));
         } else {
                 master_data = master_data & 0xccf8;
-                if (pio > 1)
+                if (pio > 1) {
                         /* enable PPE, IE and TIME */
-                        master_data = master_data | 0x0007;
+                        master_data = master_data | control;
+                }
                 master_data = master_data | (timings[pio][0] << 12) | (timings[pio][1] << 8);
         }
         pci_write_config_word(dev, master_port, master_data);
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index fc2b5496b6d2..ff80937d94dd 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -323,6 +323,7 @@ static void sc1200_tuneproc (ide_drive_t *drive, byte pio)	/* mode=255 means "au
         }
 }
 
+#ifdef CONFIG_PM
 static ide_hwif_t *lookup_pci_dev (ide_hwif_t *prev, struct pci_dev *dev)
 {
         int     h;
@@ -451,6 +452,7 @@ static int sc1200_resume (struct pci_dev *dev)
         }
         return 0;
 }
+#endif
 
 /*
  * This gets invoked by the IDE driver once for each channel,
@@ -499,8 +501,10 @@ static struct pci_driver driver = {
         .name           = "SC1200_IDE",
         .id_table       = sc1200_pci_tbl,
         .probe          = sc1200_init_one,
+#ifdef CONFIG_PM
         .suspend        = sc1200_suspend,
         .resume         = sc1200_resume,
+#endif
 };
 
 static int sc1200_ide_init(void)
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index d8a0d87df734..f3fe287fbd89 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -220,7 +220,7 @@ sgiioc4_ide_dma_end(ide_drive_t * drive)
         ide_hwif_t *hwif = HWIF(drive);
         u64 dma_base = hwif->dma_base;
         int dma_stat = 0;
-        unsigned long *ending_dma = (unsigned long *) hwif->dma_base2;
+        unsigned long *ending_dma = ide_get_hwifdata(hwif);
 
         hwif->OUTL(IOC4_S_DMA_STOP, dma_base + IOC4_DMA_CTRL * 4);
 
@@ -369,6 +369,7 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base)
 {
         void __iomem *virt_dma_base;
         int num_ports = sizeof (ioc4_dma_regs_t);
+        void *pad;
 
         printk(KERN_INFO "%s: BM-DMA at 0x%04lx-0x%04lx\n", hwif->name,
                dma_base, dma_base + num_ports - 1);
@@ -400,17 +401,14 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base)
 
         hwif->sg_max_nents = IOC4_PRD_ENTRIES;
 
-        hwif->dma_base2 = (unsigned long)
-                pci_alloc_consistent(hwif->pci_dev,
-                                     IOC4_IDE_CACHELINE_SIZE,
-                                     (dma_addr_t *) &(hwif->dma_status));
+        pad = pci_alloc_consistent(hwif->pci_dev, IOC4_IDE_CACHELINE_SIZE,
+                                   (dma_addr_t *) &(hwif->dma_status));
 
-        if (!hwif->dma_base2)
-                goto dma_base2alloc_failure;
-
-        return;
+        if (pad) {
+                ide_set_hwifdata(hwif, pad);
+                return;
+        }
 
-dma_base2alloc_failure:
         pci_free_consistent(hwif->pci_dev,
                             IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
                             hwif->dmatable_cpu, hwif->dmatable_dma);
@@ -476,7 +474,7 @@ sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive)
         hwif->OUTL(dma_addr, dma_base + IOC4_DMA_PTR_L * 4);
 
         /* Address of the Ending DMA */
-        memset((unsigned int *) hwif->dma_base2, 0, IOC4_IDE_CACHELINE_SIZE);
+        memset(ide_get_hwifdata(hwif), 0, IOC4_IDE_CACHELINE_SIZE);
         ending_dma_addr = cpu_to_le32(hwif->dma_status);
         hwif->OUTL(ending_dma_addr, dma_base + IOC4_DMA_END_ADDR * 4);
 
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 20b392948f36..697f566fb90a 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -898,7 +898,6 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
         base = (unsigned long) addr;
 
         hwif->dma_base                  = base + (ch ? 0x08 : 0x00);
-        hwif->dma_base2                 = base + (ch ? 0x18 : 0x10);
         hwif->mmio                      = 2;
 }
 
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 9b7589e8e93e..2af634d7acf4 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -248,7 +248,7 @@ static struct via_isa_bridge *via_config_find(struct pci_dev **isa)
         u8 t;
 
         for (via_config = via_isa_bridges; via_config->id; via_config++)
-                if ((*isa = pci_find_device(PCI_VENDOR_ID_VIA +
+                if ((*isa = pci_get_device(PCI_VENDOR_ID_VIA +
                         !!(via_config->flags & VIA_BAD_ID),
                         via_config->id, NULL))) {
 
@@ -256,6 +256,7 @@ static struct via_isa_bridge *via_config_find(struct pci_dev **isa)
                         if (t >= via_config->rev_min &&
                             t <= via_config->rev_max)
                                 break;
+                        pci_dev_put(*isa);
                 }
 
         return via_config;
@@ -283,6 +284,7 @@ static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const
         via_config = via_config_find(&isa);
         if (!via_config->id) {
                 printk(KERN_WARNING "VP_IDE: Unknown VIA SouthBridge, disabling DMA.\n");
+                pci_dev_put(isa);
                 return -ENODEV;
         }
 
@@ -361,6 +363,7 @@ static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const
                 via_dma[via_config->flags & VIA_UDMA],
                 pci_name(dev));
 
+        pci_dev_put(isa);
         return 0;
 }
 
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index eb0945284acc..0719b6484824 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -101,7 +101,7 @@ static ide_hwif_t *ide_match_hwif(unsigned long io_base, u8 bootable, const char
                                 return hwif;    /* pick an unused entry */
                 }
         }
-        for (h = 0; h < 2; ++h) {
+        for (h = 0; h < 2 && h < MAX_HWIFS; ++h) {
                 hwif = ide_hwifs + h;
                 if (hwif->chipset == ide_unknown)
                         return hwif;    /* pick an unused entry */
@@ -795,24 +795,6 @@ int __ide_pci_register_driver(struct pci_driver *driver, struct module *module)
 EXPORT_SYMBOL_GPL(__ide_pci_register_driver);
 
 /**
- *      ide_unregister_pci_driver       -       unregister an IDE driver
- *      @driver: driver to remove
- *
- *      Unregister a currently installed IDE driver. Returns are the same
- *      as for pci_unregister_driver
- */
- 
-void ide_pci_unregister_driver(struct pci_driver *driver)
-{
-        if(!pre_init)
-                pci_unregister_driver(driver);
-        else
-                list_del(&driver->node);
-}
-
-EXPORT_SYMBOL_GPL(ide_pci_unregister_driver);
-
-/**
  *      ide_scan_pcidev         -       find an IDE driver for a device
  *      @dev: PCI device to check
  *
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 1178bd434d1b..9ae4f3a67c70 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -874,23 +874,25 @@ static struct rdma_id_private *cma_new_id(struct rdma_cm_id *listen_id,
         __u16 port;
         u8 ip_ver;
 
+        if (cma_get_net_info(ib_event->private_data, listen_id->ps,
+                             &ip_ver, &port, &src, &dst))
+                goto err;
+
         id = rdma_create_id(listen_id->event_handler, listen_id->context,
                             listen_id->ps);
         if (IS_ERR(id))
-                return NULL;
+                goto err;
+
+        cma_save_net_info(&id->route.addr, &listen_id->route.addr,
+                          ip_ver, port, src, dst);
 
         rt = &id->route;
         rt->num_paths = ib_event->param.req_rcvd.alternate_path ? 2 : 1;
-        rt->path_rec = kmalloc(sizeof *rt->path_rec * rt->num_paths, GFP_KERNEL);
+        rt->path_rec = kmalloc(sizeof *rt->path_rec * rt->num_paths,
+                               GFP_KERNEL);
         if (!rt->path_rec)
-                goto err;
+                goto destroy_id;
 
-        if (cma_get_net_info(ib_event->private_data, listen_id->ps,
-                             &ip_ver, &port, &src, &dst))
-                goto err;
-
-        cma_save_net_info(&id->route.addr, &listen_id->route.addr,
-                          ip_ver, port, src, dst);
         rt->path_rec[0] = *ib_event->param.req_rcvd.primary_path;
         if (rt->num_paths == 2)
                 rt->path_rec[1] = *ib_event->param.req_rcvd.alternate_path;
@@ -903,8 +905,10 @@ static struct rdma_id_private *cma_new_id(struct rdma_cm_id *listen_id,
         id_priv = container_of(id, struct rdma_id_private, id);
         id_priv->state = CMA_CONNECT;
         return id_priv;
-err:
+
+destroy_id:
         rdma_destroy_id(id);
+err:
         return NULL;
 }
 
@@ -932,6 +936,7 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
         mutex_unlock(&lock);
         if (ret) {
                 ret = -ENODEV;
+                cma_exch(conn_id, CMA_DESTROYING);
                 cma_release_remove(conn_id);
                 rdma_destroy_id(&conn_id->id);
                 goto out;
@@ -1307,6 +1312,7 @@ static void cma_query_handler(int status, struct ib_sa_path_rec *path_rec,
                 work->old_state = CMA_ROUTE_QUERY;
                 work->new_state = CMA_ADDR_RESOLVED;
                 work->event.event = RDMA_CM_EVENT_ROUTE_ERROR;
+                work->event.status = status;
         }
 
         queue_work(cma_wq, &work->work);
@@ -1862,6 +1868,11 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
 
         ret = ib_send_cm_req(id_priv->cm_id.ib, &req);
 out:
+        if (ret && !IS_ERR(id_priv->cm_id.ib)) {
+                ib_destroy_cm_id(id_priv->cm_id.ib);
+                id_priv->cm_id.ib = NULL;
+        }
+
         kfree(private_data);
         return ret;
 }
@@ -1889,10 +1900,8 @@ static int cma_connect_iw(struct rdma_id_private *id_priv,
         cm_id->remote_addr = *sin;
 
         ret = cma_modify_qp_rtr(&id_priv->id);
-        if (ret) {
-                iw_destroy_cm_id(cm_id);
-                return ret;
-        }
+        if (ret)
+                goto out;
 
         iw_param.ord = conn_param->initiator_depth;
         iw_param.ird = conn_param->responder_resources;
@@ -1904,6 +1913,10 @@ static int cma_connect_iw(struct rdma_id_private *id_priv,
                 iw_param.qpn = conn_param->qp_num;
         ret = iw_cm_connect(cm_id, &iw_param);
 out:
+        if (ret && !IS_ERR(cm_id)) {
+                iw_destroy_cm_id(cm_id);
+                id_priv->cm_id.iw = NULL;
+        }
         return ret;
 }
 
@@ -2142,12 +2155,9 @@ static int cma_remove_id_dev(struct rdma_id_private *id_priv)
 
 static void cma_process_remove(struct cma_device *cma_dev)
 {
-        struct list_head remove_list;
         struct rdma_id_private *id_priv;
         int ret;
 
-        INIT_LIST_HEAD(&remove_list);
-
         mutex_lock(&lock);
         while (!list_empty(&cma_dev->id_list)) {
                 id_priv = list_entry(cma_dev->id_list.next,
@@ -2158,8 +2168,7 @@ static void cma_process_remove(struct cma_device *cma_dev)
                         continue;
                 }
 
-                list_del(&id_priv->list);
-                list_add_tail(&id_priv->list, &remove_list);
+                list_del_init(&id_priv->list);
                 atomic_inc(&id_priv->refcount);
                 mutex_unlock(&lock);
 
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 2380994418a5..024d511c4b58 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -49,7 +49,7 @@
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Christoph Raisch <raisch@de.ibm.com>");
 MODULE_DESCRIPTION("IBM eServer HCA InfiniBand Device Driver");
-MODULE_VERSION("SVNEHCA_0016");
+MODULE_VERSION("SVNEHCA_0017");
 
 int ehca_open_aqp1     = 0;
 int ehca_debug_level   = 0;
@@ -239,7 +239,7 @@ init_node_guid1:
         return ret;
 }
 
-int ehca_register_device(struct ehca_shca *shca)
+int ehca_init_device(struct ehca_shca *shca)
 {
         int ret;
 
@@ -317,11 +317,6 @@ int ehca_register_device(struct ehca_shca *shca)
         /* shca->ib_device.process_mad      = ehca_process_mad;     */
         shca->ib_device.mmap                = ehca_mmap;
 
-        ret = ib_register_device(&shca->ib_device);
-        if (ret)
-                ehca_err(&shca->ib_device,
-                         "ib_register_device() failed ret=%x", ret);
-
         return ret;
 }
 
@@ -561,9 +556,9 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
                 goto probe1;
         }
 
-        ret = ehca_register_device(shca);
+        ret = ehca_init_device(shca);
         if (ret) {
-                ehca_gen_err("Cannot register Infiniband device");
+                ehca_gen_err("Cannot init ehca  device struct");
                 goto probe1;
         }
 
@@ -571,7 +566,7 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
         ret = ehca_create_eq(shca, &shca->eq, EHCA_EQ, 2048);
         if (ret) {
                 ehca_err(&shca->ib_device, "Cannot create EQ.");
-                goto probe2;
+                goto probe1;
         }
 
         ret = ehca_create_eq(shca, &shca->neq, EHCA_NEQ, 513);
@@ -600,6 +595,13 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
                 goto probe5;
         }
 
+        ret = ib_register_device(&shca->ib_device);
+        if (ret) {
+                ehca_err(&shca->ib_device,
+                         "ib_register_device() failed ret=%x", ret);
+                goto probe6;
+        }
+
         /* create AQP1 for port 1 */
         if (ehca_open_aqp1 == 1) {
                 shca->sport[0].port_state = IB_PORT_DOWN;
@@ -607,7 +609,7 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
                 if (ret) {
                         ehca_err(&shca->ib_device,
                                  "Cannot create AQP1 for port 1.");
-                        goto probe6;
+                        goto probe7;
                 }
         }
 
@@ -618,7 +620,7 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
                 if (ret) {
                         ehca_err(&shca->ib_device,
                                  "Cannot create AQP1 for port 2.");
-                        goto probe7;
+                        goto probe8;
                 }
         }
 
@@ -630,12 +632,15 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
 
         return 0;
 
-probe7:
+probe8:
         ret = ehca_destroy_aqp1(&shca->sport[0]);
         if (ret)
                 ehca_err(&shca->ib_device,
                          "Cannot destroy AQP1 for port 1. ret=%x", ret);
 
+probe7:
+        ib_unregister_device(&shca->ib_device);
+
 probe6:
         ret = ehca_dereg_internal_maxmr(shca);
         if (ret)
@@ -660,9 +665,6 @@ probe3:
                 ehca_err(&shca->ib_device,
                          "Cannot destroy EQ. ret=%x", ret);
 
-probe2:
-        ib_unregister_device(&shca->ib_device);
-
 probe1:
         ib_dealloc_device(&shca->ib_device);
 
@@ -750,7 +752,7 @@ int __init ehca_module_init(void)
         int ret;
 
         printk(KERN_INFO "eHCA Infiniband Device Driver "
-                         "(Rel.: SVNEHCA_0016)\n");
+                         "(Rel.: SVNEHCA_0017)\n");
         idr_init(&ehca_qp_idr);
         idr_init(&ehca_cq_idr);
         spin_lock_init(&ehca_qp_idr_lock);
diff --git a/drivers/infiniband/hw/ehca/ehca_tools.h b/drivers/infiniband/hw/ehca/ehca_tools.h
index 9f56bb846d93..809da3ef706b 100644
--- a/drivers/infiniband/hw/ehca/ehca_tools.h
+++ b/drivers/infiniband/hw/ehca/ehca_tools.h
@@ -117,7 +117,7 @@ extern int ehca_debug_level;
                 unsigned int l = (unsigned int)(len); \
                 unsigned char *deb = (unsigned char*)(adr);     \
                 for (x = 0; x < l; x += 16) { \
-                        printk("EHCA_DMP:%s" format \
+                        printk("EHCA_DMP:%s " format \
                                " adr=%p ofs=%04x %016lx %016lx\n", \
                                __FUNCTION__, ##args, deb, x, \
                                *((u64 *)&deb[0]), *((u64 *)&deb[8])); \
diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
index a504cf67f272..ce6038743c5c 100644
--- a/drivers/infiniband/hw/ipath/ipath_rc.c
+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
@@ -241,10 +241,7 @@ int ipath_make_rc_req(struct ipath_qp *qp,
                  * original work request since we may need to resend
                  * it.
                  */
-                qp->s_sge.sge = wqe->sg_list[0];
-                qp->s_sge.sg_list = wqe->sg_list + 1;
-                qp->s_sge.num_sge = wqe->wr.num_sge;
-                qp->s_len = len = wqe->length;
+                len = wqe->length;
                 ss = &qp->s_sge;
                 bth2 = 0;
                 switch (wqe->wr.opcode) {
@@ -368,14 +365,23 @@ int ipath_make_rc_req(struct ipath_qp *qp,
                 default:
                         goto done;
                 }
+                qp->s_sge.sge = wqe->sg_list[0];
+                qp->s_sge.sg_list = wqe->sg_list + 1;
+                qp->s_sge.num_sge = wqe->wr.num_sge;
+                qp->s_len = wqe->length;
                 if (newreq) {
                         qp->s_tail++;
                         if (qp->s_tail >= qp->s_size)
                                 qp->s_tail = 0;
                 }
-                bth2 |= qp->s_psn++ & IPATH_PSN_MASK;
-                if ((int)(qp->s_psn - qp->s_next_psn) > 0)
-                        qp->s_next_psn = qp->s_psn;
+                bth2 |= qp->s_psn & IPATH_PSN_MASK;
+                if (wqe->wr.opcode == IB_WR_RDMA_READ)
+                        qp->s_psn = wqe->lpsn + 1;
+                else {
+                        qp->s_psn++;
+                        if ((int)(qp->s_psn - qp->s_next_psn) > 0)
+                                qp->s_next_psn = qp->s_psn;
+                }
                 /*
                  * Put the QP on the pending list so lost ACKs will cause
                  * a retry.  More than one request can be pending so the
@@ -690,13 +696,6 @@ void ipath_restart_rc(struct ipath_qp *qp, u32 psn, struct ib_wc *wc)
         struct ipath_swqe *wqe = get_swqe_ptr(qp, qp->s_last);
         struct ipath_ibdev *dev;
 
-        /*
-         * If there are no requests pending, we are done.
-         */
-        if (ipath_cmp24(psn, qp->s_next_psn) >= 0 ||
-            qp->s_last == qp->s_tail)
-                goto done;
-
         if (qp->s_retry == 0) {
                 wc->wr_id = wqe->wr.wr_id;
                 wc->status = IB_WC_RETRY_EXC_ERR;
@@ -731,8 +730,6 @@ void ipath_restart_rc(struct ipath_qp *qp, u32 psn, struct ib_wc *wc)
                 dev->n_rc_resends += (int)qp->s_psn - (int)psn;
 
         reset_psn(qp, psn);
-
-done:
         tasklet_hi_schedule(&qp->s_task);
 
 bail:
@@ -765,6 +762,7 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode)
         struct ib_wc wc;
         struct ipath_swqe *wqe;
         int ret = 0;
+        u32 ack_psn;
 
         /*
          * Remove the QP from the timeout queue (or RNR timeout queue).
@@ -777,26 +775,26 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode)
                 list_del_init(&qp->timerwait);
         spin_unlock(&dev->pending_lock);
 
+        /* Nothing is pending to ACK/NAK. */
+        if (unlikely(qp->s_last == qp->s_tail))
+                goto bail;
+
         /*
          * Note that NAKs implicitly ACK outstanding SEND and RDMA write
          * requests and implicitly NAK RDMA read and atomic requests issued
          * before the NAK'ed request.  The MSN won't include the NAK'ed
          * request but will include an ACK'ed request(s).
          */
+        ack_psn = psn;
+        if (aeth >> 29)
+                ack_psn--;
         wqe = get_swqe_ptr(qp, qp->s_last);
 
-        /* Nothing is pending to ACK/NAK. */
-        if (qp->s_last == qp->s_tail)
-                goto bail;
-
         /*
          * The MSN might be for a later WQE than the PSN indicates so
          * only complete WQEs that the PSN finishes.
          */
-        while (ipath_cmp24(psn, wqe->lpsn) >= 0) {
-                /* If we are ACKing a WQE, the MSN should be >= the SSN. */
-                if (ipath_cmp24(aeth, wqe->ssn) < 0)
-                        break;
+        while (ipath_cmp24(ack_psn, wqe->lpsn) >= 0) {
                 /*
                  * If this request is a RDMA read or atomic, and the ACK is
                  * for a later operation, this ACK NAKs the RDMA read or
@@ -807,7 +805,8 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode)
                  * is sent but before the response is received.
                  */
                 if ((wqe->wr.opcode == IB_WR_RDMA_READ &&
-                     opcode != OP(RDMA_READ_RESPONSE_LAST)) ||
+                     (opcode != OP(RDMA_READ_RESPONSE_LAST) ||
+                       ipath_cmp24(ack_psn, wqe->lpsn) != 0)) ||
                     ((wqe->wr.opcode == IB_WR_ATOMIC_CMP_AND_SWP ||
                       wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) &&
                      (opcode != OP(ATOMIC_ACKNOWLEDGE) ||
@@ -825,6 +824,10 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode)
                          */
                         goto bail;
                 }
+                if (wqe->wr.opcode == IB_WR_RDMA_READ ||
+                    wqe->wr.opcode == IB_WR_ATOMIC_CMP_AND_SWP ||
+                    wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD)
+                        tasklet_hi_schedule(&qp->s_task);
                 /* Post a send completion queue entry if requested. */
                 if (!test_bit(IPATH_S_SIGNAL_REQ_WR, &qp->s_flags) ||
                     (wqe->wr.send_flags & IB_SEND_SIGNALED)) {
@@ -1055,7 +1058,8 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
                 /* no AETH, no ACK */
                 if (unlikely(ipath_cmp24(psn, qp->s_last_psn + 1))) {
                         dev->n_rdma_seq++;
-                        ipath_restart_rc(qp, qp->s_last_psn + 1, &wc);
+                        if (qp->s_last != qp->s_tail)
+                                ipath_restart_rc(qp, qp->s_last_psn + 1, &wc);
                         goto ack_done;
                 }
         rdma_read:
@@ -1091,7 +1095,8 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
                 /* ACKs READ req. */
                 if (unlikely(ipath_cmp24(psn, qp->s_last_psn + 1))) {
                         dev->n_rdma_seq++;
-                        ipath_restart_rc(qp, qp->s_last_psn + 1, &wc);
+                        if (qp->s_last != qp->s_tail)
+                                ipath_restart_rc(qp, qp->s_last_psn + 1, &wc);
                         goto ack_done;
                 }
                 /* FALLTHROUGH */
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index e10350360f2f..e4823ab2b127 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -1721,11 +1721,11 @@ static void hisax_b_l1l2(struct hisax_if *ifc, int pr, void *arg)
                 hisax_b_sched_event(bcs, B_RCVBUFREADY);
                 break;
         case PH_DATA | CONFIRM:
-                bcs->tx_cnt -= (int) arg;
+                bcs->tx_cnt -= (long)arg;
                 if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag)) {
                         u_long  flags;
                         spin_lock_irqsave(&bcs->aclock, flags);
-                        bcs->ackcnt += (int) arg;
+                        bcs->ackcnt += (long)arg;
                         spin_unlock_irqrestore(&bcs->aclock, flags);
                         schedule_event(bcs, B_ACKPENDING);
                 }
@@ -1789,7 +1789,7 @@ static void hisax_b_l2l1(struct PStack *st, int pr, void *arg)
 
         switch (pr) {
         case PH_ACTIVATE | REQUEST:
-                B_L2L1(b_if, pr, (void *) st->l1.mode);
+                B_L2L1(b_if, pr, (void *)(unsigned long)st->l1.mode);
                 break;
         case PH_DATA | REQUEST:
         case PH_PULL | INDICATION:
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index 3a5ca8a68fc4..0ca5e66d2f5a 100644
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
@@ -424,7 +424,7 @@ bch_l2l1(struct hisax_if *ifc, int pr, void *arg)
         struct hfc4s8s_btype *bch = ifc->priv;
         struct hfc4s8s_l1 *l1 = bch->l1p;
         struct sk_buff *skb = (struct sk_buff *) arg;
-        int mode = (int) arg;
+        long mode = (long) arg;
         u_long flags;
 
         switch (pr) {
@@ -914,7 +914,7 @@ tx_d_frame(struct hfc4s8s_l1 *l1p)
         struct sk_buff *skb;
         u_char f1, f2;
         u_char *cp;
-        int cnt;
+        long cnt;
 
         if (l1p->l1_state != 7)
                 return;
@@ -980,7 +980,8 @@ tx_b_frame(struct hfc4s8s_btype *bch)
         struct sk_buff *skb;
         struct hfc4s8s_l1 *l1 = bch->l1p;
         u_char *cp;
-        int cnt, max, hdlc_num, ack_len = 0;
+        int cnt, max, hdlc_num;
+        long ack_len = 0;
 
         if (!l1->enabled || (bch->mode == L1_MODE_NULL))
                 return;
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
index f27c1608a3a7..b7e8e23be337 100644
--- a/drivers/isdn/hisax/hfc_sx.c
+++ b/drivers/isdn/hisax/hfc_sx.c
@@ -970,7 +970,7 @@ HFCSX_l1hw(struct PStack *st, int pr, void *arg)
                         break;
                 case (HW_TESTLOOP | REQUEST):
                         spin_lock_irqsave(&cs->lock, flags);
-                        switch ((int) arg) {
+                        switch ((long) arg) {
                                 case (1):
                                         Write_hfc(cs, HFCSX_B1_SSL, 0x80);      /* tx slot */
                                         Write_hfc(cs, HFCSX_B1_RSL, 0x80);      /* rx slot */
@@ -986,7 +986,7 @@ HFCSX_l1hw(struct PStack *st, int pr, void *arg)
                                 default:
                                         spin_unlock_irqrestore(&cs->lock, flags);
                                         if (cs->debug & L1_DEB_WARN)
-                                                debugl1(cs, "hfcsx_l1hw loop invalid %4x", (int) arg);
+                                                debugl1(cs, "hfcsx_l1hw loop invalid %4lx", arg);
                                         return;
                         }
                         cs->hw.hfcsx.trm |= 0x80;       /* enable IOM-loop */
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index b5e571a52694..6b88ecb5047d 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -696,7 +696,7 @@ tx_iso_complete(struct urb *urb, struct pt_regs *regs)
                                 fifo->delete_flg = TRUE;
                                 fifo->hif->l1l2(fifo->hif,
                                                 PH_DATA | CONFIRM,
-                                                (void *) fifo->skbuff->
+                                                (void *) (unsigned long) fifo->skbuff->
                                                 truesize);
                                 if (fifo->skbuff && fifo->delete_flg) {
                                         dev_kfree_skb_any(fifo->skbuff);
@@ -1144,7 +1144,7 @@ hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg)
                                 set_hfcmode(hfc,
                                             (fifo->fifonum ==
                                              HFCUSB_B1_TX) ? 0 : 1,
-                                            (int) arg);
+                                            (long) arg);
                                 fifo->hif->l1l2(fifo->hif,
                                                 PH_ACTIVATE | INDICATION,
                                                 NULL);
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index 1d7cf3bd6aa3..881a4165cfb4 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -546,7 +546,7 @@ static inline void hdlc_xpr_irq(struct fritz_bcs *bcs)
         }
         bcs->tx_cnt = 0;
         bcs->tx_skb = NULL;
-        B_L1L2(bcs, PH_DATA | CONFIRM, (void *) skb->truesize);
+        B_L1L2(bcs, PH_DATA | CONFIRM, (void *)(unsigned long)skb->truesize);
         dev_kfree_skb_irq(skb);
 }
 
@@ -635,7 +635,7 @@ static void fritz_b_l2l1(struct hisax_if *ifc, int pr, void *arg)
                 hdlc_fill_fifo(bcs);
                 break;
         case PH_ACTIVATE | REQUEST:
-                mode = (int) arg;
+                mode = (long) arg;
                 DBG(4,"B%d,PH_ACTIVATE_REQUEST %d", bcs->channel + 1, mode);
                 modehdlc(bcs, mode);
                 B_L1L2(bcs, PH_ACTIVATE | INDICATION, NULL);
@@ -998,18 +998,15 @@ static int __init hisax_fcpcipnp_init(void)
 
         retval = pci_register_driver(&fcpci_driver);
         if (retval)
-                goto out;
+                return retval;
 #ifdef __ISAPNP__
         retval = pnp_register_driver(&fcpnp_driver);
-        if (retval < 0)
-                goto out_unregister_pci;
+        if (retval < 0) {
+                pci_unregister_driver(&fcpci_driver);
+                return retval;
+        }
 #endif
         return 0;
-
- out_unregister_pci:
-        pci_unregister_driver(&fcpci_driver);
- out:
-        return retval;
 }
 
 static void __exit hisax_fcpcipnp_exit(void)
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c
index 22fd5db18d48..aca2a3954b14 100644
--- a/drivers/isdn/hisax/st5481_b.c
+++ b/drivers/isdn/hisax/st5481_b.c
@@ -86,7 +86,7 @@ static void usb_b_out(struct st5481_bcs *bcs,int buf_nr)
                         if (!skb->len) {
                                 // Frame sent
                                 b_out->tx_skb = NULL;
-                                B_L1L2(bcs, PH_DATA | CONFIRM, (void *) skb->truesize);
+                                B_L1L2(bcs, PH_DATA | CONFIRM, (void *)(unsigned long) skb->truesize);
                                 dev_kfree_skb_any(skb);
 
 /*                              if (!(bcs->tx_skb = skb_dequeue(&bcs->sq))) { */
@@ -350,7 +350,7 @@ void st5481_b_l2l1(struct hisax_if *ifc, int pr, void *arg)
 {
         struct st5481_bcs *bcs = ifc->priv;
         struct sk_buff *skb = arg;
-        int mode;
+        long mode;
 
         DBG(4, "");
 
@@ -360,8 +360,8 @@ void st5481_b_l2l1(struct hisax_if *ifc, int pr, void *arg)
                 bcs->b_out.tx_skb = skb;
                 break;
         case PH_ACTIVATE | REQUEST:
-                mode = (int) arg;
-                DBG(4,"B%d,PH_ACTIVATE_REQUEST %d", bcs->channel + 1, mode);
+                mode = (long) arg;
+                DBG(4,"B%d,PH_ACTIVATE_REQUEST %ld", bcs->channel + 1, mode);
                 st5481B_mode(bcs, mode);
                 B_L1L2(bcs, PH_ACTIVATE | INDICATION, NULL);
                 break;
diff --git a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c
index 493dc94992e5..98adec440590 100644
--- a/drivers/isdn/hisax/st5481_d.c
+++ b/drivers/isdn/hisax/st5481_d.c
@@ -374,7 +374,7 @@ static void usb_d_out_complete(struct urb *urb, struct pt_regs *regs)
 {
         struct st5481_adapter *adapter = urb->context;
         struct st5481_d_out *d_out = &adapter->d_out;
-        int buf_nr;
+        long buf_nr;
         
         DBG(2, "");
 
@@ -546,7 +546,7 @@ static void dout_reseted(struct FsmInst *fsm, int event, void *arg)
 static void dout_complete(struct FsmInst *fsm, int event, void *arg)
 {
         struct st5481_adapter *adapter = fsm->userdata;
-        int buf_nr = (int) arg;
+        long buf_nr = (long) arg;
 
         usb_d_out(adapter, buf_nr);
 }
diff --git a/drivers/isdn/sc/command.c b/drivers/isdn/sc/command.c
index b4b24335f716..04b8a58f03b5 100644
--- a/drivers/isdn/sc/command.c
+++ b/drivers/isdn/sc/command.c
@@ -103,9 +103,6 @@ int command(isdn_ctrl *cmd)
                 return -ENODEV;
         }
 
-        pr_debug("%s: Received %s command from Link Layer\n",
-                sc_adapter[card]->devicename, commands[cmd->command]);
-
         /*
          * Dispatch the command
          */
@@ -118,7 +115,7 @@ int command(isdn_ctrl *cmd)
                 memcpy(&cmdptr, cmd->parm.num, sizeof(unsigned long));
                 if (copy_from_user(&ioc, (scs_ioctl __user *)cmdptr,
                                    sizeof(scs_ioctl))) {
-                        pr_debug("%s: Failed to verify user space 0x%x\n",
+                        pr_debug("%s: Failed to verify user space 0x%lx\n",
                                 sc_adapter[card]->devicename, cmdptr);
                         return -EFAULT;
                 }
@@ -195,7 +192,7 @@ static int dial(int card, unsigned long channel, setup_parm setup)
                                 strlen(Phone),
                                 (unsigned int *) Phone);
 
-        pr_debug("%s: Dialing %s on channel %d\n",
+        pr_debug("%s: Dialing %s on channel %lu\n",
                 sc_adapter[card]->devicename, Phone, channel+1);
         
         return status;
@@ -217,7 +214,7 @@ static int answer(int card, unsigned long channel)
         }
 
         indicate_status(card, ISDN_STAT_BCONN,channel,NULL);
-        pr_debug("%s: Answered incoming call on channel %s\n",
+        pr_debug("%s: Answered incoming call on channel %lu\n",
                 sc_adapter[card]->devicename, channel+1);
         return 0;
 }
@@ -240,7 +237,7 @@ static int hangup(int card, unsigned long channel)
                                                  (unsigned char) channel+1,
                                                  0,
                                                  NULL);
-        pr_debug("%s: Sent HANGUP message to channel %d\n",
+        pr_debug("%s: Sent HANGUP message to channel %lu\n",
                 sc_adapter[card]->devicename, channel+1);
         return status;
 }
@@ -260,9 +257,6 @@ static int setl2(int card, unsigned long arg)
         protocol = arg >> 8;
         channel = arg & 0xff;
         sc_adapter[card]->channel[channel].l2_proto = protocol;
-        pr_debug("%s: Level 2 protocol for channel %d set to %s from %d\n",
-                sc_adapter[card]->devicename, channel+1,
-                l2protos[sc_adapter[card]->channel[channel].l2_proto],protocol);
 
         /*
          * check that the adapter is also set to the correct protocol
@@ -293,8 +287,6 @@ static int setl3(int card, unsigned long channel)
         }
 
         sc_adapter[card]->channel[channel].l3_proto = protocol;
-        pr_debug("%s: Level 3 protocol for channel %d set to %s\n",
-                sc_adapter[card]->devicename, channel+1, l3protos[protocol]);
         return 0;
 }
 
@@ -311,7 +303,7 @@ static int acceptb(int card, unsigned long channel)
                 return -ENOBUFS;
         }
 
-        pr_debug("%s: B-Channel connection accepted on channel %d\n",
+        pr_debug("%s: B-Channel connection accepted on channel %lu\n",
                 sc_adapter[card]->devicename, channel+1);
         indicate_status(card, ISDN_STAT_BCONN, channel, NULL);
         return 0;
@@ -326,7 +318,7 @@ static int clreaz(int card, unsigned long arg)
 
         strcpy(sc_adapter[card]->channel[arg].eazlist, "");
         sc_adapter[card]->channel[arg].eazclear = 1;
-        pr_debug("%s: EAZ List cleared for channel %d\n",
+        pr_debug("%s: EAZ List cleared for channel %lu\n",
                 sc_adapter[card]->devicename, arg+1);
         return 0;
 }
@@ -340,7 +332,7 @@ static int seteaz(int card, unsigned long arg, char *num)
 
         strcpy(sc_adapter[card]->channel[arg].eazlist, num);
         sc_adapter[card]->channel[arg].eazclear = 0;
-        pr_debug("%s: EAZ list for channel %d set to: %s\n",
+        pr_debug("%s: EAZ list for channel %lu set to: %s\n",
                 sc_adapter[card]->devicename, arg+1,
                 sc_adapter[card]->channel[arg].eazlist);
         return 0;
diff --git a/drivers/isdn/sc/event.c b/drivers/isdn/sc/event.c
index 5b8c7c1a7663..57367325ef04 100644
--- a/drivers/isdn/sc/event.c
+++ b/drivers/isdn/sc/event.c
@@ -45,8 +45,10 @@ int indicate_status(int card, int event,ulong Channel,char *Data)
 {
         isdn_ctrl cmd;
 
+#ifdef DEBUG
         pr_debug("%s: Indicating event %s on Channel %d\n",
                 sc_adapter[card]->devicename, events[event-256], Channel);
+#endif
         if (Data != NULL){
                 pr_debug("%s: Event data: %s\n", sc_adapter[card]->devicename,
                         Data);
diff --git a/drivers/isdn/sc/interrupt.c b/drivers/isdn/sc/interrupt.c
index 8631d338d69a..ae6263125ac2 100644
--- a/drivers/isdn/sc/interrupt.c
+++ b/drivers/isdn/sc/interrupt.c
@@ -91,7 +91,7 @@ irqreturn_t interrupt_handler(int interrupt, void *cardptr, struct pt_regs *regs
                  */
                 if (IS_CE_MESSAGE(rcvmsg, Lnk, 1, Read))
                 {
-                        pr_debug("%s: Received packet 0x%x bytes long at 0x%x\n",
+                        pr_debug("%s: Received packet 0x%x bytes long at 0x%lx\n",
                                                 sc_adapter[card]->devicename,
                                                 rcvmsg.msg_data.response.msg_len,
                                                 rcvmsg.msg_data.response.buff_offset);
diff --git a/drivers/isdn/sc/timer.c b/drivers/isdn/sc/timer.c
index aced19aac5a2..f43282be0ada 100644
--- a/drivers/isdn/sc/timer.c
+++ b/drivers/isdn/sc/timer.c
@@ -76,7 +76,7 @@ void check_reset(unsigned long data)
                 if (sc_adapter[card]->StartOnReset)
                         startproc(card);
         } else  {
-                pr_debug("%s: No signature yet, waiting another %d jiffies.\n", 
+                pr_debug("%s: No signature yet, waiting another %lu jiffies.\n",
                         sc_adapter[card]->devicename, CHECKRESET_TIME);
                 mod_timer(&sc_adapter[card]->reset_timer, jiffies+CHECKRESET_TIME);
                 spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 80b89649e676..4f04fd0956a0 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -336,8 +336,10 @@ int __init find_via_pmu(void)
                         if (gaddr != OF_BAD_ADDR)
                                 gpio_reg = ioremap(gaddr, 0x10);
                 }
-                if (gpio_reg == NULL)
+                if (gpio_reg == NULL) {
                         printk(KERN_ERR "via-pmu: Can't find GPIO reg !\n");
+                        goto fail_gpio;
+                }
         } else
                 pmu_kind = PMU_UNKNOWN;
 
@@ -365,6 +367,9 @@ int __init find_via_pmu(void)
         return 1;
  fail:
         of_node_put(vias);
+        iounmap(gpio_reg);
+        gpio_reg = NULL;
+ fail_gpio:
         vias = NULL;
         return 0;
 }
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 6dd31a291d84..c92c1521546d 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -138,16 +138,16 @@ config MD_RAID456
           If unsure, say Y.
 
 config MD_RAID5_RESHAPE
-        bool "Support adding drives to a raid-5 array (experimental)"
-        depends on MD_RAID456 && EXPERIMENTAL
+        bool "Support adding drives to a raid-5 array"
+        depends on MD_RAID456
+        default y
         ---help---
           A RAID-5 set can be expanded by adding extra drives. This
           requires "restriping" the array which means (almost) every
           block must be written to a different place.
 
           This option allows such restriping to be done while the array
-          is online.  However it is still EXPERIMENTAL code.  It should
-          work, but please be sure that you have backups.
+          is online.
 
           You will need mdadm version 2.4.1 or later to use this
           feature safely.  During the early stage of reshape there is
@@ -164,6 +164,8 @@ config MD_RAID5_RESHAPE
           There should be enough spares already present to make the new
           array workable.
 
+          If unsure, say Y.
+
 config MD_MULTIPATH
         tristate "Multipath I/O support"
         depends on BLK_DEV_MD
@@ -201,6 +203,14 @@ config BLK_DEV_DM
 
           If unsure, say N.
 
+config DM_DEBUG
+        boolean "Device mapper debugging support"
+        depends on BLK_DEV_DM && EXPERIMENTAL
+        ---help---
+          Enable this for messages that may help debug device-mapper problems.
+
+          If unsure, say N.
+
 config DM_CRYPT
         tristate "Crypt target support"
         depends on BLK_DEV_DM && EXPERIMENTAL
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index ecc56765d949..8e67634e79a0 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -613,6 +613,7 @@ static inline unsigned long file_page_offset(unsigned long chunk)
 static inline struct page *filemap_get_page(struct bitmap *bitmap,
                                         unsigned long chunk)
 {
+        if (file_page_index(chunk) >= bitmap->file_pages) return NULL;
         return bitmap->filemap[file_page_index(chunk) - file_page_index(0)];
 }
 
@@ -739,6 +740,7 @@ static void bitmap_file_set_bit(struct bitmap *bitmap, sector_t block)
         }
 
         page = filemap_get_page(bitmap, chunk);
+        if (!page) return;
         bit = file_page_offset(chunk);
 
         /* set the bit */
@@ -1322,6 +1324,18 @@ static void bitmap_set_memory_bits(struct bitmap *bitmap, sector_t offset, int n
 
 }
 
+/* dirty the memory and file bits for bitmap chunks "s" to "e" */
+void bitmap_dirty_bits(struct bitmap *bitmap, unsigned long s, unsigned long e)
+{
+        unsigned long chunk;
+
+        for (chunk = s; chunk <= e; chunk++) {
+                sector_t sec = chunk << CHUNK_BLOCK_SHIFT(bitmap);
+                bitmap_set_memory_bits(bitmap, sec, 1);
+                bitmap_file_set_bit(bitmap, sec);
+        }
+}
+
 /*
  * flush out any pending updates
  */
@@ -1430,8 +1444,7 @@ int bitmap_create(mddev_t *mddev)
         if (err)
                 goto error;
 
-        bitmap->chunkshift = find_first_bit(&bitmap->chunksize,
-                                        sizeof(bitmap->chunksize));
+        bitmap->chunkshift = ffz(~bitmap->chunksize);
 
         /* now that chunksize and chunkshift are set, we can use these macros */
         chunks = (blocks + CHUNK_BLOCK_RATIO(bitmap) - 1) /
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index bdbd34993a80..655d816760e5 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2003 Christophe Saout <christophe@saout.de>
  * Copyright (C) 2004 Clemens Fruhwirth <clemens@endorphin.org>
+ * Copyright (C) 2006 Red Hat, Inc. All rights reserved.
  *
  * This file is released under the GPL.
  */
@@ -22,17 +23,19 @@
 #include "dm.h"
 
 #define DM_MSG_PREFIX "crypt"
+#define MESG_STR(x) x, sizeof(x)
 
 /*
  * per bio private data
  */
 struct crypt_io {
         struct dm_target *target;
-        struct bio *bio;
+        struct bio *base_bio;
         struct bio *first_clone;
         struct work_struct work;
         atomic_t pending;
         int error;
+        int post_process;
 };
 
 /*
@@ -63,6 +66,7 @@ struct crypt_iv_operations {
  * Crypt: maps a linear range of a block device
  * and encrypts / decrypts at the same time.
  */
+enum flags { DM_CRYPT_SUSPENDED, DM_CRYPT_KEY_VALID };
 struct crypt_config {
         struct dm_dev *dev;
         sector_t start;
@@ -73,6 +77,7 @@ struct crypt_config {
          */
         mempool_t *io_pool;
         mempool_t *page_pool;
+        struct bio_set *bs;
 
         /*
          * crypto related data
@@ -86,11 +91,12 @@ struct crypt_config {
         char cipher[CRYPTO_MAX_ALG_NAME];
         char chainmode[CRYPTO_MAX_ALG_NAME];
         struct crypto_blkcipher *tfm;
+        unsigned long flags;
         unsigned int key_size;
         u8 key[0];
 };
 
-#define MIN_IOS        256
+#define MIN_IOS        16
 #define MIN_POOL_PAGES 32
 #define MIN_BIO_PAGES  8
 
@@ -306,6 +312,14 @@ static int crypt_convert(struct crypt_config *cc,
         return r;
 }
 
+ static void dm_crypt_bio_destructor(struct bio *bio)
+ {
+        struct crypt_io *io = bio->bi_private;
+        struct crypt_config *cc = io->target->private;
+
+        bio_free(bio, cc->bs);
+ }
+
 /*
  * Generate a new unfragmented bio with the given size
  * This should never violate the device limitations
@@ -315,34 +329,33 @@ static struct bio *
 crypt_alloc_buffer(struct crypt_config *cc, unsigned int size,
                    struct bio *base_bio, unsigned int *bio_vec_idx)
 {
-        struct bio *bio;
+        struct bio *clone;
         unsigned int nr_iovecs = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
         gfp_t gfp_mask = GFP_NOIO | __GFP_HIGHMEM;
         unsigned int i;
 
-        /*
-         * Use __GFP_NOMEMALLOC to tell the VM to act less aggressively and
-         * to fail earlier.  This is not necessary but increases throughput.
-         * FIXME: Is this really intelligent?
-         */
-        if (base_bio)
-                bio = bio_clone(base_bio, GFP_NOIO|__GFP_NOMEMALLOC);
-        else
-                bio = bio_alloc(GFP_NOIO|__GFP_NOMEMALLOC, nr_iovecs);
-        if (!bio)
+        if (base_bio) {
+                clone = bio_alloc_bioset(GFP_NOIO, base_bio->bi_max_vecs, cc->bs);
+                __bio_clone(clone, base_bio);
+        } else
+                clone = bio_alloc_bioset(GFP_NOIO, nr_iovecs, cc->bs);
+
+        if (!clone)
                 return NULL;
 
+        clone->bi_destructor = dm_crypt_bio_destructor;
+
         /* if the last bio was not complete, continue where that one ended */
-        bio->bi_idx = *bio_vec_idx;
-        bio->bi_vcnt = *bio_vec_idx;
-        bio->bi_size = 0;
-        bio->bi_flags &= ~(1 << BIO_SEG_VALID);
+        clone->bi_idx = *bio_vec_idx;
+        clone->bi_vcnt = *bio_vec_idx;
+        clone->bi_size = 0;
+        clone->bi_flags &= ~(1 << BIO_SEG_VALID);
 
-        /* bio->bi_idx pages have already been allocated */
-        size -= bio->bi_idx * PAGE_SIZE;
+        /* clone->bi_idx pages have already been allocated */
+        size -= clone->bi_idx * PAGE_SIZE;
 
-        for(i = bio->bi_idx; i < nr_iovecs; i++) {
-                struct bio_vec *bv = bio_iovec_idx(bio, i);
+        for (i = clone->bi_idx; i < nr_iovecs; i++) {
+                struct bio_vec *bv = bio_iovec_idx(clone, i);
 
                 bv->bv_page = mempool_alloc(cc->page_pool, gfp_mask);
                 if (!bv->bv_page)
@@ -353,7 +366,7 @@ crypt_alloc_buffer(struct crypt_config *cc, unsigned int size,
                  * return a partially allocated bio, the caller will then try
                  * to allocate additional bios while submitting this partial bio
                  */
-                if ((i - bio->bi_idx) == (MIN_BIO_PAGES - 1))
+                if ((i - clone->bi_idx) == (MIN_BIO_PAGES - 1))
                         gfp_mask = (gfp_mask | __GFP_NOWARN) & ~__GFP_WAIT;
 
                 bv->bv_offset = 0;
@@ -362,13 +375,13 @@ crypt_alloc_buffer(struct crypt_config *cc, unsigned int size,
                 else
                         bv->bv_len = size;
 
-                bio->bi_size += bv->bv_len;
-                bio->bi_vcnt++;
+                clone->bi_size += bv->bv_len;
+                clone->bi_vcnt++;
                 size -= bv->bv_len;
         }
 
-        if (!bio->bi_size) {
-                bio_put(bio);
+        if (!clone->bi_size) {
+                bio_put(clone);
                 return NULL;
         }
 
@@ -376,13 +389,13 @@ crypt_alloc_buffer(struct crypt_config *cc, unsigned int size,
          * Remember the last bio_vec allocated to be able
          * to correctly continue after the splitting.
          */
-        *bio_vec_idx = bio->bi_vcnt;
+        *bio_vec_idx = clone->bi_vcnt;
 
-        return bio;
+        return clone;
 }
 
 static void crypt_free_buffer_pages(struct crypt_config *cc,
-                                    struct bio *bio, unsigned int bytes)
+                                    struct bio *clone, unsigned int bytes)
 {
         unsigned int i, start, end;
         struct bio_vec *bv;
@@ -396,19 +409,19 @@ static void crypt_free_buffer_pages(struct crypt_config *cc,
          * A fix to the bi_idx issue in the kernel is in the works, so
          * we will hopefully be able to revert to the cleaner solution soon.
          */
-        i = bio->bi_vcnt - 1;
-        bv = bio_iovec_idx(bio, i);
-        end = (i << PAGE_SHIFT) + (bv->bv_offset + bv->bv_len) - bio->bi_size;
+        i = clone->bi_vcnt - 1;
+        bv = bio_iovec_idx(clone, i);
+        end = (i << PAGE_SHIFT) + (bv->bv_offset + bv->bv_len) - clone->bi_size;
         start = end - bytes;
 
         start >>= PAGE_SHIFT;
-        if (!bio->bi_size)
-                end = bio->bi_vcnt;
+        if (!clone->bi_size)
+                end = clone->bi_vcnt;
         else
                 end >>= PAGE_SHIFT;
 
-        for(i = start; i < end; i++) {
-                bv = bio_iovec_idx(bio, i);
+        for (i = start; i < end; i++) {
+                bv = bio_iovec_idx(clone, i);
                 BUG_ON(!bv->bv_page);
                 mempool_free(bv->bv_page, cc->page_pool);
                 bv->bv_page = NULL;
@@ -432,7 +445,7 @@ static void dec_pending(struct crypt_io *io, int error)
         if (io->first_clone)
                 bio_put(io->first_clone);
 
-        bio_endio(io->bio, io->bio->bi_size, io->error);
+        bio_endio(io->base_bio, io->base_bio->bi_size, io->error);
 
         mempool_free(io, cc->io_pool);
 }
@@ -441,29 +454,179 @@ static void dec_pending(struct crypt_io *io, int error)
  * kcryptd:
  *
  * Needed because it would be very unwise to do decryption in an
- * interrupt context, so bios returning from read requests get
- * queued here.
+ * interrupt context.
  */
 static struct workqueue_struct *_kcryptd_workqueue;
+static void kcryptd_do_work(void *data);
 
-static void kcryptd_do_work(void *data)
+static void kcryptd_queue_io(struct crypt_io *io)
 {
-        struct crypt_io *io = (struct crypt_io *) data;
-        struct crypt_config *cc = (struct crypt_config *) io->target->private;
+        INIT_WORK(&io->work, kcryptd_do_work, io);
+        queue_work(_kcryptd_workqueue, &io->work);
+}
+
+static int crypt_endio(struct bio *clone, unsigned int done, int error)
+{
+        struct crypt_io *io = clone->bi_private;
+        struct crypt_config *cc = io->target->private;
+        unsigned read_io = bio_data_dir(clone) == READ;
+
+        /*
+         * free the processed pages, even if
+         * it's only a partially completed write
+         */
+        if (!read_io)
+                crypt_free_buffer_pages(cc, clone, done);
+
+        /* keep going - not finished yet */
+        if (unlikely(clone->bi_size))
+                return 1;
+
+        if (!read_io)
+                goto out;
+
+        if (unlikely(!bio_flagged(clone, BIO_UPTODATE))) {
+                error = -EIO;
+                goto out;
+        }
+
+        bio_put(clone);
+        io->post_process = 1;
+        kcryptd_queue_io(io);
+        return 0;
+
+out:
+        bio_put(clone);
+        dec_pending(io, error);
+        return error;
+}
+
+static void clone_init(struct crypt_io *io, struct bio *clone)
+{
+        struct crypt_config *cc = io->target->private;
+
+        clone->bi_private = io;
+        clone->bi_end_io  = crypt_endio;
+        clone->bi_bdev    = cc->dev->bdev;
+        clone->bi_rw      = io->base_bio->bi_rw;
+}
+
+static void process_read(struct crypt_io *io)
+{
+        struct crypt_config *cc = io->target->private;
+        struct bio *base_bio = io->base_bio;
+        struct bio *clone;
+        sector_t sector = base_bio->bi_sector - io->target->begin;
+
+        atomic_inc(&io->pending);
+
+        /*
+         * The block layer might modify the bvec array, so always
+         * copy the required bvecs because we need the original
+         * one in order to decrypt the whole bio data *afterwards*.
+         */
+        clone = bio_alloc_bioset(GFP_NOIO, bio_segments(base_bio), cc->bs);
+        if (unlikely(!clone)) {
+                dec_pending(io, -ENOMEM);
+                return;
+        }
+
+        clone_init(io, clone);
+        clone->bi_destructor = dm_crypt_bio_destructor;
+        clone->bi_idx = 0;
+        clone->bi_vcnt = bio_segments(base_bio);
+        clone->bi_size = base_bio->bi_size;
+        clone->bi_sector = cc->start + sector;
+        memcpy(clone->bi_io_vec, bio_iovec(base_bio),
+               sizeof(struct bio_vec) * clone->bi_vcnt);
+
+        generic_make_request(clone);
+}
+
+static void process_write(struct crypt_io *io)
+{
+        struct crypt_config *cc = io->target->private;
+        struct bio *base_bio = io->base_bio;
+        struct bio *clone;
         struct convert_context ctx;
-        int r;
+        unsigned remaining = base_bio->bi_size;
+        sector_t sector = base_bio->bi_sector - io->target->begin;
+        unsigned bvec_idx = 0;
+
+        atomic_inc(&io->pending);
+
+        crypt_convert_init(cc, &ctx, NULL, base_bio, sector, 1);
+
+        /*
+         * The allocated buffers can be smaller than the whole bio,
+         * so repeat the whole process until all the data can be handled.
+         */
+        while (remaining) {
+                clone = crypt_alloc_buffer(cc, base_bio->bi_size,
+                                           io->first_clone, &bvec_idx);
+                if (unlikely(!clone)) {
+                        dec_pending(io, -ENOMEM);
+                        return;
+                }
+
+                ctx.bio_out = clone;
+
+                if (unlikely(crypt_convert(cc, &ctx) < 0)) {
+                        crypt_free_buffer_pages(cc, clone, clone->bi_size);
+                        bio_put(clone);
+                        dec_pending(io, -EIO);
+                        return;
+                }
+
+                clone_init(io, clone);
+                clone->bi_sector = cc->start + sector;
+
+                if (!io->first_clone) {
+                        /*
+                         * hold a reference to the first clone, because it
+                         * holds the bio_vec array and that can't be freed
+                         * before all other clones are released
+                         */
+                        bio_get(clone);
+                        io->first_clone = clone;
+                }
+
+                remaining -= clone->bi_size;
+                sector += bio_sectors(clone);
+
+                /* prevent bio_put of first_clone */
+                if (remaining)
+                        atomic_inc(&io->pending);
 
-        crypt_convert_init(cc, &ctx, io->bio, io->bio,
-                           io->bio->bi_sector - io->target->begin, 0);
-        r = crypt_convert(cc, &ctx);
+                generic_make_request(clone);
 
-        dec_pending(io, r);
+                /* out of memory -> run queues */
+                if (remaining)
+                        blk_congestion_wait(bio_data_dir(clone), HZ/100);
+        }
 }
 
-static void kcryptd_queue_io(struct crypt_io *io)
+static void process_read_endio(struct crypt_io *io)
 {
-        INIT_WORK(&io->work, kcryptd_do_work, io);
-        queue_work(_kcryptd_workqueue, &io->work);
+        struct crypt_config *cc = io->target->private;
+        struct convert_context ctx;
+
+        crypt_convert_init(cc, &ctx, io->base_bio, io->base_bio,
+                           io->base_bio->bi_sector - io->target->begin, 0);
+
+        dec_pending(io, crypt_convert(cc, &ctx));
+}
+
+static void kcryptd_do_work(void *data)
+{
+        struct crypt_io *io = data;
+
+        if (io->post_process)
+                process_read_endio(io);
+        else if (bio_data_dir(io->base_bio) == READ)
+                process_read(io);
+        else
+                process_write(io);
 }
 
 /*
@@ -477,7 +640,7 @@ static int crypt_decode_key(u8 *key, char *hex, unsigned int size)
 
         buffer[2] = '\0';
 
-        for(i = 0; i < size; i++) {
+        for (i = 0; i < size; i++) {
                 buffer[0] = *hex++;
                 buffer[1] = *hex++;
 
@@ -500,13 +663,38 @@ static void crypt_encode_key(char *hex, u8 *key, unsigned int size)
 {
         unsigned int i;
 
-        for(i = 0; i < size; i++) {
+        for (i = 0; i < size; i++) {
                 sprintf(hex, "%02x", *key);
                 hex += 2;
                 key++;
         }
 }
 
+static int crypt_set_key(struct crypt_config *cc, char *key)
+{
+        unsigned key_size = strlen(key) >> 1;
+
+        if (cc->key_size && cc->key_size != key_size)
+                return -EINVAL;
+
+        cc->key_size = key_size; /* initial settings */
+
+        if ((!key_size && strcmp(key, "-")) ||
+            (key_size && crypt_decode_key(cc->key, key, key_size) < 0))
+                return -EINVAL;
+
+        set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
+
+        return 0;
+}
+
+static int crypt_wipe_key(struct crypt_config *cc)
+{
+        clear_bit(DM_CRYPT_KEY_VALID, &cc->flags);
+        memset(&cc->key, 0, cc->key_size * sizeof(u8));
+        return 0;
+}
+
 /*
  * Construct an encryption mapping:
  * <cipher> <key> <iv_offset> <dev_path> <start>
@@ -539,16 +727,14 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         key_size = strlen(argv[1]) >> 1;
 
-        cc = kmalloc(sizeof(*cc) + key_size * sizeof(u8), GFP_KERNEL);
+        cc = kzalloc(sizeof(*cc) + key_size * sizeof(u8), GFP_KERNEL);
         if (cc == NULL) {
                 ti->error =
                         "Cannot allocate transparent encryption context";
                 return -ENOMEM;
         }
 
-        cc->key_size = key_size;
-        if ((!key_size && strcmp(argv[1], "-") != 0) ||
-            (key_size && crypt_decode_key(cc->key, argv[1], key_size) < 0)) {
+        if (crypt_set_key(cc, argv[1])) {
                 ti->error = "Error decoding key";
                 goto bad1;
         }
@@ -626,6 +812,12 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad4;
         }
 
+        cc->bs = bioset_create(MIN_IOS, MIN_IOS, 4);
+        if (!cc->bs) {
+                ti->error = "Cannot allocate crypt bioset";
+                goto bad_bs;
+        }
+
         if (crypto_blkcipher_setkey(tfm, cc->key, key_size) < 0) {
                 ti->error = "Error setting key";
                 goto bad5;
@@ -665,6 +857,8 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         return 0;
 
 bad5:
+        bioset_free(cc->bs);
+bad_bs:
         mempool_destroy(cc->page_pool);
 bad4:
         mempool_destroy(cc->io_pool);
@@ -684,6 +878,7 @@ static void crypt_dtr(struct dm_target *ti)
 {
         struct crypt_config *cc = (struct crypt_config *) ti->private;
 
+        bioset_free(cc->bs);
         mempool_destroy(cc->page_pool);
         mempool_destroy(cc->io_pool);
 
@@ -698,147 +893,21 @@ static void crypt_dtr(struct dm_target *ti)
         kfree(cc);
 }
 
-static int crypt_endio(struct bio *bio, unsigned int done, int error)
-{
-        struct crypt_io *io = (struct crypt_io *) bio->bi_private;
-        struct crypt_config *cc = (struct crypt_config *) io->target->private;
-
-        if (bio_data_dir(bio) == WRITE) {
-                /*
-                 * free the processed pages, even if
-                 * it's only a partially completed write
-                 */
-                crypt_free_buffer_pages(cc, bio, done);
-        }
-
-        if (bio->bi_size)
-                return 1;
-
-        bio_put(bio);
-
-        /*
-         * successful reads are decrypted by the worker thread
-         */
-        if ((bio_data_dir(bio) == READ)
-            && bio_flagged(bio, BIO_UPTODATE)) {
-                kcryptd_queue_io(io);
-                return 0;
-        }
-
-        dec_pending(io, error);
-        return error;
-}
-
-static inline struct bio *
-crypt_clone(struct crypt_config *cc, struct crypt_io *io, struct bio *bio,
-            sector_t sector, unsigned int *bvec_idx,
-            struct convert_context *ctx)
-{
-        struct bio *clone;
-
-        if (bio_data_dir(bio) == WRITE) {
-                clone = crypt_alloc_buffer(cc, bio->bi_size,
-                                 io->first_clone, bvec_idx);
-                if (clone) {
-                        ctx->bio_out = clone;
-                        if (crypt_convert(cc, ctx) < 0) {
-                                crypt_free_buffer_pages(cc, clone,
-                                                        clone->bi_size);
-                                bio_put(clone);
-                                return NULL;
-                        }
-                }
-        } else {
-                /*
-                 * The block layer might modify the bvec array, so always
-                 * copy the required bvecs because we need the original
-                 * one in order to decrypt the whole bio data *afterwards*.
-                 */
-                clone = bio_alloc(GFP_NOIO, bio_segments(bio));
-                if (clone) {
-                        clone->bi_idx = 0;
-                        clone->bi_vcnt = bio_segments(bio);
-                        clone->bi_size = bio->bi_size;
-                        memcpy(clone->bi_io_vec, bio_iovec(bio),
-                               sizeof(struct bio_vec) * clone->bi_vcnt);
-                }
-        }
-
-        if (!clone)
-                return NULL;
-
-        clone->bi_private = io;
-        clone->bi_end_io = crypt_endio;
-        clone->bi_bdev = cc->dev->bdev;
-        clone->bi_sector = cc->start + sector;
-        clone->bi_rw = bio->bi_rw;
-
-        return clone;
-}
-
 static int crypt_map(struct dm_target *ti, struct bio *bio,
                      union map_info *map_context)
 {
-        struct crypt_config *cc = (struct crypt_config *) ti->private;
-        struct crypt_io *io = mempool_alloc(cc->io_pool, GFP_NOIO);
-        struct convert_context ctx;
-        struct bio *clone;
-        unsigned int remaining = bio->bi_size;
-        sector_t sector = bio->bi_sector - ti->begin;
-        unsigned int bvec_idx = 0;
+        struct crypt_config *cc = ti->private;
+        struct crypt_io *io;
 
+        io = mempool_alloc(cc->io_pool, GFP_NOIO);
         io->target = ti;
-        io->bio = bio;
+        io->base_bio = bio;
         io->first_clone = NULL;
-        io->error = 0;
-        atomic_set(&io->pending, 1); /* hold a reference */
-
-        if (bio_data_dir(bio) == WRITE)
-                crypt_convert_init(cc, &ctx, NULL, bio, sector, 1);
-
-        /*
-         * The allocated buffers can be smaller than the whole bio,
-         * so repeat the whole process until all the data can be handled.
-         */
-        while (remaining) {
-                clone = crypt_clone(cc, io, bio, sector, &bvec_idx, &ctx);
-                if (!clone)
-                        goto cleanup;
-
-                if (!io->first_clone) {
-                        /*
-                         * hold a reference to the first clone, because it
-                         * holds the bio_vec array and that can't be freed
-                         * before all other clones are released
-                         */
-                        bio_get(clone);
-                        io->first_clone = clone;
-                }
-                atomic_inc(&io->pending);
+        io->error = io->post_process = 0;
+        atomic_set(&io->pending, 0);
+        kcryptd_queue_io(io);
 
-                remaining -= clone->bi_size;
-                sector += bio_sectors(clone);
-
-                generic_make_request(clone);
-
-                /* out of memory -> run queues */
-                if (remaining)
-                        blk_congestion_wait(bio_data_dir(clone), HZ/100);
-        }
-
-        /* drop reference, clones could have returned before we reach this */
-        dec_pending(io, 0);
         return 0;
-
-cleanup:
-        if (io->first_clone) {
-                dec_pending(io, -ENOMEM);
-                return 0;
-        }
-
-        /* if no bio has been dispatched yet, we can directly return the error */
-        mempool_free(io, cc->io_pool);
-        return -ENOMEM;
 }
 
 static int crypt_status(struct dm_target *ti, status_type_t type,
@@ -883,14 +952,71 @@ static int crypt_status(struct dm_target *ti, status_type_t type,
         return 0;
 }
 
+static void crypt_postsuspend(struct dm_target *ti)
+{
+        struct crypt_config *cc = ti->private;
+
+        set_bit(DM_CRYPT_SUSPENDED, &cc->flags);
+}
+
+static int crypt_preresume(struct dm_target *ti)
+{
+        struct crypt_config *cc = ti->private;
+
+        if (!test_bit(DM_CRYPT_KEY_VALID, &cc->flags)) {
+                DMERR("aborting resume - crypt key is not set.");
+                return -EAGAIN;
+        }
+
+        return 0;
+}
+
+static void crypt_resume(struct dm_target *ti)
+{
+        struct crypt_config *cc = ti->private;
+
+        clear_bit(DM_CRYPT_SUSPENDED, &cc->flags);
+}
+
+/* Message interface
+ *      key set <key>
+ *      key wipe
+ */
+static int crypt_message(struct dm_target *ti, unsigned argc, char **argv)
+{
+        struct crypt_config *cc = ti->private;
+
+        if (argc < 2)
+                goto error;
+
+        if (!strnicmp(argv[0], MESG_STR("key"))) {
+                if (!test_bit(DM_CRYPT_SUSPENDED, &cc->flags)) {
+                        DMWARN("not suspended during key manipulation.");
+                        return -EINVAL;
+                }
+                if (argc == 3 && !strnicmp(argv[1], MESG_STR("set")))
+                        return crypt_set_key(cc, argv[2]);
+                if (argc == 2 && !strnicmp(argv[1], MESG_STR("wipe")))
+                        return crypt_wipe_key(cc);
+        }
+
+error:
+        DMWARN("unrecognised message received.");
+        return -EINVAL;
+}
+
 static struct target_type crypt_target = {
         .name   = "crypt",
-        .version= {1, 1, 0},
+        .version= {1, 3, 0},
         .module = THIS_MODULE,
         .ctr    = crypt_ctr,
         .dtr    = crypt_dtr,
         .map    = crypt_map,
         .status = crypt_status,
+        .postsuspend = crypt_postsuspend,
+        .preresume = crypt_preresume,
+        .resume = crypt_resume,
+        .message = crypt_message,
 };
 
 static int __init dm_crypt_init(void)
diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c
index d12379b5cdb5..99cdffa7fbfe 100644
--- a/drivers/md/dm-exception-store.c
+++ b/drivers/md/dm-exception-store.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 
 #define DM_MSG_PREFIX "snapshots"
+#define DM_CHUNK_SIZE_DEFAULT_SECTORS 32        /* 16KB */
 
 /*-----------------------------------------------------------------
  * Persistent snapshots, by persistent we mean that the snapshot
@@ -150,6 +151,7 @@ static int alloc_area(struct pstore *ps)
 static void free_area(struct pstore *ps)
 {
         vfree(ps->area);
+        ps->area = NULL;
 }
 
 /*
@@ -198,48 +200,79 @@ static int read_header(struct pstore *ps, int *new_snapshot)
         int r;
         struct disk_header *dh;
         chunk_t chunk_size;
+        int chunk_size_supplied = 1;
 
-        r = chunk_io(ps, 0, READ);
+        /*
+         * Use default chunk size (or hardsect_size, if larger) if none supplied
+         */
+        if (!ps->snap->chunk_size) {
+                ps->snap->chunk_size = max(DM_CHUNK_SIZE_DEFAULT_SECTORS,
+                    bdev_hardsect_size(ps->snap->cow->bdev) >> 9);
+                ps->snap->chunk_mask = ps->snap->chunk_size - 1;
+                ps->snap->chunk_shift = ffs(ps->snap->chunk_size) - 1;
+                chunk_size_supplied = 0;
+        }
+
+        r = dm_io_get(sectors_to_pages(ps->snap->chunk_size));
         if (r)
                 return r;
 
+        r = alloc_area(ps);
+        if (r)
+                goto bad1;
+
+        r = chunk_io(ps, 0, READ);
+        if (r)
+                goto bad2;
+
         dh = (struct disk_header *) ps->area;
 
         if (le32_to_cpu(dh->magic) == 0) {
                 *new_snapshot = 1;
+                return 0;
+        }
 
-        } else if (le32_to_cpu(dh->magic) == SNAP_MAGIC) {
-                *new_snapshot = 0;
-                ps->valid = le32_to_cpu(dh->valid);
-                ps->version = le32_to_cpu(dh->version);
-                chunk_size = le32_to_cpu(dh->chunk_size);
-                if (ps->snap->chunk_size != chunk_size) {
-                        DMWARN("chunk size %llu in device metadata overrides "
-                               "table chunk size of %llu.",
-                               (unsigned long long)chunk_size,
-                               (unsigned long long)ps->snap->chunk_size);
-
-                        /* We had a bogus chunk_size. Fix stuff up. */
-                        dm_io_put(sectors_to_pages(ps->snap->chunk_size));
-                        free_area(ps);
-
-                        ps->snap->chunk_size = chunk_size;
-                        ps->snap->chunk_mask = chunk_size - 1;
-                        ps->snap->chunk_shift = ffs(chunk_size) - 1;
-
-                        r = alloc_area(ps);
-                        if (r)
-                                return r;
-
-                        r = dm_io_get(sectors_to_pages(chunk_size));
-                        if (r)
-                                return r;
-                }
-        } else {
-                DMWARN("Invalid/corrupt snapshot");
+        if (le32_to_cpu(dh->magic) != SNAP_MAGIC) {
+                DMWARN("Invalid or corrupt snapshot");
                 r = -ENXIO;
+                goto bad2;
         }
 
+        *new_snapshot = 0;
+        ps->valid = le32_to_cpu(dh->valid);
+        ps->version = le32_to_cpu(dh->version);
+        chunk_size = le32_to_cpu(dh->chunk_size);
+
+        if (!chunk_size_supplied || ps->snap->chunk_size == chunk_size)
+                return 0;
+
+        DMWARN("chunk size %llu in device metadata overrides "
+               "table chunk size of %llu.",
+               (unsigned long long)chunk_size,
+               (unsigned long long)ps->snap->chunk_size);
+
+        /* We had a bogus chunk_size. Fix stuff up. */
+        dm_io_put(sectors_to_pages(ps->snap->chunk_size));
+        free_area(ps);
+
+        ps->snap->chunk_size = chunk_size;
+        ps->snap->chunk_mask = chunk_size - 1;
+        ps->snap->chunk_shift = ffs(chunk_size) - 1;
+
+        r = dm_io_get(sectors_to_pages(chunk_size));
+        if (r)
+                return r;
+
+        r = alloc_area(ps);
+        if (r)
+                goto bad1;
+
+        return 0;
+
+bad2:
+        free_area(ps);
+bad1:
+        dm_io_put(sectors_to_pages(ps->snap->chunk_size));
         return r;
 }
 
@@ -263,42 +296,29 @@ static int write_header(struct pstore *ps)
  */
 static struct disk_exception *get_exception(struct pstore *ps, uint32_t index)
 {
-        if (index >= ps->exceptions_per_area)
-                return NULL;
+        BUG_ON(index >= ps->exceptions_per_area);
 
         return ((struct disk_exception *) ps->area) + index;
 }
 
-static int read_exception(struct pstore *ps,
-                          uint32_t index, struct disk_exception *result)
+static void read_exception(struct pstore *ps,
+                           uint32_t index, struct disk_exception *result)
 {
-        struct disk_exception *e;
-
-        e = get_exception(ps, index);
-        if (!e)
-                return -EINVAL;
+        struct disk_exception *e = get_exception(ps, index);
 
         /* copy it */
         result->old_chunk = le64_to_cpu(e->old_chunk);
         result->new_chunk = le64_to_cpu(e->new_chunk);
-
-        return 0;
 }
 
-static int write_exception(struct pstore *ps,
-                           uint32_t index, struct disk_exception *de)
+static void write_exception(struct pstore *ps,
+                            uint32_t index, struct disk_exception *de)
 {
-        struct disk_exception *e;
-
-        e = get_exception(ps, index);
-        if (!e)
-                return -EINVAL;
+        struct disk_exception *e = get_exception(ps, index);
 
         /* copy it */
         e->old_chunk = cpu_to_le64(de->old_chunk);
         e->new_chunk = cpu_to_le64(de->new_chunk);
-
-        return 0;
 }
 
 /*
@@ -316,10 +336,7 @@ static int insert_exceptions(struct pstore *ps, int *full)
         *full = 1;
 
         for (i = 0; i < ps->exceptions_per_area; i++) {
-                r = read_exception(ps, i, &de);
-
-                if (r)
-                        return r;
+                read_exception(ps, i, &de);
 
                 /*
                  * If the new_chunk is pointing at the start of
@@ -519,6 +536,16 @@ static void persistent_commit(struct exception_store *store,
                 if (r)
                         ps->valid = 0;
 
+                /*
+                 * Have we completely filled the current area ?
+                 */
+                if (ps->current_committed == ps->exceptions_per_area) {
+                        ps->current_committed = 0;
+                        r = zero_area(ps, ps->current_area + 1);
+                        if (r)
+                                ps->valid = 0;
+                }
+
                 for (i = 0; i < ps->callback_count; i++) {
                         cb = ps->callbacks + i;
                         cb->callback(cb->context, r == 0 ? 1 : 0);
@@ -526,16 +553,6 @@ static void persistent_commit(struct exception_store *store,
 
                 ps->callback_count = 0;
         }
-
-        /*
-         * Have we completely filled the current area ?
-         */
-        if (ps->current_committed == ps->exceptions_per_area) {
-                ps->current_committed = 0;
-                r = zero_area(ps, ps->current_area + 1);
-                if (r)
-                        ps->valid = 0;
-        }
 }
 
 static void persistent_drop(struct exception_store *store)
@@ -547,32 +564,22 @@ static void persistent_drop(struct exception_store *store)
                 DMWARN("write header failed");
 }
 
-int dm_create_persistent(struct exception_store *store, uint32_t chunk_size)
+int dm_create_persistent(struct exception_store *store)
 {
-        int r;
         struct pstore *ps;
 
-        r = dm_io_get(sectors_to_pages(chunk_size));
-        if (r)
-                return r;
-
         /* allocate the pstore */
         ps = kmalloc(sizeof(*ps), GFP_KERNEL);
-        if (!ps) {
-                r = -ENOMEM;
-                goto bad;
-        }
+        if (!ps)
+                return -ENOMEM;
 
         ps->snap = store->snap;
         ps->valid = 1;
         ps->version = SNAPSHOT_DISK_VERSION;
+        ps->area = NULL;
         ps->next_free = 2;      /* skipping the header and first area */
         ps->current_committed = 0;
 
-        r = alloc_area(ps);
-        if (r)
-                goto bad;
-
         ps->callback_count = 0;
         atomic_set(&ps->pending_count, 0);
         ps->callbacks = NULL;
@@ -586,13 +593,6 @@ int dm_create_persistent(struct exception_store *store, uint32_t chunk_size)
         store->context = ps;
 
         return 0;
-
-      bad:
-        dm_io_put(sectors_to_pages(chunk_size));
-        if (ps && ps->area)
-                free_area(ps);
-        kfree(ps);
-        return r;
 }
 
 /*-----------------------------------------------------------------
@@ -642,18 +642,16 @@ static void transient_fraction_full(struct exception_store *store,
         *denominator = get_dev_size(store->snap->cow->bdev);
 }
 
-int dm_create_transient(struct exception_store *store,
-                        struct dm_snapshot *s, int blocksize)
+int dm_create_transient(struct exception_store *store)
 {
         struct transient_c *tc;
 
-        memset(store, 0, sizeof(*store));
         store->destroy = transient_destroy;
         store->read_metadata = transient_read_metadata;
         store->prepare_exception = transient_prepare;
         store->commit_exception = transient_commit;
+        store->drop_snapshot = NULL;
         store->fraction_full = transient_fraction_full;
-        store->snap = s;
 
         tc = kmalloc(sizeof(struct transient_c), GFP_KERNEL);
         if (!tc)
diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index 47b3c62bbdb8..00234909b3db 100644
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -98,14 +98,31 @@ static int linear_status(struct dm_target *ti, status_type_t type,
         return 0;
 }
 
+static int linear_ioctl(struct dm_target *ti, struct inode *inode,
+                        struct file *filp, unsigned int cmd,
+                        unsigned long arg)
+{
+        struct linear_c *lc = (struct linear_c *) ti->private;
+        struct block_device *bdev = lc->dev->bdev;
+        struct file fake_file = {};
+        struct dentry fake_dentry = {};
+
+        fake_file.f_mode = lc->dev->mode;
+        fake_file.f_dentry = &fake_dentry;
+        fake_dentry.d_inode = bdev->bd_inode;
+
+        return blkdev_driver_ioctl(bdev->bd_inode, &fake_file, bdev->bd_disk, cmd, arg);
+}
+
 static struct target_type linear_target = {
         .name   = "linear",
-        .version= {1, 0, 1},
+        .version= {1, 0, 2},
         .module = THIS_MODULE,
         .ctr    = linear_ctr,
         .dtr    = linear_dtr,
         .map    = linear_map,
         .status = linear_status,
+        .ioctl  = linear_ioctl,
 };
 
 int __init dm_linear_init(void)
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 93f701ea87bc..d754e0bc6e90 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -114,12 +114,10 @@ static void trigger_event(void *data);
 
 static struct pgpath *alloc_pgpath(void)
 {
-        struct pgpath *pgpath = kmalloc(sizeof(*pgpath), GFP_KERNEL);
+        struct pgpath *pgpath = kzalloc(sizeof(*pgpath), GFP_KERNEL);
 
-        if (pgpath) {
-                memset(pgpath, 0, sizeof(*pgpath));
+        if (pgpath)
                 pgpath->path.is_active = 1;
-        }
 
         return pgpath;
 }
@@ -133,12 +131,10 @@ static struct priority_group *alloc_priority_group(void)
 {
         struct priority_group *pg;
 
-        pg = kmalloc(sizeof(*pg), GFP_KERNEL);
-        if (!pg)
-                return NULL;
+        pg = kzalloc(sizeof(*pg), GFP_KERNEL);
 
-        memset(pg, 0, sizeof(*pg));
-        INIT_LIST_HEAD(&pg->pgpaths);
+        if (pg)
+                INIT_LIST_HEAD(&pg->pgpaths);
 
         return pg;
 }
@@ -168,13 +164,12 @@ static void free_priority_group(struct priority_group *pg,
         kfree(pg);
 }
 
-static struct multipath *alloc_multipath(void)
+static struct multipath *alloc_multipath(struct dm_target *ti)
 {
         struct multipath *m;
 
-        m = kmalloc(sizeof(*m), GFP_KERNEL);
+        m = kzalloc(sizeof(*m), GFP_KERNEL);
         if (m) {
-                memset(m, 0, sizeof(*m));
                 INIT_LIST_HEAD(&m->priority_groups);
                 spin_lock_init(&m->lock);
                 m->queue_io = 1;
@@ -185,6 +180,8 @@ static struct multipath *alloc_multipath(void)
                         kfree(m);
                         return NULL;
                 }
+                m->ti = ti;
+                ti->private = m;
         }
 
         return m;
@@ -557,8 +554,7 @@ static struct pgpath *parse_path(struct arg_set *as, struct path_selector *ps,
 }
 
 static struct priority_group *parse_priority_group(struct arg_set *as,
-                                                   struct multipath *m,
-                                                   struct dm_target *ti)
+                                                   struct multipath *m)
 {
         static struct param _params[] = {
                 {1, 1024, "invalid number of paths"},
@@ -568,6 +564,7 @@ static struct priority_group *parse_priority_group(struct arg_set *as,
         int r;
         unsigned i, nr_selector_args, nr_params;
         struct priority_group *pg;
+        struct dm_target *ti = m->ti;
 
         if (as->argc < 2) {
                 as->argc = 0;
@@ -624,12 +621,12 @@ static struct priority_group *parse_priority_group(struct arg_set *as,
         return NULL;
 }
 
-static int parse_hw_handler(struct arg_set *as, struct multipath *m,
-                            struct dm_target *ti)
+static int parse_hw_handler(struct arg_set *as, struct multipath *m)
 {
         int r;
         struct hw_handler_type *hwht;
         unsigned hw_argc;
+        struct dm_target *ti = m->ti;
 
         static struct param _params[] = {
                 {0, 1024, "invalid number of hardware handler args"},
@@ -661,11 +658,11 @@ static int parse_hw_handler(struct arg_set *as, struct multipath *m,
         return 0;
 }
 
-static int parse_features(struct arg_set *as, struct multipath *m,
-                          struct dm_target *ti)
+static int parse_features(struct arg_set *as, struct multipath *m)
 {
         int r;
         unsigned argc;
+        struct dm_target *ti = m->ti;
 
         static struct param _params[] = {
                 {0, 1, "invalid number of feature args"},
@@ -704,19 +701,17 @@ static int multipath_ctr(struct dm_target *ti, unsigned int argc,
         as.argc = argc;
         as.argv = argv;
 
-        m = alloc_multipath();
+        m = alloc_multipath(ti);
         if (!m) {
                 ti->error = "can't allocate multipath";
                 return -EINVAL;
         }
 
-        m->ti = ti;
-
-        r = parse_features(&as, m, ti);
+        r = parse_features(&as, m);
         if (r)
                 goto bad;
 
-        r = parse_hw_handler(&as, m, ti);
+        r = parse_hw_handler(&as, m);
         if (r)
                 goto bad;
 
@@ -732,7 +727,7 @@ static int multipath_ctr(struct dm_target *ti, unsigned int argc,
         while (as.argc) {
                 struct priority_group *pg;
 
-                pg = parse_priority_group(&as, m, ti);
+                pg = parse_priority_group(&as, m);
                 if (!pg) {
                         r = -EINVAL;
                         goto bad;
@@ -752,8 +747,6 @@ static int multipath_ctr(struct dm_target *ti, unsigned int argc,
                 goto bad;
         }
 
-        ti->private = m;
-
         return 0;
 
  bad:
@@ -1266,12 +1259,47 @@ error:
         return -EINVAL;
 }
 
+static int multipath_ioctl(struct dm_target *ti, struct inode *inode,
+                           struct file *filp, unsigned int cmd,
+                           unsigned long arg)
+{
+        struct multipath *m = (struct multipath *) ti->private;
+        struct block_device *bdev = NULL;
+        unsigned long flags;
+        struct file fake_file = {};
+        struct dentry fake_dentry = {};
+        int r = 0;
+
+        fake_file.f_dentry = &fake_dentry;
+
+        spin_lock_irqsave(&m->lock, flags);
+
+        if (!m->current_pgpath)
+                __choose_pgpath(m);
+
+        if (m->current_pgpath) {
+                bdev = m->current_pgpath->path.dev->bdev;
+                fake_dentry.d_inode = bdev->bd_inode;
+                fake_file.f_mode = m->current_pgpath->path.dev->mode;
+        }
+
+        if (m->queue_io)
+                r = -EAGAIN;
+        else if (!bdev)
+                r = -EIO;
+
+        spin_unlock_irqrestore(&m->lock, flags);
+
+        return r ? : blkdev_driver_ioctl(bdev->bd_inode, &fake_file,
+                                         bdev->bd_disk, cmd, arg);
+}
+
 /*-----------------------------------------------------------------
  * Module setup
  *---------------------------------------------------------------*/
 static struct target_type multipath_target = {
         .name = "multipath",
-        .version = {1, 0, 4},
+        .version = {1, 0, 5},
         .module = THIS_MODULE,
         .ctr = multipath_ctr,
         .dtr = multipath_dtr,
@@ -1281,6 +1309,7 @@ static struct target_type multipath_target = {
         .resume = multipath_resume,
         .status = multipath_status,
         .message = multipath_message,
+        .ioctl  = multipath_ioctl,
 };
 
 static int __init dm_multipath_init(void)
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index c54de989eb00..659224cb7c53 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -1213,9 +1213,9 @@ static int mirror_status(struct dm_target *ti, status_type_t type,
                 break;
 
         case STATUSTYPE_TABLE:
-                DMEMIT("%d ", ms->nr_mirrors);
+                DMEMIT("%d", ms->nr_mirrors);
                 for (m = 0; m < ms->nr_mirrors; m++)
-                        DMEMIT("%s %llu ", ms->mirror[m].dev->name,
+                        DMEMIT(" %s %llu", ms->mirror[m].dev->name,
                                 (unsigned long long)ms->mirror[m].offset);
         }
 
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 1d0fafda0f76..5281e0094072 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -39,6 +39,9 @@
  */
 #define SNAPSHOT_PAGES 256
 
+struct workqueue_struct *ksnapd;
+static void flush_queued_bios(void *data);
+
 struct pending_exception {
         struct exception e;
 
@@ -56,7 +59,7 @@ struct pending_exception {
 
         /*
          * The primary pending_exception is the one that holds
-         * the sibling_count and the list of origin_bios for a
+         * the ref_count and the list of origin_bios for a
          * group of pending_exceptions.  It is always last to get freed.
          * These fields get set up when writing to the origin.
          */
@@ -69,7 +72,7 @@ struct pending_exception {
          * the sibling concerned and not pe->primary_pe->snap->lock unless
          * they are the same.
          */
-        atomic_t sibling_count;
+        atomic_t ref_count;
 
         /* Pointer back to snapshot context */
         struct dm_snapshot *snap;
@@ -387,15 +390,46 @@ static inline ulong round_up(ulong n, ulong size)
         return (n + size) & ~size;
 }
 
-static void read_snapshot_metadata(struct dm_snapshot *s)
+static int set_chunk_size(struct dm_snapshot *s, const char *chunk_size_arg,
+                          char **error)
 {
-        if (s->store.read_metadata(&s->store)) {
-                down_write(&s->lock);
-                s->valid = 0;
-                up_write(&s->lock);
+        unsigned long chunk_size;
+        char *value;
+
+        chunk_size = simple_strtoul(chunk_size_arg, &value, 10);
+        if (*chunk_size_arg == '\0' || *value != '\0') {
+                *error = "Invalid chunk size";
+                return -EINVAL;
+        }
+
+        if (!chunk_size) {
+                s->chunk_size = s->chunk_mask = s->chunk_shift = 0;
+                return 0;
+        }
+
+        /*
+         * Chunk size must be multiple of page size.  Silently
+         * round up if it's not.
+         */
+        chunk_size = round_up(chunk_size, PAGE_SIZE >> 9);
+
+        /* Check chunk_size is a power of 2 */
+        if (chunk_size & (chunk_size - 1)) {
+                *error = "Chunk size is not a power of 2";
+                return -EINVAL;
+        }
 
-                dm_table_event(s->table);
+        /* Validate the chunk size against the device block size */
+        if (chunk_size % (bdev_hardsect_size(s->cow->bdev) >> 9)) {
+                *error = "Chunk size is not a multiple of device blocksize";
+                return -EINVAL;
         }
+
+        s->chunk_size = chunk_size;
+        s->chunk_mask = chunk_size - 1;
+        s->chunk_shift = ffs(chunk_size) - 1;
+
+        return 0;
 }
 
 /*
@@ -404,15 +438,12 @@ static void read_snapshot_metadata(struct dm_snapshot *s)
 static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 {
         struct dm_snapshot *s;
-        unsigned long chunk_size;
         int r = -EINVAL;
         char persistent;
         char *origin_path;
         char *cow_path;
-        char *value;
-        int blocksize;
 
-        if (argc < 4) {
+        if (argc != 4) {
                 ti->error = "requires exactly 4 arguments";
                 r = -EINVAL;
                 goto bad1;
@@ -428,13 +459,6 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad1;
         }
 
-        chunk_size = simple_strtoul(argv[3], &value, 10);
-        if (chunk_size == 0 || value == NULL) {
-                ti->error = "Invalid chunk size";
-                r = -EINVAL;
-                goto bad1;
-        }
-
         s = kmalloc(sizeof(*s), GFP_KERNEL);
         if (s == NULL) {
                 ti->error = "Cannot allocate snapshot context private "
@@ -457,36 +481,17 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad2;
         }
 
-        /*
-         * Chunk size must be multiple of page size.  Silently
-         * round up if it's not.
-         */
-        chunk_size = round_up(chunk_size, PAGE_SIZE >> 9);
-
-        /* Validate the chunk size against the device block size */
-        blocksize = s->cow->bdev->bd_disk->queue->hardsect_size;
-        if (chunk_size % (blocksize >> 9)) {
-                ti->error = "Chunk size is not a multiple of device blocksize";
-                r = -EINVAL;
-                goto bad3;
-        }
-
-        /* Check chunk_size is a power of 2 */
-        if (chunk_size & (chunk_size - 1)) {
-                ti->error = "Chunk size is not a power of 2";
-                r = -EINVAL;
+        r = set_chunk_size(s, argv[3], &ti->error);
+        if (r)
                 goto bad3;
-        }
 
-        s->chunk_size = chunk_size;
-        s->chunk_mask = chunk_size - 1;
         s->type = persistent;
-        s->chunk_shift = ffs(chunk_size) - 1;
 
         s->valid = 1;
         s->active = 0;
         s->last_percent = 0;
         init_rwsem(&s->lock);
+        spin_lock_init(&s->pe_lock);
         s->table = ti->table;
 
         /* Allocate hash table for COW data */
@@ -496,16 +501,12 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad3;
         }
 
-        /*
-         * Check the persistent flag - done here because we need the iobuf
-         * to check the LV header
-         */
         s->store.snap = s;
 
         if (persistent == 'P')
-                r = dm_create_persistent(&s->store, chunk_size);
+                r = dm_create_persistent(&s->store);
         else
-                r = dm_create_transient(&s->store, s, blocksize);
+                r = dm_create_transient(&s->store);
 
         if (r) {
                 ti->error = "Couldn't create exception store";
@@ -520,7 +521,14 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         }
 
         /* Metadata must only be loaded into one table at once */
-        read_snapshot_metadata(s);
+        r = s->store.read_metadata(&s->store);
+        if (r) {
+                ti->error = "Failed to read snapshot metadata";
+                goto bad6;
+        }
+
+        bio_list_init(&s->queued_bios);
+        INIT_WORK(&s->queued_bios_work, flush_queued_bios, s);
 
         /* Add snapshot to the list of snapshots for this origin */
         /* Exceptions aren't triggered till snapshot_resume() is called */
@@ -560,6 +568,8 @@ static void snapshot_dtr(struct dm_target *ti)
 {
         struct dm_snapshot *s = (struct dm_snapshot *) ti->private;
 
+        flush_workqueue(ksnapd);
+
         /* Prevent further origin writes from using this snapshot. */
         /* After this returns there can be no new kcopyd jobs. */
         unregister_snapshot(s);
@@ -593,6 +603,19 @@ static void flush_bios(struct bio *bio)
         }
 }
 
+static void flush_queued_bios(void *data)
+{
+        struct dm_snapshot *s = (struct dm_snapshot *) data;
+        struct bio *queued_bios;
+        unsigned long flags;
+
+        spin_lock_irqsave(&s->pe_lock, flags);
+        queued_bios = bio_list_get(&s->queued_bios);
+        spin_unlock_irqrestore(&s->pe_lock, flags);
+
+        flush_bios(queued_bios);
+}
+
 /*
  * Error a list of buffers.
  */
@@ -608,28 +631,7 @@ static void error_bios(struct bio *bio)
         }
 }
 
-static inline void error_snapshot_bios(struct pending_exception *pe)
-{
-        error_bios(bio_list_get(&pe->snapshot_bios));
-}
-
-static struct bio *__flush_bios(struct pending_exception *pe)
-{
-        /*
-         * If this pe is involved in a write to the origin and
-         * it is the last sibling to complete then release
-         * the bios for the original write to the origin.
-         */
-
-        if (pe->primary_pe &&
-            atomic_dec_and_test(&pe->primary_pe->sibling_count))
-                return bio_list_get(&pe->primary_pe->origin_bios);
-
-        return NULL;
-}
-
-static void __invalidate_snapshot(struct dm_snapshot *s,
-                                struct pending_exception *pe, int err)
+static void __invalidate_snapshot(struct dm_snapshot *s, int err)
 {
         if (!s->valid)
                 return;
@@ -639,9 +641,6 @@ static void __invalidate_snapshot(struct dm_snapshot *s,
         else if (err == -ENOMEM)
                 DMERR("Invalidating snapshot: Unable to allocate exception.");
 
-        if (pe)
-                remove_exception(&pe->e);
-
         if (s->store.drop_snapshot)
                 s->store.drop_snapshot(&s->store);
 
@@ -650,78 +649,95 @@ static void __invalidate_snapshot(struct dm_snapshot *s,
         dm_table_event(s->table);
 }
 
+static void get_pending_exception(struct pending_exception *pe)
+{
+        atomic_inc(&pe->ref_count);
+}
+
+static struct bio *put_pending_exception(struct pending_exception *pe)
+{
+        struct pending_exception *primary_pe;
+        struct bio *origin_bios = NULL;
+
+        primary_pe = pe->primary_pe;
+
+        /*
+         * If this pe is involved in a write to the origin and
+         * it is the last sibling to complete then release
+         * the bios for the original write to the origin.
+         */
+        if (primary_pe &&
+            atomic_dec_and_test(&primary_pe->ref_count))
+                origin_bios = bio_list_get(&primary_pe->origin_bios);
+
+        /*
+         * Free the pe if it's not linked to an origin write or if
+         * it's not itself a primary pe.
+         */
+        if (!primary_pe || primary_pe != pe)
+                free_pending_exception(pe);
+
+        /*
+         * Free the primary pe if nothing references it.
+         */
+        if (primary_pe && !atomic_read(&primary_pe->ref_count))
+                free_pending_exception(primary_pe);
+
+        return origin_bios;
+}
+
 static void pending_complete(struct pending_exception *pe, int success)
 {
         struct exception *e;
-        struct pending_exception *primary_pe;
         struct dm_snapshot *s = pe->snap;
-        struct bio *flush = NULL;
+        struct bio *origin_bios = NULL;
+        struct bio *snapshot_bios = NULL;
+        int error = 0;
 
         if (!success) {
                 /* Read/write error - snapshot is unusable */
                 down_write(&s->lock);
-                __invalidate_snapshot(s, pe, -EIO);
-                flush = __flush_bios(pe);
-                up_write(&s->lock);
-
-                error_snapshot_bios(pe);
+                __invalidate_snapshot(s, -EIO);
+                error = 1;
                 goto out;
         }
 
         e = alloc_exception();
         if (!e) {
                 down_write(&s->lock);
-                __invalidate_snapshot(s, pe, -ENOMEM);
-                flush = __flush_bios(pe);
-                up_write(&s->lock);
-
-                error_snapshot_bios(pe);
+                __invalidate_snapshot(s, -ENOMEM);
+                error = 1;
                 goto out;
         }
         *e = pe->e;
 
-        /*
-         * Add a proper exception, and remove the
-         * in-flight exception from the list.
-         */
         down_write(&s->lock);
         if (!s->valid) {
-                flush = __flush_bios(pe);
-                up_write(&s->lock);
-
                 free_exception(e);
-
-                error_snapshot_bios(pe);
+                error = 1;
                 goto out;
         }
 
+        /*
+         * Add a proper exception, and remove the
+         * in-flight exception from the list.
+         */
         insert_exception(&s->complete, e);
+
+ out:
         remove_exception(&pe->e);
-        flush = __flush_bios(pe);
+        snapshot_bios = bio_list_get(&pe->snapshot_bios);
+        origin_bios = put_pending_exception(pe);
 
         up_write(&s->lock);
 
         /* Submit any pending write bios */
-        flush_bios(bio_list_get(&pe->snapshot_bios));
-
- out:
-        primary_pe = pe->primary_pe;
-
-        /*
-         * Free the pe if it's not linked to an origin write or if
-         * it's not itself a primary pe.
-         */
-        if (!primary_pe || primary_pe != pe)
-                free_pending_exception(pe);
-
-        /*
-         * Free the primary pe if nothing references it.
-         */
-        if (primary_pe && !atomic_read(&primary_pe->sibling_count))
-                free_pending_exception(primary_pe);
+        if (error)
+                error_bios(snapshot_bios);
+        else
+                flush_bios(snapshot_bios);
 
-        if (flush)
-                flush_bios(flush);
+        flush_bios(origin_bios);
 }
 
 static void commit_callback(void *context, int success)
@@ -822,7 +838,7 @@ __find_pending_exception(struct dm_snapshot *s, struct bio *bio)
         bio_list_init(&pe->origin_bios);
         bio_list_init(&pe->snapshot_bios);
         pe->primary_pe = NULL;
-        atomic_set(&pe->sibling_count, 1);
+        atomic_set(&pe->ref_count, 0);
         pe->snap = s;
         pe->started = 0;
 
@@ -831,6 +847,7 @@ __find_pending_exception(struct dm_snapshot *s, struct bio *bio)
                 return NULL;
         }
 
+        get_pending_exception(pe);
         insert_exception(&s->pending, &pe->e);
 
  out:
@@ -850,7 +867,6 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
 {
         struct exception *e;
         struct dm_snapshot *s = (struct dm_snapshot *) ti->private;
-        int copy_needed = 0;
         int r = 1;
         chunk_t chunk;
         struct pending_exception *pe = NULL;
@@ -865,32 +881,31 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
         if (unlikely(bio_barrier(bio)))
                 return -EOPNOTSUPP;
 
+        /* FIXME: should only take write lock if we need
+         * to copy an exception */
+        down_write(&s->lock);
+
+        if (!s->valid) {
+                r = -EIO;
+                goto out_unlock;
+        }
+
+        /* If the block is already remapped - use that, else remap it */
+        e = lookup_exception(&s->complete, chunk);
+        if (e) {
+                remap_exception(s, e, bio);
+                goto out_unlock;
+        }
+
         /*
          * Write to snapshot - higher level takes care of RW/RO
          * flags so we should only get this if we are
          * writeable.
          */
         if (bio_rw(bio) == WRITE) {
-
-                /* FIXME: should only take write lock if we need
-                 * to copy an exception */
-                down_write(&s->lock);
-
-                if (!s->valid) {
-                        r = -EIO;
-                        goto out_unlock;
-                }
-
-                /* If the block is already remapped - use that, else remap it */
-                e = lookup_exception(&s->complete, chunk);
-                if (e) {
-                        remap_exception(s, e, bio);
-                        goto out_unlock;
-                }
-
                 pe = __find_pending_exception(s, bio);
                 if (!pe) {
-                        __invalidate_snapshot(s, pe, -ENOMEM);
+                        __invalidate_snapshot(s, -ENOMEM);
                         r = -EIO;
                         goto out_unlock;
                 }
@@ -898,45 +913,27 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
                 remap_exception(s, &pe->e, bio);
                 bio_list_add(&pe->snapshot_bios, bio);
 
+                r = 0;
+
                 if (!pe->started) {
                         /* this is protected by snap->lock */
                         pe->started = 1;
-                        copy_needed = 1;
-                }
-
-                r = 0;
-
- out_unlock:
-                up_write(&s->lock);
-
-                if (copy_needed)
+                        up_write(&s->lock);
                         start_copy(pe);
-        } else {
+                        goto out;
+                }
+        } else
                 /*
                  * FIXME: this read path scares me because we
                  * always use the origin when we have a pending
                  * exception.  However I can't think of a
                  * situation where this is wrong - ejt.
                  */
+                bio->bi_bdev = s->origin->bdev;
 
-                /* Do reads */
-                down_read(&s->lock);
-
-                if (!s->valid) {
-                        up_read(&s->lock);
-                        return -EIO;
-                }
-
-                /* See if it it has been remapped */
-                e = lookup_exception(&s->complete, chunk);
-                if (e)
-                        remap_exception(s, e, bio);
-                else
-                        bio->bi_bdev = s->origin->bdev;
-
-                up_read(&s->lock);
-        }
-
+ out_unlock:
+        up_write(&s->lock);
+ out:
         return r;
 }
 
@@ -1025,7 +1022,7 @@ static int __origin_write(struct list_head *snapshots, struct bio *bio)
                  * is already remapped in this snapshot
                  * and trigger an exception if not.
                  *
-                 * sibling_count is initialised to 1 so pending_complete()
+                 * ref_count is initialised to 1 so pending_complete()
                  * won't destroy the primary_pe while we're inside this loop.
                  */
                 e = lookup_exception(&snap->complete, chunk);
@@ -1034,7 +1031,7 @@ static int __origin_write(struct list_head *snapshots, struct bio *bio)
 
                 pe = __find_pending_exception(snap, bio);
                 if (!pe) {
-                        __invalidate_snapshot(snap, pe, ENOMEM);
+                        __invalidate_snapshot(snap, -ENOMEM);
                         goto next_snapshot;
                 }
 
@@ -1056,8 +1053,8 @@ static int __origin_write(struct list_head *snapshots, struct bio *bio)
                 }
 
                 if (!pe->primary_pe) {
-                        atomic_inc(&primary_pe->sibling_count);
                         pe->primary_pe = primary_pe;
+                        get_pending_exception(primary_pe);
                 }
 
                 if (!pe->started) {
@@ -1070,20 +1067,20 @@ static int __origin_write(struct list_head *snapshots, struct bio *bio)
         }
 
         if (!primary_pe)
-                goto out;
+                return r;
 
         /*
          * If this is the first time we're processing this chunk and
-         * sibling_count is now 1 it means all the pending exceptions
+         * ref_count is now 1 it means all the pending exceptions
          * got completed while we were in the loop above, so it falls to
          * us here to remove the primary_pe and submit any origin_bios.
          */
 
-        if (first && atomic_dec_and_test(&primary_pe->sibling_count)) {
+        if (first && atomic_dec_and_test(&primary_pe->ref_count)) {
                 flush_bios(bio_list_get(&primary_pe->origin_bios));
                 free_pending_exception(primary_pe);
                 /* If we got here, pe_queue is necessarily empty. */
-                goto out;
+                return r;
         }
 
         /*
@@ -1092,7 +1089,6 @@ static int __origin_write(struct list_head *snapshots, struct bio *bio)
         list_for_each_entry_safe(pe, next_pe, &pe_queue, list)
                 start_copy(pe);
 
- out:
         return r;
 }
 
@@ -1205,7 +1201,7 @@ static int origin_status(struct dm_target *ti, status_type_t type, char *result,
 
 static struct target_type origin_target = {
         .name    = "snapshot-origin",
-        .version = {1, 4, 0},
+        .version = {1, 5, 0},
         .module  = THIS_MODULE,
         .ctr     = origin_ctr,
         .dtr     = origin_dtr,
@@ -1216,7 +1212,7 @@ static struct target_type origin_target = {
 
 static struct target_type snapshot_target = {
         .name    = "snapshot",
-        .version = {1, 4, 0},
+        .version = {1, 5, 0},
         .module  = THIS_MODULE,
         .ctr     = snapshot_ctr,
         .dtr     = snapshot_dtr,
@@ -1275,8 +1271,17 @@ static int __init dm_snapshot_init(void)
                 goto bad5;
         }
 
+        ksnapd = create_singlethread_workqueue("ksnapd");
+        if (!ksnapd) {
+                DMERR("Failed to create ksnapd workqueue.");
+                r = -ENOMEM;
+                goto bad6;
+        }
+
         return 0;
 
+      bad6:
+        mempool_destroy(pending_pool);
       bad5:
         kmem_cache_destroy(pending_cache);
       bad4:
@@ -1294,6 +1299,8 @@ static void __exit dm_snapshot_exit(void)
 {
         int r;
 
+        destroy_workqueue(ksnapd);
+
         r = dm_unregister_target(&snapshot_target);
         if (r)
                 DMERR("snapshot unregister failed %d", r);
diff --git a/drivers/md/dm-snap.h b/drivers/md/dm-snap.h
index fdec1e2dc871..15fa2ae6cdc2 100644
--- a/drivers/md/dm-snap.h
+++ b/drivers/md/dm-snap.h
@@ -10,7 +10,9 @@
 #define DM_SNAPSHOT_H
 
 #include "dm.h"
+#include "dm-bio-list.h"
 #include <linux/blkdev.h>
+#include <linux/workqueue.h>
 
 struct exception_table {
         uint32_t hash_mask;
@@ -112,10 +114,20 @@ struct dm_snapshot {
         struct exception_table pending;
         struct exception_table complete;
 
+        /*
+         * pe_lock protects all pending_exception operations and access
+         * as well as the snapshot_bios list.
+         */
+        spinlock_t pe_lock;
+
         /* The on disk metadata handler */
         struct exception_store store;
 
         struct kcopyd_client *kcopyd_client;
+
+        /* Queue of snapshot writes for ksnapd to flush */
+        struct bio_list queued_bios;
+        struct work_struct queued_bios_work;
 };
 
 /*
@@ -128,10 +140,9 @@ int dm_add_exception(struct dm_snapshot *s, chunk_t old, chunk_t new);
  * Constructor and destructor for the default persistent
  * store.
  */
-int dm_create_persistent(struct exception_store *store, uint32_t chunk_size);
+int dm_create_persistent(struct exception_store *store);
 
-int dm_create_transient(struct exception_store *store,
-                        struct dm_snapshot *s, int blocksize);
+int dm_create_transient(struct exception_store *store);
 
 /*
  * Return the number of sectors in the device.
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 75fe9493e6af..05befa91807a 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -522,56 +522,61 @@ static int __table_get_device(struct dm_table *t, struct dm_target *ti,
         return 0;
 }
 
-
-int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
-                  sector_t len, int mode, struct dm_dev **result)
+void dm_set_device_limits(struct dm_target *ti, struct block_device *bdev)
 {
-        int r = __table_get_device(ti->table, ti, path,
-                                   start, len, mode, result);
-        if (!r) {
-                request_queue_t *q = bdev_get_queue((*result)->bdev);
-                struct io_restrictions *rs = &ti->limits;
-
-                /*
-                 * Combine the device limits low.
-                 *
-                 * FIXME: if we move an io_restriction struct
-                 *        into q this would just be a call to
-                 *        combine_restrictions_low()
-                 */
+        request_queue_t *q = bdev_get_queue(bdev);
+        struct io_restrictions *rs = &ti->limits;
+
+        /*
+         * Combine the device limits low.
+         *
+         * FIXME: if we move an io_restriction struct
+         *        into q this would just be a call to
+         *        combine_restrictions_low()
+         */
+        rs->max_sectors =
+                min_not_zero(rs->max_sectors, q->max_sectors);
+
+        /* FIXME: Device-Mapper on top of RAID-0 breaks because DM
+         *        currently doesn't honor MD's merge_bvec_fn routine.
+         *        In this case, we'll force DM to use PAGE_SIZE or
+         *        smaller I/O, just to be safe. A better fix is in the
+         *        works, but add this for the time being so it will at
+         *        least operate correctly.
+         */
+        if (q->merge_bvec_fn)
                 rs->max_sectors =
-                        min_not_zero(rs->max_sectors, q->max_sectors);
+                        min_not_zero(rs->max_sectors,
+                                     (unsigned int) (PAGE_SIZE >> 9));
 
-                /* FIXME: Device-Mapper on top of RAID-0 breaks because DM
-                 *        currently doesn't honor MD's merge_bvec_fn routine.
-                 *        In this case, we'll force DM to use PAGE_SIZE or
-                 *        smaller I/O, just to be safe. A better fix is in the
-                 *        works, but add this for the time being so it will at
-                 *        least operate correctly.
-                 */
-                if (q->merge_bvec_fn)
-                        rs->max_sectors =
-                                min_not_zero(rs->max_sectors,
-                                             (unsigned int) (PAGE_SIZE >> 9));
+        rs->max_phys_segments =
+                min_not_zero(rs->max_phys_segments,
+                             q->max_phys_segments);
 
-                rs->max_phys_segments =
-                        min_not_zero(rs->max_phys_segments,
-                                     q->max_phys_segments);
+        rs->max_hw_segments =
+                min_not_zero(rs->max_hw_segments, q->max_hw_segments);
 
-                rs->max_hw_segments =
-                        min_not_zero(rs->max_hw_segments, q->max_hw_segments);
+        rs->hardsect_size = max(rs->hardsect_size, q->hardsect_size);
 
-                rs->hardsect_size = max(rs->hardsect_size, q->hardsect_size);
+        rs->max_segment_size =
+                min_not_zero(rs->max_segment_size, q->max_segment_size);
 
-                rs->max_segment_size =
-                        min_not_zero(rs->max_segment_size, q->max_segment_size);
+        rs->seg_boundary_mask =
+                min_not_zero(rs->seg_boundary_mask,
+                             q->seg_boundary_mask);
 
-                rs->seg_boundary_mask =
-                        min_not_zero(rs->seg_boundary_mask,
-                                     q->seg_boundary_mask);
+        rs->no_cluster |= !test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags);
+}
+EXPORT_SYMBOL_GPL(dm_set_device_limits);
 
-                rs->no_cluster |= !test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags);
-        }
+int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
+                  sector_t len, int mode, struct dm_dev **result)
+{
+        int r = __table_get_device(ti->table, ti, path,
+                                   start, len, mode, result);
+
+        if (!r)
+                dm_set_device_limits(ti, (*result)->bdev);
 
         return r;
 }
@@ -939,9 +944,20 @@ void dm_table_postsuspend_targets(struct dm_table *t)
         return suspend_targets(t, 1);
 }
 
-void dm_table_resume_targets(struct dm_table *t)
+int dm_table_resume_targets(struct dm_table *t)
 {
-        int i;
+        int i, r = 0;
+
+        for (i = 0; i < t->num_targets; i++) {
+                struct dm_target *ti = t->targets + i;
+
+                if (!ti->type->preresume)
+                        continue;
+
+                r = ti->type->preresume(ti);
+                if (r)
+                        return r;
+        }
 
         for (i = 0; i < t->num_targets; i++) {
                 struct dm_target *ti = t->targets + i;
@@ -949,6 +965,8 @@ void dm_table_resume_targets(struct dm_table *t)
                 if (ti->type->resume)
                         ti->type->resume(ti);
         }
+
+        return 0;
 }
 
 int dm_table_any_congested(struct dm_table *t, int bdi_bits)
@@ -983,6 +1001,11 @@ int dm_table_flush_all(struct dm_table *t)
 {
         struct list_head *d, *devices = dm_table_get_devices(t);
         int ret = 0;
+        unsigned i;
+
+        for (i = 0; i < t->num_targets; i++)
+                if (t->targets[i].type->flush)
+                        t->targets[i].type->flush(&t->targets[i]);
 
         for (d = devices->next; d != devices; d = d->next) {
                 struct dm_dev *dd = list_entry(d, struct dm_dev, list);
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index c99bf9f01759..b5764a86c8b5 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -20,6 +20,7 @@
 #include <linux/idr.h>
 #include <linux/hdreg.h>
 #include <linux/blktrace_api.h>
+#include <linux/smp_lock.h>
 
 #define DM_MSG_PREFIX "core"
 
@@ -101,6 +102,8 @@ struct mapped_device {
         mempool_t *io_pool;
         mempool_t *tio_pool;
 
+        struct bio_set *bs;
+
         /*
          * Event handling.
          */
@@ -121,16 +124,10 @@ struct mapped_device {
 static kmem_cache_t *_io_cache;
 static kmem_cache_t *_tio_cache;
 
-static struct bio_set *dm_set;
-
 static int __init local_init(void)
 {
         int r;
 
-        dm_set = bioset_create(16, 16, 4);
-        if (!dm_set)
-                return -ENOMEM;
-
         /* allocate a slab for the dm_ios */
         _io_cache = kmem_cache_create("dm_io",
                                       sizeof(struct dm_io), 0, 0, NULL, NULL);
@@ -164,8 +161,6 @@ static void local_exit(void)
         kmem_cache_destroy(_tio_cache);
         kmem_cache_destroy(_io_cache);
 
-        bioset_free(dm_set);
-
         if (unregister_blkdev(_major, _name) < 0)
                 DMERR("unregister_blkdev failed");
 
@@ -288,6 +283,45 @@ static int dm_blk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         return dm_get_geometry(md, geo);
 }
 
+static int dm_blk_ioctl(struct inode *inode, struct file *file,
+                        unsigned int cmd, unsigned long arg)
+{
+        struct mapped_device *md;
+        struct dm_table *map;
+        struct dm_target *tgt;
+        int r = -ENOTTY;
+
+        /* We don't really need this lock, but we do need 'inode'. */
+        unlock_kernel();
+
+        md = inode->i_bdev->bd_disk->private_data;
+
+        map = dm_get_table(md);
+
+        if (!map || !dm_table_get_size(map))
+                goto out;
+
+        /* We only support devices that have a single target */
+        if (dm_table_get_num_targets(map) != 1)
+                goto out;
+
+        tgt = dm_table_get_target(map, 0);
+
+        if (dm_suspended(md)) {
+                r = -EAGAIN;
+                goto out;
+        }
+
+        if (tgt->type->ioctl)
+                r = tgt->type->ioctl(tgt, inode, file, cmd, arg);
+
+out:
+        dm_table_put(map);
+
+        lock_kernel();
+        return r;
+}
+
 static inline struct dm_io *alloc_io(struct mapped_device *md)
 {
         return mempool_alloc(md->io_pool, GFP_NOIO);
@@ -435,7 +469,7 @@ static int clone_endio(struct bio *bio, unsigned int done, int error)
 {
         int r = 0;
         struct target_io *tio = bio->bi_private;
-        struct dm_io *io = tio->io;
+        struct mapped_device *md = tio->io->md;
         dm_endio_fn endio = tio->ti->type->end_io;
 
         if (bio->bi_size)
@@ -454,9 +488,15 @@ static int clone_endio(struct bio *bio, unsigned int done, int error)
                         return 1;
         }
 
-        free_tio(io->md, tio);
-        dec_pending(io, error);
+        dec_pending(tio->io, error);
+
+        /*
+         * Store md for cleanup instead of tio which is about to get freed.
+         */
+        bio->bi_private = md->bs;
+
         bio_put(bio);
+        free_tio(md, tio);
         return r;
 }
 
@@ -485,6 +525,7 @@ static void __map_bio(struct dm_target *ti, struct bio *clone,
 {
         int r;
         sector_t sector;
+        struct mapped_device *md;
 
         /*
          * Sanity checks.
@@ -514,10 +555,14 @@ static void __map_bio(struct dm_target *ti, struct bio *clone,
 
         else if (r < 0) {
                 /* error the io and bail out */
-                struct dm_io *io = tio->io;
-                free_tio(tio->io->md, tio);
-                dec_pending(io, r);
+                md = tio->io->md;
+                dec_pending(tio->io, r);
+                /*
+                 * Store bio_set for cleanup.
+                 */
+                clone->bi_private = md->bs;
                 bio_put(clone);
+                free_tio(md, tio);
         }
 }
 
@@ -533,7 +578,9 @@ struct clone_info {
 
 static void dm_bio_destructor(struct bio *bio)
 {
-        bio_free(bio, dm_set);
+        struct bio_set *bs = bio->bi_private;
+
+        bio_free(bio, bs);
 }
 
 /*
@@ -541,12 +588,12 @@ static void dm_bio_destructor(struct bio *bio)
  */
 static struct bio *split_bvec(struct bio *bio, sector_t sector,
                               unsigned short idx, unsigned int offset,
-                              unsigned int len)
+                              unsigned int len, struct bio_set *bs)
 {
         struct bio *clone;
         struct bio_vec *bv = bio->bi_io_vec + idx;
 
-        clone = bio_alloc_bioset(GFP_NOIO, 1, dm_set);
+        clone = bio_alloc_bioset(GFP_NOIO, 1, bs);
         clone->bi_destructor = dm_bio_destructor;
         *clone->bi_io_vec = *bv;
 
@@ -566,11 +613,13 @@ static struct bio *split_bvec(struct bio *bio, sector_t sector,
  */
 static struct bio *clone_bio(struct bio *bio, sector_t sector,
                              unsigned short idx, unsigned short bv_count,
-                             unsigned int len)
+                             unsigned int len, struct bio_set *bs)
 {
         struct bio *clone;
 
-        clone = bio_clone(bio, GFP_NOIO);
+        clone = bio_alloc_bioset(GFP_NOIO, bio->bi_max_vecs, bs);
+        __bio_clone(clone, bio);
+        clone->bi_destructor = dm_bio_destructor;
         clone->bi_sector = sector;
         clone->bi_idx = idx;
         clone->bi_vcnt = idx + bv_count;
@@ -601,7 +650,8 @@ static void __clone_and_map(struct clone_info *ci)
                  * the remaining io with a single clone.
                  */
                 clone = clone_bio(bio, ci->sector, ci->idx,
-                                  bio->bi_vcnt - ci->idx, ci->sector_count);
+                                  bio->bi_vcnt - ci->idx, ci->sector_count,
+                                  ci->md->bs);
                 __map_bio(ti, clone, tio);
                 ci->sector_count = 0;
 
@@ -624,7 +674,8 @@ static void __clone_and_map(struct clone_info *ci)
                         len += bv_len;
                 }
 
-                clone = clone_bio(bio, ci->sector, ci->idx, i - ci->idx, len);
+                clone = clone_bio(bio, ci->sector, ci->idx, i - ci->idx, len,
+                                  ci->md->bs);
                 __map_bio(ti, clone, tio);
 
                 ci->sector += len;
@@ -653,7 +704,8 @@ static void __clone_and_map(struct clone_info *ci)
                         len = min(remaining, max);
 
                         clone = split_bvec(bio, ci->sector, ci->idx,
-                                           bv->bv_offset + offset, len);
+                                           bv->bv_offset + offset, len,
+                                           ci->md->bs);
 
                         __map_bio(ti, clone, tio);
 
@@ -903,7 +955,7 @@ static struct mapped_device *alloc_dev(int minor)
 
         md->queue = blk_alloc_queue(GFP_KERNEL);
         if (!md->queue)
-                goto bad1;
+                goto bad1_free_minor;
 
         md->queue->queuedata = md;
         md->queue->backing_dev_info.congested_fn = dm_any_congested;
@@ -921,6 +973,10 @@ static struct mapped_device *alloc_dev(int minor)
         if (!md->tio_pool)
                 goto bad3;
 
+        md->bs = bioset_create(16, 16, 4);
+        if (!md->bs)
+                goto bad_no_bioset;
+
         md->disk = alloc_disk(1);
         if (!md->disk)
                 goto bad4;
@@ -948,11 +1004,14 @@ static struct mapped_device *alloc_dev(int minor)
         return md;
 
  bad4:
+        bioset_free(md->bs);
+ bad_no_bioset:
         mempool_destroy(md->tio_pool);
  bad3:
         mempool_destroy(md->io_pool);
  bad2:
         blk_cleanup_queue(md->queue);
+ bad1_free_minor:
         free_minor(minor);
  bad1:
         module_put(THIS_MODULE);
@@ -971,6 +1030,7 @@ static void free_dev(struct mapped_device *md)
         }
         mempool_destroy(md->tio_pool);
         mempool_destroy(md->io_pool);
+        bioset_free(md->bs);
         del_gendisk(md->disk);
         free_minor(minor);
 
@@ -1319,7 +1379,9 @@ int dm_resume(struct mapped_device *md)
         if (!map || !dm_table_get_size(map))
                 goto out;
 
-        dm_table_resume_targets(map);
+        r = dm_table_resume_targets(map);
+        if (r)
+                goto out;
 
         down_write(&md->io_lock);
         clear_bit(DMF_BLOCK_IO, &md->flags);
@@ -1337,6 +1399,8 @@ int dm_resume(struct mapped_device *md)
 
         dm_table_unplug_all(map);
 
+        kobject_uevent(&md->disk->kobj, KOBJ_CHANGE);
+
         r = 0;
 
 out:
@@ -1377,6 +1441,7 @@ int dm_suspended(struct mapped_device *md)
 static struct block_device_operations dm_blk_dops = {
         .open = dm_blk_open,
         .release = dm_blk_close,
+        .ioctl = dm_blk_ioctl,
         .getgeo = dm_blk_getgeo,
         .owner = THIS_MODULE
 };
diff --git a/drivers/md/dm.h b/drivers/md/dm.h
index 3c03c0ecab7e..a48ec5e3c1f4 100644
--- a/drivers/md/dm.h
+++ b/drivers/md/dm.h
@@ -21,6 +21,11 @@
 #define DMERR(f, arg...) printk(KERN_ERR DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)
 #define DMWARN(f, arg...) printk(KERN_WARNING DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)
 #define DMINFO(f, arg...) printk(KERN_INFO DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)
+#ifdef CONFIG_DM_DEBUG
+#  define DMDEBUG(f, arg...) printk(KERN_DEBUG DM_NAME ": " DM_MSG_PREFIX " DEBUG: " f "\n", ## arg)
+#else
+#  define DMDEBUG(f, arg...) do {} while (0)
+#endif
 
 #define DMEMIT(x...) sz += ((sz >= maxlen) ? \
                           0 : scnprintf(result + sz, maxlen - sz, x))
@@ -52,7 +57,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q);
 struct list_head *dm_table_get_devices(struct dm_table *t);
 void dm_table_presuspend_targets(struct dm_table *t);
 void dm_table_postsuspend_targets(struct dm_table *t);
-void dm_table_resume_targets(struct dm_table *t);
+int dm_table_resume_targets(struct dm_table *t);
 int dm_table_any_congested(struct dm_table *t, int bdi_bits);
 void dm_table_unplug_all(struct dm_table *t);
 int dm_table_flush_all(struct dm_table *t);
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index b99c19c7eb22..c625ddb8833d 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -111,6 +111,19 @@ static int linear_issue_flush(request_queue_t *q, struct gendisk *disk,
         return ret;
 }
 
+static int linear_congested(void *data, int bits)
+{
+        mddev_t *mddev = data;
+        linear_conf_t *conf = mddev_to_conf(mddev);
+        int i, ret = 0;
+
+        for (i = 0; i < mddev->raid_disks && !ret ; i++) {
+                request_queue_t *q = bdev_get_queue(conf->disks[i].rdev->bdev);
+                ret |= bdi_congested(&q->backing_dev_info, bits);
+        }
+        return ret;
+}
+
 static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)
 {
         linear_conf_t *conf;
@@ -269,6 +282,8 @@ static int linear_run (mddev_t *mddev)
         blk_queue_merge_bvec(mddev->queue, linear_mergeable_bvec);
         mddev->queue->unplug_fn = linear_unplug;
         mddev->queue->issue_flush_fn = linear_issue_flush;
+        mddev->queue->backing_dev_info.congested_fn = linear_congested;
+        mddev->queue->backing_dev_info.congested_data = mddev;
         return 0;
 }
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 8dbab2ef3885..38a0a5741d52 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -389,8 +389,12 @@ static int super_written(struct bio *bio, unsigned int bytes_done, int error)
         if (bio->bi_size)
                 return 1;
 
-        if (error || !test_bit(BIO_UPTODATE, &bio->bi_flags))
+        if (error || !test_bit(BIO_UPTODATE, &bio->bi_flags)) {
+                printk("md: super_written gets error=%d, uptodate=%d\n",
+                       error, test_bit(BIO_UPTODATE, &bio->bi_flags));
+                WARN_ON(test_bit(BIO_UPTODATE, &bio->bi_flags));
                 md_error(mddev, rdev);
+        }
 
         if (atomic_dec_and_test(&mddev->pending_writes))
                 wake_up(&mddev->sb_wait);
@@ -1587,7 +1591,7 @@ static void sync_sbs(mddev_t * mddev, int nospares)
         }
 }
 
-void md_update_sb(mddev_t * mddev)
+static void md_update_sb(mddev_t * mddev, int force_change)
 {
         int err;
         struct list_head *tmp;
@@ -1598,7 +1602,18 @@ void md_update_sb(mddev_t * mddev)
 repeat:
         spin_lock_irq(&mddev->write_lock);
 
-        if (mddev->degraded && mddev->sb_dirty == 3)
+        set_bit(MD_CHANGE_PENDING, &mddev->flags);
+        if (test_and_clear_bit(MD_CHANGE_DEVS, &mddev->flags))
+                force_change = 1;
+        if (test_and_clear_bit(MD_CHANGE_CLEAN, &mddev->flags))
+                /* just a clean<-> dirty transition, possibly leave spares alone,
+                 * though if events isn't the right even/odd, we will have to do
+                 * spares after all
+                 */
+                nospares = 1;
+        if (force_change)
+                nospares = 0;
+        if (mddev->degraded)
                 /* If the array is degraded, then skipping spares is both
                  * dangerous and fairly pointless.
                  * Dangerous because a device that was removed from the array
@@ -1608,20 +1623,14 @@ repeat:
                  * then a recovery will happen and soon that array won't
                  * be degraded any more and the spare can go back to sleep then.
                  */
-                mddev->sb_dirty = 1;
+                nospares = 0;
 
         sync_req = mddev->in_sync;
         mddev->utime = get_seconds();
-        if (mddev->sb_dirty == 3)
-                /* just a clean<-> dirty transition, possibly leave spares alone,
-                 * though if events isn't the right even/odd, we will have to do
-                 * spares after all
-                 */
-                nospares = 1;
 
         /* If this is just a dirty<->clean transition, and the array is clean
          * and 'events' is odd, we can roll back to the previous clean state */
-        if (mddev->sb_dirty == 3
+        if (nospares
             && (mddev->in_sync && mddev->recovery_cp == MaxSector)
             && (mddev->events & 1))
                 mddev->events--;
@@ -1652,7 +1661,6 @@ repeat:
                 MD_BUG();
                 mddev->events --;
         }
-        mddev->sb_dirty = 2;
         sync_sbs(mddev, nospares);
 
         /*
@@ -1660,7 +1668,7 @@ repeat:
          * nonpersistent superblocks
          */
         if (!mddev->persistent) {
-                mddev->sb_dirty = 0;
+                clear_bit(MD_CHANGE_PENDING, &mddev->flags);
                 spin_unlock_irq(&mddev->write_lock);
                 wake_up(&mddev->sb_wait);
                 return;
@@ -1697,20 +1705,20 @@ repeat:
                         break;
         }
         md_super_wait(mddev);
-        /* if there was a failure, sb_dirty was set to 1, and we re-write super */
+        /* if there was a failure, MD_CHANGE_DEVS was set, and we re-write super */
 
         spin_lock_irq(&mddev->write_lock);
-        if (mddev->in_sync != sync_req|| mddev->sb_dirty == 1) {
+        if (mddev->in_sync != sync_req ||
+            test_bit(MD_CHANGE_DEVS, &mddev->flags)) {
                 /* have to write it out again */
                 spin_unlock_irq(&mddev->write_lock);
                 goto repeat;
         }
-        mddev->sb_dirty = 0;
+        clear_bit(MD_CHANGE_PENDING, &mddev->flags);
         spin_unlock_irq(&mddev->write_lock);
         wake_up(&mddev->sb_wait);
 
 }
-EXPORT_SYMBOL_GPL(md_update_sb);
 
 /* words written to sysfs files may, or my not, be \n terminated.
  * We want to accept with case. For this we use cmd_match.
@@ -1783,7 +1791,7 @@ state_store(mdk_rdev_t *rdev, const char *buf, size_t len)
                 else {
                         mddev_t *mddev = rdev->mddev;
                         kick_rdev_from_array(rdev);
-                        md_update_sb(mddev);
+                        md_update_sb(mddev, 1);
                         md_new_event(mddev);
                         err = 0;
                 }
@@ -2426,7 +2434,7 @@ array_state_store(mddev_t *mddev, const char *buf, size_t len)
                         spin_lock_irq(&mddev->write_lock);
                         if (atomic_read(&mddev->writes_pending) == 0) {
                                 mddev->in_sync = 1;
-                                mddev->sb_dirty = 1;
+                                set_bit(MD_CHANGE_CLEAN, &mddev->flags);
                         }
                         spin_unlock_irq(&mddev->write_lock);
                 } else {
@@ -2438,7 +2446,7 @@ array_state_store(mddev_t *mddev, const char *buf, size_t len)
         case active:
                 if (mddev->pers) {
                         restart_array(mddev);
-                        mddev->sb_dirty = 0;
+                        clear_bit(MD_CHANGE_CLEAN, &mddev->flags);
                         wake_up(&mddev->sb_wait);
                         err = 0;
                 } else {
@@ -2520,6 +2528,36 @@ static struct md_sysfs_entry md_new_device =
 __ATTR(new_dev, S_IWUSR, null_show, new_dev_store);
 
 static ssize_t
+bitmap_store(mddev_t *mddev, const char *buf, size_t len)
+{
+        char *end;
+        unsigned long chunk, end_chunk;
+
+        if (!mddev->bitmap)
+                goto out;
+        /* buf should be <chunk> <chunk> ... or <chunk>-<chunk> ... (range) */
+        while (*buf) {
+                chunk = end_chunk = simple_strtoul(buf, &end, 0);
+                if (buf == end) break;
+                if (*end == '-') { /* range */
+                        buf = end + 1;
+                        end_chunk = simple_strtoul(buf, &end, 0);
+                        if (buf == end) break;
+                }
+                if (*end && !isspace(*end)) break;
+                bitmap_dirty_bits(mddev->bitmap, chunk, end_chunk);
+                buf = end;
+                while (isspace(*buf)) buf++;
+        }
+        bitmap_unplug(mddev->bitmap); /* flush the bits to disk */
+out:
+        return len;
+}
+
+static struct md_sysfs_entry md_bitmap =
+__ATTR(bitmap_set_bits, S_IWUSR, null_show, bitmap_store);
+
+static ssize_t
 size_show(mddev_t *mddev, char *page)
 {
         return sprintf(page, "%llu\n", (unsigned long long)mddev->size);
@@ -2543,7 +2581,7 @@ size_store(mddev_t *mddev, const char *buf, size_t len)
 
         if (mddev->pers) {
                 err = update_size(mddev, size);
-                md_update_sb(mddev);
+                md_update_sb(mddev, 1);
         } else {
                 if (mddev->size == 0 ||
                     mddev->size > size)
@@ -2839,6 +2877,7 @@ static struct attribute *md_redundancy_attrs[] = {
         &md_sync_completed.attr,
         &md_suspend_lo.attr,
         &md_suspend_hi.attr,
+        &md_bitmap.attr,
         NULL,
 };
 static struct attribute_group md_redundancy_group = {
@@ -3111,8 +3150,8 @@ static int do_md_run(mddev_t * mddev)
         
         set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
         
-        if (mddev->sb_dirty)
-                md_update_sb(mddev);
+        if (mddev->flags)
+                md_update_sb(mddev, 0);
 
         set_capacity(disk, mddev->array_size<<1);
 
@@ -3275,10 +3314,10 @@ static int do_md_stop(mddev_t * mddev, int mode)
                         if (mddev->ro)
                                 mddev->ro = 0;
                 }
-                if (!mddev->in_sync || mddev->sb_dirty) {
+                if (!mddev->in_sync || mddev->flags) {
                         /* mark array as shutdown cleanly */
                         mddev->in_sync = 1;
-                        md_update_sb(mddev);
+                        md_update_sb(mddev, 1);
                 }
                 if (mode == 1)
                         set_disk_ro(disk, 1);
@@ -3374,6 +3413,7 @@ static void autorun_devices(int part)
 
         printk(KERN_INFO "md: autorun ...\n");
         while (!list_empty(&pending_raid_disks)) {
+                int unit;
                 dev_t dev;
                 LIST_HEAD(candidates);
                 rdev0 = list_entry(pending_raid_disks.next,
@@ -3393,16 +3433,19 @@ static void autorun_devices(int part)
                  * mostly sane superblocks. It's time to allocate the
                  * mddev.
                  */
-                if (rdev0->preferred_minor < 0 || rdev0->preferred_minor >= MAX_MD_DEVS) {
+                if (part) {
+                        dev = MKDEV(mdp_major,
+                                    rdev0->preferred_minor << MdpMinorShift);
+                        unit = MINOR(dev) >> MdpMinorShift;
+                } else {
+                        dev = MKDEV(MD_MAJOR, rdev0->preferred_minor);
+                        unit = MINOR(dev);
+                }
+                if (rdev0->preferred_minor != unit) {
                         printk(KERN_INFO "md: unit number in %s is bad: %d\n",
                                bdevname(rdev0->bdev, b), rdev0->preferred_minor);
                         break;
                 }
-                if (part)
-                        dev = MKDEV(mdp_major,
-                                    rdev0->preferred_minor << MdpMinorShift);
-                else
-                        dev = MKDEV(MD_MAJOR, rdev0->preferred_minor);
 
                 md_probe(dev, NULL, NULL);
                 mddev = mddev_find(dev);
@@ -3440,67 +3483,6 @@ static void autorun_devices(int part)
         printk(KERN_INFO "md: ... autorun DONE.\n");
 }
 
-/*
- * import RAID devices based on one partition
- * if possible, the array gets run as well.
- */
-
-static int autostart_array(dev_t startdev)
-{
-        char b[BDEVNAME_SIZE];
-        int err = -EINVAL, i;
-        mdp_super_t *sb = NULL;
-        mdk_rdev_t *start_rdev = NULL, *rdev;
-
-        start_rdev = md_import_device(startdev, 0, 0);
-        if (IS_ERR(start_rdev))
-                return err;
-
-
-        /* NOTE: this can only work for 0.90.0 superblocks */
-        sb = (mdp_super_t*)page_address(start_rdev->sb_page);
-        if (sb->major_version != 0 ||
-            sb->minor_version != 90 ) {
-                printk(KERN_WARNING "md: can only autostart 0.90.0 arrays\n");
-                export_rdev(start_rdev);
-                return err;
-        }
-
-        if (test_bit(Faulty, &start_rdev->flags)) {
-                printk(KERN_WARNING 
-                        "md: can not autostart based on faulty %s!\n",
-                        bdevname(start_rdev->bdev,b));
-                export_rdev(start_rdev);
-                return err;
-        }
-        list_add(&start_rdev->same_set, &pending_raid_disks);
-
-        for (i = 0; i < MD_SB_DISKS; i++) {
-                mdp_disk_t *desc = sb->disks + i;
-                dev_t dev = MKDEV(desc->major, desc->minor);
-
-                if (!dev)
-                        continue;
-                if (dev == startdev)
-                        continue;
-                if (MAJOR(dev) != desc->major || MINOR(dev) != desc->minor)
-                        continue;
-                rdev = md_import_device(dev, 0, 0);
-                if (IS_ERR(rdev))
-                        continue;
-
-                list_add(&rdev->same_set, &pending_raid_disks);
-        }
-
-        /*
-         * possibly return codes
-         */
-        autorun_devices(0);
-        return 0;
-
-}
-
-
 static int get_version(void __user * arg)
 {
         mdu_version_t ver;
@@ -3808,7 +3790,7 @@ static int hot_remove_disk(mddev_t * mddev, dev_t dev)
                 goto busy;
 
         kick_rdev_from_array(rdev);
-        md_update_sb(mddev);
+        md_update_sb(mddev, 1);
         md_new_event(mddev);
 
         return 0;
@@ -3885,7 +3867,7 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
 
         rdev->raid_disk = -1;
 
-        md_update_sb(mddev);
+        md_update_sb(mddev, 1);
 
         /*
          * Kick recovery, maybe this spare has to be added to the
@@ -4016,7 +3998,8 @@ static int set_array_info(mddev_t * mddev, mdu_array_info_t *info)
 
         mddev->max_disks     = MD_SB_DISKS;
 
-        mddev->sb_dirty      = 1;
+        mddev->flags         = 0;
+        set_bit(MD_CHANGE_DEVS, &mddev->flags);
 
         mddev->default_bitmap_offset = MD_SB_BYTES >> 9;
         mddev->bitmap_offset = 0;
@@ -4185,7 +4168,7 @@ static int update_array_info(mddev_t *mddev, mdu_array_info_t *info)
                         mddev->bitmap_offset = 0;
                 }
         }
-        md_update_sb(mddev);
+        md_update_sb(mddev, 1);
         return rv;
 }
 
@@ -4259,27 +4242,6 @@ static int md_ioctl(struct inode *inode, struct file *file,
                 goto abort;
         }
 
-
-        if (cmd == START_ARRAY) {
-                /* START_ARRAY doesn't need to lock the array as autostart_array
-                 * does the locking, and it could even be a different array
-                 */
-                static int cnt = 3;
-                if (cnt > 0 ) {
-                        printk(KERN_WARNING
-                               "md: %s(pid %d) used deprecated START_ARRAY ioctl. "
-                               "This will not be supported beyond July 2006\n",
-                               current->comm, current->pid);
-                        cnt--;
-                }
-                err = autostart_array(new_decode_dev(arg));
-                if (err) {
-                        printk(KERN_WARNING "md: autostart failed!\n");
-                        goto abort;
-                }
-                goto done;
-        }
-
         err = mddev_lock(mddev);
         if (err) {
                 printk(KERN_INFO 
@@ -4687,9 +4649,11 @@ static void status_resync(struct seq_file *seq, mddev_t * mddev)
         seq_printf(seq, " %s =%3u.%u%% (%llu/%llu)",
                    (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)?
                     "reshape" :
-                      (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ?
-                       "resync" : "recovery")),
-                      per_milli/10, per_milli % 10,
+                    (test_bit(MD_RECOVERY_CHECK, &mddev->recovery)?
+                     "check" :
+                     (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ?
+                      "resync" : "recovery"))),
+                   per_milli/10, per_milli % 10,
                    (unsigned long long) resync,
                    (unsigned long long) max_blocks);
 
@@ -5042,12 +5006,12 @@ void md_write_start(mddev_t *mddev, struct bio *bi)
                 spin_lock_irq(&mddev->write_lock);
                 if (mddev->in_sync) {
                         mddev->in_sync = 0;
-                        mddev->sb_dirty = 3;
+                        set_bit(MD_CHANGE_CLEAN, &mddev->flags);
                         md_wakeup_thread(mddev->thread);
                 }
                 spin_unlock_irq(&mddev->write_lock);
         }
-        wait_event(mddev->sb_wait, mddev->sb_dirty==0);
+        wait_event(mddev->sb_wait, mddev->flags==0);
 }
 
 void md_write_end(mddev_t *mddev)
@@ -5078,6 +5042,7 @@ void md_do_sync(mddev_t *mddev)
         int skipped = 0;
         struct list_head *rtmp;
         mdk_rdev_t *rdev;
+        char *desc;
 
         /* just incase thread restarts... */
         if (test_bit(MD_RECOVERY_DONE, &mddev->recovery))
@@ -5085,6 +5050,18 @@ void md_do_sync(mddev_t *mddev)
         if (mddev->ro) /* never try to sync a read-only array */
                 return;
 
+        if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {
+                if (test_bit(MD_RECOVERY_CHECK, &mddev->recovery))
+                        desc = "data-check";
+                else if (test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery))
+                        desc = "requested-resync";
+                else
+                        desc = "resync";
+        } else if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery))
+                desc = "reshape";
+        else
+                desc = "recovery";
+
         /* we overload curr_resync somewhat here.
          * 0 == not engaged in resync at all
          * 2 == checking that there is no conflict with another sync
@@ -5128,10 +5105,10 @@ void md_do_sync(mddev_t *mddev)
                                 prepare_to_wait(&resync_wait, &wq, TASK_UNINTERRUPTIBLE);
                                 if (!kthread_should_stop() &&
                                     mddev2->curr_resync >= mddev->curr_resync) {
-                                        printk(KERN_INFO "md: delaying resync of %s"
-                                               " until %s has finished resync (they"
+                                        printk(KERN_INFO "md: delaying %s of %s"
+                                               " until %s has finished (they"
                                                " share one or more physical units)\n",
-                                               mdname(mddev), mdname(mddev2));
+                                               desc, mdname(mddev), mdname(mddev2));
                                         mddev_put(mddev2);
                                         schedule();
                                         finish_wait(&resync_wait, &wq);
@@ -5167,12 +5144,12 @@ void md_do_sync(mddev_t *mddev)
                                 j = rdev->recovery_offset;
         }
 
-        printk(KERN_INFO "md: syncing RAID array %s\n", mdname(mddev));
-        printk(KERN_INFO "md: minimum _guaranteed_ reconstruction speed:"
-                " %d KB/sec/disc.\n", speed_min(mddev));
+        printk(KERN_INFO "md: %s of RAID array %s\n", desc, mdname(mddev));
+        printk(KERN_INFO "md: minimum _guaranteed_  speed:"
+                " %d KB/sec/disk.\n", speed_min(mddev));
         printk(KERN_INFO "md: using maximum available idle IO bandwidth "
-               "(but not more than %d KB/sec) for reconstruction.\n",
-               speed_max(mddev));
+               "(but not more than %d KB/sec) for %s.\n",
+               speed_max(mddev), desc);
 
         is_mddev_idle(mddev); /* this also initializes IO event counters */
 
@@ -5198,8 +5175,8 @@ void md_do_sync(mddev_t *mddev)
 
         if (j>2) {
                 printk(KERN_INFO 
-                        "md: resuming recovery of %s from checkpoint.\n",
-                        mdname(mddev));
+                       "md: resuming %s of %s from checkpoint.\n",
+                       desc, mdname(mddev));
                 mddev->curr_resync = j;
         }
 
@@ -5282,7 +5259,7 @@ void md_do_sync(mddev_t *mddev)
                         }
                 }
         }
-        printk(KERN_INFO "md: %s: sync done.\n",mdname(mddev));
+        printk(KERN_INFO "md: %s: %s done.\n",mdname(mddev), desc);
         /*
          * this also signals 'finished resyncing' to md_stop
          */
@@ -5302,8 +5279,8 @@ void md_do_sync(mddev_t *mddev)
                         if (test_bit(MD_RECOVERY_INTR, &mddev->recovery)) {
                                 if (mddev->curr_resync >= mddev->recovery_cp) {
                                         printk(KERN_INFO
-                                               "md: checkpointing recovery of %s.\n",
-                                               mdname(mddev));
+                                               "md: checkpointing %s of %s.\n",
+                                               desc, mdname(mddev));
                                         mddev->recovery_cp = mddev->curr_resync;
                                 }
                         } else
@@ -5317,7 +5294,6 @@ void md_do_sync(mddev_t *mddev)
                                     !test_bit(In_sync, &rdev->flags) &&
                                     rdev->recovery_offset < mddev->curr_resync)
                                         rdev->recovery_offset = mddev->curr_resync;
-                        mddev->sb_dirty = 1;
                 }
         }
 
@@ -5374,7 +5350,7 @@ void md_check_recovery(mddev_t *mddev)
         }
 
         if ( ! (
-                mddev->sb_dirty ||
+                mddev->flags ||
                 test_bit(MD_RECOVERY_NEEDED, &mddev->recovery) ||
                 test_bit(MD_RECOVERY_DONE, &mddev->recovery) ||
                 (mddev->safemode == 1) ||
@@ -5390,14 +5366,14 @@ void md_check_recovery(mddev_t *mddev)
                 if (mddev->safemode && !atomic_read(&mddev->writes_pending) &&
                     !mddev->in_sync && mddev->recovery_cp == MaxSector) {
                         mddev->in_sync = 1;
-                        mddev->sb_dirty = 3;
+                        set_bit(MD_CHANGE_CLEAN, &mddev->flags);
                 }
                 if (mddev->safemode == 1)
                         mddev->safemode = 0;
                 spin_unlock_irq(&mddev->write_lock);
 
-                if (mddev->sb_dirty)
-                        md_update_sb(mddev);
+                if (mddev->flags)
+                        md_update_sb(mddev, 0);
 
 
                 if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) &&
@@ -5416,7 +5392,7 @@ void md_check_recovery(mddev_t *mddev)
                                 /* activate any spares */
                                 mddev->pers->spare_active(mddev);
                         }
-                        md_update_sb(mddev);
+                        md_update_sb(mddev, 1);
 
                         /* if array is no-longer degraded, then any saved_raid_disk
                          * information must be scrapped
@@ -5556,22 +5532,15 @@ static void md_geninit(void)
 
 static int __init md_init(void)
 {
-        printk(KERN_INFO "md: md driver %d.%d.%d MAX_MD_DEVS=%d,"
-                        " MD_SB_DISKS=%d\n",
-                        MD_MAJOR_VERSION, MD_MINOR_VERSION,
-                        MD_PATCHLEVEL_VERSION, MAX_MD_DEVS, MD_SB_DISKS);
-        printk(KERN_INFO "md: bitmap version %d.%d\n", BITMAP_MAJOR_HI,
-                        BITMAP_MINOR);
-
         if (register_blkdev(MAJOR_NR, "md"))
                 return -1;
         if ((mdp_major=register_blkdev(0, "mdp"))<=0) {
                 unregister_blkdev(MAJOR_NR, "md");
                 return -1;
         }
-        blk_register_region(MKDEV(MAJOR_NR, 0), MAX_MD_DEVS, THIS_MODULE,
-                                md_probe, NULL, NULL);
-        blk_register_region(MKDEV(mdp_major, 0), MAX_MD_DEVS<<MdpMinorShift, THIS_MODULE,
+        blk_register_region(MKDEV(MAJOR_NR, 0), 1UL<<MINORBITS, THIS_MODULE,
+                            md_probe, NULL, NULL);
+        blk_register_region(MKDEV(mdp_major, 0), 1UL<<MINORBITS, THIS_MODULE,
                             md_probe, NULL, NULL);
 
         register_reboot_notifier(&md_notifier);
@@ -5630,8 +5599,8 @@ static __exit void md_exit(void)
         mddev_t *mddev;
         struct list_head *tmp;
 
-        blk_unregister_region(MKDEV(MAJOR_NR,0), MAX_MD_DEVS);
-        blk_unregister_region(MKDEV(mdp_major,0), MAX_MD_DEVS << MdpMinorShift);
+        blk_unregister_region(MKDEV(MAJOR_NR,0), 1U << MINORBITS);
+        blk_unregister_region(MKDEV(mdp_major,0), 1U << MINORBITS);
 
         unregister_blkdev(MAJOR_NR,"md");
         unregister_blkdev(mdp_major, "mdp");
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 1cc9de44ce86..171ff41b52b0 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -228,6 +228,28 @@ static int multipath_issue_flush(request_queue_t *q, struct gendisk *disk,
         rcu_read_unlock();
         return ret;
 }
+static int multipath_congested(void *data, int bits)
+{
+        mddev_t *mddev = data;
+        multipath_conf_t *conf = mddev_to_conf(mddev);
+        int i, ret = 0;
+
+        rcu_read_lock();
+        for (i = 0; i < mddev->raid_disks ; i++) {
+                mdk_rdev_t *rdev = rcu_dereference(conf->multipaths[i].rdev);
+                if (rdev && !test_bit(Faulty, &rdev->flags)) {
+                        request_queue_t *q = bdev_get_queue(rdev->bdev);
+
+                        ret |= bdi_congested(&q->backing_dev_info, bits);
+                        /* Just like multipath_map, we just check the
+                         * first available device
+                         */
+                        break;
+                }
+        }
+        rcu_read_unlock();
+        return ret;
+}
 
 /*
  * Careful, this can execute in IRQ contexts as well!
@@ -253,7 +275,7 @@ static void multipath_error (mddev_t *mddev, mdk_rdev_t *rdev)
                         char b[BDEVNAME_SIZE];
                         clear_bit(In_sync, &rdev->flags);
                         set_bit(Faulty, &rdev->flags);
-                        mddev->sb_dirty = 1;
+                        set_bit(MD_CHANGE_DEVS, &mddev->flags);
                         conf->working_disks--;
                         printk(KERN_ALERT "multipath: IO failure on %s,"
                                 " disabling IO path. \n Operation continuing"
@@ -470,7 +492,6 @@ static int multipath_run (mddev_t *mddev)
         }
 
         conf->raid_disks = mddev->raid_disks;
-        mddev->sb_dirty = 1;
         conf->mddev = mddev;
         spin_lock_init(&conf->device_lock);
         INIT_LIST_HEAD(&conf->retry_list);
@@ -510,6 +531,8 @@ static int multipath_run (mddev_t *mddev)
 
         mddev->queue->unplug_fn = multipath_unplug;
         mddev->queue->issue_flush_fn = multipath_issue_flush;
+        mddev->queue->backing_dev_info.congested_fn = multipath_congested;
+        mddev->queue->backing_dev_info.congested_data = mddev;
 
         return 0;
 
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index cb8c6317e4e5..dfe32149ad3a 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -60,6 +60,21 @@ static int raid0_issue_flush(request_queue_t *q, struct gendisk *disk,
         return ret;
 }
 
+static int raid0_congested(void *data, int bits)
+{
+        mddev_t *mddev = data;
+        raid0_conf_t *conf = mddev_to_conf(mddev);
+        mdk_rdev_t **devlist = conf->strip_zone[0].dev;
+        int i, ret = 0;
+
+        for (i = 0; i < mddev->raid_disks && !ret ; i++) {
+                request_queue_t *q = bdev_get_queue(devlist[i]->bdev);
+
+                ret |= bdi_congested(&q->backing_dev_info, bits);
+        }
+        return ret;
+}
+
 
 static int create_strip_zones (mddev_t *mddev)
 {
@@ -236,6 +251,8 @@ static int create_strip_zones (mddev_t *mddev)
         mddev->queue->unplug_fn = raid0_unplug;
 
         mddev->queue->issue_flush_fn = raid0_issue_flush;
+        mddev->queue->backing_dev_info.congested_fn = raid0_congested;
+        mddev->queue->backing_dev_info.congested_data = mddev;
 
         printk("raid0: done.\n");
         return 0;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 3b4d69c05623..dc9d2def0270 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -271,7 +271,7 @@ static int raid1_end_read_request(struct bio *bio, unsigned int bytes_done, int
          */
         update_head_pos(mirror, r1_bio);
 
-        if (uptodate || conf->working_disks <= 1) {
+        if (uptodate || (conf->raid_disks - conf->mddev->degraded) <= 1) {
                 /*
                  * Set R1BIO_Uptodate in our master bio, so that
                  * we will return a good error code for to the higher
@@ -601,6 +601,32 @@ static int raid1_issue_flush(request_queue_t *q, struct gendisk *disk,
         return ret;
 }
 
+static int raid1_congested(void *data, int bits)
+{
+        mddev_t *mddev = data;
+        conf_t *conf = mddev_to_conf(mddev);
+        int i, ret = 0;
+
+        rcu_read_lock();
+        for (i = 0; i < mddev->raid_disks; i++) {
+                mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev);
+                if (rdev && !test_bit(Faulty, &rdev->flags)) {
+                        request_queue_t *q = bdev_get_queue(rdev->bdev);
+
+                        /* Note the '|| 1' - when read_balance prefers
+                         * non-congested targets, it can be removed
+                         */
+                        if ((bits & (1<<BDI_write_congested)) || 1)
+                                ret |= bdi_congested(&q->backing_dev_info, bits);
+                        else
+                                ret &= bdi_congested(&q->backing_dev_info, bits);
+                }
+        }
+        rcu_read_unlock();
+        return ret;
+}
+
+
 /* Barriers....
  * Sometimes we need to suspend IO while we do something else,
  * either some resync/recovery, or reconfigure the array.
@@ -929,7 +955,7 @@ static void status(struct seq_file *seq, mddev_t *mddev)
         int i;
 
         seq_printf(seq, " [%d/%d] [", conf->raid_disks,
-                                                conf->working_disks);
+                   conf->raid_disks - mddev->degraded);
         rcu_read_lock();
         for (i = 0; i < conf->raid_disks; i++) {
                 mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev);
@@ -953,26 +979,27 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
          * else mark the drive as failed
          */
         if (test_bit(In_sync, &rdev->flags)
-            && conf->working_disks == 1)
+            && (conf->raid_disks - mddev->degraded) == 1)
                 /*
                  * Don't fail the drive, act as though we were just a
                  * normal single drive
                  */
                 return;
-        if (test_bit(In_sync, &rdev->flags)) {
+        if (test_and_clear_bit(In_sync, &rdev->flags)) {
+                unsigned long flags;
+                spin_lock_irqsave(&conf->device_lock, flags);
                 mddev->degraded++;
-                conf->working_disks--;
+                spin_unlock_irqrestore(&conf->device_lock, flags);
                 /*
                  * if recovery is running, make sure it aborts.
                  */
                 set_bit(MD_RECOVERY_ERR, &mddev->recovery);
         }
-        clear_bit(In_sync, &rdev->flags);
         set_bit(Faulty, &rdev->flags);
-        mddev->sb_dirty = 1;
+        set_bit(MD_CHANGE_DEVS, &mddev->flags);
         printk(KERN_ALERT "raid1: Disk failure on %s, disabling device. \n"
                 "       Operation continuing on %d devices\n",
-                bdevname(rdev->bdev,b), conf->working_disks);
+                bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);
 }
 
 static void print_conf(conf_t *conf)
@@ -984,7 +1011,7 @@ static void print_conf(conf_t *conf)
                 printk("(!conf)\n");
                 return;
         }
-        printk(" --- wd:%d rd:%d\n", conf->working_disks,
+        printk(" --- wd:%d rd:%d\n", conf->raid_disks - conf->mddev->degraded,
                 conf->raid_disks);
 
         rcu_read_lock();
@@ -1023,10 +1050,11 @@ static int raid1_spare_active(mddev_t *mddev)
                 mdk_rdev_t *rdev = conf->mirrors[i].rdev;
                 if (rdev
                     && !test_bit(Faulty, &rdev->flags)
-                    && !test_bit(In_sync, &rdev->flags)) {
-                        conf->working_disks++;
+                    && !test_and_set_bit(In_sync, &rdev->flags)) {
+                        unsigned long flags;
+                        spin_lock_irqsave(&conf->device_lock, flags);
                         mddev->degraded--;
-                        set_bit(In_sync, &rdev->flags);
+                        spin_unlock_irqrestore(&conf->device_lock, flags);
                 }
         }
 
@@ -1368,6 +1396,95 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)
  *      3.      Performs writes following reads for array syncronising.
  */
 
+static void fix_read_error(conf_t *conf, int read_disk,
+                           sector_t sect, int sectors)
+{
+        mddev_t *mddev = conf->mddev;
+        while(sectors) {
+                int s = sectors;
+                int d = read_disk;
+                int success = 0;
+                int start;
+                mdk_rdev_t *rdev;
+
+                if (s > (PAGE_SIZE>>9))
+                        s = PAGE_SIZE >> 9;
+
+                do {
+                        /* Note: no rcu protection needed here
+                         * as this is synchronous in the raid1d thread
+                         * which is the thread that might remove
+                         * a device.  If raid1d ever becomes multi-threaded....
+                         */
+                        rdev = conf->mirrors[d].rdev;
+                        if (rdev &&
+                            test_bit(In_sync, &rdev->flags) &&
+                            sync_page_io(rdev->bdev,
+                                         sect + rdev->data_offset,
+                                         s<<9,
+                                         conf->tmppage, READ))
+                                success = 1;
+                        else {
+                                d++;
+                                if (d == conf->raid_disks)
+                                        d = 0;
+                        }
+                } while (!success && d != read_disk);
+
+                if (!success) {
+                        /* Cannot read from anywhere -- bye bye array */
+                        md_error(mddev, conf->mirrors[read_disk].rdev);
+                        break;
+                }
+                /* write it back and re-read */
+                start = d;
+                while (d != read_disk) {
+                        if (d==0)
+                                d = conf->raid_disks;
+                        d--;
+                        rdev = conf->mirrors[d].rdev;
+                        if (rdev &&
+                            test_bit(In_sync, &rdev->flags)) {
+                                if (sync_page_io(rdev->bdev,
+                                                 sect + rdev->data_offset,
+                                                 s<<9, conf->tmppage, WRITE)
+                                    == 0)
+                                        /* Well, this device is dead */
+                                        md_error(mddev, rdev);
+                        }
+                }
+                d = start;
+                while (d != read_disk) {
+                        char b[BDEVNAME_SIZE];
+                        if (d==0)
+                                d = conf->raid_disks;
+                        d--;
+                        rdev = conf->mirrors[d].rdev;
+                        if (rdev &&
+                            test_bit(In_sync, &rdev->flags)) {
+                                if (sync_page_io(rdev->bdev,
+                                                 sect + rdev->data_offset,
+                                                 s<<9, conf->tmppage, READ)
+                                    == 0)
+                                        /* Well, this device is dead */
+                                        md_error(mddev, rdev);
+                                else {
+                                        atomic_add(s, &rdev->corrected_errors);
+                                        printk(KERN_INFO
+                                               "raid1:%s: read error corrected "
+                                               "(%d sectors at %llu on %s)\n",
+                                               mdname(mddev), s,
+                                               (unsigned long long)sect +
+                                                   rdev->data_offset,
+                                               bdevname(rdev->bdev, b));
+                                }
+                        }
+                }
+                sectors -= s;
+                sect += s;
+        }
+}
+
 static void raid1d(mddev_t *mddev)
 {
         r1bio_t *r1_bio;
@@ -1460,86 +1577,14 @@ static void raid1d(mddev_t *mddev)
                          * This is all done synchronously while the array is
                          * frozen
                          */
-                        sector_t sect = r1_bio->sector;
-                        int sectors = r1_bio->sectors;
-                        freeze_array(conf);
-                        if (mddev->ro == 0) while(sectors) {
-                                int s = sectors;
-                                int d = r1_bio->read_disk;
-                                int success = 0;
-
-                                if (s > (PAGE_SIZE>>9))
-                                        s = PAGE_SIZE >> 9;
-
-                                do {
-                                        /* Note: no rcu protection needed here
-                                         * as this is synchronous in the raid1d thread
-                                         * which is the thread that might remove
-                                         * a device.  If raid1d ever becomes multi-threaded....
-                                         */
-                                        rdev = conf->mirrors[d].rdev;
-                                        if (rdev &&
-                                            test_bit(In_sync, &rdev->flags) &&
-                                            sync_page_io(rdev->bdev,
-                                                         sect + rdev->data_offset,
-                                                         s<<9,
-                                                         conf->tmppage, READ))
-                                                success = 1;
-                                        else {
-                                                d++;
-                                                if (d == conf->raid_disks)
-                                                        d = 0;
-                                        }
-                                } while (!success && d != r1_bio->read_disk);
-
-                                if (success) {
-                                        /* write it back and re-read */
-                                        int start = d;
-                                        while (d != r1_bio->read_disk) {
-                                                if (d==0)
-                                                        d = conf->raid_disks;
-                                                d--;
-                                                rdev = conf->mirrors[d].rdev;
-                                                if (rdev &&
-                                                    test_bit(In_sync, &rdev->flags)) {
-                                                        if (sync_page_io(rdev->bdev,
-                                                                         sect + rdev->data_offset,
-                                                                         s<<9, conf->tmppage, WRITE) == 0)
-                                                                /* Well, this device is dead */
-                                                                md_error(mddev, rdev);
-                                                }
-                                        }
-                                        d = start;
-                                        while (d != r1_bio->read_disk) {
-                                                if (d==0)
-                                                        d = conf->raid_disks;
-                                                d--;
-                                                rdev = conf->mirrors[d].rdev;
-                                                if (rdev &&
-                                                    test_bit(In_sync, &rdev->flags)) {
-                                                        if (sync_page_io(rdev->bdev,
-                                                                         sect + rdev->data_offset,
-                                                                         s<<9, conf->tmppage, READ) == 0)
-                                                                /* Well, this device is dead */
-                                                                md_error(mddev, rdev);
-                                                        else {
-                                                                atomic_add(s, &rdev->corrected_errors);
-                                                                printk(KERN_INFO "raid1:%s: read error corrected (%d sectors at %llu on %s)\n",
-                                                                       mdname(mddev), s, (unsigned long long)(sect + rdev->data_offset), bdevname(rdev->bdev, b));
-                                                        }
-                                                }
-                                        }
-                                } else {
-                                        /* Cannot read from anywhere -- bye bye array */
-                                        md_error(mddev, conf->mirrors[r1_bio->read_disk].rdev);
-                                        break;
-                                }
-                                sectors -= s;
-                                sect += s;
+                        if (mddev->ro == 0) {
+                                freeze_array(conf);
+                                fix_read_error(conf, r1_bio->read_disk,
+                                               r1_bio->sector,
+                                               r1_bio->sectors);
+                                unfreeze_array(conf);
                         }
 
-                        unfreeze_array(conf);
-
                         bio = r1_bio->bios[r1_bio->read_disk];
                         if ((disk=read_balance(conf, r1_bio)) == -1) {
                                 printk(KERN_ALERT "raid1: %s: unrecoverable I/O"
@@ -1884,15 +1929,11 @@ static int run(mddev_t *mddev)
                         blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
 
                 disk->head_position = 0;
-                if (!test_bit(Faulty, &rdev->flags) && test_bit(In_sync, &rdev->flags))
-                        conf->working_disks++;
         }
         conf->raid_disks = mddev->raid_disks;
         conf->mddev = mddev;
         spin_lock_init(&conf->device_lock);
         INIT_LIST_HEAD(&conf->retry_list);
-        if (conf->working_disks == 1)
-                mddev->recovery_cp = MaxSector;
 
         spin_lock_init(&conf->resync_lock);
         init_waitqueue_head(&conf->wait_barrier);
@@ -1900,11 +1941,6 @@ static int run(mddev_t *mddev)
         bio_list_init(&conf->pending_bio_list);
         bio_list_init(&conf->flushing_bio_list);
 
-        if (!conf->working_disks) {
-                printk(KERN_ERR "raid1: no operational mirrors for %s\n",
-                        mdname(mddev));
-                goto out_free_conf;
-        }
 
         mddev->degraded = 0;
         for (i = 0; i < conf->raid_disks; i++) {
@@ -1917,6 +1953,13 @@ static int run(mddev_t *mddev)
                         mddev->degraded++;
                 }
         }
+        if (mddev->degraded == conf->raid_disks) {
+                printk(KERN_ERR "raid1: no operational mirrors for %s\n",
+                        mdname(mddev));
+                goto out_free_conf;
+        }
+        if (conf->raid_disks - mddev->degraded == 1)
+                mddev->recovery_cp = MaxSector;
 
         /*
          * find the first working one and use it as a starting point
@@ -1948,6 +1991,8 @@ static int run(mddev_t *mddev)
 
         mddev->queue->unplug_fn = raid1_unplug;
         mddev->queue->issue_flush_fn = raid1_issue_flush;
+        mddev->queue->backing_dev_info.congested_fn = raid1_congested;
+        mddev->queue->backing_dev_info.congested_data = mddev;
 
         return 0;
 
@@ -2035,7 +2080,7 @@ static int raid1_reshape(mddev_t *mddev)
         mirror_info_t *newmirrors;
         conf_t *conf = mddev_to_conf(mddev);
         int cnt, raid_disks;
-
+        unsigned long flags;
         int d, d2;
 
         /* Cannot change chunk_size, layout, or level */
@@ -2094,7 +2139,9 @@ static int raid1_reshape(mddev_t *mddev)
         kfree(conf->poolinfo);
         conf->poolinfo = newpoolinfo;
 
+        spin_lock_irqsave(&conf->device_lock, flags);
         mddev->degraded += (raid_disks - conf->raid_disks);
+        spin_unlock_irqrestore(&conf->device_lock, flags);
         conf->raid_disks = mddev->raid_disks = raid_disks;
         mddev->delta_disks = 0;
 
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 016ddb831c9b..1250f0eab4af 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -648,6 +648,26 @@ static int raid10_issue_flush(request_queue_t *q, struct gendisk *disk,
         return ret;
 }
 
+static int raid10_congested(void *data, int bits)
+{
+        mddev_t *mddev = data;
+        conf_t *conf = mddev_to_conf(mddev);
+        int i, ret = 0;
+
+        rcu_read_lock();
+        for (i = 0; i < mddev->raid_disks && ret == 0; i++) {
+                mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev);
+                if (rdev && !test_bit(Faulty, &rdev->flags)) {
+                        request_queue_t *q = bdev_get_queue(rdev->bdev);
+
+                        ret |= bdi_congested(&q->backing_dev_info, bits);
+                }
+        }
+        rcu_read_unlock();
+        return ret;
+}
+
+
 /* Barriers....
  * Sometimes we need to suspend IO while we do something else,
  * either some resync/recovery, or reconfigure the array.
@@ -921,7 +941,7 @@ static void status(struct seq_file *seq, mddev_t *mddev)
                         seq_printf(seq, " %d far-copies", conf->far_copies);
         }
         seq_printf(seq, " [%d/%d] [", conf->raid_disks,
-                                                conf->working_disks);
+                                        conf->raid_disks - mddev->degraded);
         for (i = 0; i < conf->raid_disks; i++)
                 seq_printf(seq, "%s",
                               conf->mirrors[i].rdev &&
@@ -941,7 +961,7 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
          * else mark the drive as failed
          */
         if (test_bit(In_sync, &rdev->flags)
-            && conf->working_disks == 1)
+            && conf->raid_disks-mddev->degraded == 1)
                 /*
                  * Don't fail the drive, just return an IO error.
                  * The test should really be more sophisticated than
@@ -950,20 +970,21 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
                  * really dead" tests...
                  */
                 return;
-        if (test_bit(In_sync, &rdev->flags)) {
+        if (test_and_clear_bit(In_sync, &rdev->flags)) {
+                unsigned long flags;
+                spin_lock_irqsave(&conf->device_lock, flags);
                 mddev->degraded++;
-                conf->working_disks--;
+                spin_unlock_irqrestore(&conf->device_lock, flags);
                 /*
                  * if recovery is running, make sure it aborts.
                  */
                 set_bit(MD_RECOVERY_ERR, &mddev->recovery);
         }
-        clear_bit(In_sync, &rdev->flags);
         set_bit(Faulty, &rdev->flags);
-        mddev->sb_dirty = 1;
+        set_bit(MD_CHANGE_DEVS, &mddev->flags);
         printk(KERN_ALERT "raid10: Disk failure on %s, disabling device. \n"
                 "       Operation continuing on %d devices\n",
-                bdevname(rdev->bdev,b), conf->working_disks);
+                bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);
 }
 
 static void print_conf(conf_t *conf)
@@ -976,7 +997,7 @@ static void print_conf(conf_t *conf)
                 printk("(!conf)\n");
                 return;
         }
-        printk(" --- wd:%d rd:%d\n", conf->working_disks,
+        printk(" --- wd:%d rd:%d\n", conf->raid_disks - conf->mddev->degraded,
                 conf->raid_disks);
 
         for (i = 0; i < conf->raid_disks; i++) {
@@ -1034,10 +1055,11 @@ static int raid10_spare_active(mddev_t *mddev)
                 tmp = conf->mirrors + i;
                 if (tmp->rdev
                     && !test_bit(Faulty, &tmp->rdev->flags)
-                    && !test_bit(In_sync, &tmp->rdev->flags)) {
-                        conf->working_disks++;
+                    && !test_and_set_bit(In_sync, &tmp->rdev->flags)) {
+                        unsigned long flags;
+                        spin_lock_irqsave(&conf->device_lock, flags);
                         mddev->degraded--;
-                        set_bit(In_sync, &tmp->rdev->flags);
+                        spin_unlock_irqrestore(&conf->device_lock, flags);
                 }
         }
 
@@ -1350,9 +1372,119 @@ static void recovery_request_write(mddev_t *mddev, r10bio_t *r10_bio)
  *
  *      1.      Retries failed read operations on working mirrors.
  *      2.      Updates the raid superblock when problems encounter.
- *      3.      Performs writes following reads for array syncronising.
+ *      3.      Performs writes following reads for array synchronising.
  */
 
+static void fix_read_error(conf_t *conf, mddev_t *mddev, r10bio_t *r10_bio)
+{
+        int sect = 0; /* Offset from r10_bio->sector */
+        int sectors = r10_bio->sectors;
+        mdk_rdev_t*rdev;
+        while(sectors) {
+                int s = sectors;
+                int sl = r10_bio->read_slot;
+                int success = 0;
+                int start;
+
+                if (s > (PAGE_SIZE>>9))
+                        s = PAGE_SIZE >> 9;
+
+                rcu_read_lock();
+                do {
+                        int d = r10_bio->devs[sl].devnum;
+                        rdev = rcu_dereference(conf->mirrors[d].rdev);
+                        if (rdev &&
+                            test_bit(In_sync, &rdev->flags)) {
+                                atomic_inc(&rdev->nr_pending);
+                                rcu_read_unlock();
+                                success = sync_page_io(rdev->bdev,
+                                                       r10_bio->devs[sl].addr +
+                                                       sect + rdev->data_offset,
+                                                       s<<9,
+                                                       conf->tmppage, READ);
+                                rdev_dec_pending(rdev, mddev);
+                                rcu_read_lock();
+                                if (success)
+                                        break;
+                        }
+                        sl++;
+                        if (sl == conf->copies)
+                                sl = 0;
+                } while (!success && sl != r10_bio->read_slot);
+                rcu_read_unlock();
+
+                if (!success) {
+                        /* Cannot read from anywhere -- bye bye array */
+                        int dn = r10_bio->devs[r10_bio->read_slot].devnum;
+                        md_error(mddev, conf->mirrors[dn].rdev);
+                        break;
+                }
+
+                start = sl;
+                /* write it back and re-read */
+                rcu_read_lock();
+                while (sl != r10_bio->read_slot) {
+                        int d;
+                        if (sl==0)
+                                sl = conf->copies;
+                        sl--;
+                        d = r10_bio->devs[sl].devnum;
+                        rdev = rcu_dereference(conf->mirrors[d].rdev);
+                        if (rdev &&
+                            test_bit(In_sync, &rdev->flags)) {
+                                atomic_inc(&rdev->nr_pending);
+                                rcu_read_unlock();
+                                atomic_add(s, &rdev->corrected_errors);
+                                if (sync_page_io(rdev->bdev,
+                                                 r10_bio->devs[sl].addr +
+                                                 sect + rdev->data_offset,
+                                                 s<<9, conf->tmppage, WRITE)
+                                    == 0)
+                                        /* Well, this device is dead */
+                                        md_error(mddev, rdev);
+                                rdev_dec_pending(rdev, mddev);
+                                rcu_read_lock();
+                        }
+                }
+                sl = start;
+                while (sl != r10_bio->read_slot) {
+                        int d;
+                        if (sl==0)
+                                sl = conf->copies;
+                        sl--;
+                        d = r10_bio->devs[sl].devnum;
+                        rdev = rcu_dereference(conf->mirrors[d].rdev);
+                        if (rdev &&
+                            test_bit(In_sync, &rdev->flags)) {
+                                char b[BDEVNAME_SIZE];
+                                atomic_inc(&rdev->nr_pending);
+                                rcu_read_unlock();
+                                if (sync_page_io(rdev->bdev,
+                                                 r10_bio->devs[sl].addr +
+                                                 sect + rdev->data_offset,
+                                                 s<<9, conf->tmppage, READ) == 0)
+                                        /* Well, this device is dead */
+                                        md_error(mddev, rdev);
+                                else
+                                        printk(KERN_INFO
+                                               "raid10:%s: read error corrected"
+                                               " (%d sectors at %llu on %s)\n",
+                                               mdname(mddev), s,
+                                               (unsigned long long)sect+
+                                                    rdev->data_offset,
+                                               bdevname(rdev->bdev, b));
+
+                                rdev_dec_pending(rdev, mddev);
+                                rcu_read_lock();
+                        }
+                }
+                rcu_read_unlock();
+
+                sectors -= s;
+                sect += s;
+        }
+}
+
 static void raid10d(mddev_t *mddev)
 {
         r10bio_t *r10_bio;
@@ -1413,105 +1545,12 @@ static void raid10d(mddev_t *mddev)
                          * This is all done synchronously while the array is
                          * frozen.
                          */
-                        int sect = 0; /* Offset from r10_bio->sector */
-                        int sectors = r10_bio->sectors;
-                        freeze_array(conf);
-                        if (mddev->ro == 0) while(sectors) {
-                                int s = sectors;
-                                int sl = r10_bio->read_slot;
-                                int success = 0;
-
-                                if (s > (PAGE_SIZE>>9))
-                                        s = PAGE_SIZE >> 9;
-
-                                rcu_read_lock();
-                                do {
-                                        int d = r10_bio->devs[sl].devnum;
-                                        rdev = rcu_dereference(conf->mirrors[d].rdev);
-                                        if (rdev &&
-                                            test_bit(In_sync, &rdev->flags)) {
-                                                atomic_inc(&rdev->nr_pending);
-                                                rcu_read_unlock();
-                                                success = sync_page_io(rdev->bdev,
-                                                                       r10_bio->devs[sl].addr +
-                                                                       sect + rdev->data_offset,
-                                                                       s<<9,
-                                                                       conf->tmppage, READ);
-                                                rdev_dec_pending(rdev, mddev);
-                                                rcu_read_lock();
-                                                if (success)
-                                                        break;
-                                        }
-                                        sl++;
-                                        if (sl == conf->copies)
-                                                sl = 0;
-                                } while (!success && sl != r10_bio->read_slot);
-                                rcu_read_unlock();
-
-                                if (success) {
-                                        int start = sl;
-                                        /* write it back and re-read */
-                                        rcu_read_lock();
-                                        while (sl != r10_bio->read_slot) {
-                                                int d;
-                                                if (sl==0)
-                                                        sl = conf->copies;
-                                                sl--;
-                                                d = r10_bio->devs[sl].devnum;
-                                                rdev = rcu_dereference(conf->mirrors[d].rdev);
-                                                if (rdev &&
-                                                    test_bit(In_sync, &rdev->flags)) {
-                                                        atomic_inc(&rdev->nr_pending);
-                                                        rcu_read_unlock();
-                                                        atomic_add(s, &rdev->corrected_errors);
-                                                        if (sync_page_io(rdev->bdev,
-                                                                         r10_bio->devs[sl].addr +
-                                                                         sect + rdev->data_offset,
-                                                                         s<<9, conf->tmppage, WRITE) == 0)
-                                                                /* Well, this device is dead */
-                                                                md_error(mddev, rdev);
-                                                        rdev_dec_pending(rdev, mddev);
-                                                        rcu_read_lock();
-                                                }
-                                        }
-                                        sl = start;
-                                        while (sl != r10_bio->read_slot) {
-                                                int d;
-                                                if (sl==0)
-                                                        sl = conf->copies;
-                                                sl--;
-                                                d = r10_bio->devs[sl].devnum;
-                                                rdev = rcu_dereference(conf->mirrors[d].rdev);
-                                                if (rdev &&
-                                                    test_bit(In_sync, &rdev->flags)) {
-                                                        atomic_inc(&rdev->nr_pending);
-                                                        rcu_read_unlock();
-                                                        if (sync_page_io(rdev->bdev,
-                                                                         r10_bio->devs[sl].addr +
-                                                                         sect + rdev->data_offset,
-                                                                         s<<9, conf->tmppage, READ) == 0)
-                                                                /* Well, this device is dead */
-                                                                md_error(mddev, rdev);
-                                                        else
-                                                                printk(KERN_INFO "raid10:%s: read error corrected (%d sectors at %llu on %s)\n",
-                                                                       mdname(mddev), s, (unsigned long long)(sect+rdev->data_offset), bdevname(rdev->bdev, b));
-
-                                                        rdev_dec_pending(rdev, mddev);
-                                                        rcu_read_lock();
-                                                }
-                                        }
-                                        rcu_read_unlock();
-                                } else {
-                                        /* Cannot read from anywhere -- bye bye array */
-                                        md_error(mddev, conf->mirrors[r10_bio->devs[r10_bio->read_slot].devnum].rdev);
-                                        break;
-                                }
-                                sectors -= s;
-                                sect += s;
+                        if (mddev->ro == 0) {
+                                freeze_array(conf);
+                                fix_read_error(conf, mddev, r10_bio);
+                                unfreeze_array(conf);
                         }
 
-                        unfreeze_array(conf);
-
                         bio = r10_bio->devs[r10_bio->read_slot].bio;
                         r10_bio->devs[r10_bio->read_slot].bio =
                                 mddev->ro ? IO_BLOCKED : NULL;
@@ -2018,8 +2057,6 @@ static int run(mddev_t *mddev)
                         mddev->queue->max_sectors = (PAGE_SIZE>>9);
 
                 disk->head_position = 0;
-                if (!test_bit(Faulty, &rdev->flags) && test_bit(In_sync, &rdev->flags))
-                        conf->working_disks++;
         }
         conf->raid_disks = mddev->raid_disks;
         conf->mddev = mddev;
@@ -2077,6 +2114,8 @@ static int run(mddev_t *mddev)
 
         mddev->queue->unplug_fn = raid10_unplug;
         mddev->queue->issue_flush_fn = raid10_issue_flush;
+        mddev->queue->backing_dev_info.congested_fn = raid10_congested;
+        mddev->queue->backing_dev_info.congested_data = mddev;
 
         /* Calculate max read-ahead size.
          * We need to readahead at least twice a whole stripe....
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 450066007160..37e4ff661b6c 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -636,7 +636,6 @@ static int raid5_end_write_request (struct bio *bi, unsigned int bytes_done,
         struct stripe_head *sh = bi->bi_private;
         raid5_conf_t *conf = sh->raid_conf;
         int disks = sh->disks, i;
-        unsigned long flags;
         int uptodate = test_bit(BIO_UPTODATE, &bi->bi_flags);
 
         if (bi->bi_size)
@@ -654,7 +653,6 @@ static int raid5_end_write_request (struct bio *bi, unsigned int bytes_done,
                 return 0;
         }
 
-        spin_lock_irqsave(&conf->device_lock, flags);
         if (!uptodate)
                 md_error(conf->mddev, conf->disks[i].rdev);
 
@@ -662,8 +660,7 @@ static int raid5_end_write_request (struct bio *bi, unsigned int bytes_done,
         
         clear_bit(R5_LOCKED, &sh->dev[i].flags);
         set_bit(STRIPE_HANDLE, &sh->state);
-        __release_stripe(conf, sh);
-        spin_unlock_irqrestore(&conf->device_lock, flags);
+        release_stripe(sh);
         return 0;
 }
 
@@ -696,12 +693,12 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
         PRINTK("raid5: error called\n");
 
         if (!test_bit(Faulty, &rdev->flags)) {
-                mddev->sb_dirty = 1;
-                if (test_bit(In_sync, &rdev->flags)) {
-                        conf->working_disks--;
+                set_bit(MD_CHANGE_DEVS, &mddev->flags);
+                if (test_and_clear_bit(In_sync, &rdev->flags)) {
+                        unsigned long flags;
+                        spin_lock_irqsave(&conf->device_lock, flags);
                         mddev->degraded++;
-                        conf->failed_disks++;
-                        clear_bit(In_sync, &rdev->flags);
+                        spin_unlock_irqrestore(&conf->device_lock, flags);
                         /*
                          * if recovery was running, make sure it aborts.
                          */
@@ -711,7 +708,7 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
                 printk (KERN_ALERT
                         "raid5: Disk failure on %s, disabling device."
                         " Operation continuing on %d devices\n",
-                        bdevname(rdev->bdev,b), conf->working_disks);
+                        bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);
         }
 }
 
@@ -1353,10 +1350,9 @@ static int page_is_zero(struct page *p)
 static int stripe_to_pdidx(sector_t stripe, raid5_conf_t *conf, int disks)
 {
         int sectors_per_chunk = conf->chunk_size >> 9;
-        sector_t x = stripe;
         int pd_idx, dd_idx;
-        int chunk_offset = sector_div(x, sectors_per_chunk);
-        stripe = x;
+        int chunk_offset = sector_div(stripe, sectors_per_chunk);
+
         raid5_compute_sector(stripe*(disks-1)*sectors_per_chunk
                              + chunk_offset, disks, disks-1, &dd_idx, &pd_idx, conf);
         return pd_idx;
@@ -2597,6 +2593,24 @@ static int raid5_issue_flush(request_queue_t *q, struct gendisk *disk,
         return ret;
 }
 
+static int raid5_congested(void *data, int bits)
+{
+        mddev_t *mddev = data;
+        raid5_conf_t *conf = mddev_to_conf(mddev);
+
+        /* No difference between reads and writes.  Just check
+         * how busy the stripe_cache is
+         */
+        if (conf->inactive_blocked)
+                return 1;
+        if (conf->quiesce)
+                return 1;
+        if (list_empty_careful(&conf->inactive_list))
+                return 1;
+
+        return 0;
+}
+
 static int make_request(request_queue_t *q, struct bio * bi)
 {
         mddev_t *mddev = q->queuedata;
@@ -2781,9 +2795,9 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped
                 wait_event(conf->wait_for_overlap,
                            atomic_read(&conf->reshape_stripes)==0);
                 mddev->reshape_position = conf->expand_progress;
-                mddev->sb_dirty = 1;
+                set_bit(MD_CHANGE_DEVS, &mddev->flags);
                 md_wakeup_thread(mddev->thread);
-                wait_event(mddev->sb_wait, mddev->sb_dirty == 0 ||
+                wait_event(mddev->sb_wait, mddev->flags == 0 ||
                            kthread_should_stop());
                 spin_lock_irq(&conf->device_lock);
                 conf->expand_lo = mddev->reshape_position;
@@ -3074,6 +3088,7 @@ static int run(mddev_t *mddev)
         mdk_rdev_t *rdev;
         struct disk_info *disk;
         struct list_head *tmp;
+        int working_disks = 0;
 
         if (mddev->level != 5 && mddev->level != 4 && mddev->level != 6) {
                 printk(KERN_ERR "raid5: %s: raid level not set to 4/5/6 (%d)\n",
@@ -3176,14 +3191,14 @@ static int run(mddev_t *mddev)
                         printk(KERN_INFO "raid5: device %s operational as raid"
                                 " disk %d\n", bdevname(rdev->bdev,b),
                                 raid_disk);
-                        conf->working_disks++;
+                        working_disks++;
                 }
         }
 
         /*
          * 0 for a fully functional array, 1 or 2 for a degraded array.
          */
-        mddev->degraded = conf->failed_disks = conf->raid_disks - conf->working_disks;
+        mddev->degraded = conf->raid_disks - working_disks;
         conf->mddev = mddev;
         conf->chunk_size = mddev->chunk_size;
         conf->level = mddev->level;
@@ -3218,7 +3233,7 @@ static int run(mddev_t *mddev)
         if (mddev->degraded > conf->max_degraded) {
                 printk(KERN_ERR "raid5: not enough operational devices for %s"
                         " (%d/%d failed)\n",
-                        mdname(mddev), conf->failed_disks, conf->raid_disks);
+                        mdname(mddev), mddev->degraded, conf->raid_disks);
                 goto abort;
         }
 
@@ -3299,6 +3314,9 @@ static int run(mddev_t *mddev)
 
         mddev->queue->unplug_fn = raid5_unplug_device;
         mddev->queue->issue_flush_fn = raid5_issue_flush;
+        mddev->queue->backing_dev_info.congested_fn = raid5_congested;
+        mddev->queue->backing_dev_info.congested_data = mddev;
+
         mddev->array_size =  mddev->size * (conf->previous_raid_disks -
                                             conf->max_degraded);
 
@@ -3375,7 +3393,7 @@ static void status (struct seq_file *seq, mddev_t *mddev)
         int i;
 
         seq_printf (seq, " level %d, %dk chunk, algorithm %d", mddev->level, mddev->chunk_size >> 10, mddev->layout);
-        seq_printf (seq, " [%d/%d] [", conf->raid_disks, conf->working_disks);
+        seq_printf (seq, " [%d/%d] [", conf->raid_disks, conf->raid_disks - mddev->degraded);
         for (i = 0; i < conf->raid_disks; i++)
                 seq_printf (seq, "%s",
                                conf->disks[i].rdev &&
@@ -3397,8 +3415,8 @@ static void print_raid5_conf (raid5_conf_t *conf)
                 printk("(conf==NULL)\n");
                 return;
         }
-        printk(" --- rd:%d wd:%d fd:%d\n", conf->raid_disks,
-                 conf->working_disks, conf->failed_disks);
+        printk(" --- rd:%d wd:%d\n", conf->raid_disks,
+                 conf->raid_disks - conf->mddev->degraded);
 
         for (i = 0; i < conf->raid_disks; i++) {
                 char b[BDEVNAME_SIZE];
@@ -3420,11 +3438,11 @@ static int raid5_spare_active(mddev_t *mddev)
                 tmp = conf->disks + i;
                 if (tmp->rdev
                     && !test_bit(Faulty, &tmp->rdev->flags)
-                    && !test_bit(In_sync, &tmp->rdev->flags)) {
+                    && !test_and_set_bit(In_sync, &tmp->rdev->flags)) {
+                        unsigned long flags;
+                        spin_lock_irqsave(&conf->device_lock, flags);
                         mddev->degraded--;
-                        conf->failed_disks--;
-                        conf->working_disks++;
-                        set_bit(In_sync, &tmp->rdev->flags);
+                        spin_unlock_irqrestore(&conf->device_lock, flags);
                 }
         }
         print_raid5_conf(conf);
@@ -3560,6 +3578,7 @@ static int raid5_start_reshape(mddev_t *mddev)
         struct list_head *rtmp;
         int spares = 0;
         int added_devices = 0;
+        unsigned long flags;
 
         if (mddev->degraded ||
             test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))
@@ -3593,7 +3612,6 @@ static int raid5_start_reshape(mddev_t *mddev)
                         if (raid5_add_disk(mddev, rdev)) {
                                 char nm[20];
                                 set_bit(In_sync, &rdev->flags);
-                                conf->working_disks++;
                                 added_devices++;
                                 rdev->recovery_offset = 0;
                                 sprintf(nm, "rd%d", rdev->raid_disk);
@@ -3602,10 +3620,12 @@ static int raid5_start_reshape(mddev_t *mddev)
                                 break;
                 }
 
+        spin_lock_irqsave(&conf->device_lock, flags);
         mddev->degraded = (conf->raid_disks - conf->previous_raid_disks) - added_devices;
+        spin_unlock_irqrestore(&conf->device_lock, flags);
         mddev->raid_disks = conf->raid_disks;
         mddev->reshape_position = 0;
-        mddev->sb_dirty = 1;
+        set_bit(MD_CHANGE_DEVS, &mddev->flags);
 
         clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
         clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 9953201c670d..a67f5efc983f 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -165,7 +165,7 @@ static struct devprobe2 mca_probes[] __initdata = {
  * look for EISA/PCI/MCA cards in addition to ISA cards).
  */
 static struct devprobe2 isa_probes[] __initdata = {
-#ifdef CONFIG_HP100             /* ISA, EISA & PCI */
+#if defined(CONFIG_HP100) && defined(CONFIG_ISA)        /* ISA, EISA */
         {hp100_probe, 0},
 #endif
 #ifdef CONFIG_3C515
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 34412bc7c4b6..d01870619a4a 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -944,12 +944,13 @@ extern int fs_mii_connect(struct net_device *dev);
 extern void fs_mii_disconnect(struct net_device *dev);
 
 static struct net_device *fs_init_instance(struct device *dev,
-                const struct fs_platform_info *fpi)
+                struct fs_platform_info *fpi)
 {
         struct net_device *ndev = NULL;
         struct fs_enet_private *fep = NULL;
         int privsize, i, r, err = 0, registered = 0;
 
+        fpi->fs_no = fs_get_id(fpi);
         /* guard */
         if ((unsigned int)fpi->fs_no >= FS_MAX_INDEX)
                 return ERR_PTR(-EINVAL);
@@ -971,7 +972,7 @@ static struct net_device *fs_init_instance(struct device *dev,
         dev_set_drvdata(dev, ndev);
         fep->fpi = fpi;
         if (fpi->init_ioports)
-                fpi->init_ioports();
+                fpi->init_ioports((struct fs_platform_info *)fpi);
 
 #ifdef CONFIG_FS_ENET_HAS_FEC
         if (fs_get_fec_index(fpi->fs_no) >= 0)
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 561db440bc2c..ae8ad4f763bf 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -188,7 +188,7 @@ struct hp100_private {
 /*
  *  variables
  */
-#ifndef MODULE
+#ifdef CONFIG_ISA
 static const char *hp100_isa_tbl[] = {
         "HWPF150", /* HP J2573 rev A */
         "HWP1950", /* HP J2573 */
@@ -335,7 +335,7 @@ static __devinit const char *hp100_read_id(int ioaddr)
         return str;
 }
 
-#ifndef MODULE
+#ifdef CONFIG_ISA
 static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr)
 {
         const char *sig;
@@ -393,7 +393,9 @@ static int  __init hp100_isa_probe(struct net_device *dev, int addr)
         }
         return err;
 }
+#endif /* CONFIG_ISA */
 
+#if !defined(MODULE) && defined(CONFIG_ISA)
 struct net_device * __init hp100_probe(int unit)
 {
         struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));
@@ -423,7 +425,7 @@ struct net_device * __init hp100_probe(int unit)
         free_netdev(dev);
         return ERR_PTR(err);
 }
-#endif
+#endif /* !MODULE && CONFIG_ISA */
 
 static int __devinit hp100_probe1(struct net_device *dev, int ioaddr,
                                   u_char bus, struct pci_dev *pci_dev)
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 6469130c1413..c26a4b8e552a 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -200,8 +200,8 @@ static struct net_device_stats *ifb_get_stats(struct net_device *dev)
 
         pr_debug("tasklets stats %ld:%ld:%ld:%ld:%ld:%ld:%ld:%ld:%ld \n",
                 dp->st_task_enter, dp->st_txq_refl_try, dp->st_rxq_enter,
-                dp->st_rx2tx_tran dp->st_rxq_notenter, dp->st_rx_frm_egr,
-                dp->st_rx_frm_ing, dp->st_rxq_check, dp->st_rxq_rsch );
+                dp->st_rx2tx_tran, dp->st_rxq_notenter, dp->st_rx_frm_egr,
+                dp->st_rx_frm_ing, dp->st_rxq_check, dp->st_rxq_rsch);
 
         return stats;
 }
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 43894ddec7dc..fe800dc0be9f 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -3374,10 +3374,6 @@ __setup("parport_init_mode=",parport_init_mode_setup);
 
 static int __init parport_pc_init(void)
 {
-#if defined(CONFIG_PPC_MERGE)
-        if (check_legacy_ioport(PARALLEL_BASE))
-                return -ENODEV;
-#endif
         if (parse_parport_params())
                 return -EINVAL;
 
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index f2e0179962e2..3ac5b123215a 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -1049,6 +1049,10 @@ static int __init isapnp_init(void)
                 printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");
                 return 0;
         }
+#ifdef CONFIG_PPC_MERGE
+        if (check_legacy_ioport(_PIDXR) || check_legacy_ioport(_PNPWRP))
+                return -EINVAL;
+#endif
 #ifdef ISAPNP_REGION_OK
         if (!request_region(_PIDXR, 1, "isapnp index")) {
                 printk(KERN_ERR "isapnp: Index Register 0x%x already used\n", _PIDXR);
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 0ae9ced00ed4..10c2daab99ac 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -320,8 +320,8 @@ static unsigned int serial_in(struct uart_8250_port *up, int offset)
 
         case UPIO_TSI:
                 if (offset == UART_IIR) {
-                        tmp = readl((u32 *)(up->port.membase + UART_RX));
-                        return (cpu_to_le32(tmp) >> 8) & 0xff;
+                        tmp = readl(up->port.membase + (UART_IIR & ~3));
+                        return (tmp >> 16) & 0xff; /* UART_IIR % 4 == 2 */
                 } else
                         return readb(up->port.membase + offset);
 
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index 90ff96e3339b..a0d6136deb9b 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -46,6 +46,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/delay.h>
+#include <asm/fs_pd.h>
 
 #if defined(CONFIG_SERIAL_CPM_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
@@ -1022,15 +1023,17 @@ int cpm_uart_drv_get_platform_data(struct platform_device *pdev, int is_con)
 {
         struct resource *r;
         struct fs_uart_platform_info *pdata = pdev->dev.platform_data;
-        int idx = pdata->fs_no; /* It is UART_SMCx or UART_SCCx index */
+        int idx;        /* It is UART_SMCx or UART_SCCx index */
         struct uart_cpm_port *pinfo;
         int line;
         u32 mem, pram;
 
+        idx = pdata->fs_no = fs_uart_get_id(pdata);
+
         line = cpm_uart_id2nr(idx);
         if(line < 0) {
                 printk(KERN_ERR"%s(): port %d is not registered", __FUNCTION__, idx);
-                return -1;
+                return -EINVAL;
         }
 
         pinfo = (struct uart_cpm_port *) &cpm_uart_ports[idx];
@@ -1044,11 +1047,11 @@ int cpm_uart_drv_get_platform_data(struct platform_device *pdev, int is_con)
 
         if (!(r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs")))
                 return -EINVAL;
-        mem = r->start;
+        mem = (u32)ioremap(r->start, r->end - r->start + 1);
 
         if (!(r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pram")))
                 return -EINVAL;
-        pram = r->start;
+        pram = (u32)ioremap(r->start, r->end - r->start + 1);
 
         if(idx > fsid_smc2_uart) {
                 pinfo->sccp = (scc_t *)mem;
@@ -1179,7 +1182,7 @@ static int __init cpm_uart_console_setup(struct console *co, char *options)
                 pdata = pdev->dev.platform_data;
                 if (pdata)
                         if (pdata->init_ioports)
-                                pdata->init_ioports();
+                                pdata->init_ioports(pdata);
 
                 cpm_uart_drv_get_platform_data(pdev, 1);
         }
@@ -1189,11 +1192,7 @@ static int __init cpm_uart_console_setup(struct console *co, char *options)
         if (options) {
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
         } else {
-                bd_t *bd = (bd_t *) __res;
-
-                if (bd->bi_baudrate)
-                        baud = bd->bi_baudrate;
-                else
+                if ((baud = uart_baudrate()) == -1)
                         baud = 9600;
         }
 
@@ -1266,13 +1265,14 @@ static int cpm_uart_drv_probe(struct device *dev)
         }
 
         pdata = pdev->dev.platform_data;
-        pr_debug("cpm_uart_drv_probe: Adding CPM UART %d\n", cpm_uart_id2nr(pdata->fs_no));
 
         if ((ret = cpm_uart_drv_get_platform_data(pdev, 0)))
                 return ret;
 
+        pr_debug("cpm_uart_drv_probe: Adding CPM UART %d\n", cpm_uart_id2nr(pdata->fs_no));
+
         if (pdata->init_ioports)
-                pdata->init_ioports();
+                pdata->init_ioports(pdata);
 
         ret = uart_add_one_port(&cpm_reg, &cpm_uart_ports[pdata->fs_no].port);
 
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index ef3bb476c432..b691d3e14754 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -40,6 +40,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/fs_pd.h>
 
 #include <linux/serial_core.h>
 #include <linux/kernel.h>
@@ -50,8 +51,9 @@
 
 void cpm_line_cr_cmd(int line, int cmd)
 {
-        volatile cpm_cpm2_t *cp = cpmp;
         ulong val;
+        volatile cpm_cpm2_t *cp = cpm2_map(im_cpm);
+
 
         switch (line) {
         case UART_SMC1:
@@ -84,11 +86,14 @@ void cpm_line_cr_cmd(int line, int cmd)
         }
         cp->cp_cpcr = val;
         while (cp->cp_cpcr & CPM_CR_FLG) ;
+
+        cpm2_unmap(cp);
 }
 
 void smc1_lineif(struct uart_cpm_port *pinfo)
 {
-        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        volatile iop_cpm2_t *io = cpm2_map(im_ioport);
+        volatile cpmux_t *cpmux = cpm2_map(im_cpmux);
 
         /* SMC1 is only on port D */
         io->iop_ppard |= 0x00c00000;
@@ -97,13 +102,17 @@ void smc1_lineif(struct uart_cpm_port *pinfo)
         io->iop_psord &= ~0x00c00000;
 
         /* Wire BRG1 to SMC1 */
-        cpm2_immr->im_cpmux.cmx_smr &= 0x0f;
+        cpmux->cmx_smr &= 0x0f;
         pinfo->brg = 1;
+
+        cpm2_unmap(cpmux);
+        cpm2_unmap(io);
 }
 
 void smc2_lineif(struct uart_cpm_port *pinfo)
 {
-        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        volatile iop_cpm2_t *io = cpm2_map(im_ioport);
+        volatile cpmux_t *cpmux = cpm2_map(im_cpmux);
 
         /* SMC2 is only on port A */
         io->iop_ppara |= 0x00c00000;
@@ -112,13 +121,17 @@ void smc2_lineif(struct uart_cpm_port *pinfo)
         io->iop_psora &= ~0x00c00000;
 
         /* Wire BRG2 to SMC2 */
-        cpm2_immr->im_cpmux.cmx_smr &= 0xf0;
+        cpmux->cmx_smr &= 0xf0;
         pinfo->brg = 2;
+
+        cpm2_unmap(cpmux);
+        cpm2_unmap(io);
 }
 
 void scc1_lineif(struct uart_cpm_port *pinfo)
 {
-        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        volatile iop_cpm2_t *io = cpm2_map(im_ioport);
+        volatile cpmux_t *cpmux = cpm2_map(im_cpmux);
 
         /* Use Port D for SCC1 instead of other functions.  */
         io->iop_ppard |= 0x00000003;
@@ -128,9 +141,12 @@ void scc1_lineif(struct uart_cpm_port *pinfo)
         io->iop_pdird |= 0x00000002;    /* Tx */
 
         /* Wire BRG1 to SCC1 */
-        cpm2_immr->im_cpmux.cmx_scr &= 0x00ffffff;
-        cpm2_immr->im_cpmux.cmx_scr |= 0x00000000;
+        cpmux->cmx_scr &= 0x00ffffff;
+        cpmux->cmx_scr |= 0x00000000;
         pinfo->brg = 1;
+
+        cpm2_unmap(cpmux);
+        cpm2_unmap(io);
 }
 
 void scc2_lineif(struct uart_cpm_port *pinfo)
@@ -143,43 +159,57 @@ void scc2_lineif(struct uart_cpm_port *pinfo)
          * be supported in a sane fashion.
          */
 #ifndef CONFIG_STX_GP3
-        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        volatile iop_cpm2_t *io = cpm2_map(im_ioport);
+        volatile cpmux_t *cpmux = cpm2_map(im_cpmux);
+
         io->iop_pparb |= 0x008b0000;
         io->iop_pdirb |= 0x00880000;
         io->iop_psorb |= 0x00880000;
         io->iop_pdirb &= ~0x00030000;
         io->iop_psorb &= ~0x00030000;
 #endif
-        cpm2_immr->im_cpmux.cmx_scr &= 0xff00ffff;
-        cpm2_immr->im_cpmux.cmx_scr |= 0x00090000;
+        cpmux->cmx_scr &= 0xff00ffff;
+        cpmux->cmx_scr |= 0x00090000;
         pinfo->brg = 2;
+
+        cpm2_unmap(cpmux);
+        cpm2_unmap(io);
 }
 
 void scc3_lineif(struct uart_cpm_port *pinfo)
 {
-        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        volatile iop_cpm2_t *io = cpm2_map(im_ioport);
+        volatile cpmux_t *cpmux = cpm2_map(im_cpmux);
+
         io->iop_pparb |= 0x008b0000;
         io->iop_pdirb |= 0x00880000;
         io->iop_psorb |= 0x00880000;
         io->iop_pdirb &= ~0x00030000;
         io->iop_psorb &= ~0x00030000;
-        cpm2_immr->im_cpmux.cmx_scr &= 0xffff00ff;
-        cpm2_immr->im_cpmux.cmx_scr |= 0x00001200;
+        cpmux->cmx_scr &= 0xffff00ff;
+        cpmux->cmx_scr |= 0x00001200;
         pinfo->brg = 3;
+
+        cpm2_unmap(cpmux);
+        cpm2_unmap(io);
 }
 
 void scc4_lineif(struct uart_cpm_port *pinfo)
 {
-        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        volatile iop_cpm2_t *io = cpm2_map(im_ioport);
+        volatile cpmux_t *cpmux = cpm2_map(im_cpmux);
 
         io->iop_ppard |= 0x00000600;
         io->iop_psord &= ~0x00000600;   /* Tx/Rx */
         io->iop_pdird &= ~0x00000200;   /* Rx */
         io->iop_pdird |= 0x00000400;    /* Tx */
 
-        cpm2_immr->im_cpmux.cmx_scr &= 0xffffff00;
-        cpm2_immr->im_cpmux.cmx_scr |= 0x0000001b;
+        cpmux->cmx_scr &= 0xffffff00;
+        cpmux->cmx_scr |= 0x0000001b;
         pinfo->brg = 4;
+
+        cpm2_unmap(cpmux);
+        cpm2_unmap(io);
 }
 
 /*
@@ -254,88 +284,103 @@ void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 /* Setup any dynamic params in the uart desc */
 int cpm_uart_init_portdesc(void)
 {
+#if defined(CONFIG_SERIAL_CPM_SMC1) || defined(CONFIG_SERIAL_CPM_SMC2)
+        u32 addr;
+#endif
         pr_debug("CPM uart[-]:init portdesc\n");
 
         cpm_uart_nr = 0;
 #ifdef CONFIG_SERIAL_CPM_SMC1
-        cpm_uart_ports[UART_SMC1].smcp = (smc_t *) & cpm2_immr->im_smc[0];
-        cpm_uart_ports[UART_SMC1].smcup =
-            (smc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SMC1];
-        *(u16 *)(&cpm2_immr->im_dprambase[PROFF_SMC1_BASE]) = PROFF_SMC1;
+        cpm_uart_ports[UART_SMC1].smcp = (smc_t *) cpm2_map(im_smc[0]);
         cpm_uart_ports[UART_SMC1].port.mapbase =
-            (unsigned long)&cpm2_immr->im_smc[0];
+            (unsigned long)cpm_uart_ports[UART_SMC1].smcp;
+
+        cpm_uart_ports[UART_SMC1].smcup =
+            (smc_uart_t *) cpm2_map_size(im_dprambase[PROFF_SMC1], PROFF_SMC_SIZE);
+        addr = (u16 *)cpm2_map_size(im_dprambase[PROFF_SMC1_BASE], 2);
+        *addr = PROFF_SMC1;
+        cpm2_unmap(addr);
+
         cpm_uart_ports[UART_SMC1].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
         cpm_uart_ports[UART_SMC1].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-        cpm_uart_ports[UART_SMC1].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SMC1].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SMC1;
 #endif
 
 #ifdef CONFIG_SERIAL_CPM_SMC2
-        cpm_uart_ports[UART_SMC2].smcp = (smc_t *) & cpm2_immr->im_smc[1];
-        cpm_uart_ports[UART_SMC2].smcup =
-            (smc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SMC2];
-        *(u16 *)(&cpm2_immr->im_dprambase[PROFF_SMC2_BASE]) = PROFF_SMC2;
+        cpm_uart_ports[UART_SMC2].smcp = (smc_t *) cpm2_map(im_smc[1]);
         cpm_uart_ports[UART_SMC2].port.mapbase =
-            (unsigned long)&cpm2_immr->im_smc[1];
+            (unsigned long)cpm_uart_ports[UART_SMC2].smcp;
+
+        cpm_uart_ports[UART_SMC2].smcup =
+            (smc_uart_t *) cpm2_map_size(im_dprambase[PROFF_SMC2], PROFF_SMC_SIZE);
+        addr = (u16 *)cpm2_map_size(im_dprambase[PROFF_SMC2_BASE], 2);
+        *addr = PROFF_SMC2;
+        cpm2_unmap(addr);
+
         cpm_uart_ports[UART_SMC2].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
         cpm_uart_ports[UART_SMC2].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-        cpm_uart_ports[UART_SMC2].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SMC2].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SMC2;
 #endif
 
 #ifdef CONFIG_SERIAL_CPM_SCC1
-        cpm_uart_ports[UART_SCC1].sccp = (scc_t *) & cpm2_immr->im_scc[0];
-        cpm_uart_ports[UART_SCC1].sccup =
-            (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC1];
+        cpm_uart_ports[UART_SCC1].sccp = (scc_t *) cpm2_map(im_scc[0]);
         cpm_uart_ports[UART_SCC1].port.mapbase =
-            (unsigned long)&cpm2_immr->im_scc[0];
+            (unsigned long)cpm_uart_ports[UART_SCC1].sccp;
+        cpm_uart_ports[UART_SCC1].sccup =
+            (scc_uart_t *) cpm2_map_size(im_dprambase[PROFF_SCC1], PROFF_SCC_SIZE);
+
         cpm_uart_ports[UART_SCC1].sccp->scc_sccm &=
             ~(UART_SCCM_TX | UART_SCCM_RX);
         cpm_uart_ports[UART_SCC1].sccp->scc_gsmrl &=
             ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC1].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SCC1].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SCC1;
 #endif
 
 #ifdef CONFIG_SERIAL_CPM_SCC2
-        cpm_uart_ports[UART_SCC2].sccp = (scc_t *) & cpm2_immr->im_scc[1];
-        cpm_uart_ports[UART_SCC2].sccup =
-            (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC2];
+        cpm_uart_ports[UART_SCC2].sccp = (scc_t *) cpm2_map(im_scc[1]);
         cpm_uart_ports[UART_SCC2].port.mapbase =
-            (unsigned long)&cpm2_immr->im_scc[1];
+            (unsigned long)cpm_uart_ports[UART_SCC2].sccp;
+        cpm_uart_ports[UART_SCC2].sccup =
+            (scc_uart_t *) cpm2_map_size(im_dprambase[PROFF_SCC2], PROFF_SCC_SIZE);
+
         cpm_uart_ports[UART_SCC2].sccp->scc_sccm &=
             ~(UART_SCCM_TX | UART_SCCM_RX);
         cpm_uart_ports[UART_SCC2].sccp->scc_gsmrl &=
             ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC2].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SCC2].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SCC2;
 #endif
 
 #ifdef CONFIG_SERIAL_CPM_SCC3
-        cpm_uart_ports[UART_SCC3].sccp = (scc_t *) & cpm2_immr->im_scc[2];
-        cpm_uart_ports[UART_SCC3].sccup =
-            (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC3];
+        cpm_uart_ports[UART_SCC3].sccp = (scc_t *) cpm2_map(im_scc[2]);
         cpm_uart_ports[UART_SCC3].port.mapbase =
-            (unsigned long)&cpm2_immr->im_scc[2];
+            (unsigned long)cpm_uart_ports[UART_SCC3].sccp;
+        cpm_uart_ports[UART_SCC3].sccup =
+            (scc_uart_t *) cpm2_map_size(im_dprambase[PROFF_SCC3], PROFF_SCC_SIZE);
+
         cpm_uart_ports[UART_SCC3].sccp->scc_sccm &=
             ~(UART_SCCM_TX | UART_SCCM_RX);
         cpm_uart_ports[UART_SCC3].sccp->scc_gsmrl &=
             ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC3].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SCC3].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SCC3;
 #endif
 
 #ifdef CONFIG_SERIAL_CPM_SCC4
-        cpm_uart_ports[UART_SCC4].sccp = (scc_t *) & cpm2_immr->im_scc[3];
-        cpm_uart_ports[UART_SCC4].sccup =
-            (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC4];
+        cpm_uart_ports[UART_SCC4].sccp = (scc_t *) cpm2_map(im_scc[3]);
         cpm_uart_ports[UART_SCC4].port.mapbase =
-            (unsigned long)&cpm2_immr->im_scc[3];
+            (unsigned long)cpm_uart_ports[UART_SCC4].sccp;
+        cpm_uart_ports[UART_SCC4].sccup =
+            (scc_uart_t *) cpm2_map_size(im_dprambase[PROFF_SCC4], PROFF_SCC_SIZE);
+
         cpm_uart_ports[UART_SCC4].sccp->scc_sccm &=
             ~(UART_SCCM_TX | UART_SCCM_RX);
         cpm_uart_ports[UART_SCC4].sccp->scc_gsmrl &=
             ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC4].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SCC4].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SCC4;
 #endif
 
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
index 4793fecf8ece..a663300d3476 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
@@ -40,6 +40,6 @@ static inline void cpm_set_smc_fcr(volatile smc_uart_t * up)
         up->smc_tfcr = CPMFCR_GBL | CPMFCR_EB;
 }
 
-#define DPRAM_BASE      ((unsigned char *)&cpm2_immr->im_dprambase[0])
+#define DPRAM_BASE      ((unsigned char *)cpm_dpram_addr(0))
 
 #endif
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e0ef3328942c..a1c8923b0bf5 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -53,6 +53,11 @@ config FB
           (e.g. an accelerated X server) and that are not frame buffer
           device-aware may cause unexpected results. If unsure, say N.
 
+config FB_DDC
+       tristate
+       depends on FB && I2C && I2C_ALGOBIT
+       default n
+
 config FB_CFB_FILLRECT
         tristate
         depends on FB
@@ -696,6 +701,7 @@ config FB_NVIDIA
         depends on FB && PCI
         select I2C_ALGOBIT if FB_NVIDIA_I2C
         select I2C if FB_NVIDIA_I2C
+        select FB_DDC if FB_NVIDIA_I2C
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
@@ -734,6 +740,7 @@ config FB_RIVA
         depends on FB && PCI
         select I2C_ALGOBIT if FB_RIVA_I2C
         select I2C if FB_RIVA_I2C
+        select FB_DDC if FB_RIVA_I2C
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
@@ -822,6 +829,7 @@ config FB_I810_I2C
         depends on FB_I810 && FB_I810_GTF
         select I2C
         select I2C_ALGOBIT
+        select FB_DDC
         help
 
 config FB_INTEL
@@ -1012,6 +1020,7 @@ config FB_RADEON
         depends on FB && PCI
         select I2C_ALGOBIT if FB_RADEON_I2C
         select I2C if FB_RADEON_I2C
+        select FB_DDC if FB_RADEON_I2C
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
@@ -1140,6 +1149,7 @@ config FB_SAVAGE
         depends on FB && PCI && EXPERIMENTAL
         select I2C_ALGOBIT if FB_SAVAGE_I2C
         select I2C if FB_SAVAGE_I2C
+        select FB_DDC if FB_SAVAGE_I2C
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
@@ -1619,7 +1629,8 @@ config FB_VIRTUAL
           kernel option `video=vfb:'.
 
           To compile this driver as a module, choose M here: the
-          module will be called vfb.
+          module will be called vfb. In order to load it, you must use
+          the vfb_enable=1 option.
 
           If unsure, say N.
 if VT
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 481c6c9695f8..a6980e9a2481 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_FB_CFB_FILLRECT)  += cfbfillrect.o
 obj-$(CONFIG_FB_CFB_COPYAREA)  += cfbcopyarea.o
 obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o
 obj-$(CONFIG_FB_MACMODES)      += macmodes.o
+obj-$(CONFIG_FB_DDC)           += fb_ddc.o
 
 # Hardware specific drivers go first
 obj-$(CONFIG_FB_RETINAZ3)         += retz3fb.o
diff --git a/drivers/video/aty/atyfb.h b/drivers/video/aty/atyfb.h
index 55fb8b04489b..b04f49fb976a 100644
--- a/drivers/video/aty/atyfb.h
+++ b/drivers/video/aty/atyfb.h
@@ -355,5 +355,9 @@ static inline void wait_for_idle(struct atyfb_par *par)
 
 extern void aty_reset_engine(const struct atyfb_par *par);
 extern void aty_init_engine(struct atyfb_par *par, struct fb_info *info);
-extern void aty_st_pll_ct(int offset, u8 val, const struct atyfb_par *par);
 extern u8   aty_ld_pll_ct(int offset, const struct atyfb_par *par);
+
+void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area);
+void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
+void atyfb_imageblit(struct fb_info *info, const struct fb_image *image);
+
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 19a71f045784..b45c9fd1b330 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -240,9 +240,6 @@ static int atyfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
 static int atyfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info);
 static int atyfb_blank(int blank, struct fb_info *info);
 static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg);
-extern void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
-extern void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area);
-extern void atyfb_imageblit(struct fb_info *info, const struct fb_image *image);
 #ifdef __sparc__
 static int atyfb_mmap(struct fb_info *info, struct vm_area_struct *vma);
 #endif
@@ -3863,6 +3860,7 @@ static int __devinit atyfb_setup(char *options)
 
 static int __devinit atyfb_init(void)
 {
+    int err1 = 1, err2 = 1;
 #ifndef MODULE
     char *option = NULL;
 
@@ -3872,12 +3870,13 @@ static int __devinit atyfb_init(void)
 #endif
 
 #ifdef CONFIG_PCI
-    pci_register_driver(&atyfb_driver);
+    err1 = pci_register_driver(&atyfb_driver);
 #endif
 #ifdef CONFIG_ATARI
-    atyfb_atari_probe();
+    err2 = atyfb_atari_probe();
 #endif
-    return 0;
+
+    return (err1 && err2) ? -ENODEV : 0;
 }
 
 static void __exit atyfb_exit(void)
diff --git a/drivers/video/aty/mach64_ct.c b/drivers/video/aty/mach64_ct.c
index e7056934c6a8..5080816be653 100644
--- a/drivers/video/aty/mach64_ct.c
+++ b/drivers/video/aty/mach64_ct.c
@@ -27,7 +27,7 @@ u8 aty_ld_pll_ct(int offset, const struct atyfb_par *par)
         return res;
 }
 
-void aty_st_pll_ct(int offset, u8 val, const struct atyfb_par *par)
+static void aty_st_pll_ct(int offset, u8 val, const struct atyfb_par *par)
 {
         /* write addr byte */
         aty_st_8(CLOCK_CNTL_ADDR, ((offset << 2) & PLL_ADDR) | PLL_WR_EN, par);
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index 9aaca58c074a..676754520099 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -16,8 +16,6 @@
 #include "radeonfb.h"
 #include "../edid.h"
 
-#define RADEON_DDC      0x50
-
 static void radeon_gpio_setscl(void* data, int state)
 {
         struct radeon_i2c_chan  *chan = data;
@@ -138,108 +136,10 @@ void radeon_delete_i2c_busses(struct radeonfb_info *rinfo)
         rinfo->i2c[3].rinfo = NULL;
 }
 
-
-static u8 *radeon_do_probe_i2c_edid(struct radeon_i2c_chan *chan)
-{
-        u8 start = 0x0;
-        struct i2c_msg msgs[] = {
-                {
-                        .addr   = RADEON_DDC,
-                        .len    = 1,
-                        .buf    = &start,
-                }, {
-                        .addr   = RADEON_DDC,
-                        .flags  = I2C_M_RD,
-                        .len    = EDID_LENGTH,
-                },
-        };
-        u8 *buf;
-
-        buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
-        if (!buf) {
-                dev_warn(&chan->rinfo->pdev->dev, "Out of memory!\n");
-                return NULL;
-        }
-        msgs[1].buf = buf;
-
-        if (i2c_transfer(&chan->adapter, msgs, 2) == 2)
-                return buf;
-        dev_dbg(&chan->rinfo->pdev->dev, "Unable to read EDID block.\n");
-        kfree(buf);
-        return NULL;
-}
-
-
-int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn, u8 **out_edid)
+int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn,
+                               u8 **out_edid)
 {
-        u32 reg = rinfo->i2c[conn-1].ddc_reg;
-        u8 *edid = NULL;
-        int i, j;
-
-        OUTREG(reg, INREG(reg) & 
-                        ~(VGA_DDC_DATA_OUTPUT | VGA_DDC_CLK_OUTPUT));
-
-        OUTREG(reg, INREG(reg) & ~(VGA_DDC_CLK_OUT_EN));
-        (void)INREG(reg);
-
-        for (i = 0; i < 3; i++) {
-                /* For some old monitors we need the
-                 * following process to initialize/stop DDC
-                 */
-                OUTREG(reg, INREG(reg) & ~(VGA_DDC_DATA_OUT_EN));
-                (void)INREG(reg);
-                msleep(13);
-
-                OUTREG(reg, INREG(reg) & ~(VGA_DDC_CLK_OUT_EN));
-                (void)INREG(reg);
-                for (j = 0; j < 5; j++) {
-                        msleep(10);
-                        if (INREG(reg) & VGA_DDC_CLK_INPUT)
-                                break;
-                }
-                if (j == 5)
-                        continue;
-
-                OUTREG(reg, INREG(reg) | VGA_DDC_DATA_OUT_EN);
-                (void)INREG(reg);
-                msleep(15);
-                OUTREG(reg, INREG(reg) | VGA_DDC_CLK_OUT_EN);
-                (void)INREG(reg);
-                msleep(15);
-                OUTREG(reg, INREG(reg) & ~(VGA_DDC_DATA_OUT_EN));
-                (void)INREG(reg);
-                msleep(15);
-
-                /* Do the real work */
-                edid = radeon_do_probe_i2c_edid(&rinfo->i2c[conn-1]);
-
-                OUTREG(reg, INREG(reg) | 
-                                (VGA_DDC_DATA_OUT_EN | VGA_DDC_CLK_OUT_EN));
-                (void)INREG(reg);
-                msleep(15);
-                
-                OUTREG(reg, INREG(reg) & ~(VGA_DDC_CLK_OUT_EN));
-                (void)INREG(reg);
-                for (j = 0; j < 10; j++) {
-                        msleep(10);
-                        if (INREG(reg) & VGA_DDC_CLK_INPUT)
-                                break;
-                }
-
-                OUTREG(reg, INREG(reg) & ~(VGA_DDC_DATA_OUT_EN));
-                (void)INREG(reg);
-                msleep(15);
-                OUTREG(reg, INREG(reg) |
-                                (VGA_DDC_DATA_OUT_EN | VGA_DDC_CLK_OUT_EN));
-                (void)INREG(reg);
-                if (edid)
-                        break;
-        }
-        /* Release the DDC lines when done or the Apple Cinema HD display
-         * will switch off
-         */
-        OUTREG(reg, INREG(reg) & ~(VGA_DDC_CLK_OUT_EN | VGA_DDC_DATA_OUT_EN));
-        (void)INREG(reg);
+        u8 *edid = fb_ddc_read(&rinfo->i2c[conn-1].adapter);
 
         if (out_edid)
                 *out_edid = edid;
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 365de5dcc888..9a2b0d69b0ae 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -86,6 +86,9 @@ static struct radeon_device_id radeon_workaround_list[] = {
         BUGFIX("Samsung P35",
                PCI_VENDOR_ID_SAMSUNG, 0xc00c,
                radeon_pm_off, radeon_reinitialize_M10),
+        BUGFIX("Acer Aspire 2010",
+               PCI_VENDOR_ID_AI, 0x0061,
+               radeon_pm_off, radeon_reinitialize_M10),
         { .ident = NULL }
 };
 
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index f25d5d648333..ef5c16f7f5a6 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -8,6 +8,7 @@
  *      <c.pellegrin@exadron.com>
  *
  * PM support added by Rodolfo Giometti <giometti@linux.it>
+ * Cursor enable/disable by Rodolfo Giometti <giometti@linux.it>
  *
  * Copyright 2002 MontaVista Software
  * Author: MontaVista Software, Inc.
@@ -110,6 +111,10 @@ static struct fb_var_screeninfo au1100fb_var __initdata = {
 
 static struct au1100fb_drv_info drv_info;
 
+static int nocursor = 0;
+module_param(nocursor, int, 0644);
+MODULE_PARM_DESC(nocursor, "cursor enable/disable");
+
 /*
  * Set hardware with var settings. This will enable the controller with a specific
  * mode, normally validated with the fb_check_var method
@@ -422,6 +427,17 @@ int au1100fb_fb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)
         return 0;
 }
 
+/* fb_cursor
+ * Used to disable cursor drawing...
+ */
+int au1100fb_fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
+{
+        if (nocursor)
+                return 0;
+        else
+                return -EINVAL; /* just to force soft_cursor() call */
+}
+
 static struct fb_ops au1100fb_ops =
 {
         .owner                  = THIS_MODULE,
@@ -433,6 +449,7 @@ static struct fb_ops au1100fb_ops =
         .fb_imageblit           = cfb_imageblit,
         .fb_rotate              = au1100fb_fb_rotate,
         .fb_mmap                = au1100fb_fb_mmap,
+        .fb_cursor              = au1100fb_fb_cursor,
 };
 
 
@@ -677,7 +694,7 @@ int au1100fb_setup(char *options)
         if (options) {
                 while ((this_opt = strsep(&options,",")) != NULL) {
                         /* Panel option */
-                if (!strncmp(this_opt, "panel:", 6)) {
+                        if (!strncmp(this_opt, "panel:", 6)) {
                                 int i;
                                 this_opt += 6;
                                 for (i = 0; i < num_panels; i++) {
@@ -685,13 +702,18 @@ int au1100fb_setup(char *options)
                                                      known_lcd_panels[i].name,
                                                         strlen(this_opt))) {
                                                 panel_idx = i;
-                                        break;
+                                                break;
+                                        }
                                 }
-                        }
                                 if (i >= num_panels) {
                                         print_warn("Panel %s not supported!", this_opt);
                                 }
                         }
+                        if (!strncmp(this_opt, "nocursor", 8)) {
+                                this_opt += 8;
+                                nocursor = 1;
+                                print_info("Cursor disabled");
+                        }
                         /* Mode option (only option that start with digit) */
                         else if (isdigit(this_opt[0])) {
                                 mode = kmalloc(strlen(this_opt) + 1, GFP_KERNEL);
@@ -700,7 +722,7 @@ int au1100fb_setup(char *options)
                         /* Unsupported option */
                         else {
                                 print_warn("Unsupported option \"%s\"", this_opt);
-                }
+                        }
                 }
         }
 
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 1b4f75d1f8a9..8c041daa3a15 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -133,6 +133,7 @@ static int info_idx = -1;
 
 /* console rotation */
 static int rotate;
+static int fbcon_has_sysfs;
 
 static const struct consw fb_con;
 
@@ -396,9 +397,8 @@ static void fb_flashcursor(void *private)
                 vc = vc_cons[ops->currcon].d;
 
         if (!vc || !CON_IS_VISIBLE(vc) ||
-            fbcon_is_inactive(vc, info) ||
             registered_fb[con2fb_map[vc->vc_num]] != info ||
-            vc_cons[ops->currcon].d->vc_deccm != 1) {
+            vc->vc_deccm != 1) {
                 release_console_sem();
                 return;
         }
@@ -2166,7 +2166,12 @@ static int fbcon_switch(struct vc_data *vc)
                         fbcon_del_cursor_timer(old_info);
         }
 
-        fbcon_add_cursor_timer(info);
+        if (fbcon_is_inactive(vc, info) ||
+            ops->blank_state != FB_BLANK_UNBLANK)
+                fbcon_del_cursor_timer(info);
+        else
+                fbcon_add_cursor_timer(info);
+
         set_blitting_type(vc, info);
         ops->cursor_reset = 1;
 
@@ -2276,10 +2281,11 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
                         update_screen(vc);
         }
 
-        if (!blank)
-                fbcon_add_cursor_timer(info);
-        else
+        if (fbcon_is_inactive(vc, info) ||
+            ops->blank_state != FB_BLANK_UNBLANK)
                 fbcon_del_cursor_timer(info);
+        else
+                fbcon_add_cursor_timer(info);
 
         return 0;
 }
@@ -3161,11 +3167,26 @@ static struct class_device_attribute class_device_attrs[] = {
 
 static int fbcon_init_class_device(void)
 {
-        int i;
+        int i, error = 0;
+
+        fbcon_has_sysfs = 1;
+
+        for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) {
+                error = class_device_create_file(fbcon_class_device,
+                                                 &class_device_attrs[i]);
+
+                if (error)
+                        break;
+        }
+
+        if (error) {
+                while (--i >= 0)
+                        class_device_remove_file(fbcon_class_device,
+                                                 &class_device_attrs[i]);
+
+                fbcon_has_sysfs = 0;
+        }
 
-        for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
-                class_device_create_file(fbcon_class_device,
-                                         &class_device_attrs[i]);
         return 0;
 }
 
@@ -3225,7 +3246,10 @@ static void fbcon_exit(void)
                         module_put(info->fbops->owner);
 
                         if (info->fbcon_par) {
+                                struct fbcon_ops *ops = info->fbcon_par;
+
                                 fbcon_del_cursor_timer(info);
+                                kfree(ops->cursor_src);
                                 kfree(info->fbcon_par);
                                 info->fbcon_par = NULL;
                         }
@@ -3271,9 +3295,13 @@ static void __exit fbcon_deinit_class_device(void)
 {
         int i;
 
-        for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
-                class_device_remove_file(fbcon_class_device,
-                                         &class_device_attrs[i]);
+        if (fbcon_has_sysfs) {
+                for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
+                        class_device_remove_file(fbcon_class_device,
+                                                 &class_device_attrs[i]);
+
+                fbcon_has_sysfs = 0;
+        }
 }
 
 static void __exit fb_console_exit(void)
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
index f244ad066d68..b9386d168c04 100644
--- a/drivers/video/console/fbcon.h
+++ b/drivers/video/console/fbcon.h
@@ -80,6 +80,8 @@ struct fbcon_ops {
         char  *cursor_data;
         u8    *fontbuffer;
         u8    *fontdata;
+        u8    *cursor_src;
+        u32    cursor_size;
         u32    fd_size;
 };
     /*
diff --git a/drivers/video/console/fbcon_ccw.c b/drivers/video/console/fbcon_ccw.c
index 4481c80b8b2a..825e6d6972a7 100644
--- a/drivers/video/console/fbcon_ccw.c
+++ b/drivers/video/console/fbcon_ccw.c
@@ -391,7 +391,7 @@ static void ccw_cursor(struct vc_data *vc, struct fb_info *info, int mode,
         ops->cursor_reset = 0;
 }
 
-int ccw_update_start(struct fb_info *info)
+static int ccw_update_start(struct fb_info *info)
 {
         struct fbcon_ops *ops = info->fbcon_par;
         u32 yoffset;
diff --git a/drivers/video/console/fbcon_cw.c b/drivers/video/console/fbcon_cw.c
index 7f92c06afea7..c637e6318803 100644
--- a/drivers/video/console/fbcon_cw.c
+++ b/drivers/video/console/fbcon_cw.c
@@ -375,7 +375,7 @@ static void cw_cursor(struct vc_data *vc, struct fb_info *info, int mode,
         ops->cursor_reset = 0;
 }
 
-int cw_update_start(struct fb_info *info)
+static int cw_update_start(struct fb_info *info)
 {
         struct fbcon_ops *ops = info->fbcon_par;
         u32 vxres = GETVXRES(ops->p->scrollmode, info);
diff --git a/drivers/video/console/fbcon_ud.c b/drivers/video/console/fbcon_ud.c
index ab91005e64dc..1473506df5d0 100644
--- a/drivers/video/console/fbcon_ud.c
+++ b/drivers/video/console/fbcon_ud.c
@@ -415,7 +415,7 @@ static void ud_cursor(struct vc_data *vc, struct fb_info *info, int mode,
         ops->cursor_reset = 0;
 }
 
-int ud_update_start(struct fb_info *info)
+static int ud_update_start(struct fb_info *info)
 {
         struct fbcon_ops *ops = info->fbcon_par;
         int xoffset, yoffset;
diff --git a/drivers/video/console/softcursor.c b/drivers/video/console/softcursor.c
index 557c563e4aed..7d07d8383569 100644
--- a/drivers/video/console/softcursor.c
+++ b/drivers/video/console/softcursor.c
@@ -20,11 +20,12 @@
 
 int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
 {
+        struct fbcon_ops *ops = info->fbcon_par;
         unsigned int scan_align = info->pixmap.scan_align - 1;
         unsigned int buf_align = info->pixmap.buf_align - 1;
         unsigned int i, size, dsize, s_pitch, d_pitch;
         struct fb_image *image;
-        u8 *dst, *src;
+        u8 *dst;
 
         if (info->state != FBINFO_STATE_RUNNING)
                 return 0;
@@ -32,11 +33,19 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
         s_pitch = (cursor->image.width + 7) >> 3;
         dsize = s_pitch * cursor->image.height;
 
-        src = kmalloc(dsize + sizeof(struct fb_image), GFP_ATOMIC);
-        if (!src)
-                return -ENOMEM;
+        if (dsize + sizeof(struct fb_image) != ops->cursor_size) {
+                if (ops->cursor_src != NULL)
+                        kfree(ops->cursor_src);
+                ops->cursor_size = dsize + sizeof(struct fb_image);
 
-        image = (struct fb_image *) (src + dsize);
+                ops->cursor_src = kmalloc(ops->cursor_size, GFP_ATOMIC);
+                if (!ops->cursor_src) {
+                        ops->cursor_size = 0;
+                        return -ENOMEM;
+                }
+        }
+
+        image = (struct fb_image *) (ops->cursor_src + dsize);
         *image = cursor->image;
         d_pitch = (s_pitch + scan_align) & ~scan_align;
 
@@ -48,21 +57,23 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
                 switch (cursor->rop) {
                 case ROP_XOR:
                         for (i = 0; i < dsize; i++)
-                                src[i] = image->data[i] ^ cursor->mask[i];
+                                ops->cursor_src[i] = image->data[i] ^
+                                        cursor->mask[i];
                         break;
                 case ROP_COPY:
                 default:
                         for (i = 0; i < dsize; i++)
-                                src[i] = image->data[i] & cursor->mask[i];
+                                ops->cursor_src[i] = image->data[i] &
+                                        cursor->mask[i];
                         break;
                 }
         } else
-                memcpy(src, image->data, dsize);
+                memcpy(ops->cursor_src, image->data, dsize);
 
-        fb_pad_aligned_buffer(dst, d_pitch, src, s_pitch, image->height);
+        fb_pad_aligned_buffer(dst, d_pitch, ops->cursor_src, s_pitch,
+                              image->height);
         image->data = dst;
         info->fbops->fb_imageblit(info, image);
-        kfree(src);
         return 0;
 }
 
diff --git a/drivers/video/fb_ddc.c b/drivers/video/fb_ddc.c
new file mode 100644
index 000000000000..3aa6ebf68f17
--- /dev/null
+++ b/drivers/video/fb_ddc.c
@@ -0,0 +1,116 @@
+/*
+ * driver/vide/fb_ddc.c - DDC/EDID read support.
+ *
+ *  Copyright (C) 2006 Dennis Munsie <dmunsie@cecropia.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/fb.h>
+#include <linux/i2c-algo-bit.h>
+
+#include "edid.h"
+
+#define DDC_ADDR        0x50
+
+static unsigned char *fb_do_probe_ddc_edid(struct i2c_adapter *adapter)
+{
+        unsigned char start = 0x0;
+        struct i2c_msg msgs[] = {
+                {
+                        .addr   = DDC_ADDR,
+                        .len    = 1,
+                        .buf    = &start,
+                }, {
+                        .addr   = DDC_ADDR,
+                        .flags  = I2C_M_RD,
+                        .len    = EDID_LENGTH,
+                }
+        };
+        unsigned char *buf;
+
+        buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
+        if (!buf) {
+                dev_warn(&adapter->dev, "unable to allocate memory for EDID "
+                         "block.\n");
+                return NULL;
+        }
+        msgs[1].buf = buf;
+
+        if (i2c_transfer(adapter, msgs, 2) == 2)
+                return buf;
+
+        dev_warn(&adapter->dev, "unable to read EDID block.\n");
+        kfree(buf);
+        return NULL;
+}
+
+unsigned char *fb_ddc_read(struct i2c_adapter *adapter)
+{
+        struct i2c_algo_bit_data *algo_data = adapter->algo_data;
+        unsigned char *edid = NULL;
+        int i, j;
+
+        algo_data->setscl(algo_data->data, 1);
+        algo_data->setscl(algo_data->data, 0);
+
+        for (i = 0; i < 3; i++) {
+                /* For some old monitors we need the
+                 * following process to initialize/stop DDC
+                 */
+                algo_data->setsda(algo_data->data, 0);
+                msleep(13);
+
+                algo_data->setscl(algo_data->data, 1);
+                for (j = 0; j < 5; j++) {
+                        msleep(10);
+                        if (algo_data->getscl(algo_data->data))
+                                break;
+                }
+                if (j == 5)
+                        continue;
+
+                algo_data->setsda(algo_data->data, 0);
+                msleep(15);
+                algo_data->setscl(algo_data->data, 0);
+                msleep(15);
+                algo_data->setsda(algo_data->data, 1);
+                msleep(15);
+
+                /* Do the real work */
+                edid = fb_do_probe_ddc_edid(adapter);
+                algo_data->setsda(algo_data->data, 0);
+                algo_data->setscl(algo_data->data, 0);
+                msleep(15);
+
+                algo_data->setscl(algo_data->data, 1);
+                for (j = 0; j < 10; j++) {
+                        msleep(10);
+                        if (algo_data->getscl(algo_data->data))
+                                break;
+                }
+
+                algo_data->setsda(algo_data->data, 1);
+                msleep(15);
+                algo_data->setscl(algo_data->data, 0);
+                if (edid)
+                        break;
+        }
+        /* Release the DDC lines when done or the Apple Cinema HD display
+         * will switch off
+         */
+        algo_data->setsda(algo_data->data, 0);
+        algo_data->setscl(algo_data->data, 0);
+
+        return edid;
+}
+
+EXPORT_SYMBOL_GPL(fb_ddc_read);
+
+MODULE_AUTHOR("Dennis Munsie <dmunsie@cecropia.com>");
+MODULE_DESCRIPTION("DDC/EDID reading support");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 17961e3ecaa0..93ffcdd95f50 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -554,7 +554,8 @@ static int fbmem_read_proc(char *buf, char **start, off_t offset,
         int clen;
 
         clen = 0;
-        for (fi = registered_fb; fi < &registered_fb[FB_MAX] && len < 4000; fi++)
+        for (fi = registered_fb; fi < &registered_fb[FB_MAX] && clen < 4000;
+             fi++)
                 if (*fi)
                         clen += sprintf(buf + clen, "%d %s\n",
                                         (*fi)->node,
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index c151dcf68786..d3a50417ed9a 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -20,6 +20,8 @@
 #include <linux/console.h>
 #include <linux/module.h>
 
+#define FB_SYSFS_FLAG_ATTR 1
+
 /**
  * framebuffer_alloc - creates a new frame buffer info structure
  *
@@ -483,12 +485,27 @@ static struct class_device_attribute class_device_attrs[] = {
 
 int fb_init_class_device(struct fb_info *fb_info)
 {
-        unsigned int i;
+        int i, error = 0;
+
         class_set_devdata(fb_info->class_device, fb_info);
 
-        for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
-                class_device_create_file(fb_info->class_device,
-                                         &class_device_attrs[i]);
+        fb_info->class_flag |= FB_SYSFS_FLAG_ATTR;
+
+        for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) {
+                error = class_device_create_file(fb_info->class_device,
+                                                 &class_device_attrs[i]);
+
+                if (error)
+                        break;
+        }
+
+        if (error) {
+                while (--i >= 0)
+                        class_device_remove_file(fb_info->class_device,
+                                                 &class_device_attrs[i]);
+                fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR;
+        }
+
         return 0;
 }
 
@@ -496,9 +513,13 @@ void fb_cleanup_class_device(struct fb_info *fb_info)
 {
         unsigned int i;
 
-        for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
-                class_device_remove_file(fb_info->class_device,
-                                         &class_device_attrs[i]);
+        if (fb_info->class_flag & FB_SYSFS_FLAG_ATTR) {
+                for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
+                        class_device_remove_file(fb_info->class_device,
+                                                 &class_device_attrs[i]);
+
+                fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR;
+        }
 }
 
 #ifdef CONFIG_FB_BACKLIGHT
diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c
index 7d06b38e80a0..b38d805db313 100644
--- a/drivers/video/i810/i810-i2c.c
+++ b/drivers/video/i810/i810-i2c.c
@@ -19,7 +19,6 @@
 #include "i810_main.h"
 #include "../edid.h"
 
-#define I810_DDC 0x50
 /* bit locations in the registers */
 #define SCL_DIR_MASK            0x0001
 #define SCL_DIR                 0x0002
@@ -150,53 +149,14 @@ void i810_delete_i2c_busses(struct i810fb_par *par)
         par->chan[2].par = NULL;
 }
 
-static u8 *i810_do_probe_i2c_edid(struct i810fb_i2c_chan *chan)
-{
-        u8 start = 0x0;
-        struct i2c_msg msgs[] = {
-                {
-                        .addr   = I810_DDC,
-                        .len    = 1,
-                        .buf    = &start,
-                }, {
-                        .addr   = I810_DDC,
-                        .flags  = I2C_M_RD,
-                        .len    = EDID_LENGTH,
-                },
-        };
-        u8 *buf;
-
-        buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
-        if (!buf) {
-                DPRINTK("i810-i2c: Failed to allocate memory\n");
-                return NULL;
-        }
-        msgs[1].buf = buf;
-
-        if (i2c_transfer(&chan->adapter, msgs, 2) == 2) {
-                DPRINTK("i810-i2c: I2C Transfer successful\n");
-                return buf;
-        }
-
-        DPRINTK("i810-i2c: Unable to read EDID block.\n");
-        kfree(buf);
-        return NULL;
-}
-
 int i810_probe_i2c_connector(struct fb_info *info, u8 **out_edid, int conn)
 {
         struct i810fb_par *par = info->par;
         u8 *edid = NULL;
-        int i;
 
         DPRINTK("i810-i2c: Probe DDC%i Bus\n", conn+1);
         if (conn < par->ddc_num) {
-                for (i = 0; i < 3; i++) {
-                        /* Do the real work */
-                        edid = i810_do_probe_i2c_edid(&par->chan[conn]);
-                        if (edid)
-                                break;
-                }
+                edid = fb_ddc_read(&par->chan[conn].adapter);
         } else {
                 const u8 *e = fb_firmware_edid(info->device);
 
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index d42edaccb84c..b55a12d95eb2 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -1602,7 +1602,10 @@ static int i810fb_resume(struct pci_dev *dev)
         acquire_console_sem();
         pci_set_power_state(dev, PCI_D0);
         pci_restore_state(dev);
-        pci_enable_device(dev);
+
+        if (pci_enable_device(dev))
+                goto fail;
+
         pci_set_master(dev);
         agp_bind_memory(par->i810_gtt.i810_fb_memory,
                         par->fb.offset);
@@ -1611,6 +1614,7 @@ static int i810fb_resume(struct pci_dev *dev)
         i810fb_set_par(info);
         fb_set_suspend (info, 0);
         info->fbops->fb_blank(VESA_NO_BLANKING, info);
+fail:
         release_console_sem();
         return 0;
 }
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 4a57dabb77d4..7acf01c181ee 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -2277,10 +2277,13 @@ static void __init matroxfb_init_params(void) {
         }
 }
 
-static void __init matrox_init(void) {
+static int __init matrox_init(void) {
+        int err;
+
         matroxfb_init_params();
-        pci_register_driver(&matroxfb_driver);
+        err = pci_register_driver(&matroxfb_driver);
         dev = -1;       /* accept all new devices... */
+        return err;
 }
 
 /* **************************** exit-time only **************************** */
@@ -2437,6 +2440,7 @@ static int __initdata initialized = 0;
 static int __init matroxfb_init(void)
 {
         char *option = NULL;
+        int err = 0;
 
         DBG(__FUNCTION__)
 
@@ -2448,11 +2452,11 @@ static int __init matroxfb_init(void)
                 return -ENXIO;
         if (!initialized) {
                 initialized = 1;
-                matrox_init();
+                err = matrox_init();
         }
         hotplug = 1;
         /* never return failure, user can hotplug matrox later... */
-        return 0;
+        return err;
 }
 
 module_init(matroxfb_init);
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
index 6849ab75d403..a32d1af79e07 100644
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
@@ -118,8 +118,19 @@ static unsigned int mbxfb_get_pixclock(unsigned int pixclock_ps,
         /* convert pixclock to KHz */
         pixclock = PICOS2KHZ(pixclock_ps);
 
+        /* PLL output freq = (ref_clk * M) / (N * 2^P)
+         *
+         * M: 1 to 63
+         * N: 1 to 7
+         * P: 0 to 7
+         */
+
+        /* RAPH: When N==1, the resulting pixel clock appears to
+         * get divided by 2. Preventing N=1 by starting the following
+         * loop at 2 prevents this. Is this a bug with my chip
+         * revision or something I dont understand? */
         for (m = 1; m < 64; m++) {
-                for (n = 1; n < 8; n++) {
+                for (n = 2; n < 8; n++) {
                         for (p = 0; p < 8; p++) {
                                 clk = (ref_clk * m) / (n * (1 << p));
                                 err = (clk > pixclock) ? (clk - pixclock) :
@@ -244,8 +255,8 @@ static int mbxfb_set_par(struct fb_info *info)
 
         /* setup resolution */
         gsctrl &= ~(FMsk(GSCTRL_GSWIDTH) | FMsk(GSCTRL_GSHEIGHT));
-        gsctrl |= Gsctrl_Width(info->var.xres - 1) |
-                Gsctrl_Height(info->var.yres - 1);
+        gsctrl |= Gsctrl_Width(info->var.xres) |
+                Gsctrl_Height(info->var.yres);
         writel(gsctrl, GSCTRL);
         udelay(1000);
 
@@ -402,8 +413,8 @@ static void __devinit setup_graphics(struct fb_info *fbi)
 {
         unsigned long gsctrl;
 
-        gsctrl = GSCTRL_GAMMA_EN | Gsctrl_Width(fbi->var.xres - 1) |
-                Gsctrl_Height(fbi->var.yres - 1);
+        gsctrl = GSCTRL_GAMMA_EN | Gsctrl_Width(fbi->var.xres) |
+                Gsctrl_Height(fbi->var.yres);
         switch (fbi->var.bits_per_pixel) {
         case 16:
                 if (fbi->var.green.length == 5)
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index 19eef3a09023..e48de3c9fd13 100644
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/drivers/video/nvidia/nv_i2c.c
@@ -160,51 +160,12 @@ void nvidia_delete_i2c_busses(struct nvidia_par *par)
 
 }
 
-static u8 *nvidia_do_probe_i2c_edid(struct nvidia_i2c_chan *chan)
-{
-        u8 start = 0x0;
-        struct i2c_msg msgs[] = {
-                {
-                 .addr = 0x50,
-                 .len = 1,
-                 .buf = &start,
-                 }, {
-                     .addr = 0x50,
-                     .flags = I2C_M_RD,
-                     .len = EDID_LENGTH,
-                     },
-        };
-        u8 *buf;
-
-        if (!chan->par)
-                return NULL;
-
-        buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
-        if (!buf) {
-                dev_warn(&chan->par->pci_dev->dev, "Out of memory!\n");
-                return NULL;
-        }
-        msgs[1].buf = buf;
-
-        if (i2c_transfer(&chan->adapter, msgs, 2) == 2)
-                return buf;
-        dev_dbg(&chan->par->pci_dev->dev, "Unable to read EDID block.\n");
-        kfree(buf);
-        return NULL;
-}
-
 int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
 {
         struct nvidia_par *par = info->par;
-        u8 *edid = NULL;
-        int i;
-
-        for (i = 0; i < 3; i++) {
-                /* Do the real work */
-                edid = nvidia_do_probe_i2c_edid(&par->chan[conn - 1]);
-                if (edid)
-                        break;
-        }
+        u8 *edid;
+
+        edid = fb_ddc_read(&par->chan[conn - 1].adapter);
 
         if (!edid && conn == 1) {
                 /* try to get from firmware */
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index f8cd4c519aeb..eb24107bcc81 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -28,6 +28,9 @@
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #endif
+#ifdef CONFIG_BOOTX_TEXT
+#include <asm/btext.h>
+#endif
 
 #include "nv_local.h"
 #include "nv_type.h"
@@ -681,6 +684,13 @@ static int nvidiafb_set_par(struct fb_info *info)
 
         nvidia_vga_protect(par, 0);
 
+#ifdef CONFIG_BOOTX_TEXT
+        /* Update debug text engine */
+        btext_update_display(info->fix.smem_start,
+                             info->var.xres, info->var.yres,
+                             info->var.bits_per_pixel, info->fix.line_length);
+#endif
+
         NVTRACE_LEAVE();
         return 0;
 }
@@ -984,7 +994,10 @@ static int nvidiafb_resume(struct pci_dev *dev)
 
         if (par->pm_state != PM_EVENT_FREEZE) {
                 pci_restore_state(dev);
-                pci_enable_device(dev);
+
+                if (pci_enable_device(dev))
+                        goto fail;
+
                 pci_set_master(dev);
         }
 
@@ -993,6 +1006,7 @@ static int nvidiafb_resume(struct pci_dev *dev)
         fb_set_suspend (info, 0);
         nvidiafb_blank(FB_BLANK_UNBLANK, info);
 
+fail:
         release_console_sem();
         return 0;
 }
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 4acde4f7dbf8..b120896c8ab4 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -393,8 +393,8 @@ static void riva_bl_init(struct riva_par *par)
         mutex_lock(&info->bl_mutex);
         info->bl_dev = bd;
         fb_bl_default_curve(info, 0,
-                0x158 * FB_BACKLIGHT_MAX / MAX_LEVEL,
-                0x534 * FB_BACKLIGHT_MAX / MAX_LEVEL);
+                MIN_LEVEL * FB_BACKLIGHT_MAX / MAX_LEVEL,
+                FB_BACKLIGHT_MAX);
         mutex_unlock(&info->bl_mutex);
 
         down(&bd->sem);
@@ -784,7 +784,7 @@ static void riva_load_video_mode(struct fb_info *info)
         
         NVTRACE_ENTER();
         /* time to calculate */
-        rivafb_blank(1, info);
+        rivafb_blank(FB_BLANK_NORMAL, info);
 
         bpp = info->var.bits_per_pixel;
         if (bpp == 16 && info->var.green.length == 5)
@@ -917,7 +917,7 @@ static void riva_load_video_mode(struct fb_info *info)
         par->current_state = newmode;
         riva_load_state(par, &par->current_state);
         par->riva.LockUnlock(&par->riva, 0); /* important for HW cursor */
-        rivafb_blank(0, info);
+        rivafb_blank(FB_BLANK_UNBLANK, info);
         NVTRACE_LEAVE();
 }
 
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index 9751c37c0bfd..c15b259af644 100644
--- a/drivers/video/riva/rivafb-i2c.c
+++ b/drivers/video/riva/rivafb-i2c.c
@@ -25,8 +25,6 @@
 #include "rivafb.h"
 #include "../edid.h"
 
-#define RIVA_DDC        0x50
-
 static void riva_gpio_setscl(void* data, int state)
 {
         struct riva_i2c_chan    *chan = data;
@@ -158,50 +156,12 @@ void riva_delete_i2c_busses(struct riva_par *par)
         par->chan[2].par = NULL;
 }
 
-static u8 *riva_do_probe_i2c_edid(struct riva_i2c_chan *chan)
-{
-        u8 start = 0x0;
-        struct i2c_msg msgs[] = {
-                {
-                        .addr   = RIVA_DDC,
-                        .len    = 1,
-                        .buf    = &start,
-                }, {
-                        .addr   = RIVA_DDC,
-                        .flags  = I2C_M_RD,
-                        .len    = EDID_LENGTH,
-                },
-        };
-        u8 *buf;
-
-        if (!chan->par)
-                return NULL;
-
-        buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
-        if (!buf) {
-                dev_warn(&chan->par->pdev->dev, "Out of memory!\n");
-                return NULL;
-        }
-        msgs[1].buf = buf;
-
-        if (i2c_transfer(&chan->adapter, msgs, 2) == 2)
-                return buf;
-        dev_dbg(&chan->par->pdev->dev, "Unable to read EDID block.\n");
-        kfree(buf);
-        return NULL;
-}
-
 int riva_probe_i2c_connector(struct riva_par *par, int conn, u8 **out_edid)
 {
         u8 *edid = NULL;
-        int i;
 
-        for (i = 0; i < 3; i++) {
-                /* Do the real work */
-                edid = riva_do_probe_i2c_edid(&par->chan[conn-1]);
-                if (edid)
-                        break;
-        }
+        edid = fb_ddc_read(&par->chan[conn-1].adapter);
+
         if (out_edid)
                 *out_edid = edid;
         if (!edid)
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index d7d810dbf0bd..3f94223b7f0c 100644
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -213,52 +213,15 @@ void savagefb_delete_i2c_busses(struct fb_info *info)
         par->chan.par = NULL;
 }
 
-static u8 *savage_do_probe_i2c_edid(struct savagefb_i2c_chan *chan)
-{
-        u8 start = 0x0;
-        struct i2c_msg msgs[] = {
-                {
-                        .addr   = SAVAGE_DDC,
-                        .len    = 1,
-                        .buf    = &start,
-                }, {
-                        .addr   = SAVAGE_DDC,
-                        .flags  = I2C_M_RD,
-                        .len    = EDID_LENGTH,
-                },
-        };
-        u8 *buf = NULL;
-
-        if (chan->par) {
-                buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
-
-                if (buf) {
-                        msgs[1].buf = buf;
-
-                        if (i2c_transfer(&chan->adapter, msgs, 2) != 2) {
-                                dev_dbg(&chan->par->pcidev->dev,
-                                        "Unable to read EDID block.\n");
-                                kfree(buf);
-                                buf = NULL;
-                        }
-                }
-        }
-
-        return buf;
-}
-
 int savagefb_probe_i2c_connector(struct fb_info *info, u8 **out_edid)
 {
         struct savagefb_par *par = info->par;
-        u8 *edid = NULL;
-        int i;
-
-        for (i = 0; i < 3; i++) {
-                /* Do the real work */
-                edid = savage_do_probe_i2c_edid(&par->chan);
-                if (edid)
-                        break;
-        }
+        u8 *edid;
+
+        if (par->chan.par)
+                edid = fb_ddc_read(&par->chan.adapter);
+        else
+                edid = NULL;
 
         if (!edid) {
                 /* try to get from firmware */
diff --git a/drivers/video/sis/init.h b/drivers/video/sis/init.h
index 7ecab87cef02..59d12844b4dd 100644
--- a/drivers/video/sis/init.h
+++ b/drivers/video/sis/init.h
@@ -77,16 +77,9 @@
 #include <linux/types.h>
 #include <asm/io.h>
 #include <linux/fb.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <video/fbcon.h>
-#endif
 #include "sis.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <linux/sisfb.h>
-#else
 #include <video/sisfb.h>
 #endif
-#endif
 
 /* Mode numbers */
 static const unsigned short ModeIndex_320x200[]      = {0x59, 0x41, 0x00, 0x4f};
diff --git a/drivers/video/sis/init301.h b/drivers/video/sis/init301.h
index bc321dc57e92..4f3a28699d37 100644
--- a/drivers/video/sis/init301.h
+++ b/drivers/video/sis/init301.h
@@ -71,16 +71,9 @@
 #include <linux/types.h>
 #include <asm/io.h>
 #include <linux/fb.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <video/fbcon.h>
-#endif
 #include "sis.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <linux/sisfb.h>
-#else
 #include <video/sisfb.h>
 #endif
-#endif
 
 static const unsigned char SiS_YPbPrTable[3][64] = {
   {
diff --git a/drivers/video/sis/initextlfb.c b/drivers/video/sis/initextlfb.c
index 09f5d758b6c0..c3884a29f4c5 100644
--- a/drivers/video/sis/initextlfb.c
+++ b/drivers/video/sis/initextlfb.c
@@ -34,12 +34,10 @@
 #include <linux/types.h>
 #include <linux/fb.h>
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 int             sisfb_mode_rate_to_dclock(struct SiS_Private *SiS_Pr,
                         unsigned char modeno, unsigned char rateindex);
 int             sisfb_mode_rate_to_ddata(struct SiS_Private *SiS_Pr, unsigned char modeno,
                         unsigned char rateindex, struct fb_var_screeninfo *var);
-#endif
 BOOLEAN         sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno,
                         int *htotal, int *vtotal, unsigned char rateindex);
 
@@ -49,7 +47,6 @@ extern BOOLEAN	SiS_SearchModeID(struct SiS_Private *SiS_Pr, unsigned short *Mode
 extern void     SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
                         int xres, int yres, struct fb_var_screeninfo *var, BOOLEAN writeres);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 int
 sisfb_mode_rate_to_dclock(struct SiS_Private *SiS_Pr, unsigned char modeno,
                         unsigned char rateindex)
@@ -177,7 +174,6 @@ sisfb_mode_rate_to_ddata(struct SiS_Private *SiS_Pr, unsigned char modeno,
 
     return 1;
 }
-#endif /* Linux >= 2.5 */
 
 BOOLEAN
 sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno, int *htotal,
diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h
index f59568020eb2..d048bd39961b 100644
--- a/drivers/video/sis/osdef.h
+++ b/drivers/video/sis/osdef.h
@@ -100,11 +100,7 @@
 #define SIS315H
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 #define SIS_LINUX_KERNEL_26
-#else
-#define SIS_LINUX_KERNEL_24
-#endif
 
 #if !defined(SIS300) && !defined(SIS315H)
 #warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is set
diff --git a/drivers/video/sis/sis_accel.c b/drivers/video/sis/sis_accel.c
index 3b7ce032e2ed..7addf91d2fea 100644
--- a/drivers/video/sis/sis_accel.c
+++ b/drivers/video/sis/sis_accel.c
@@ -32,22 +32,10 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/fb.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <linux/console.h>
-#endif
 #include <linux/ioport.h>
 #include <linux/types.h>
-
 #include <asm/io.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <video/fbcon.h>
-#include <video/fbcon-cfb8.h>
-#include <video/fbcon-cfb16.h>
-#include <video/fbcon-cfb24.h>
-#include <video/fbcon-cfb32.h>
-#endif
-
 #include "sis.h"
 #include "sis_accel.h"
 
@@ -91,11 +79,9 @@ static const u8 sisPatALUConv[] =
     0xFF,       /* dest = 0xFF;         1,      GXset,          0xF */
 };
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,34)
 static const int myrops[] = {
         3, 10, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
 };
-#endif
 
 /* 300 series ----------------------------------------------------- */
 #ifdef CONFIG_FB_SIS_300
@@ -315,8 +301,6 @@ void sisfb_syncaccel(struct sis_video_info *ivideo)
         }
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)  /* --------------- 2.5 --------------- */
-
 int fbcon_sis_sync(struct fb_info *info)
 {
         struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
@@ -438,13 +422,3 @@ void fbcon_sis_copyarea(struct fb_info *info, const struct fb_copyarea *area)
 
         sisfb_syncaccel(ivideo);
 }
-
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)  /* -------------- 2.4 --------------- */
-
-#include "sisfb_accel_2_4.h"
-
-#endif /* KERNEL VERSION */
-
-
diff --git a/drivers/video/sis/sis_accel.h b/drivers/video/sis/sis_accel.h
index 046e2c4a8e09..30e03cdf6b85 100644
--- a/drivers/video/sis/sis_accel.h
+++ b/drivers/video/sis/sis_accel.h
@@ -390,25 +390,11 @@
         MMIO_OUT32(ivideo->mmio_vbase, FIRE_TRIGGER, 0); \
         CmdQueLen -= 2;
 
-
 int  sisfb_initaccel(struct sis_video_info *ivideo);
 void sisfb_syncaccel(struct sis_video_info *ivideo);
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,33)
-void fbcon_sis_bmove(struct display *p, int srcy, int srcx, int dsty,
-                        int dstx, int height, int width);
-void fbcon_sis_revc(struct display *p, int srcy, int srcx);
-void fbcon_sis_clear8(struct vc_data *conp, struct display *p, int srcy,
-                        int srcx, int height, int width);
-void fbcon_sis_clear16(struct vc_data *conp, struct display *p, int srcy,
-                        int srcx, int height, int width);
-void fbcon_sis_clear32(struct vc_data *conp, struct display *p, int srcy,
-                        int srcx, int height, int width);
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,34)
 int  fbcon_sis_sync(struct fb_info *info);
 void fbcon_sis_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
 void fbcon_sis_copyarea(struct fb_info *info, const struct fb_copyarea *area);
-#endif
 
 #endif
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 895ebda7d9e3..baaf495a0a6d 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -35,9 +35,7 @@
 
 #include <linux/version.h>
 #include <linux/module.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 #include <linux/moduleparam.h>
-#endif
 #include <linux/kernel.h>
 #include <linux/smp_lock.h>
 #include <linux/spinlock.h>
@@ -58,9 +56,6 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <linux/vt_kern.h>
-#endif
 #include <linux/capability.h>
 #include <linux/fs.h>
 #include <linux/types.h>
@@ -70,35 +65,9 @@
 #include <asm/mtrr.h>
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <video/fbcon.h>
-#include <video/fbcon-cfb8.h>
-#include <video/fbcon-cfb16.h>
-#include <video/fbcon-cfb24.h>
-#include <video/fbcon-cfb32.h>
-#endif
-
 #include "sis.h"
 #include "sis_main.h"
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,3)
-#error "This version of sisfb requires at least 2.6.3"
-#endif
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#ifdef FBCON_HAS_CFB8
-extern struct display_switch fbcon_sis8;
-#endif
-#ifdef FBCON_HAS_CFB16
-extern struct display_switch fbcon_sis16;
-#endif
-#ifdef FBCON_HAS_CFB32
-extern struct display_switch fbcon_sis32;
-#endif
-#endif
-
 static void sisfb_handle_command(struct sis_video_info *ivideo,
                                  struct sisfb_cmd *sisfb_command);
 
@@ -114,17 +83,7 @@ sisfb_setdefaultparms(void)
         sisfb_max               = -1;
         sisfb_userom            = -1;
         sisfb_useoem            = -1;
-#ifdef MODULE
-        /* Module: "None" for 2.4, default mode for 2.5+ */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-        sisfb_mode_idx          = -1;
-#else
-        sisfb_mode_idx          = MODE_INDEX_NONE;
-#endif
-#else
-        /* Static: Default mode */
         sisfb_mode_idx          = -1;
-#endif
         sisfb_parm_rate         = -1;
         sisfb_crt1off           = 0;
         sisfb_forcecrt1         = -1;
@@ -142,10 +101,6 @@ sisfb_setdefaultparms(void)
         sisfb_tvxposoffset      = 0;
         sisfb_tvyposoffset      = 0;
         sisfb_nocrt2rate        = 0;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        sisfb_inverse           = 0;
-        sisfb_fontname[0]       = 0;
-#endif
 #if !defined(__i386__) && !defined(__x86_64__)
         sisfb_resetcard         = 0;
         sisfb_videoram          = 0;
@@ -162,14 +117,11 @@ sisfb_search_vesamode(unsigned int vesamode, BOOLEAN quiet)
         /* We don't know the hardware specs yet and there is no ivideo */
 
         if(vesamode == 0) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-                sisfb_mode_idx = MODE_INDEX_NONE;
-#else
                 if(!quiet)
                         printk(KERN_ERR "sisfb: Invalid mode. Using default.\n");
 
                 sisfb_mode_idx = DEFAULT_MODE;
-#endif
+
                 return;
         }
 
@@ -215,7 +167,6 @@ sisfb_search_mode(char *name, BOOLEAN quiet)
                 return;
         }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
         if(!strnicmp(name, sisbios_mode[MODE_INDEX_NONE].name, strlen(name))) {
                 if(!quiet)
                         printk(KERN_ERR "sisfb: Mode 'none' not supported anymore. Using default.\n");
@@ -223,7 +174,7 @@ sisfb_search_mode(char *name, BOOLEAN quiet)
                 sisfb_mode_idx = DEFAULT_MODE;
                 return;
         }
-#endif
+
         if(strlen(name) <= 19) {
                 strcpy(strbuf1, name);
                 for(i = 0; i < strlen(strbuf1); i++) {
@@ -1315,20 +1266,7 @@ sisfb_do_set_var(struct fb_var_screeninfo *var, int isactive, struct fb_info *in
                 ivideo->refresh_rate = 60;
         }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        if(ivideo->sisfb_thismonitor.datavalid) {
-                if(!sisfb_verify_rate(ivideo, &ivideo->sisfb_thismonitor, ivideo->sisfb_mode_idx,
-                                 ivideo->rate_idx, ivideo->refresh_rate)) {
-                        printk(KERN_INFO "sisfb: WARNING: Refresh rate exceeds monitor specs!\n");
-                }
-        }
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        if(((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) && isactive) {
-#else
         if(isactive) {
-#endif
                 /* If acceleration to be used? Need to know
                  * before pre/post_set_mode()
                  */
@@ -1367,9 +1305,7 @@ sisfb_do_set_var(struct fb_var_screeninfo *var, int isactive, struct fb_info *in
                 ivideo->current_linelength = ivideo->video_linelength;
                 ivideo->current_pixclock = var->pixclock;
                 ivideo->current_refresh_rate = ivideo->refresh_rate;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
                 ivideo->sisfb_lastrates[ivideo->mode_no] = ivideo->refresh_rate;
-#endif
         }
 
         return 0;
@@ -1435,18 +1371,6 @@ sisfb_pan_var(struct sis_video_info *ivideo, struct fb_var_screeninfo *var)
         return 0;
 }
 
-/* ------------ FBDev related routines for 2.4 series ----------- */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-
-#include "sisfb_fbdev_2_4.h"
-
-#endif
-
-/* ------------ FBDev related routines for 2.6 series ----------- */
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-
 static int
 sisfb_open(struct fb_info *info, int user)
 {
@@ -1744,8 +1668,6 @@ sisfb_blank(int blank, struct fb_info *info)
         return sisfb_myblank(ivideo, blank);
 }
 
-#endif
-
 /* ----------- FBDev related routines for all series ---------- */
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
@@ -1969,20 +1891,6 @@ sisfb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info)
 
 /* ----------------  fb_ops structures ----------------- */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-static struct fb_ops sisfb_ops = {
-        .owner          = THIS_MODULE,
-        .fb_get_fix     = sisfb_get_fix,
-        .fb_get_var     = sisfb_get_var,
-        .fb_set_var     = sisfb_set_var,
-        .fb_get_cmap    = sisfb_get_cmap,
-        .fb_set_cmap    = sisfb_set_cmap,
-        .fb_pan_display = sisfb_pan_display,
-        .fb_ioctl       = sisfb_ioctl
-};
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 static struct fb_ops sisfb_ops = {
         .owner          = THIS_MODULE,
         .fb_open        = sisfb_open,
@@ -2004,7 +1912,6 @@ static struct fb_ops sisfb_ops = {
 #endif
         .fb_ioctl       = sisfb_ioctl
 };
-#endif
 
 /* ---------------- Chip generation dependent routines ---------------- */
 
@@ -4100,16 +4007,6 @@ sisfb_setup(char *options)
                         sisfb_search_mode(this_opt + 5, FALSE);
                 } else if(!strnicmp(this_opt, "vesa:", 5)) {
                         sisfb_search_vesamode(simple_strtoul(this_opt + 5, NULL, 0), FALSE);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-                } else if(!strnicmp(this_opt, "inverse", 7)) {
-                        sisfb_inverse = 1;
-                        /* fb_invert_cmaps(); */
-                } else if(!strnicmp(this_opt, "font:", 5)) {
-                        if(strlen(this_opt + 5) < 40) {
-                           strncpy(sisfb_fontname, this_opt + 5, sizeof(sisfb_fontname) - 1);
-                           sisfb_fontname[sizeof(sisfb_fontname) - 1] = '\0';
-                        }
-#endif
                 } else if(!strnicmp(this_opt, "rate:", 5)) {
                         sisfb_parm_rate = simple_strtoul(this_opt + 5, NULL, 0);
                 } else if(!strnicmp(this_opt, "forcecrt1:", 10)) {
@@ -5870,17 +5767,9 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if(sisfb_off)
                 return -ENXIO;
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,3))
         sis_fb_info = framebuffer_alloc(sizeof(*ivideo), &pdev->dev);
         if(!sis_fb_info)
                 return -ENOMEM;
-#else
-        sis_fb_info = kmalloc(sizeof(*sis_fb_info) + sizeof(*ivideo), GFP_KERNEL);
-        if(!sis_fb_info)
-                return -ENOMEM;
-        memset(sis_fb_info, 0, sizeof(*sis_fb_info) + sizeof(*ivideo));
-        sis_fb_info->par = ((char *)sis_fb_info + sizeof(*sis_fb_info));
-#endif
 
         ivideo = (struct sis_video_info *)sis_fb_info->par;
         ivideo->memyselfandi = sis_fb_info;
@@ -5970,10 +5859,6 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         ivideo->tvxpos = sisfb_tvxposoffset;
         ivideo->tvypos = sisfb_tvyposoffset;
         ivideo->sisfb_nocrt2rate = sisfb_nocrt2rate;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)
-        ivideo->sisfb_inverse = sisfb_inverse;
-#endif
-
         ivideo->refresh_rate = 0;
         if(ivideo->sisfb_parm_rate != -1) {
                 ivideo->refresh_rate = ivideo->sisfb_parm_rate;
@@ -6049,10 +5934,6 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 }
         }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        strcpy(sis_fb_info->modename, ivideo->myid);
-#endif
-
         ivideo->SiS_Pr.ChipType = ivideo->chip;
 
         ivideo->SiS_Pr.ivideo = (void *)ivideo;
@@ -6134,20 +6015,6 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 #endif
         }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#ifdef MODULE
-        if((reg & 0x80) && (reg != 0xff)) {
-                if((sisbios_mode[ivideo->sisfb_mode_idx].mode_no[ivideo->mni])
-                                                                        != 0xFF) {
-                        printk(KERN_INFO "sisfb: Cannot initialize display mode, "
-                                         "X server is active\n");
-                        ret = -EBUSY;
-                        goto error_4;
-                }
-        }
-#endif
-#endif
-
         /* Search and copy ROM image */
         ivideo->bios_abase = NULL;
         ivideo->SiS_Pr.VirtualRomBase = NULL;
@@ -6281,9 +6148,6 @@ error_0:	iounmap(ivideo->video_vbase);
 error_1:        release_mem_region(ivideo->video_base, ivideo->video_size);
 error_2:        release_mem_region(ivideo->mmio_base, ivideo->mmio_size);
 error_3:        vfree(ivideo->bios_abase);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-error_4:
-#endif
                 if(ivideo->lpcdev)
                         SIS_PCI_PUT_DEVICE(ivideo->lpcdev);
                 if(ivideo->nbridge)
@@ -6586,7 +6450,6 @@ error_4:
                 sis_fb_info->fix = ivideo->sisfb_fix;
                 sis_fb_info->screen_base = ivideo->video_vbase + ivideo->video_offset;
                 sis_fb_info->fbops = &sisfb_ops;
-
                 sisfb_get_fix(&sis_fb_info->fix, -1, sis_fb_info);
                 sis_fb_info->pseudo_palette = ivideo->pseudo_palette;
 
@@ -6603,10 +6466,6 @@ error_4:
                 }
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-                vc_resize_con(1, 1, 0);
-#endif
-
                 if(register_framebuffer(sis_fb_info) < 0) {
                         printk(KERN_ERR "sisfb: Fatal error: Failed to register framebuffer\n");
                         ret = -EINVAL;
@@ -6653,12 +6512,7 @@ error_4:
 
 
                 printk(KERN_INFO "fb%d: %s frame buffer device version %d.%d.%d\n",
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-                        GET_FB_IDX(sis_fb_info->node),
-#else
-                        sis_fb_info->node,
-#endif
-                        ivideo->myid, VER_MAJOR, VER_MINOR, VER_LEVEL);
+                        sis_fb_info->node, ivideo->myid, VER_MAJOR, VER_MINOR, VER_LEVEL);
 
                 printk(KERN_INFO "sisfb: Copyright (C) 2001-2005 Thomas Winischhofer\n");
 
@@ -6732,11 +6586,7 @@ static void __devexit sisfb_remove(struct pci_dev *pdev)
         /* Unregister the framebuffer */
         if(ivideo->registered) {
                 unregister_framebuffer(sis_fb_info);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,3))
                 framebuffer_release(sis_fb_info);
-#else
-                kfree(sis_fb_info);
-#endif
         }
 
         /* OK, our ivideo is gone for good from here. */
@@ -6762,7 +6612,6 @@ static struct pci_driver sisfb_driver = {
 
 SISINITSTATIC int __init sisfb_init(void)
 {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
 #ifndef MODULE
         char *options = NULL;
 
@@ -6771,15 +6620,12 @@ SISINITSTATIC int __init sisfb_init(void)
 
         sisfb_setup(options);
 #endif
-#endif
         return pci_register_driver(&sisfb_driver);
 }
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
 #ifndef MODULE
 module_init(sisfb_init);
 #endif
-#endif
 
 /*****************************************************/
 /*                      MODULE                       */
@@ -6799,9 +6645,6 @@ static int		pdc1 = -1;
 static int              noaccel = -1;
 static int              noypan  = -1;
 static int              nomax = -1;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-static int              inverse = 0;
-#endif
 static int              userom = -1;
 static int              useoem = -1;
 static char             *tvstandard = NULL;
@@ -6861,10 +6704,6 @@ static int __init sisfb_init_module(void)
         else if(nomax == 0)
                 sisfb_max = 1;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        if(inverse) sisfb_inverse = 1;
-#endif
-
         if(mem)
                 sisfb_parm_mem = mem;
 
@@ -6913,35 +6752,6 @@ MODULE_DESCRIPTION("SiS 300/540/630/730/315/55x/65x/661/74x/330/76x/34x, XGI V3X
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Thomas Winischhofer <thomas@winischhofer.net>, Others");
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-MODULE_PARM(mem, "i");
-MODULE_PARM(noaccel, "i");
-MODULE_PARM(noypan, "i");
-MODULE_PARM(nomax, "i");
-MODULE_PARM(userom, "i");
-MODULE_PARM(useoem, "i");
-MODULE_PARM(mode, "s");
-MODULE_PARM(vesa, "i");
-MODULE_PARM(rate, "i");
-MODULE_PARM(forcecrt1, "i");
-MODULE_PARM(forcecrt2type, "s");
-MODULE_PARM(scalelcd, "i");
-MODULE_PARM(pdc, "i");
-MODULE_PARM(pdc1, "i");
-MODULE_PARM(specialtiming, "s");
-MODULE_PARM(lvdshl, "i");
-MODULE_PARM(tvstandard, "s");
-MODULE_PARM(tvxposoffset, "i");
-MODULE_PARM(tvyposoffset, "i");
-MODULE_PARM(nocrt2rate, "i");
-MODULE_PARM(inverse, "i");
-#if !defined(__i386__) && !defined(__x86_64__)
-MODULE_PARM(resetcard, "i");
-MODULE_PARM(videoram, "i");
-#endif
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 module_param(mem, int, 0);
 module_param(noaccel, int, 0);
 module_param(noypan, int, 0);
@@ -6966,18 +6776,7 @@ module_param(nocrt2rate, int, 0);
 module_param(resetcard, int, 0);
 module_param(videoram, int, 0);
 #endif
-#endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-MODULE_PARM_DESC(mem,
-        "\nDetermines the beginning of the video memory heap in KB. This heap is used\n"
-          "for video RAM management for eg. DRM/DRI. On 300 series, the default depends\n"
-          "on the amount of video RAM available. If 8MB of video RAM or less is available,\n"
-          "the heap starts at 4096KB, if between 8 and 16MB are available at 8192KB,\n"
-          "otherwise at 12288KB. On 315/330/340 series, the heap size is 32KB by default.\n"
-          "The value is to be specified without 'KB' and must match the MaxXFBMem setting\n"
-          "for XFree86 4.x/X.org 6.7 and later.\n");
-#else
 MODULE_PARM_DESC(mem,
         "\nDetermines the beginning of the video memory heap in KB. This heap is used\n"
           "for video RAM management for eg. DRM/DRI. On 300 series, the default depends\n"
@@ -6985,7 +6784,6 @@ MODULE_PARM_DESC(mem,
           "the heap starts at 4096KB, if between 8 and 16MB are available at 8192KB,\n"
           "otherwise at 12288KB. On 315/330/340 series, the heap size is 32KB by default.\n"
           "The value is to be specified without 'KB'.\n");
-#endif
 
 MODULE_PARM_DESC(noaccel,
         "\nIf set to anything other than 0, 2D acceleration will be disabled.\n"
@@ -7002,23 +6800,6 @@ MODULE_PARM_DESC(nomax,
           "enable the user to positively specify a virtual Y size of the screen using\n"
           "fbset. (default: 0)\n");
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-MODULE_PARM_DESC(mode,
-        "\nSelects the desired display mode in the format [X]x[Y]x[Depth], eg.\n"
-          "1024x768x16. Other formats supported include XxY-Depth and\n"
-          "XxY-Depth@Rate. If the parameter is only one (decimal or hexadecimal)\n"
-          "number, it will be interpreted as a VESA mode number. (default: none if\n"
-          "sisfb is a module; this leaves the console untouched and the driver will\n"
-          "only do the video memory management for eg. DRM/DRI; 800x600x8 if sisfb\n"
-          "is in the kernel)\n");
-MODULE_PARM_DESC(vesa,
-        "\nSelects the desired display mode by VESA defined mode number, eg. 0x117\n"
-          "(default: 0x0000 if sisfb is a module; this leaves the console untouched\n"
-          "and the driver will only do the video memory management for eg. DRM/DRI;\n"
-          "0x0103 if sisfb is in the kernel)\n");
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 MODULE_PARM_DESC(mode,
         "\nSelects the desired default display mode in the format XxYxDepth,\n"
          "eg. 1024x768x16. Other formats supported include XxY-Depth and\n"
@@ -7028,7 +6809,6 @@ MODULE_PARM_DESC(mode,
 MODULE_PARM_DESC(vesa,
         "\nSelects the desired default display mode by VESA defined mode number, eg.\n"
          "0x117 (default: 0x0103)\n");
-#endif
 
 MODULE_PARM_DESC(rate,
         "\nSelects the desired vertical refresh rate for CRT1 (external VGA) in Hz.\n"
@@ -7094,12 +6874,6 @@ MODULE_PARM_DESC(nocrt2rate,
         "\nSetting this to 1 will force the driver to use the default refresh rate for\n"
           "CRT2 if CRT2 type is VGA. (default: 0, use same rate as CRT1)\n");
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-MODULE_PARM_DESC(inverse,
-        "\nSetting this to anything but 0 should invert the display colors, but this\n"
-          "does not seem to work. (default: 0)\n");
-#endif
-
 #if !defined(__i386__) && !defined(__x86_64__)
 #ifdef CONFIG_FB_SIS_300
 MODULE_PARM_DESC(resetcard,
diff --git a/drivers/video/sis/sis_main.h b/drivers/video/sis/sis_main.h
index 70b6df371b8e..88e4f1e41470 100644
--- a/drivers/video/sis/sis_main.h
+++ b/drivers/video/sis/sis_main.h
@@ -67,15 +67,7 @@ static int sisfb_ypan = -1;
 static int sisfb_max = -1;
 static int sisfb_userom = 1;
 static int sisfb_useoem = -1;
-#ifdef MODULE
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-static int sisfb_mode_idx = -1;
-#else
-static int sisfb_mode_idx = MODE_INDEX_NONE;  /* Don't use a mode by default if we are a module */
-#endif
-#else
 static int sisfb_mode_idx = -1;               /* Use a default mode if we are inside the kernel */
-#endif
 static int sisfb_parm_rate = -1;
 static int sisfb_crt1off = 0;
 static int sisfb_forcecrt1 = -1;
@@ -93,10 +85,6 @@ static int sisfb_tvstd  = -1;
 static int sisfb_tvxposoffset = 0;
 static int sisfb_tvyposoffset = 0;
 static int sisfb_nocrt2rate = 0;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-static int  sisfb_inverse = 0;
-static char sisfb_fontname[40];
-#endif
 #if !defined(__i386__) && !defined(__x86_64__)
 static int sisfb_resetcard = 0;
 static int sisfb_videoram = 0;
@@ -687,54 +675,8 @@ SISINITSTATIC int sisfb_init(void);
 static int      sisfb_get_fix(struct fb_fix_screeninfo *fix, int con,
                                 struct fb_info *info);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-static int      sisfb_get_fix(struct fb_fix_screeninfo *fix,
-                                int con,
-                                struct fb_info *info);
-static int      sisfb_get_var(struct fb_var_screeninfo *var,
-                                int con,
-                                struct fb_info *info);
-static int      sisfb_set_var(struct fb_var_screeninfo *var,
-                                int con,
-                                struct fb_info *info);
-static void     sisfb_crtc_to_var(struct sis_video_info *ivideo,
-                                struct fb_var_screeninfo *var);
-static int      sisfb_get_cmap(struct fb_cmap *cmap,
-                                int kspc,
-                                int con,
-                                struct fb_info *info);
-static int      sisfb_set_cmap(struct fb_cmap *cmap,
-                                int kspc,
-                                int con,
-                                struct fb_info *info);
-static int      sisfb_update_var(int con,
-                                struct fb_info *info);
-static int      sisfb_switch(int con,
-                             struct fb_info *info);
-static void     sisfb_blank(int blank,
-                                struct fb_info *info);
-static void     sisfb_set_disp(int con,
-                                struct fb_var_screeninfo *var,
-                                struct fb_info *info);
-static int      sis_getcolreg(unsigned regno, unsigned *red, unsigned *green,
-                                unsigned *blue, unsigned *transp,
-                                struct fb_info *fb_info);
-static void     sisfb_do_install_cmap(int con,
-                                struct fb_info *info);
-static int      sisfb_ioctl(struct inode *inode, struct file *file,
-                                unsigned int cmd, unsigned long arg, int con,
-                                struct fb_info *info);
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
 static int      sisfb_ioctl(struct fb_info *info, unsigned int cmd,
                             unsigned long arg);
-#else
-static int      sisfb_ioctl(struct inode *inode, struct file *file,
-                                unsigned int cmd, unsigned long arg,
-                                struct fb_info *info);
-#endif
 static int      sisfb_set_par(struct fb_info *info);
 static int      sisfb_blank(int blank,
                                 struct fb_info *info);
@@ -743,7 +685,6 @@ extern void	fbcon_sis_fillrect(struct fb_info *info,
 extern void     fbcon_sis_copyarea(struct fb_info *info,
                                 const struct fb_copyarea *area);
 extern int      fbcon_sis_sync(struct fb_info *info);
-#endif
 
 /* Internal 2D accelerator functions */
 extern int      sisfb_initaccel(struct sis_video_info *ivideo);
@@ -811,16 +752,10 @@ extern BOOLEAN		SiSDetermineROMLayout661(struct SiS_Private *SiS_Pr);
 
 extern BOOLEAN          sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno,
                                 int *htotal, int *vtotal, unsigned char rateindex);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 extern int              sisfb_mode_rate_to_dclock(struct SiS_Private *SiS_Pr,
                                 unsigned char modeno, unsigned char rateindex);
 extern int              sisfb_mode_rate_to_ddata(struct SiS_Private *SiS_Pr, unsigned char modeno,
                                 unsigned char rateindex, struct fb_var_screeninfo *var);
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-extern void             SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata, int xres,
-                                int yres, struct fb_var_screeninfo *var, BOOLEAN writeres);
-#endif
 
 /* Chrontel TV, DDC and DPMS functions */
 extern unsigned short   SiS_GetCH700x(struct SiS_Private *SiS_Pr, unsigned short reg);
diff --git a/drivers/video/sis/vgatypes.h b/drivers/video/sis/vgatypes.h
index 831b9f42264b..05d08b7889a1 100644
--- a/drivers/video/sis/vgatypes.h
+++ b/drivers/video/sis/vgatypes.h
@@ -73,12 +73,10 @@ typedef unsigned int BOOLEAN;
 
 #ifdef SIS_LINUX_KERNEL
 typedef unsigned long SISIOADDRESS;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
 #include <linux/types.h>  /* Need __iomem */
 #undef SISIOMEMTYPE
 #define SISIOMEMTYPE __iomem
 #endif
-#endif
 
 #ifdef SIS_XORG_XF86
 #if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0)
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index dad54e73147b..711cb11d6eb3 100644
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -17,7 +17,10 @@
  *      (port driver to new frambuffer infrastructure)
  * 01/2003 Helge Deller    <deller@gmx.de>
  *      (initial work on fb hardware acceleration for voodoo2)
- *
+ * 08/2006 Alan Cox        <alan@redhat.com>
+ *      Remove never finished and bogus 24/32bit support
+ *      Clean up macro abuse
+ *      Minor tidying for format.
  */
 
 /*
@@ -40,6 +43,7 @@
        through the fifo. warning: issuing a nop command seems to need pci_fifo
 -FIXME: in case of failure in the init sequence, be sure we return to a safe
         state.
+- FIXME: Use accelerator for 2D scroll
 -FIXME: 4MB boards have banked memory (FbiInit2 bits 1 & 20)
  */
 
@@ -67,9 +71,6 @@
 
 #undef SST_DEBUG
 
-/* enable 24/32 bpp functions ? (completely untested!) */
-#undef EN_24_32_BPP
-
 /*
   Default video mode .
   0 800x600@60  took from glide
@@ -377,7 +378,11 @@ static void sstfb_clear_screen(struct fb_info *info)
  *      sstfb_check_var - Optional function.  Validates a var passed in.
  *      @var: frame buffer variable screen structure
  *      @info: frame buffer structure that represents a single frame buffer
+ *
+ *      Limit to the abilities of a single chip as SLI is not supported
+ *      by this driver.
  */
+
 static int sstfb_check_var(struct fb_var_screeninfo *var,
                 struct fb_info *info)
 {
@@ -390,7 +395,7 @@ static int sstfb_check_var(struct fb_var_screeninfo *var,
         unsigned int freq;
 
         if (sst_calc_pll(PICOS2KHZ(var->pixclock), &freq, &par->pll)) {
-                eprintk("Pixclock at %ld KHZ out of range\n",
+                printk(KERN_ERR "sstfb: Pixclock at %ld KHZ out of range\n",
                                 PICOS2KHZ(var->pixclock));
                 return -EINVAL;
         }
@@ -409,27 +414,15 @@ static int sstfb_check_var(struct fb_var_screeninfo *var,
         case 0 ... 16 :
                 var->bits_per_pixel = 16;
                 break;
-#ifdef EN_24_32_BPP
-        case 17 ... 24 :
-                var->bits_per_pixel = 24;
-                break;
-        case 25 ... 32 :
-                var->bits_per_pixel = 32;
-                break;
-#endif
         default :
-                eprintk("Unsupported bpp %d\n", var->bits_per_pixel);
+                printk(KERN_ERR "sstfb: Unsupported bpp %d\n", var->bits_per_pixel);
                 return -EINVAL;
         }
         
         /* validity tests */
-        if ((var->xres <= 1) || (yDim <= 0 )
-           || (var->hsync_len <= 1)
-           || (hSyncOff <= 1)
-           || (var->left_margin <= 2)
-           || (vSyncOn <= 0)
-           || (vSyncOff <= 0)
-           || (vBackPorch <= 0)) {
+        if (var->xres <= 1 || yDim <= 0 || var->hsync_len <= 1  ||
+            hSyncOff <= 1  || var->left_margin <= 2  || vSyncOn <= 0 ||
+            vSyncOff <= 0 || vBackPorch <= 0) {
                 return -EINVAL;
         }
 
@@ -437,21 +430,17 @@ static int sstfb_check_var(struct fb_var_screeninfo *var,
                 /* Voodoo 2 limits */
                 tiles_in_X = (var->xres + 63 ) / 64 * 2;                
 
-                if (((var->xres - 1) >= POW2(11)) || (yDim >= POW2(11))) {
-                        eprintk("Unsupported resolution %dx%d\n",
+                if (var->xres  > POW2(11) || yDim >= POW2(11)) {
+                        printk(KERN_ERR "sstfb: Unsupported resolution %dx%d\n",
                                  var->xres, var->yres);
                         return -EINVAL;
                 }
 
-                if (((var->hsync_len-1) >= POW2(9))
-                   || ((hSyncOff-1) >= POW2(11))
-                   || ((var->left_margin - 2) >= POW2(9))
-                   || (vSyncOn >= POW2(13))
-                   || (vSyncOff >= POW2(13))
-                   || (vBackPorch >= POW2(9))
-                   || (tiles_in_X >= POW2(6))
-                   || (tiles_in_X <= 0)) {
-                        eprintk("Unsupported Timings\n");
+                if (var->hsync_len > POW2(9) || hSyncOff > POW2(11) ||
+                    var->left_margin - 2 >= POW2(9) || vSyncOn >= POW2(13) ||
+                    vSyncOff >= POW2(13) || vBackPorch >= POW2(9) ||
+                    tiles_in_X >= POW2(6) || tiles_in_X <= 0) {
+                        printk(KERN_ERR "sstfb: Unsupported timings\n");
                         return -EINVAL;
                 }
         } else {
@@ -459,24 +448,20 @@ static int sstfb_check_var(struct fb_var_screeninfo *var,
                 tiles_in_X = (var->xres + 63 ) / 64;
 
                 if (var->vmode) {
-                        eprintk("Interlace/Doublescan not supported %#x\n",
+                        printk(KERN_ERR "sstfb: Interlace/doublescan not supported %#x\n",
                                 var->vmode);
                         return -EINVAL;
                 }
-                if (((var->xres - 1) >= POW2(10)) || (var->yres >= POW2(10))) {
-                        eprintk("Unsupported resolution %dx%d\n",
+                if (var->xres > POW2(10) || var->yres >= POW2(10)) {
+                        printk(KERN_ERR "sstfb: Unsupported resolution %dx%d\n",
                                  var->xres, var->yres);
                         return -EINVAL;
                 }
-                if (((var->hsync_len - 1) >= POW2(8))
-                   || ((hSyncOff-1) >= POW2(10))
-                   || ((var->left_margin - 2) >= POW2(8))
-                   || (vSyncOn >= POW2(12))
-                   || (vSyncOff >= POW2(12))
-                   || (vBackPorch >= POW2(8))
-                   || (tiles_in_X >= POW2(4))
-                   || (tiles_in_X <= 0)) {
-                        eprintk("Unsupported Timings\n");
+                if (var->hsync_len > POW2(8) || hSyncOff - 1 > POW2(10) ||
+                    var->left_margin - 2 >= POW2(8) || vSyncOn >= POW2(12) ||
+                    vSyncOff >= POW2(12) || vBackPorch >= POW2(8) ||
+                    tiles_in_X >= POW2(4) || tiles_in_X <= 0) {
+                        printk(KERN_ERR "sstfb: Unsupported timings\n");
                         return -EINVAL;
                 }
         }
@@ -486,8 +471,8 @@ static int sstfb_check_var(struct fb_var_screeninfo *var,
         real_length = tiles_in_X  * (IS_VOODOO2(par) ? 32 : 64 )
                       * ((var->bits_per_pixel == 16) ? 2 : 4);
 
-        if ((real_length * yDim) > info->fix.smem_len) {
-                eprintk("Not enough video memory\n");
+        if (real_length * yDim > info->fix.smem_len) {
+                printk(KERN_ERR "sstfb: Not enough video memory\n");
                 return -ENOMEM;
         }
 
@@ -515,20 +500,6 @@ static int sstfb_check_var(struct fb_var_screeninfo *var,
                 var->blue.offset   = 0;
                 var->transp.offset = 0;
                 break;
-#ifdef EN_24_32_BPP
-        case 24:        /* RGB 888 LfbMode 4 */
-        case 32:        /* ARGB 8888 LfbMode 5 */
-                var->red.length    = 8;
-                var->green.length  = 8;
-                var->blue.length   = 8;
-                var->transp.length = 0;
-
-                var->red.offset    = 16;
-                var->green.offset  = 8;
-                var->blue.offset   = 0;
-                var->transp.offset = 0; /* in 24bpp we fake a 32 bpp mode */
-                break;
-#endif
         default:
                 return -EINVAL;
         }
@@ -653,13 +624,6 @@ static int sstfb_set_par(struct fb_info *info)
         case 16:
                 fbiinit1 |=  SEL_SOURCE_VCLK_2X_SEL;
                 break;
-#ifdef EN_24_32_BPP
-        case 24:
-        case 32:
-                /* sst_set_bits(FBIINIT1, SEL_SOURCE_VCLK_2X_DIV2 | EN_24BPP);*/
-                fbiinit1 |= SEL_SOURCE_VCLK_2X_SEL | EN_24BPP;
-                break;
-#endif
         default:
                 return -EINVAL;
         }
@@ -690,14 +654,6 @@ static int sstfb_set_par(struct fb_info *info)
         case 16:
                 lfbmode = LFB_565;
                 break;
-#ifdef EN_24_32_BPP
-        case 24:
-                lfbmode = LFB_888;
-                break;
-        case 32:
-                lfbmode = LFB_8888;
-                break;
-#endif
         default:
                 return -EINVAL;
         }
@@ -789,8 +745,7 @@ static int sstfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
                         return -EFAULT;
                 if (val > info->fix.smem_len)
                         val = info->fix.smem_len;
-                printk("filling %#x \n", val);
-                for (p=0 ; p<val; p+=2)
+                for (p = 0 ; p < val; p += 2)
                         writew(p >> 6, info->screen_base + p);
                 return 0;
                 
@@ -802,13 +757,10 @@ static int sstfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
                 pci_write_config_dword(sst_dev, PCI_INIT_ENABLE,
                                        tmp | PCI_EN_INIT_WR );
                 fbiinit0 = sst_read (FBIINIT0);
-                if (val) {
+                if (val)
                         sst_write(FBIINIT0, fbiinit0 & ~EN_VGA_PASSTHROUGH);
-                        iprintk("Disabling VGA pass-through\n");
-                } else {
+                else
                         sst_write(FBIINIT0, fbiinit0 | EN_VGA_PASSTHROUGH);
-                        iprintk("Enabling VGA pass-through\n");
-                }
                 pci_write_config_dword(sst_dev, PCI_INIT_ENABLE, tmp);
                 return 0;
                 
@@ -884,9 +836,9 @@ static int __devinit sst_get_memsize(struct fb_info *info, __u32 *memsize)
         u8 __iomem *fbbase_virt = info->screen_base;
 
         /* force memsize */
-        if ((mem >= 1 ) &&  (mem <= 4)) {
+        if (mem >= 1  && mem <= 4) {
                 *memsize = (mem * 0x100000);
-                iprintk("supplied memsize: %#x\n", *memsize);
+                printk(KERN_INFO "supplied memsize: %#x\n", *memsize);
                 return 1;
         }
 
@@ -927,7 +879,7 @@ static int __devinit sst_detect_att(struct fb_info *info)
         struct sstfb_par *par = info->par;
         int i, mir, dir;
 
-        for (i=0; i<3; i++) {
+        for (i = 0; i < 3; i++) {
                 sst_dac_write(DACREG_WMA, 0);   /* backdoor */
                 sst_dac_read(DACREG_RMR);       /* read 4 times RMR */
                 sst_dac_read(DACREG_RMR);
@@ -940,7 +892,7 @@ static int __devinit sst_detect_att(struct fb_info *info)
                 /*the 7th, device ID register */
                 dir = sst_dac_read(DACREG_RMR);
                 f_ddprintk("mir: %#x, dir: %#x\n", mir, dir);
-                if ((mir == DACREG_MIR_ATT ) && (dir == DACREG_DIR_ATT)) {
+                if (mir == DACREG_MIR_ATT && dir == DACREG_DIR_ATT) {
                         return 1;
                 }
         }
@@ -1134,12 +1086,6 @@ static void sst_set_vidmod_att_ti(struct fb_info *info, const int bpp)
         case 16:
                 sst_dac_write(DACREG_RMR, (cr0 & 0x0f) | DACREG_CR0_16BPP);
                 break;
-#ifdef EN_24_32_BPP
-        case 24:
-        case 32:
-                sst_dac_write(DACREG_RMR, (cr0 & 0x0f) | DACREG_CR0_24BPP);
-                break;
-#endif
         default:
                 dprintk("%s: bad depth '%u'\n", __FUNCTION__, bpp);
                 break;
@@ -1154,12 +1100,6 @@ static void sst_set_vidmod_ics(struct fb_info *info, const int bpp)
         case 16:
                 sst_dac_write(DACREG_ICS_CMD, DACREG_ICS_CMD_16BPP);
                 break;
-#ifdef EN_24_32_BPP
-        case 24:
-        case 32:
-                sst_dac_write(DACREG_ICS_CMD, DACREG_ICS_CMD_24BPP);
-                break;
-#endif
         default:
                 dprintk("%s: bad depth '%u'\n", __FUNCTION__, bpp);
                 break;
@@ -1250,7 +1190,7 @@ static int __devinit sst_init(struct fb_info *info, struct sstfb_par *par)
                                 PCI_EN_INIT_WR | PCI_REMAP_DAC );
         /* detect dac type */
         if (!sst_detect_dactype(info, par)) {
-                eprintk("Unknown dac type\n");
+                printk(KERN_ERR "sstfb: unknown dac type.\n");
                 //FIXME watch it: we are not in a safe state, bad bad bad.
                 return 0;
         }
@@ -1258,10 +1198,10 @@ static int __devinit sst_init(struct fb_info *info, struct sstfb_par *par)
         /* set graphic clock */
         par->gfx_clock = spec->default_gfx_clock;
         if ((gfxclk >10 ) && (gfxclk < spec->max_gfxclk)) {
-                iprintk("Using supplied graphic freq : %dMHz\n", gfxclk);
+                printk(KERN_INFO "sstfb: Using supplied graphic freq : %dMHz\n", gfxclk);
                  par->gfx_clock = gfxclk *1000;
         } else if (gfxclk) {
-                wprintk ("%dMhz is way out of spec! Using default\n", gfxclk);
+                printk(KERN_WARNING "sstfb: %dMhz is way out of spec! Using default\n", gfxclk);
         }
 
         sst_calc_pll(par->gfx_clock, &Fout, &gfx_timings);
@@ -1396,7 +1336,7 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
 
         /* Enable device in PCI config. */
         if ((err=pci_enable_device(pdev))) {
-                eprintk("cannot enable device\n");
+                printk(KERN_ERR "cannot enable device\n");
                 return err;
         }
 
@@ -1422,39 +1362,39 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
         fix->smem_start = fix->mmio_start + 0x400000;
 
         if (!request_mem_region(fix->mmio_start, fix->mmio_len, "sstfb MMIO")) {
-                eprintk("cannot reserve mmio memory\n");
+                printk(KERN_ERR "sstfb: cannot reserve mmio memory\n");
                 goto fail_mmio_mem;
         }
 
         if (!request_mem_region(fix->smem_start, 0x400000,"sstfb FB")) {
-                eprintk("cannot reserve fb memory\n");
+                printk(KERN_ERR "sstfb: cannot reserve fb memory\n");
                 goto fail_fb_mem;
         }
 
         par->mmio_vbase = ioremap_nocache(fix->mmio_start,
                                         fix->mmio_len);
         if (!par->mmio_vbase) {
-                eprintk("cannot remap register area %#lx\n",
+                printk(KERN_ERR "sstfb: cannot remap register area %#lx\n",
                         fix->mmio_start);
                 goto fail_mmio_remap;
         }
         info->screen_base = ioremap_nocache(fix->smem_start, 0x400000);
         if (!info->screen_base) {
-                eprintk("cannot remap framebuffer %#lx\n",
+                printk(KERN_ERR "sstfb: cannot remap framebuffer %#lx\n",
                         fix->smem_start);
                 goto fail_fb_remap;
         }
 
         if (!sst_init(info, par)) {
-                eprintk("Init failed\n");
+                printk(KERN_ERR "sstfb: Init failed\n");
                 goto fail;
         }
         sst_get_memsize(info, &fix->smem_len);
         strlcpy(fix->id, spec->name, sizeof(fix->id));
 
-        iprintk("%s (revision %d) with %s dac\n",
+        printk(KERN_INFO "%s (revision %d) with %s dac\n",
                 fix->id, par->revision, par->dac_sw.name);
-        iprintk("framebuffer at %#lx, mapped to 0x%p, size %dMB\n",
+        printk(KERN_INFO "framebuffer at %#lx, mapped to 0x%p, size %dMB\n",
                 fix->smem_start, info->screen_base,
                 fix->smem_len >> 20);
 
@@ -1471,24 +1411,25 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
         fix->accel      = FB_ACCEL_NONE;  /* FIXME */
         /*
          * According to the specs, the linelength must be of 1024 *pixels*
-         * and the 24bpp mode is in fact a 32 bpp mode.
+         * and the 24bpp mode is in fact a 32 bpp mode (and both are in
+         * fact dithered to 16bit).
          */
         fix->line_length = 2048; /* default value, for 24 or 32bit: 4096 */
         
         if ( mode_option &&
              fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 16)) {
-                eprintk("can't set supplied video mode. Using default\n");
+                printk(KERN_ERR "sstfb: can't set supplied video mode. Using default\n");
                 info->var = sstfb_default;
         } else
                 info->var = sstfb_default;
 
         if (sstfb_check_var(&info->var, info)) {
-                eprintk("invalid default video mode.\n");
+                printk(KERN_ERR "sstfb: invalid default video mode.\n");
                 goto fail;
         }
 
         if (sstfb_set_par(info)) {
-                eprintk("can't set default video mode.\n");
+                printk(KERN_ERR "sstfb: can't set default video mode.\n");
                 goto fail;
         }
         
@@ -1497,7 +1438,7 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
         /* register fb */
         info->device = &pdev->dev;
         if (register_framebuffer(info) < 0) {
-                eprintk("can't register framebuffer.\n");
+                printk(KERN_ERR "sstfb: can't register framebuffer.\n");
                 goto fail;
         }
 
@@ -1711,4 +1652,3 @@ module_param(gfxclk, int, 0);
 MODULE_PARM_DESC(gfxclk, "Force graphic chip frequency in MHz. DANGEROUS. (default=auto)");
 module_param(slowpci, bool, 0);
 MODULE_PARM_DESC(slowpci, "Uses slow PCI settings (0 or 1) (default=0)");
-
diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index 2fc99877cb0d..cf8a2cb28505 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -30,7 +30,7 @@ static int afs_dir_readdir(struct file *file, void *dirent, filldir_t filldir);
 static int afs_d_revalidate(struct dentry *dentry, struct nameidata *nd);
 static int afs_d_delete(struct dentry *dentry);
 static int afs_dir_lookup_filldir(void *_cookie, const char *name, int nlen,
-                                  loff_t fpos, ino_t ino, unsigned dtype);
+                                  loff_t fpos, u64 ino, unsigned dtype);
 
 const struct file_operations afs_dir_file_operations = {
         .open           = afs_dir_open,
@@ -409,7 +409,7 @@ static int afs_dir_readdir(struct file *file, void *cookie, filldir_t filldir)
  *   uniquifier through dtype
  */
 static int afs_dir_lookup_filldir(void *_cookie, const char *name, int nlen,
-                                  loff_t fpos, ino_t ino, unsigned dtype)
+                                  loff_t fpos, u64 ino, unsigned dtype)
 {
         struct afs_dir_lookup_cookie *cookie = _cookie;
 
diff --git a/fs/aio.c b/fs/aio.c
index 2e0d1505ee36..94766599db00 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -675,7 +675,7 @@ static ssize_t aio_run_iocb(struct kiocb *iocb)
         }
 
         if (!(iocb->ki_retried & 0xff)) {
-                pr_debug("%ld retry: %d of %d\n", iocb->ki_retried,
+                pr_debug("%ld retry: %zd of %zd\n", iocb->ki_retried,
                         iocb->ki_nbytes - iocb->ki_left, iocb->ki_nbytes);
         }
 
@@ -1008,7 +1008,7 @@ int fastcall aio_complete(struct kiocb *iocb, long res, long res2)
 
         pr_debug("added to ring %p at [%lu]\n", iocb, tail);
 
-        pr_debug("%ld retries: %d of %d\n", iocb->ki_retried,
+        pr_debug("%ld retries: %zd of %zd\n", iocb->ki_retried,
                 iocb->ki_nbytes - iocb->ki_left, iocb->ki_nbytes);
 put_rq:
         /* everything turned out well, dispose of the aiocb. */
diff --git a/fs/compat.c b/fs/compat.c
index d98c96f4a44d..4d3fbcb2ddb1 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -914,20 +914,24 @@ struct compat_readdir_callback {
 };
 
 static int compat_fillonedir(void *__buf, const char *name, int namlen,
-                        loff_t offset, ino_t ino, unsigned int d_type)
+                        loff_t offset, u64 ino, unsigned int d_type)
 {
         struct compat_readdir_callback *buf = __buf;
         struct compat_old_linux_dirent __user *dirent;
+        compat_ulong_t d_ino;
 
         if (buf->result)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         buf->result++;
         dirent = buf->dirent;
         if (!access_ok(VERIFY_WRITE, dirent,
                         (unsigned long)(dirent->d_name + namlen + 1) -
                                 (unsigned long)dirent))
                 goto efault;
-        if (    __put_user(ino, &dirent->d_ino) ||
+        if (    __put_user(d_ino, &dirent->d_ino) ||
                 __put_user(offset, &dirent->d_offset) ||
                 __put_user(namlen, &dirent->d_namlen) ||
                 __copy_to_user(dirent->d_name, name, namlen) ||
@@ -978,22 +982,26 @@ struct compat_getdents_callback {
 };
 
 static int compat_filldir(void *__buf, const char *name, int namlen,
-                loff_t offset, ino_t ino, unsigned int d_type)
+                loff_t offset, u64 ino, unsigned int d_type)
 {
         struct compat_linux_dirent __user * dirent;
         struct compat_getdents_callback *buf = __buf;
+        compat_ulong_t d_ino;
         int reclen = COMPAT_ROUND_UP(NAME_OFFSET(dirent) + namlen + 2);
 
         buf->error = -EINVAL;   /* only used if we fail.. */
         if (reclen > buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         dirent = buf->previous;
         if (dirent) {
                 if (__put_user(offset, &dirent->d_off))
                         goto efault;
         }
         dirent = buf->current_dir;
-        if (__put_user(ino, &dirent->d_ino))
+        if (__put_user(d_ino, &dirent->d_ino))
                 goto efault;
         if (__put_user(reclen, &dirent->d_reclen))
                 goto efault;
@@ -1064,7 +1072,7 @@ struct compat_getdents_callback64 {
 };
 
 static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t offset,
-                     ino_t ino, unsigned int d_type)
+                     u64 ino, unsigned int d_type)
 {
         struct linux_dirent64 __user *dirent;
         struct compat_getdents_callback64 *buf = __buf;
diff --git a/fs/configfs/file.c b/fs/configfs/file.c
index 85105e50f7db..e6d5754a715e 100644
--- a/fs/configfs/file.c
+++ b/fs/configfs/file.c
@@ -137,8 +137,8 @@ configfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *pp
                 if ((retval = fill_read_buffer(file->f_dentry,buffer)))
                         goto out;
         }
-        pr_debug("%s: count = %d, ppos = %lld, buf = %s\n",
-                 __FUNCTION__,count,*ppos,buffer->page);
+        pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n",
+                 __FUNCTION__, count, *ppos, buffer->page);
         retval = flush_read_buffer(buffer,buf,count,ppos);
 out:
         up(&buffer->sem);
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 8d544334bcd2..557d5b614fae 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -720,9 +720,10 @@ static int ep_getfd(int *efd, struct inode **einode, struct file **efile,
 
         /* Allocates an inode from the eventpoll file system */
         inode = ep_eventpoll_inode();
-        error = PTR_ERR(inode);
-        if (IS_ERR(inode))
+        if (IS_ERR(inode)) {
+                error = PTR_ERR(inode);
                 goto eexit_2;
+        }
 
         /* Allocates a free descriptor to plug the file onto */
         error = get_unused_fd();
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c
index 4c39009350f3..93e77c3d2490 100644
--- a/fs/exportfs/expfs.c
+++ b/fs/exportfs/expfs.c
@@ -315,7 +315,7 @@ struct getdents_callback {
  * the name matching the specified inode number.
  */
 static int filldir_one(void * __buf, const char * name, int len,
-                        loff_t pos, ino_t ino, unsigned int d_type)
+                        loff_t pos, u64 ino, unsigned int d_type)
 {
         struct getdents_callback *buf = __buf;
         int result = 0;
diff --git a/fs/fat/dir.c b/fs/fat/dir.c
index 3e50a4166283..69c439f44387 100644
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@ -648,7 +648,7 @@ static int fat_readdir(struct file *filp, void *dirent, filldir_t filldir)
 }
 
 static int fat_ioctl_filldir(void *__buf, const char *name, int name_len,
-                             loff_t offset, ino_t ino, unsigned int d_type)
+                             loff_t offset, u64 ino, unsigned int d_type)
 {
         struct fat_ioctl_filldir_callback *buf = __buf;
         struct dirent __user *d1 = buf->dirent;
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index e35d7e52fdeb..1cbd2e4ee122 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -184,7 +184,7 @@ struct dentry_list_arg {
 
 static int
 nfsd4_build_dentrylist(void *arg, const char *name, int namlen,
-                loff_t offset, ino_t ino, unsigned int d_type)
+                loff_t offset, u64 ino, unsigned int d_type)
 {
         struct dentry_list_arg *dla = arg;
         struct list_head *dentries = &dla->dentries;
diff --git a/fs/readdir.c b/fs/readdir.c
index b6109329b607..bff3ee58e2f8 100644
--- a/fs/readdir.c
+++ b/fs/readdir.c
@@ -69,20 +69,24 @@ struct readdir_callback {
 };
 
 static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset,
-                      ino_t ino, unsigned int d_type)
+                      u64 ino, unsigned int d_type)
 {
         struct readdir_callback * buf = (struct readdir_callback *) __buf;
         struct old_linux_dirent __user * dirent;
+        unsigned long d_ino;
 
         if (buf->result)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         buf->result++;
         dirent = buf->dirent;
         if (!access_ok(VERIFY_WRITE, dirent,
                         (unsigned long)(dirent->d_name + namlen + 1) -
                                 (unsigned long)dirent))
                 goto efault;
-        if (    __put_user(ino, &dirent->d_ino) ||
+        if (    __put_user(d_ino, &dirent->d_ino) ||
                 __put_user(offset, &dirent->d_offset) ||
                 __put_user(namlen, &dirent->d_namlen) ||
                 __copy_to_user(dirent->d_name, name, namlen) ||
@@ -138,22 +142,26 @@ struct getdents_callback {
 };
 
 static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
-                   ino_t ino, unsigned int d_type)
+                   u64 ino, unsigned int d_type)
 {
         struct linux_dirent __user * dirent;
         struct getdents_callback * buf = (struct getdents_callback *) __buf;
+        unsigned long d_ino;
         int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 2);
 
         buf->error = -EINVAL;   /* only used if we fail.. */
         if (reclen > buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         dirent = buf->previous;
         if (dirent) {
                 if (__put_user(offset, &dirent->d_off))
                         goto efault;
         }
         dirent = buf->current_dir;
-        if (__put_user(ino, &dirent->d_ino))
+        if (__put_user(d_ino, &dirent->d_ino))
                 goto efault;
         if (__put_user(reclen, &dirent->d_reclen))
                 goto efault;
@@ -222,7 +230,7 @@ struct getdents_callback64 {
 };
 
 static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
-                     ino_t ino, unsigned int d_type)
+                     u64 ino, unsigned int d_type)
 {
         struct linux_dirent64 __user *dirent;
         struct getdents_callback64 * buf = (struct getdents_callback64 *) __buf;
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index d935fb9394e3..7bdb0ed443e1 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -773,7 +773,7 @@ int reiserfs_xattr_del(struct inode *inode, const char *name)
 
 static int
 reiserfs_delete_xattrs_filler(void *buf, const char *name, int namelen,
-                              loff_t offset, ino_t ino, unsigned int d_type)
+                              loff_t offset, u64 ino, unsigned int d_type)
 {
         struct dentry *xadir = (struct dentry *)buf;
 
@@ -851,7 +851,7 @@ struct reiserfs_chown_buf {
 /* XXX: If there is a better way to do this, I'd love to hear about it */
 static int
 reiserfs_chown_xattrs_filler(void *buf, const char *name, int namelen,
-                             loff_t offset, ino_t ino, unsigned int d_type)
+                             loff_t offset, u64 ino, unsigned int d_type)
 {
         struct reiserfs_chown_buf *chown_buf = (struct reiserfs_chown_buf *)buf;
         struct dentry *xafile, *xadir = chown_buf->xadir;
@@ -1036,7 +1036,7 @@ struct reiserfs_listxattr_buf {
 
 static int
 reiserfs_listxattr_filler(void *buf, const char *name, int namelen,
-                          loff_t offset, ino_t ino, unsigned int d_type)
+                          loff_t offset, u64 ino, unsigned int d_type)
 {
         struct reiserfs_listxattr_buf *b = (struct reiserfs_listxattr_buf *)buf;
         int len = 0;
diff --git a/fs/stat.c b/fs/stat.c
index 60a31d5e5966..bca07eb2003c 100644
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -140,6 +140,8 @@ static int cp_old_stat(struct kstat *stat, struct __old_kernel_stat __user * sta
         memset(&tmp, 0, sizeof(struct __old_kernel_stat));
         tmp.st_dev = old_encode_dev(stat->dev);
         tmp.st_ino = stat->ino;
+        if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
+                return -EOVERFLOW;
         tmp.st_mode = stat->mode;
         tmp.st_nlink = stat->nlink;
         if (tmp.st_nlink != stat->nlink)
@@ -210,6 +212,8 @@ static int cp_new_stat(struct kstat *stat, struct stat __user *statbuf)
         tmp.st_dev = new_encode_dev(stat->dev);
 #endif
         tmp.st_ino = stat->ino;
+        if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
+                return -EOVERFLOW;
         tmp.st_mode = stat->mode;
         tmp.st_nlink = stat->nlink;
         if (tmp.st_nlink != stat->nlink)
@@ -347,6 +351,8 @@ static long cp_new_stat64(struct kstat *stat, struct stat64 __user *statbuf)
         tmp.st_rdev = huge_encode_dev(stat->rdev);
 #endif
         tmp.st_ino = stat->ino;
+        if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
+                return -EOVERFLOW;
 #ifdef STAT64_HAS_BROKEN_ST_INO
         tmp.__st_ino = stat->ino;
 #endif
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index cf3786625bfa..146f1dedec84 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -157,8 +157,8 @@ sysfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *ppos)
                 if ((retval = fill_read_buffer(file->f_dentry,buffer)))
                         goto out;
         }
-        pr_debug("%s: count = %d, ppos = %lld, buf = %s\n",
-                 __FUNCTION__,count,*ppos,buffer->page);
+        pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n",
+                 __FUNCTION__, count, *ppos, buffer->page);
         retval = flush_read_buffer(buffer,buf,count,ppos);
 out:
         up(&buffer->sem);
diff --git a/include/asm-arm/arch-pnx4008/clock.h b/include/asm-arm/arch-pnx4008/clock.h
index 91ae0030fdf2..ce155e161269 100644
--- a/include/asm-arm/arch-pnx4008/clock.h
+++ b/include/asm-arm/arch-pnx4008/clock.h
@@ -32,6 +32,7 @@ struct clk;
 #define KEYCLKCTRL_REG          (PWRMAN_VA_BASE + 0xb0)
 #define TSCLKCTRL_REG           (PWRMAN_VA_BASE + 0xb4)
 #define PWMCLKCTRL_REG          (PWRMAN_VA_BASE + 0xb8)
+#define TIMCLKCTRL_REG          (PWRMAN_VA_BASE + 0xbc)
 #define SPICTRL_REG             (PWRMAN_VA_BASE + 0xc4)
 #define FLASHCLKCTRL_REG        (PWRMAN_VA_BASE + 0xc8)
 #define UART3CLK_REG            (PWRMAN_VA_BASE + 0xd0)
diff --git a/include/asm-i386/mca_dma.h b/include/asm-i386/mca_dma.h
index 4b3b526c5a3f..fbb1f3b71279 100644
--- a/include/asm-i386/mca_dma.h
+++ b/include/asm-i386/mca_dma.h
@@ -181,7 +181,7 @@ static __inline__ void mca_set_dma_io(unsigned int dmanr, unsigned int io_addr)
  *      @mode: mode to set
  *
  *      The DMA controller supports several modes. The mode values you can
- *      set are :
+ *      set are-
  *
  *      %MCA_DMA_MODE_READ when reading from the DMA device.
  *
@@ -190,7 +190,6 @@ static __inline__ void mca_set_dma_io(unsigned int dmanr, unsigned int io_addr)
  *      %MCA_DMA_MODE_IO to do DMA to or from an I/O port.
  *
  *      %MCA_DMA_MODE_16 to do 16bit transfers.
- *
  */
 
 static __inline__ void mca_set_dma_mode(unsigned int dmanr, unsigned int mode)
diff --git a/include/asm-i386/topology.h b/include/asm-i386/topology.h
index 6adbd9b1ae88..978d09596130 100644
--- a/include/asm-i386/topology.h
+++ b/include/asm-i386/topology.h
@@ -74,6 +74,7 @@ static inline int node_to_first_cpu(int node)
 #define SD_NODE_INIT (struct sched_domain) {            \
         .span                   = CPU_MASK_NONE,        \
         .parent                 = NULL,                 \
+        .child                  = NULL,                 \
         .groups                 = NULL,                 \
         .min_interval           = 8,                    \
         .max_interval           = 32,                   \
diff --git a/include/asm-ia64/topology.h b/include/asm-ia64/topology.h
index 937c21257523..a6e38565ab4c 100644
--- a/include/asm-ia64/topology.h
+++ b/include/asm-ia64/topology.h
@@ -59,6 +59,7 @@ void build_cpu_to_node_map(void);
 #define SD_CPU_INIT (struct sched_domain) {             \
         .span                   = CPU_MASK_NONE,        \
         .parent                 = NULL,                 \
+        .child                  = NULL,                 \
         .groups                 = NULL,                 \
         .min_interval           = 1,                    \
         .max_interval           = 4,                    \
@@ -84,6 +85,7 @@ void build_cpu_to_node_map(void);
 #define SD_NODE_INIT (struct sched_domain) {            \
         .span                   = CPU_MASK_NONE,        \
         .parent                 = NULL,                 \
+        .child                  = NULL,                 \
         .groups                 = NULL,                 \
         .min_interval           = 8,                    \
         .max_interval           = 8*(min(num_online_cpus(), 32)), \
diff --git a/include/asm-mips/mach-ip27/topology.h b/include/asm-mips/mach-ip27/topology.h
index 59d26b52ba32..a13b715fd9ca 100644
--- a/include/asm-mips/mach-ip27/topology.h
+++ b/include/asm-mips/mach-ip27/topology.h
@@ -22,6 +22,7 @@ extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES];
 #define SD_NODE_INIT (struct sched_domain) {            \
         .span                   = CPU_MASK_NONE,        \
         .parent                 = NULL,                 \
+        .child                  = NULL,                 \
         .groups                 = NULL,                 \
         .min_interval           = 8,                    \
         .max_interval           = 32,                   \
diff --git a/include/asm-powerpc/fs_pd.h b/include/asm-powerpc/fs_pd.h
new file mode 100644
index 000000000000..3d0e819d37f1
--- /dev/null
+++ b/include/asm-powerpc/fs_pd.h
@@ -0,0 +1,45 @@
+/*
+ * Platform information definitions.
+ *
+ * 2006 (c) MontaVista Software, Inc.
+ * Vitaly Bordug <vbordug@ru.mvista.com>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#ifndef FS_PD_H
+#define FS_PD_H
+#include <asm/cpm2.h>
+#include <sysdev/fsl_soc.h>
+#include <asm/time.h>
+
+static inline int uart_baudrate(void)
+{
+        return get_baudrate();
+}
+
+static inline int uart_clock(void)
+{
+        return ppc_proc_freq;
+}
+
+#define cpm2_map(member)                                                \
+({                                                                      \
+        u32 offset = offsetof(cpm2_map_t, member);                      \
+        void *addr = ioremap (CPM_MAP_ADDR + offset,                    \
+                              sizeof( ((cpm2_map_t*)0)->member));       \
+        addr;                                                           \
+})
+
+#define cpm2_map_size(member, size)                                     \
+({                                                                      \
+        u32 offset = offsetof(cpm2_map_t, member);                      \
+        void *addr = ioremap (CPM_MAP_ADDR + offset, size);             \
+        addr;                                                           \
+})
+
+#define cpm2_unmap(addr)        iounmap(addr)
+
+#endif
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index 19b2ec1ec665..cbbd8c648df1 100644
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -11,7 +11,6 @@
 
 /* Check of existence of legacy devices */
 extern int check_legacy_ioport(unsigned long base_port);
-#define PARALLEL_BASE   0x378
 #define PNPBIOS_BASE    0xf000  /* only relevant for PReP */
 
 #ifndef CONFIG_PPC64
diff --git a/include/asm-powerpc/mpc85xx.h b/include/asm-powerpc/mpc85xx.h
new file mode 100644
index 000000000000..ccdb8a21138f
--- /dev/null
+++ b/include/asm-powerpc/mpc85xx.h
@@ -0,0 +1,53 @@
+/*
+ * include/asm-powerpc/mpc85xx.h
+ *
+ * MPC85xx definitions
+ *
+ * Maintainer: Kumar Gala <galak@kernel.crashing.org>
+ *
+ * Copyright 2004 Freescale Semiconductor, Inc
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#ifdef __KERNEL__
+#ifndef __ASM_MPC85xx_H__
+#define __ASM_MPC85xx_H__
+
+#include <asm/mmu.h>
+
+#ifdef CONFIG_85xx
+
+#if defined(CONFIG_MPC8540_ADS) || defined(CONFIG_MPC8560_ADS)
+#include <platforms/85xx/mpc85xx_ads.h>
+#endif
+#if defined(CONFIG_MPC8555_CDS) || defined(CONFIG_MPC8548_CDS)
+#include <platforms/85xx/mpc8555_cds.h>
+#endif
+#ifdef CONFIG_MPC85xx_CDS
+#include <platforms/85xx/mpc85xx_cds.h>
+#endif
+
+#define _IO_BASE        isa_io_base
+#define _ISA_MEM_BASE   isa_mem_base
+#ifdef CONFIG_PCI
+#define PCI_DRAM_OFFSET pci_dram_offset
+#else
+#define PCI_DRAM_OFFSET 0
+#endif
+
+/* Let modules/drivers get at CCSRBAR */
+extern phys_addr_t get_ccsrbar(void);
+
+#ifdef MODULE
+#define CCSRBAR get_ccsrbar()
+#else
+#define CCSRBAR BOARD_CCSRBAR
+#endif
+
+#endif /* CONFIG_85xx */
+#endif /* __ASM_MPC85xx_H__ */
+#endif /* __KERNEL__ */
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h
index 5785ac4737b5..b051d4c88c3b 100644
--- a/include/asm-powerpc/time.h
+++ b/include/asm-powerpc/time.h
@@ -39,6 +39,10 @@ extern void generic_calibrate_decr(void);
 extern void wakeup_decrementer(void);
 extern void snapshot_timebase(void);
 
+#ifdef CONFIG_RTC_CLASS
+extern int __init rtc_class_hookup(void);
+#endif
+
 /* Some sane defaults: 125 MHz timebase, 1GHz processor */
 extern unsigned long ppc_proc_freq;
 #define DEFAULT_PROC_FREQ       (DEFAULT_TB_FREQ * 8)
@@ -234,4 +238,4 @@ extern void snapshot_timebases(void);
 #endif
 
 #endif /* __KERNEL__ */
-#endif /* __PPC64_TIME_H */
+#endif /* __POWERPC_TIME_H */
diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h
index bbc3844b086f..8f7ee16781a4 100644
--- a/include/asm-powerpc/topology.h
+++ b/include/asm-powerpc/topology.h
@@ -43,6 +43,7 @@ extern int pcibus_to_node(struct pci_bus *bus);
 #define SD_NODE_INIT (struct sched_domain) {            \
         .span                   = CPU_MASK_NONE,        \
         .parent                 = NULL,                 \
+        .child                  = NULL,                 \
         .groups                 = NULL,                 \
         .min_interval           = 8,                    \
         .max_interval           = 32,                   \
diff --git a/include/asm-ppc/cpm2.h b/include/asm-ppc/cpm2.h
index f6a7ff04ffe5..220cc2debe08 100644
--- a/include/asm-ppc/cpm2.h
+++ b/include/asm-ppc/cpm2.h
@@ -42,6 +42,8 @@
 #define CPM_CR_IDMA4_SBLOCK     (0x17)
 #define CPM_CR_MCC1_SBLOCK      (0x1c)
 
+#define CPM_CR_FCC_SBLOCK(x)    (x + 0x10)
+
 #define CPM_CR_SCC1_PAGE        (0x00)
 #define CPM_CR_SCC2_PAGE        (0x01)
 #define CPM_CR_SCC3_PAGE        (0x02)
@@ -62,6 +64,8 @@
 #define CPM_CR_MCC1_PAGE        (0x07)
 #define CPM_CR_MCC2_PAGE        (0x08)
 
+#define CPM_CR_FCC_PAGE(x)      (x + 0x04)
+
 /* Some opcodes (there are more...later)
 */
 #define CPM_CR_INIT_TRX         ((ushort)0x0000)
@@ -173,6 +177,10 @@ typedef struct cpm_buf_desc {
 #define PROFF_I2C_BASE          ((uint)0x8afc)
 #define PROFF_IDMA4_BASE        ((uint)0x8afe)
 
+#define PROFF_SCC_SIZE          ((uint)0x100)
+#define PROFF_FCC_SIZE          ((uint)0x100)
+#define PROFF_SMC_SIZE          ((uint)64)
+
 /* The SMCs are relocated to any of the first eight DPRAM pages.
  * We will fix these at the first locations of DPRAM, until we
  * get some microcode patches :-).
@@ -1186,7 +1194,60 @@ typedef struct im_idma {
 #define FCC_MEM_OFFSET(x) (CPM_FCC_SPECIAL_BASE + (x*128))
 #define FCC1_MEM_OFFSET FCC_MEM_OFFSET(0)
 #define FCC2_MEM_OFFSET FCC_MEM_OFFSET(1)
-#define FCC2_MEM_OFFSET FCC_MEM_OFFSET(2)
+#define FCC3_MEM_OFFSET FCC_MEM_OFFSET(2)
+
+/* Clocks and GRG's */
+
+enum cpm_clk_dir {
+        CPM_CLK_RX,
+        CPM_CLK_TX,
+        CPM_CLK_RTX
+};
+
+enum cpm_clk_target {
+        CPM_CLK_SCC1,
+        CPM_CLK_SCC2,
+        CPM_CLK_SCC3,
+        CPM_CLK_SCC4,
+        CPM_CLK_FCC1,
+        CPM_CLK_FCC2,
+        CPM_CLK_FCC3
+};
+
+enum cpm_clk {
+        CPM_CLK_NONE = 0,
+        CPM_BRG1,       /* Baud Rate Generator  1 */
+        CPM_BRG2,       /* Baud Rate Generator  2 */
+        CPM_BRG3,       /* Baud Rate Generator  3 */
+        CPM_BRG4,       /* Baud Rate Generator  4 */
+        CPM_BRG5,       /* Baud Rate Generator  5 */
+        CPM_BRG6,       /* Baud Rate Generator  6 */
+        CPM_BRG7,       /* Baud Rate Generator  7 */
+        CPM_BRG8,       /* Baud Rate Generator  8 */
+        CPM_CLK1,       /* Clock  1 */
+        CPM_CLK2,       /* Clock  2 */
+        CPM_CLK3,       /* Clock  3 */
+        CPM_CLK4,       /* Clock  4 */
+        CPM_CLK5,       /* Clock  5 */
+        CPM_CLK6,       /* Clock  6 */
+        CPM_CLK7,       /* Clock  7 */
+        CPM_CLK8,       /* Clock  8 */
+        CPM_CLK9,       /* Clock  9 */
+        CPM_CLK10,      /* Clock 10 */
+        CPM_CLK11,      /* Clock 11 */
+        CPM_CLK12,      /* Clock 12 */
+        CPM_CLK13,      /* Clock 13 */
+        CPM_CLK14,      /* Clock 14 */
+        CPM_CLK15,      /* Clock 15 */
+        CPM_CLK16,      /* Clock 16 */
+        CPM_CLK17,      /* Clock 17 */
+        CPM_CLK18,      /* Clock 18 */
+        CPM_CLK19,      /* Clock 19 */
+        CPM_CLK20,      /* Clock 20 */
+        CPM_CLK_DUMMY
+};
+
+extern int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode);
 
 #endif /* __CPM2__ */
 #endif /* __KERNEL__ */
diff --git a/include/asm-ppc/fs_pd.h b/include/asm-ppc/fs_pd.h
new file mode 100644
index 000000000000..8691327653af
--- /dev/null
+++ b/include/asm-ppc/fs_pd.h
@@ -0,0 +1,36 @@
+/*
+ * Platform information definitions.
+ *
+ * 2006 (c) MontaVista Software, Inc.
+ * Vitaly Bordug <vbordug@ru.mvista.com>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#ifndef FS_PD_H
+#define FS_PD_H
+
+static inline int uart_baudrate(void)
+{
+        int baud;
+        bd_t *bd = (bd_t *) __res;
+
+        if (bd->bi_baudrate)
+                baud = bd->bi_baudrate;
+        else
+                baud = -1;
+        return baud;
+}
+
+static inline int uart_clock(void)
+{
+        return (((bd_t *) __res)->bi_intfreq);
+}
+
+#define cpm2_map(member)        (&cpm2_immr->member)
+#define cpm2_map_size(member, size)     (&cpm2_immr->member)
+#define cpm2_unmap(addr)        do {} while(0)
+
+#endif
diff --git a/include/asm-ppc/rheap.h b/include/asm-ppc/rheap.h
index e6ca1f67cedc..65b93225a778 100644
--- a/include/asm-ppc/rheap.h
+++ b/include/asm-ppc/rheap.h
@@ -62,6 +62,10 @@ extern int rh_attach_region(rh_info_t * info, void *start, int size);
 /* Detach a free region */
 extern void *rh_detach_region(rh_info_t * info, void *start, int size);
 
+/* Allocate the given size from the remote heap (with alignment) */
+extern void *rh_alloc_align(rh_info_t * info, int size, int alignment,
+                const char *owner);
+
 /* Allocate the given size from the remote heap */
 extern void *rh_alloc(rh_info_t * info, int size, const char *owner);
 
diff --git a/include/asm-x86_64/topology.h b/include/asm-x86_64/topology.h
index 6e7a2e976b04..5c8f49280dbc 100644
--- a/include/asm-x86_64/topology.h
+++ b/include/asm-x86_64/topology.h
@@ -31,6 +31,7 @@ extern int __node_distance(int, int);
 #define SD_NODE_INIT (struct sched_domain) {            \
         .span                   = CPU_MASK_NONE,        \
         .parent                 = NULL,                 \
+        .child                  = NULL,                 \
         .groups                 = NULL,                 \
         .min_interval           = 8,                    \
         .max_interval           = 32,                   \
diff --git a/include/linux/compat_ioctl.h b/include/linux/compat_ioctl.h
index d5b7abc4f409..4e1663d7691e 100644
--- a/include/linux/compat_ioctl.h
+++ b/include/linux/compat_ioctl.h
@@ -122,10 +122,10 @@ COMPATIBLE_IOCTL(PROTECT_ARRAY)
 ULONG_IOCTL(HOT_ADD_DISK)
 ULONG_IOCTL(SET_DISK_FAULTY)
 COMPATIBLE_IOCTL(RUN_ARRAY)
-ULONG_IOCTL(START_ARRAY)
 COMPATIBLE_IOCTL(STOP_ARRAY)
 COMPATIBLE_IOCTL(STOP_ARRAY_RO)
 COMPATIBLE_IOCTL(RESTART_ARRAY_RW)
+ULONG_IOCTL(SET_BITMAP_FILE)
 /* DM */
 COMPATIBLE_IOCTL(DM_VERSION_32)
 COMPATIBLE_IOCTL(DM_REMOVE_ALL_32)
diff --git a/include/linux/console.h b/include/linux/console.h
index 76a1807726eb..7d0420274de0 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -129,6 +129,9 @@ static inline void suspend_console(void) {}
 static inline void resume_console(void) {}
 #endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */
 
+int mda_console_init(void);
+void prom_con_init(void);
+
 /* Some debug stub to catch some of the obvious races in the VT code */
 #if 1
 #define WARN_CONSOLE_UNLOCKED() WARN_ON(!is_console_locked() && !oops_in_progress)
diff --git a/include/linux/consolemap.h b/include/linux/consolemap.h
index 65842efc1b70..82c9a1f11020 100644
--- a/include/linux/consolemap.h
+++ b/include/linux/consolemap.h
@@ -13,3 +13,4 @@ struct vc_data;
 extern unsigned char inverse_translate(struct vc_data *conp, int glyph);
 extern unsigned short *set_translate(int m, struct vc_data *vc);
 extern int conv_uni_to_pc(struct vc_data *conp, long ucs);
+void console_map_init(void);
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index e3d1c33d1558..03ef41c1eaac 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -55,8 +55,10 @@ typedef int (*dm_endio_fn) (struct dm_target *ti,
                             struct bio *bio, int error,
                             union map_info *map_context);
 
+typedef void (*dm_flush_fn) (struct dm_target *ti);
 typedef void (*dm_presuspend_fn) (struct dm_target *ti);
 typedef void (*dm_postsuspend_fn) (struct dm_target *ti);
+typedef int (*dm_preresume_fn) (struct dm_target *ti);
 typedef void (*dm_resume_fn) (struct dm_target *ti);
 
 typedef int (*dm_status_fn) (struct dm_target *ti, status_type_t status_type,
@@ -64,9 +66,18 @@ typedef int (*dm_status_fn) (struct dm_target *ti, status_type_t status_type,
 
 typedef int (*dm_message_fn) (struct dm_target *ti, unsigned argc, char **argv);
 
+typedef int (*dm_ioctl_fn) (struct dm_target *ti, struct inode *inode,
+                            struct file *filp, unsigned int cmd,
+                            unsigned long arg);
+
 void dm_error(const char *message);
 
 /*
+ * Combine device limits.
+ */
+void dm_set_device_limits(struct dm_target *ti, struct block_device *bdev);
+
+/*
  * Constructors should call these functions to ensure destination devices
  * are opened/closed correctly.
  * FIXME: too many arguments.
@@ -86,11 +97,14 @@ struct target_type {
         dm_dtr_fn dtr;
         dm_map_fn map;
         dm_endio_fn end_io;
+        dm_flush_fn flush;
         dm_presuspend_fn presuspend;
         dm_postsuspend_fn postsuspend;
+        dm_preresume_fn preresume;
         dm_resume_fn resume;
         dm_status_fn status;
         dm_message_fn message;
+        dm_ioctl_fn ioctl;
 };
 
 struct io_restrictions {
diff --git a/include/linux/dm-ioctl.h b/include/linux/dm-ioctl.h
index 9623bb625090..8853fc4d1c5e 100644
--- a/include/linux/dm-ioctl.h
+++ b/include/linux/dm-ioctl.h
@@ -285,9 +285,9 @@ typedef char ioctl_struct[308];
 #define DM_DEV_SET_GEOMETRY     _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
 
 #define DM_VERSION_MAJOR        4
-#define DM_VERSION_MINOR        7
+#define DM_VERSION_MINOR        10
 #define DM_VERSION_PATCHLEVEL   0
-#define DM_VERSION_EXTRA        "-ioctl (2006-06-24)"
+#define DM_VERSION_EXTRA        "-ioctl (2006-09-14)"
 
 /* Status bits */
 #define DM_READONLY_FLAG        (1 << 0) /* In/Out */
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 2f335e966011..3e69241e6a81 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -2,6 +2,7 @@
 #define _LINUX_FB_H
 
 #include <asm/types.h>
+#include <linux/i2c.h>
 
 /* Definitions of frame buffers                                         */
 
@@ -775,6 +776,7 @@ struct fb_info {
         struct fb_ops *fbops;
         struct device *device;
         struct class_device *class_device; /* sysfs per device attrs */
+        int class_flag;                    /* private sysfs flags */
 #ifdef CONFIG_FB_TILEBLITTING
         struct fb_tile_ops *tileops;    /* Tile Blitting */
 #endif
@@ -940,6 +942,7 @@ extern void fb_edid_to_monspecs(unsigned char *edid,
                                 struct fb_monspecs *specs);
 extern void fb_destroy_modedb(struct fb_videomode *modedb);
 extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb);
+extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter);
 
 /* drivers/video/modedb.c */
 #define VESA_MODEDB_SIZE 34
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 91c0b2a32a90..f53bf4ff1955 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1049,7 +1049,7 @@ int generic_osync_inode(struct inode *, struct address_space *, int);
  * This allows the kernel to read directories into kernel space or
  * to have different dirent layouts depending on the binary type.
  */
-typedef int (*filldir_t)(void *, const char *, int, loff_t, ino_t, unsigned);
+typedef int (*filldir_t)(void *, const char *, int, loff_t, u64, unsigned);
 
 struct block_device_operations {
         int (*open) (struct inode *, struct file *);
@@ -1523,6 +1523,9 @@ extern const struct file_operations def_fifo_fops;
 #ifdef CONFIG_BLOCK
 extern int ioctl_by_bdev(struct block_device *, unsigned, unsigned long);
 extern int blkdev_ioctl(struct inode *, struct file *, unsigned, unsigned long);
+extern int blkdev_driver_ioctl(struct inode *inode, struct file *file,
+                               struct gendisk *disk, unsigned cmd,
+                               unsigned long arg);
 extern long compat_blkdev_ioctl(struct file *, unsigned, unsigned long);
 extern int blkdev_get(struct block_device *, mode_t, unsigned);
 extern int blkdev_put(struct block_device *);
diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h
index 74ed35a00a94..543cd3cd9e77 100644
--- a/include/linux/fs_enet_pd.h
+++ b/include/linux/fs_enet_pd.h
@@ -55,6 +55,30 @@ static inline int fs_get_scc_index(enum fs_id id)
         return -1;
 }
 
+static inline int fs_fec_index2id(int index)
+{
+        int id = fsid_fec1 + index - 1;
+        if (id >= fsid_fec1 && id <= fsid_fec2)
+                return id;
+        return FS_MAX_INDEX;
+                }
+
+static inline int fs_fcc_index2id(int index)
+{
+        int id = fsid_fcc1 + index - 1;
+        if (id >= fsid_fcc1 && id <= fsid_fcc3)
+                return id;
+        return FS_MAX_INDEX;
+}
+
+static inline int fs_scc_index2id(int index)
+{
+        int id = fsid_scc1 + index - 1;
+        if (id >= fsid_scc1 && id <= fsid_scc4)
+                return id;
+        return FS_MAX_INDEX;
+}
+
 enum fs_mii_method {
         fsmii_fixed,
         fsmii_fec,
@@ -87,18 +111,21 @@ struct fs_mii_bb_platform_info {
 };
 
 struct fs_platform_info {
-        
-        void(*init_ioports)(void);
+
+        void(*init_ioports)(struct fs_platform_info *);
         /* device specific information */
         int fs_no;              /* controller index            */
+        char fs_type[4];        /* controller type             */
 
         u32 cp_page;            /* CPM page */
         u32 cp_block;           /* CPM sblock */
-        
+
         u32 clk_trx;            /* some stuff for pins & mux configuration*/
+        u32 clk_rx;
+        u32 clk_tx;
         u32 clk_route;
         u32 clk_mask;
-        
+
         u32 mem_offset;
         u32 dpram_offset;
         u32 fcc_regs_c;
@@ -124,4 +151,16 @@ struct fs_mii_fec_platform_info {
         u32 irq[32];
         u32 mii_speed;
 };
+
+static inline int fs_get_id(struct fs_platform_info *fpi)
+{
+        if(strstr(fpi->fs_type, "SCC"))
+                return fs_scc_index2id(fpi->fs_no);
+        if(strstr(fpi->fs_type, "FCC"))
+                return fs_fcc_index2id(fpi->fs_no);
+        if(strstr(fpi->fs_type, "FEC"))
+                return fs_fec_index2id(fpi->fs_no);
+        return fpi->fs_no;
+}
+
 #endif
diff --git a/include/linux/fs_uart_pd.h b/include/linux/fs_uart_pd.h
index f5975126b712..809bb9ffc788 100644
--- a/include/linux/fs_uart_pd.h
+++ b/include/linux/fs_uart_pd.h
@@ -46,15 +46,27 @@ static inline int fs_uart_id_fsid2smc(int id)
 }
 
 struct fs_uart_platform_info {
-        void(*init_ioports)(void);
+        void(*init_ioports)(struct fs_uart_platform_info *);
         /* device specific information */
         int fs_no;              /* controller index */
+        char fs_type[4];        /* controller type  */
         u32 uart_clk;
         u8 tx_num_fifo;
         u8 tx_buf_size;
         u8 rx_num_fifo;
         u8 rx_buf_size;
         u8 brg;
+        u8 clk_rx;
+        u8 clk_tx;
 };
 
+static inline int fs_uart_get_id(struct fs_uart_platform_info *fpi)
+{
+        if(strstr(fpi->fs_type, "SMC"))
+                return fs_uart_id_smc2fsid(fpi->fs_no);
+        if(strstr(fpi->fs_type, "SCC"))
+                return fs_uart_id_scc2fsid(fpi->fs_no);
+        return fpi->fs_no;
+}
+
 #endif
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 99620451d958..07d8d725541f 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -251,7 +251,8 @@ static inline void ide_std_init_ports(hw_regs_t *hw,
 
 #include <asm/ide.h>
 
-#ifndef MAX_HWIFS
+#if !defined(MAX_HWIFS) || defined(CONFIG_EMBEDDED)
+#undef MAX_HWIFS
 #define MAX_HWIFS       CONFIG_IDE_MAX_HWIFS
 #endif
 
@@ -773,12 +774,13 @@ typedef struct hwif_s {
         unsigned long   dma_status;     /* dma status register */
         unsigned long   dma_vendor3;    /* dma vendor 3 register */
         unsigned long   dma_prdtable;   /* actual prd table address */
-        unsigned long   dma_base2;      /* extended base addr for dma ports */
 
-        unsigned        dma_extra;      /* extra addr for dma ports */
         unsigned long   config_data;    /* for use by chipset-specific code */
         unsigned long   select_data;    /* for use by chipset-specific code */
 
+        unsigned long   extra_base;     /* extra addr for dma ports */
+        unsigned        extra_ports;    /* number of extra dma ports */
+
         unsigned        noprobe    : 1; /* don't probe for this interface */
         unsigned        present    : 1; /* this interface exists */
         unsigned        hold       : 1; /* this interface is always present */
@@ -823,6 +825,9 @@ typedef struct hwgroup_s {
         unsigned int sleeping   : 1;
                 /* BOOL: polling active & poll_timeout field valid */
         unsigned int polling    : 1;
+                /* BOOL: in a polling reset situation. Must not trigger another reset yet */
+        unsigned int resetting  : 1;
+
                 /* current drive */
         ide_drive_t *drive;
                 /* ptr to current hwif in linked-list */
@@ -1190,7 +1195,6 @@ extern int ideprobe_init(void);
 extern void ide_scan_pcibus(int scan_direction) __init;
 extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner);
 #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE)
-extern void ide_pci_unregister_driver(struct pci_driver *driver);
 void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *);
 extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d);
 
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
index 849043ce4ed6..1cebcbc28b47 100644
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@ -12,6 +12,10 @@
 /* Lookup the address for a symbol. Returns 0 if not found. */
 unsigned long kallsyms_lookup_name(const char *name);
 
+extern int kallsyms_lookup_size_offset(unsigned long addr,
+                                  unsigned long *symbolsize,
+                                  unsigned long *offset);
+
 /* Lookup an address.  modname is set to NULL if it's in the kernel. */
 const char *kallsyms_lookup(unsigned long addr,
                             unsigned long *symbolsize,
@@ -28,6 +32,13 @@ static inline unsigned long kallsyms_lookup_name(const char *name)
         return 0;
 }
 
+static inline int kallsyms_lookup_size_offset(unsigned long addr,
+                                              unsigned long *symbolsize,
+                                              unsigned long *offset)
+{
+        return 0;
+}
+
 static inline const char *kallsyms_lookup(unsigned long addr,
                                           unsigned long *symbolsize,
                                           unsigned long *offset,
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 4d00988dad03..80f39cab470a 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -216,8 +216,10 @@ extern void dump_stack(void);
 #define pr_debug(fmt,arg...) \
         printk(KERN_DEBUG fmt,##arg)
 #else
-#define pr_debug(fmt,arg...) \
-        do { } while (0)
+static inline int __attribute__ ((format (printf, 1, 2))) pr_debug(const char * fmt, ...)
+{
+        return 0;
+}
 #endif
 
 #define pr_info(fmt,arg...) \
diff --git a/include/linux/pid.h b/include/linux/pid.h
index 17b9e04d3586..2c0007d17218 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -105,28 +105,28 @@ static inline pid_t pid_nr(struct pid *pid)
 }
 
 
-#define do_each_task_pid(who, type, task)                                       \
-        do {                                                                    \
-                struct hlist_node *pos___;                                      \
-                struct pid *pid___ = find_pid(who);                             \
-                if (pid___ != NULL)                                             \
-                        hlist_for_each_entry_rcu((task), pos___,                \
+#define do_each_task_pid(who, type, task)                               \
+        do {                                                            \
+                struct hlist_node *pos___;                              \
+                struct pid *pid___ = find_pid(who);                     \
+                if (pid___ != NULL)                                     \
+                        hlist_for_each_entry_rcu((task), pos___,        \
                                 &pid___->tasks[type], pids[type].node) {
 
-#define while_each_task_pid(who, type, task)                                    \
-                        }                                                       \
+#define while_each_task_pid(who, type, task)                            \
+                        }                                               \
         } while (0)
 
 
-#define do_each_pid_task(pid, type, task)                                       \
-        do {                                                                    \
-                struct hlist_node *pos___;                                      \
-                if (pid != NULL)                                                \
-                        hlist_for_each_entry_rcu((task), pos___,                \
+#define do_each_pid_task(pid, type, task)                               \
+        do {                                                            \
+                struct hlist_node *pos___;                              \
+                if (pid != NULL)                                        \
+                        hlist_for_each_entry_rcu((task), pos___,        \
                                 &pid->tasks[type], pids[type].node) {
 
-#define while_each_pid_task(pid, type, task)                                    \
-                        }                                                       \
+#define while_each_pid_task(pid, type, task)                            \
+                        }                                               \
         } while (0)
 
 #endif /* _LINUX_PID_H */
diff --git a/include/linux/raid/bitmap.h b/include/linux/raid/bitmap.h
index 63df898fe2e9..84d887751855 100644
--- a/include/linux/raid/bitmap.h
+++ b/include/linux/raid/bitmap.h
@@ -265,6 +265,8 @@ int bitmap_update_sb(struct bitmap *bitmap);
 int  bitmap_setallbits(struct bitmap *bitmap);
 void bitmap_write_all(struct bitmap *bitmap);
 
+void bitmap_dirty_bits(struct bitmap *bitmap, unsigned long s, unsigned long e);
+
 /* these are exported */
 int bitmap_startwrite(struct bitmap *bitmap, sector_t offset,
                         unsigned long sectors, int behind);
diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h
index c588709acbbc..866a1e2b0ce0 100644
--- a/include/linux/raid/md.h
+++ b/include/linux/raid/md.h
@@ -95,7 +95,6 @@ extern int sync_page_io(struct block_device *bdev, sector_t sector, int size,
 extern void md_do_sync(mddev_t *mddev);
 extern void md_new_event(mddev_t *mddev);
 
-extern void md_update_sb(mddev_t * mddev);
 
 #endif /* CONFIG_MD */
 #endif 
diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
index 920b94fe31fa..8245c282168b 100644
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
@@ -31,18 +31,15 @@
 #define LEVEL_NONE              (-1000000)
 
 #define MaxSector (~(sector_t)0)
-#define MD_THREAD_NAME_MAX 14
 
 typedef struct mddev_s mddev_t;
 typedef struct mdk_rdev_s mdk_rdev_t;
 
-#define MAX_MD_DEVS  256        /* Max number of md dev */
-
 /*
  * options passed in raidrun:
  */
 
-/* Currently this must fix in an 'int' */
+/* Currently this must fit in an 'int' */
 #define MAX_CHUNK_SIZE (1<<30)
 
 /*
@@ -116,7 +113,11 @@ struct mddev_s
         dev_t                           unit;
         int                             md_minor;
         struct list_head                disks;
-        int                             sb_dirty;
+        unsigned long                   flags;
+#define MD_CHANGE_DEVS  0       /* Some device status has changed */
+#define MD_CHANGE_CLEAN 1       /* transition to or from 'clean' */
+#define MD_CHANGE_PENDING 2     /* superblock update in progress */
+
         int                             ro;
 
         struct gendisk                  *gendisk;
diff --git a/include/linux/raid/md_u.h b/include/linux/raid/md_u.h
index 81da20ccec4d..7192035fc4b0 100644
--- a/include/linux/raid/md_u.h
+++ b/include/linux/raid/md_u.h
@@ -41,7 +41,7 @@
 
 /* usage */
 #define RUN_ARRAY               _IOW (MD_MAJOR, 0x30, mdu_param_t)
-#define START_ARRAY             _IO (MD_MAJOR, 0x31)
+/*  0x31 was START_ARRAY  */
 #define STOP_ARRAY              _IO (MD_MAJOR, 0x32)
 #define STOP_ARRAY_RO           _IO (MD_MAJOR, 0x33)
 #define RESTART_ARRAY_RW        _IO (MD_MAJOR, 0x34)
diff --git a/include/linux/raid/raid1.h b/include/linux/raid/raid1.h
index 3009c813d83d..0a9ba7c3302e 100644
--- a/include/linux/raid/raid1.h
+++ b/include/linux/raid/raid1.h
@@ -30,7 +30,6 @@ struct r1_private_data_s {
         mddev_t                 *mddev;
         mirror_info_t           *mirrors;
         int                     raid_disks;
-        int                     working_disks;
         int                     last_used;
         sector_t                next_seq_sect;
         spinlock_t              device_lock;
diff --git a/include/linux/raid/raid10.h b/include/linux/raid/raid10.h
index c41e56a7c090..e9091cfeb286 100644
--- a/include/linux/raid/raid10.h
+++ b/include/linux/raid/raid10.h
@@ -16,7 +16,6 @@ struct r10_private_data_s {
         mddev_t                 *mddev;
         mirror_info_t           *mirrors;
         int                     raid_disks;
-        int                     working_disks;
         spinlock_t              device_lock;
 
         /* geometry */
diff --git a/include/linux/raid/raid5.h b/include/linux/raid/raid5.h
index 20ed4c997636..f13299a15591 100644
--- a/include/linux/raid/raid5.h
+++ b/include/linux/raid/raid5.h
@@ -195,8 +195,9 @@ struct stripe_head {
  * it to the count of prereading stripes.
  * When write is initiated, or the stripe refcnt == 0 (just in case) we
  * clear the PREREAD_ACTIVE flag and decrement the count
- * Whenever the delayed queue is empty and the device is not plugged, we
- * move any strips from delayed to handle and clear the DELAYED flag and set PREREAD_ACTIVE.
+ * Whenever the 'handle' queue is empty and the device is not plugged, we
+ * move any strips from delayed to handle and clear the DELAYED flag and set
+ * PREREAD_ACTIVE.
  * In stripe_handle, if we find pre-reading is necessary, we do it if
  * PREREAD_ACTIVE is set, else we set DELAYED which will send it to the delayed queue.
  * HANDLE gets cleared if stripe_handle leave nothing locked.
@@ -213,7 +214,7 @@ struct raid5_private_data {
         struct disk_info        *spare;
         int                     chunk_size, level, algorithm;
         int                     max_degraded;
-        int                     raid_disks, working_disks, failed_disks;
+        int                     raid_disks;
         int                     max_nr_stripes;
 
         /* used during an expand */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 38530232d92f..331f4502e92b 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -625,9 +625,17 @@ enum idle_type
 #define SD_WAKE_BALANCE         64      /* Perform balancing at task wakeup */
 #define SD_SHARE_CPUPOWER       128     /* Domain members share cpu power */
 #define SD_POWERSAVINGS_BALANCE 256     /* Balance for power savings */
+#define SD_SHARE_PKG_RESOURCES  512     /* Domain members share cpu pkg resources */
 
-#define BALANCE_FOR_POWER       ((sched_mc_power_savings || sched_smt_power_savings) \
-                                 ? SD_POWERSAVINGS_BALANCE : 0)
+#define BALANCE_FOR_MC_POWER    \
+        (sched_smt_power_savings ? SD_POWERSAVINGS_BALANCE : 0)
+
+#define BALANCE_FOR_PKG_POWER   \
+        ((sched_mc_power_savings || sched_smt_power_savings) ?  \
+         SD_POWERSAVINGS_BALANCE : 0)
+
+#define test_sd_parent(sd, flag)        ((sd->parent &&         \
+                                         (sd->parent->flags & flag)) ? 1 : 0)
 
 
 struct sched_group {
@@ -644,6 +652,7 @@ struct sched_group {
 struct sched_domain {
         /* These fields must be setup */
         struct sched_domain *parent;    /* top domain must be null terminated */
+        struct sched_domain *child;     /* bottom domain must be null terminated */
         struct sched_group *groups;     /* the balancing groups of the domain */
         cpumask_t span;                 /* span of all CPUs in this domain */
         unsigned long min_interval;     /* Minimum balance interval ms */
diff --git a/include/linux/stat.h b/include/linux/stat.h
index 8669291352db..679ef0d70b6b 100644
--- a/include/linux/stat.h
+++ b/include/linux/stat.h
@@ -57,7 +57,7 @@
 #include <linux/time.h>
 
 struct kstat {
-        unsigned long   ino;
+        u64             ino;
         dev_t           dev;
         umode_t         mode;
         unsigned int    nlink;
diff --git a/include/linux/topology.h b/include/linux/topology.h
index ec1eca85290a..da508d1998e4 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -89,6 +89,7 @@
 #define SD_SIBLING_INIT (struct sched_domain) {         \
         .span                   = CPU_MASK_NONE,        \
         .parent                 = NULL,                 \
+        .child                  = NULL,                 \
         .groups                 = NULL,                 \
         .min_interval           = 1,                    \
         .max_interval           = 2,                    \
@@ -114,11 +115,44 @@
 #endif
 #endif /* CONFIG_SCHED_SMT */
 
+#ifdef CONFIG_SCHED_MC
+/* Common values for MC siblings. for now mostly derived from SD_CPU_INIT */
+#ifndef SD_MC_INIT
+#define SD_MC_INIT (struct sched_domain) {              \
+        .span                   = CPU_MASK_NONE,        \
+        .parent                 = NULL,                 \
+        .child                  = NULL,                 \
+        .groups                 = NULL,                 \
+        .min_interval           = 1,                    \
+        .max_interval           = 4,                    \
+        .busy_factor            = 64,                   \
+        .imbalance_pct          = 125,                  \
+        .cache_nice_tries       = 1,                    \
+        .per_cpu_gain           = 100,                  \
+        .busy_idx               = 2,                    \
+        .idle_idx               = 1,                    \
+        .newidle_idx            = 2,                    \
+        .wake_idx               = 1,                    \
+        .forkexec_idx           = 1,                    \
+        .flags                  = SD_LOAD_BALANCE       \
+                                | SD_BALANCE_NEWIDLE    \
+                                | SD_BALANCE_EXEC       \
+                                | SD_WAKE_AFFINE        \
+                                | SD_SHARE_PKG_RESOURCES\
+                                | BALANCE_FOR_MC_POWER, \
+        .last_balance           = jiffies,              \
+        .balance_interval       = 1,                    \
+        .nr_balance_failed      = 0,                    \
+}
+#endif
+#endif /* CONFIG_SCHED_MC */
+
 /* Common values for CPUs */
 #ifndef SD_CPU_INIT
 #define SD_CPU_INIT (struct sched_domain) {             \
         .span                   = CPU_MASK_NONE,        \
         .parent                 = NULL,                 \
+        .child                  = NULL,                 \
         .groups                 = NULL,                 \
         .min_interval           = 1,                    \
         .max_interval           = 4,                    \
@@ -135,7 +169,7 @@
                                 | SD_BALANCE_NEWIDLE    \
                                 | SD_BALANCE_EXEC       \
                                 | SD_WAKE_AFFINE        \
-                                | BALANCE_FOR_POWER,    \
+                                | BALANCE_FOR_PKG_POWER,\
         .last_balance           = jiffies,              \
         .balance_interval       = 1,                    \
         .nr_balance_failed      = 0,                    \
@@ -146,6 +180,7 @@
 #define SD_ALLNODES_INIT (struct sched_domain) {        \
         .span                   = CPU_MASK_NONE,        \
         .parent                 = NULL,                 \
+        .child                  = NULL,                 \
         .groups                 = NULL,                 \
         .min_interval           = 64,                   \
         .max_interval           = 64*num_online_cpus(), \
@@ -165,15 +200,6 @@
         .nr_balance_failed      = 0,                    \
 }
 
-#ifdef CONFIG_SCHED_MC
-#ifndef SD_MC_INIT
-/* for now its same as SD_CPU_INIT.
- * TBD: Tune Domain parameters!
- */
-#define SD_MC_INIT   SD_CPU_INIT
-#endif
-#endif
-
 #ifdef CONFIG_NUMA
 #ifndef SD_NODE_INIT
 #error Please define an appropriate SD_NODE_INIT in include/asm/topology.h!!!
diff --git a/include/video/sstfb.h b/include/video/sstfb.h
index 3570f9c9b111..5dbf5e7e50a8 100644
--- a/include/video/sstfb.h
+++ b/include/video/sstfb.h
@@ -68,10 +68,6 @@
 #  define print_var(X,Y...)
 #endif
 
-#define eprintk(X...)   printk(KERN_ERR "sstfb: " X)
-#define iprintk(X...)   printk(KERN_INFO "sstfb: " X)
-#define wprintk(X...)   printk(KERN_WARNING "sstfb: " X)
-
 #define BIT(x)          (1ul<<(x))
 #define POW2(x)         (1ul<<(x))
 
diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
index 2429e1bf8c60..753dc54a6649 100644
--- a/init/do_mounts_md.c
+++ b/init/do_mounts_md.c
@@ -20,7 +20,7 @@ static struct {
         int level;
         int chunk;
         char *device_names;
-} md_setup_args[MAX_MD_DEVS] __initdata;
+} md_setup_args[256] __initdata;
 
 static int md_setup_ents __initdata;
 
@@ -61,10 +61,6 @@ static int __init md_setup(char *str)
                 return 0;
         }
         str1 = str;
-        if (minor >= MAX_MD_DEVS) {
-                printk(KERN_WARNING "md: md=%d, Minor device number too high.\n", minor);
-                return 0;
-        }
         for (ent=0 ; ent< md_setup_ents ; ent++)
                 if (md_setup_args[ent].minor == minor &&
                     md_setup_args[ent].partitioned == partitioned) {
@@ -72,7 +68,7 @@ static int __init md_setup(char *str)
                                "Replacing previous definition.\n", partitioned?"d":"", minor);
                         break;
                 }
-        if (ent >= MAX_MD_DEVS) {
+        if (ent >= ARRAY_SIZE(md_setup_args)) {
                 printk(KERN_WARNING "md: md=%s%d - too many md initialisations\n", partitioned?"d":"", minor);
                 return 0;
         }
diff --git a/kernel/dma.c b/kernel/dma.c
index aef0a45b7893..2020644c938a 100644
--- a/kernel/dma.c
+++ b/kernel/dma.c
@@ -62,6 +62,11 @@ static struct dma_chan dma_chan_busy[MAX_DMA_CHANNELS] = {
 };
 
 
+/**
+ * request_dma - request and reserve a system DMA channel
+ * @dmanr: DMA channel number
+ * @device_id: reserving device ID string, used in /proc/dma
+ */
 int request_dma(unsigned int dmanr, const char * device_id)
 {
         if (dmanr >= MAX_DMA_CHANNELS)
@@ -76,7 +81,10 @@ int request_dma(unsigned int dmanr, const char * device_id)
         return 0;
 } /* request_dma */
 
-
+/**
+ * free_dma - free a reserved system DMA channel
+ * @dmanr: DMA channel number
+ */
 void free_dma(unsigned int dmanr)
 {
         if (dmanr >= MAX_DMA_CHANNELS) {
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index 342bca62c496..eeac3e313b2b 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -69,6 +69,15 @@ static inline int is_kernel(unsigned long addr)
         return in_gate_area_no_task(addr);
 }
 
+static int is_ksym_addr(unsigned long addr)
+{
+        if (all_var)
+                return is_kernel(addr);
+
+        return is_kernel_text(addr) || is_kernel_inittext(addr) ||
+                is_kernel_extratext(addr);
+}
+
 /* expand a compressed symbol data into the resulting uncompressed string,
    given the offset to where the symbol is in the compressed stream */
 static unsigned int kallsyms_expand_symbol(unsigned int off, char *result)
@@ -155,6 +164,73 @@ unsigned long kallsyms_lookup_name(const char *name)
         return module_kallsyms_lookup_name(name);
 }
 
+static unsigned long get_symbol_pos(unsigned long addr,
+                                    unsigned long *symbolsize,
+                                    unsigned long *offset)
+{
+        unsigned long symbol_start = 0, symbol_end = 0;
+        unsigned long i, low, high, mid;
+
+        /* This kernel should never had been booted. */
+        BUG_ON(!kallsyms_addresses);
+
+        /* do a binary search on the sorted kallsyms_addresses array */
+        low = 0;
+        high = kallsyms_num_syms;
+
+        while (high - low > 1) {
+                mid = (low + high) / 2;
+                if (kallsyms_addresses[mid] <= addr)
+                        low = mid;
+                else
+                        high = mid;
+        }
+
+        /*
+         * search for the first aliased symbol. Aliased
+         * symbols are symbols with the same address
+         */
+        while (low && kallsyms_addresses[low-1] == kallsyms_addresses[low])
+                --low;
+
+        symbol_start = kallsyms_addresses[low];
+
+        /* Search for next non-aliased symbol */
+        for (i = low + 1; i < kallsyms_num_syms; i++) {
+                if (kallsyms_addresses[i] > symbol_start) {
+                        symbol_end = kallsyms_addresses[i];
+                        break;
+                }
+        }
+
+        /* if we found no next symbol, we use the end of the section */
+        if (!symbol_end) {
+                if (is_kernel_inittext(addr))
+                        symbol_end = (unsigned long)_einittext;
+                else if (all_var)
+                        symbol_end = (unsigned long)_end;
+                else
+                        symbol_end = (unsigned long)_etext;
+        }
+
+        *symbolsize = symbol_end - symbol_start;
+        *offset = addr - symbol_start;
+
+        return low;
+}
+
+/*
+ * Lookup an address but don't bother to find any names.
+ */
+int kallsyms_lookup_size_offset(unsigned long addr, unsigned long *symbolsize,
+                                unsigned long *offset)
+{
+        if (is_ksym_addr(addr))
+                return !!get_symbol_pos(addr, symbolsize, offset);
+
+        return !!module_address_lookup(addr, symbolsize, offset, NULL);
+}
+
 /*
  * Lookup an address
  * - modname is set to NULL if it's in the kernel
@@ -167,57 +243,18 @@ const char *kallsyms_lookup(unsigned long addr,
                             unsigned long *offset,
                             char **modname, char *namebuf)
 {
-        unsigned long i, low, high, mid;
         const char *msym;
 
-        /* This kernel should never had been booted. */
-        BUG_ON(!kallsyms_addresses);
-
         namebuf[KSYM_NAME_LEN] = 0;
         namebuf[0] = 0;
 
-        if ((all_var && is_kernel(addr)) ||
-            (!all_var && (is_kernel_text(addr) || is_kernel_inittext(addr) ||
-                                is_kernel_extratext(addr)))) {
-                unsigned long symbol_end = 0;
-
-                /* do a binary search on the sorted kallsyms_addresses array */
-                low = 0;
-                high = kallsyms_num_syms;
-
-                while (high-low > 1) {
-                        mid = (low + high) / 2;
-                        if (kallsyms_addresses[mid] <= addr) low = mid;
-                        else high = mid;
-                }
-
-                /* search for the first aliased symbol. Aliased symbols are
-                   symbols with the same address */
-                while (low && kallsyms_addresses[low - 1] == kallsyms_addresses[low])
-                        --low;
+        if (is_ksym_addr(addr)) {
+                unsigned long pos;
 
+                pos = get_symbol_pos(addr, symbolsize, offset);
                 /* Grab name */
-                kallsyms_expand_symbol(get_symbol_offset(low), namebuf);
-
-                /* Search for next non-aliased symbol */
-                for (i = low + 1; i < kallsyms_num_syms; i++) {
-                        if (kallsyms_addresses[i] > kallsyms_addresses[low]) {
-                                symbol_end = kallsyms_addresses[i];
-                                break;
-                        }
-                }
-
-                /* if we found no next symbol, we use the end of the section */
-                if (!symbol_end) {
-                        if (is_kernel_inittext(addr))
-                                symbol_end = (unsigned long)_einittext;
-                        else
-                                symbol_end = all_var ? (unsigned long)_end : (unsigned long)_etext;
-                }
-
-                *symbolsize = symbol_end - kallsyms_addresses[low];
+                kallsyms_expand_symbol(get_symbol_offset(pos), namebuf);
                 *modname = NULL;
-                *offset = addr - kallsyms_addresses[low];
                 return namebuf;
         }
 
diff --git a/kernel/module.c b/kernel/module.c
index 7c77a0a9275c..7f60e782de1e 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2040,7 +2040,8 @@ const char *module_address_lookup(unsigned long addr,
         list_for_each_entry(mod, &modules, list) {
                 if (within(addr, mod->module_init, mod->init_size)
                     || within(addr, mod->module_core, mod->core_size)) {
-                        *modname = mod->name;
+                        if (modname)
+                                *modname = mod->name;
                         return get_ksymbol(mod, addr, size, offset);
                 }
         }
diff --git a/kernel/resource.c b/kernel/resource.c
index 9db38a1a7520..6de60c12143e 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -193,6 +193,13 @@ static int __release_resource(struct resource *old)
         return -EINVAL;
 }
 
+/**
+ * request_resource - request and reserve an I/O or memory resource
+ * @root: root resource descriptor
+ * @new: resource descriptor desired by caller
+ *
+ * Returns 0 for success, negative error code on error.
+ */
 int request_resource(struct resource *root, struct resource *new)
 {
         struct resource *conflict;
@@ -205,6 +212,15 @@ int request_resource(struct resource *root, struct resource *new)
 
 EXPORT_SYMBOL(request_resource);
 
+/**
+ * ____request_resource - reserve a resource, with resource conflict returned
+ * @root: root resource descriptor
+ * @new: resource descriptor desired by caller
+ *
+ * Returns:
+ * On success, NULL is returned.
+ * On error, a pointer to the conflicting resource is returned.
+ */
 struct resource *____request_resource(struct resource *root, struct resource *new)
 {
         struct resource *conflict;
@@ -217,6 +233,10 @@ struct resource *____request_resource(struct resource *root, struct resource *ne
 
 EXPORT_SYMBOL(____request_resource);
 
+/**
+ * release_resource - release a previously reserved resource
+ * @old: resource pointer
+ */
 int release_resource(struct resource *old)
 {
         int retval;
@@ -315,8 +335,16 @@ static int find_resource(struct resource *root, struct resource *new,
         return -EBUSY;
 }
 
-/*
- * Allocate empty slot in the resource tree given range and alignment.
+/**
+ * allocate_resource - allocate empty slot in the resource tree given range & alignment
+ * @root: root resource descriptor
+ * @new: resource descriptor desired by caller
+ * @size: requested resource region size
+ * @min: minimum size to allocate
+ * @max: maximum size to allocate
+ * @align: alignment requested, in bytes
+ * @alignf: alignment function, optional, called if not NULL
+ * @alignf_data: arbitrary data to pass to the @alignf function
  */
 int allocate_resource(struct resource *root, struct resource *new,
                       resource_size_t size, resource_size_t min,
@@ -407,10 +435,15 @@ int insert_resource(struct resource *parent, struct resource *new)
         return result;
 }
 
-/*
+/**
+ * adjust_resource - modify a resource's start and size
+ * @res: resource to modify
+ * @start: new start value
+ * @size: new size
+ *
  * Given an existing resource, change its start and size to match the
- * arguments.  Returns -EBUSY if it can't fit.  Existing children of
- * the resource are assumed to be immutable.
+ * arguments.  Returns 0 on success, -EBUSY if it can't fit.
+ * Existing children of the resource are assumed to be immutable.
  */
 int adjust_resource(struct resource *res, resource_size_t start, resource_size_t size)
 {
@@ -456,11 +489,19 @@ EXPORT_SYMBOL(adjust_resource);
  * Note how this, unlike the above, knows about
  * the IO flag meanings (busy etc).
  *
- * Request-region creates a new busy region.
+ * request_region creates a new busy region.
  *
- * Check-region returns non-zero if the area is already busy
+ * check_region returns non-zero if the area is already busy.
  *
- * Release-region releases a matching busy region.
+ * release_region releases a matching busy region.
+ */
+
+/**
+ * __request_region - create a new busy resource region
+ * @parent: parent resource descriptor
+ * @start: resource start address
+ * @n: resource region size
+ * @name: reserving caller's ID string
  */
 struct resource * __request_region(struct resource *parent,
                                    resource_size_t start, resource_size_t n,
@@ -497,9 +538,23 @@ struct resource * __request_region(struct resource *parent,
         }
         return res;
 }
-
 EXPORT_SYMBOL(__request_region);
 
+/**
+ * __check_region - check if a resource region is busy or free
+ * @parent: parent resource descriptor
+ * @start: resource start address
+ * @n: resource region size
+ *
+ * Returns 0 if the region is free at the moment it is checked,
+ * returns %-EBUSY if the region is busy.
+ *
+ * NOTE:
+ * This function is deprecated because its use is racy.
+ * Even if it returns 0, a subsequent call to request_region()
+ * may fail because another driver etc. just allocated the region.
+ * Do NOT use it.  It will be removed from the kernel.
+ */
 int __check_region(struct resource *parent, resource_size_t start,
                         resource_size_t n)
 {
@@ -513,9 +568,16 @@ int __check_region(struct resource *parent, resource_size_t start,
         kfree(res);
         return 0;
 }
-
 EXPORT_SYMBOL(__check_region);
 
+/**
+ * __release_region - release a previously reserved resource region
+ * @parent: parent resource descriptor
+ * @start: resource start address
+ * @n: resource region size
+ *
+ * The described resource region must match a currently busy region.
+ */
 void __release_region(struct resource *parent, resource_size_t start,
                         resource_size_t n)
 {
@@ -553,7 +615,6 @@ void __release_region(struct resource *parent, resource_size_t start,
                 "<%016llx-%016llx>\n", (unsigned long long)start,
                 (unsigned long long)end);
 }
-
 EXPORT_SYMBOL(__release_region);
 
 /*
diff --git a/kernel/sched.c b/kernel/sched.c
index e4e54e86f4a2..53608a59d6e3 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1232,7 +1232,7 @@ nextgroup:
 }
 
 /*
- * find_idlest_queue - find the idlest runqueue among the cpus in group.
+ * find_idlest_cpu - find the idlest cpu among the cpus in group.
  */
 static int
 find_idlest_cpu(struct sched_group *group, struct task_struct *p, int this_cpu)
@@ -1286,21 +1286,29 @@ static int sched_balance_self(int cpu, int flag)
         while (sd) {
                 cpumask_t span;
                 struct sched_group *group;
-                int new_cpu;
-                int weight;
+                int new_cpu, weight;
+
+                if (!(sd->flags & flag)) {
+                        sd = sd->child;
+                        continue;
+                }
 
                 span = sd->span;
                 group = find_idlest_group(sd, t, cpu);
-                if (!group)
-                        goto nextlevel;
+                if (!group) {
+                        sd = sd->child;
+                        continue;
+                }
 
                 new_cpu = find_idlest_cpu(group, t, cpu);
-                if (new_cpu == -1 || new_cpu == cpu)
-                        goto nextlevel;
+                if (new_cpu == -1 || new_cpu == cpu) {
+                        /* Now try balancing at a lower domain level of cpu */
+                        sd = sd->child;
+                        continue;
+                }
 
-                /* Now try balancing at a lower domain level */
+                /* Now try balancing at a lower domain level of new_cpu */
                 cpu = new_cpu;
-nextlevel:
                 sd = NULL;
                 weight = cpus_weight(span);
                 for_each_domain(cpu, tmp) {
@@ -2533,8 +2541,14 @@ static int load_balance(int this_cpu, struct rq *this_rq,
         struct rq *busiest;
         cpumask_t cpus = CPU_MASK_ALL;
 
+        /*
+         * When power savings policy is enabled for the parent domain, idle
+         * sibling can pick up load irrespective of busy siblings. In this case,
+         * let the state of idle sibling percolate up as IDLE, instead of
+         * portraying it as NOT_IDLE.
+         */
         if (idle != NOT_IDLE && sd->flags & SD_SHARE_CPUPOWER &&
-            !sched_smt_power_savings)
+            !test_sd_parent(sd, SD_POWERSAVINGS_BALANCE))
                 sd_idle = 1;
 
         schedstat_inc(sd, lb_cnt[idle]);
@@ -2630,7 +2644,7 @@ redo:
         }
 
         if (!nr_moved && !sd_idle && sd->flags & SD_SHARE_CPUPOWER &&
-            !sched_smt_power_savings)
+            !test_sd_parent(sd, SD_POWERSAVINGS_BALANCE))
                 return -1;
         return nr_moved;
 
@@ -2646,7 +2660,7 @@ out_one_pinned:
                 sd->balance_interval *= 2;
 
         if (!sd_idle && sd->flags & SD_SHARE_CPUPOWER &&
-                        !sched_smt_power_savings)
+            !test_sd_parent(sd, SD_POWERSAVINGS_BALANCE))
                 return -1;
         return 0;
 }
@@ -2668,7 +2682,14 @@ load_balance_newidle(int this_cpu, struct rq *this_rq, struct sched_domain *sd)
         int sd_idle = 0;
         cpumask_t cpus = CPU_MASK_ALL;
 
-        if (sd->flags & SD_SHARE_CPUPOWER && !sched_smt_power_savings)
+        /*
+         * When power savings policy is enabled for the parent domain, idle
+         * sibling can pick up load irrespective of busy siblings. In this case,
+         * let the state of idle sibling percolate up as IDLE, instead of
+         * portraying it as NOT_IDLE.
+         */
+        if (sd->flags & SD_SHARE_CPUPOWER &&
+            !test_sd_parent(sd, SD_POWERSAVINGS_BALANCE))
                 sd_idle = 1;
 
         schedstat_inc(sd, lb_cnt[NEWLY_IDLE]);
@@ -2709,7 +2730,8 @@ redo:
 
         if (!nr_moved) {
                 schedstat_inc(sd, lb_failed[NEWLY_IDLE]);
-                if (!sd_idle && sd->flags & SD_SHARE_CPUPOWER)
+                if (!sd_idle && sd->flags & SD_SHARE_CPUPOWER &&
+                    !test_sd_parent(sd, SD_POWERSAVINGS_BALANCE))
                         return -1;
         } else
                 sd->nr_balance_failed = 0;
@@ -2719,7 +2741,7 @@ redo:
 out_balanced:
         schedstat_inc(sd, lb_balanced[NEWLY_IDLE]);
         if (!sd_idle && sd->flags & SD_SHARE_CPUPOWER &&
-                                        !sched_smt_power_savings)
+            !test_sd_parent(sd, SD_POWERSAVINGS_BALANCE))
                 return -1;
         sd->nr_balance_failed = 0;
 
@@ -4817,7 +4839,7 @@ void show_state(void)
  * NOTE: this function does not set the idle thread's NEED_RESCHED
  * flag, to make booting more robust.
  */
-void __devinit init_idle(struct task_struct *idle, int cpu)
+void __cpuinit init_idle(struct task_struct *idle, int cpu)
 {
         struct rq *rq = cpu_rq(cpu);
         unsigned long flags;
@@ -5392,7 +5414,9 @@ static int sd_degenerate(struct sched_domain *sd)
         if (sd->flags & (SD_LOAD_BALANCE |
                          SD_BALANCE_NEWIDLE |
                          SD_BALANCE_FORK |
-                         SD_BALANCE_EXEC)) {
+                         SD_BALANCE_EXEC |
+                         SD_SHARE_CPUPOWER |
+                         SD_SHARE_PKG_RESOURCES)) {
                 if (sd->groups != sd->groups->next)
                         return 0;
         }
@@ -5426,7 +5450,9 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)
                 pflags &= ~(SD_LOAD_BALANCE |
                                 SD_BALANCE_NEWIDLE |
                                 SD_BALANCE_FORK |
-                                SD_BALANCE_EXEC);
+                                SD_BALANCE_EXEC |
+                                SD_SHARE_CPUPOWER |
+                                SD_SHARE_PKG_RESOURCES);
         }
         if (~cflags & pflags)
                 return 0;
@@ -5448,12 +5474,18 @@ static void cpu_attach_domain(struct sched_domain *sd, int cpu)
                 struct sched_domain *parent = tmp->parent;
                 if (!parent)
                         break;
-                if (sd_parent_degenerate(tmp, parent))
+                if (sd_parent_degenerate(tmp, parent)) {
                         tmp->parent = parent->parent;
+                        if (parent->parent)
+                                parent->parent->child = tmp;
+                }
         }
 
-        if (sd && sd_degenerate(sd))
+        if (sd && sd_degenerate(sd)) {
                 sd = sd->parent;
+                if (sd)
+                        sd->child = NULL;
+        }
 
         sched_domain_debug(sd, cpu);
 
@@ -5461,7 +5493,7 @@ static void cpu_attach_domain(struct sched_domain *sd, int cpu)
 }
 
 /* cpus with isolated domains */
-static cpumask_t __devinitdata cpu_isolated_map = CPU_MASK_NONE;
+static cpumask_t __cpuinitdata cpu_isolated_map = CPU_MASK_NONE;
 
 /* Setup the mask of cpus configured for isolated domains */
 static int __init isolated_cpu_setup(char *str)
@@ -5489,15 +5521,17 @@ __setup ("isolcpus=", isolated_cpu_setup);
  * covered by the given span, and will set each group's ->cpumask correctly,
  * and ->cpu_power to 0.
  */
-static void init_sched_build_groups(struct sched_group groups[], cpumask_t span,
-                                    int (*group_fn)(int cpu))
+static void
+init_sched_build_groups(struct sched_group groups[], cpumask_t span,
+                        const cpumask_t *cpu_map,
+                        int (*group_fn)(int cpu, const cpumask_t *cpu_map))
 {
         struct sched_group *first = NULL, *last = NULL;
         cpumask_t covered = CPU_MASK_NONE;
         int i;
 
         for_each_cpu_mask(i, span) {
-                int group = group_fn(i);
+                int group = group_fn(i, cpu_map);
                 struct sched_group *sg = &groups[group];
                 int j;
 
@@ -5508,7 +5542,7 @@ static void init_sched_build_groups(struct sched_group groups[], cpumask_t span,
                 sg->cpu_power = 0;
 
                 for_each_cpu_mask(j, span) {
-                        if (group_fn(j) != group)
+                        if (group_fn(j, cpu_map) != group)
                                 continue;
 
                         cpu_set(j, covered);
@@ -5975,13 +6009,15 @@ static void calibrate_migration_costs(const cpumask_t *cpu_map)
 #endif
                 );
         if (system_state == SYSTEM_BOOTING) {
-                printk("migration_cost=");
-                for (distance = 0; distance <= max_distance; distance++) {
-                        if (distance)
-                                printk(",");
-                        printk("%ld", (long)migration_cost[distance] / 1000);
+                if (num_online_cpus() > 1) {
+                        printk("migration_cost=");
+                        for (distance = 0; distance <= max_distance; distance++) {
+                                if (distance)
+                                        printk(",");
+                                printk("%ld", (long)migration_cost[distance] / 1000);
+                        }
+                        printk("\n");
                 }
-                printk("\n");
         }
         j1 = jiffies;
         if (migration_debug)
@@ -6084,7 +6120,7 @@ int sched_smt_power_savings = 0, sched_mc_power_savings = 0;
 static DEFINE_PER_CPU(struct sched_domain, cpu_domains);
 static struct sched_group sched_group_cpus[NR_CPUS];
 
-static int cpu_to_cpu_group(int cpu)
+static int cpu_to_cpu_group(int cpu, const cpumask_t *cpu_map)
 {
         return cpu;
 }
@@ -6095,31 +6131,36 @@ static int cpu_to_cpu_group(int cpu)
  */
 #ifdef CONFIG_SCHED_MC
 static DEFINE_PER_CPU(struct sched_domain, core_domains);
-static struct sched_group *sched_group_core_bycpu[NR_CPUS];
+static struct sched_group sched_group_core[NR_CPUS];
 #endif
 
 #if defined(CONFIG_SCHED_MC) && defined(CONFIG_SCHED_SMT)
-static int cpu_to_core_group(int cpu)
+static int cpu_to_core_group(int cpu, const cpumask_t *cpu_map)
 {
-        return first_cpu(cpu_sibling_map[cpu]);
+        cpumask_t mask = cpu_sibling_map[cpu];
+        cpus_and(mask, mask, *cpu_map);
+        return first_cpu(mask);
 }
 #elif defined(CONFIG_SCHED_MC)
-static int cpu_to_core_group(int cpu)
+static int cpu_to_core_group(int cpu, const cpumask_t *cpu_map)
 {
         return cpu;
 }
 #endif
 
 static DEFINE_PER_CPU(struct sched_domain, phys_domains);
-static struct sched_group *sched_group_phys_bycpu[NR_CPUS];
+static struct sched_group sched_group_phys[NR_CPUS];
 
-static int cpu_to_phys_group(int cpu)
+static int cpu_to_phys_group(int cpu, const cpumask_t *cpu_map)
 {
 #ifdef CONFIG_SCHED_MC
         cpumask_t mask = cpu_coregroup_map(cpu);
+        cpus_and(mask, mask, *cpu_map);
         return first_cpu(mask);
 #elif defined(CONFIG_SCHED_SMT)
-        return first_cpu(cpu_sibling_map[cpu]);
+        cpumask_t mask = cpu_sibling_map[cpu];
+        cpus_and(mask, mask, *cpu_map);
+        return first_cpu(mask);
 #else
         return cpu;
 #endif
@@ -6137,7 +6178,7 @@ static struct sched_group **sched_group_nodes_bycpu[NR_CPUS];
 static DEFINE_PER_CPU(struct sched_domain, allnodes_domains);
 static struct sched_group *sched_group_allnodes_bycpu[NR_CPUS];
 
-static int cpu_to_allnodes_group(int cpu)
+static int cpu_to_allnodes_group(int cpu, const cpumask_t *cpu_map)
 {
         return cpu_to_node(cpu);
 }
@@ -6169,12 +6210,11 @@ next_sg:
 }
 #endif
 
+#ifdef CONFIG_NUMA
 /* Free memory allocated for various sched_group structures */
 static void free_sched_groups(const cpumask_t *cpu_map)
 {
-        int cpu;
-#ifdef CONFIG_NUMA
-        int i;
+        int cpu, i;
 
         for_each_cpu_mask(cpu, *cpu_map) {
                 struct sched_group *sched_group_allnodes
@@ -6211,19 +6251,63 @@ next_sg:
                 kfree(sched_group_nodes);
                 sched_group_nodes_bycpu[cpu] = NULL;
         }
+}
+#else
+static void free_sched_groups(const cpumask_t *cpu_map)
+{
+}
 #endif
-        for_each_cpu_mask(cpu, *cpu_map) {
-                if (sched_group_phys_bycpu[cpu]) {
-                        kfree(sched_group_phys_bycpu[cpu]);
-                        sched_group_phys_bycpu[cpu] = NULL;
-                }
-#ifdef CONFIG_SCHED_MC
-                if (sched_group_core_bycpu[cpu]) {
-                        kfree(sched_group_core_bycpu[cpu]);
-                        sched_group_core_bycpu[cpu] = NULL;
-                }
-#endif
+
+/*
+ * Initialize sched groups cpu_power.
+ *
+ * cpu_power indicates the capacity of sched group, which is used while
+ * distributing the load between different sched groups in a sched domain.
+ * Typically cpu_power for all the groups in a sched domain will be same unless
+ * there are asymmetries in the topology. If there are asymmetries, group
+ * having more cpu_power will pickup more load compared to the group having
+ * less cpu_power.
+ *
+ * cpu_power will be a multiple of SCHED_LOAD_SCALE. This multiple represents
+ * the maximum number of tasks a group can handle in the presence of other idle
+ * or lightly loaded groups in the same sched domain.
+ */
+static void init_sched_groups_power(int cpu, struct sched_domain *sd)
+{
+        struct sched_domain *child;
+        struct sched_group *group;
+
+        WARN_ON(!sd || !sd->groups);
+
+        if (cpu != first_cpu(sd->groups->cpumask))
+                return;
+
+        child = sd->child;
+
+        /*
+         * For perf policy, if the groups in child domain share resources
+         * (for example cores sharing some portions of the cache hierarchy
+         * or SMT), then set this domain groups cpu_power such that each group
+         * can handle only one task, when there are other idle groups in the
+         * same sched domain.
+         */
+        if (!child || (!(sd->flags & SD_POWERSAVINGS_BALANCE) &&
+                       (child->flags &
+                        (SD_SHARE_CPUPOWER | SD_SHARE_PKG_RESOURCES)))) {
+                sd->groups->cpu_power = SCHED_LOAD_SCALE;
+                return;
         }
+
+        sd->groups->cpu_power = 0;
+
+        /*
+         * add cpu_power of each child group to this groups cpu_power
+         */
+        group = child->groups;
+        do {
+                sd->groups->cpu_power += group->cpu_power;
+                group = group->next;
+        } while (group != child->groups);
 }
 
 /*
@@ -6233,10 +6317,7 @@ next_sg:
 static int build_sched_domains(const cpumask_t *cpu_map)
 {
         int i;
-        struct sched_group *sched_group_phys = NULL;
-#ifdef CONFIG_SCHED_MC
-        struct sched_group *sched_group_core = NULL;
-#endif
+        struct sched_domain *sd;
 #ifdef CONFIG_NUMA
         struct sched_group **sched_group_nodes = NULL;
         struct sched_group *sched_group_allnodes = NULL;
@@ -6268,9 +6349,10 @@ static int build_sched_domains(const cpumask_t *cpu_map)
                                 > SD_NODES_PER_DOMAIN*cpus_weight(nodemask)) {
                         if (!sched_group_allnodes) {
                                 sched_group_allnodes
-                                        = kmalloc(sizeof(struct sched_group)
-                                                        * MAX_NUMNODES,
-                                                  GFP_KERNEL);
+                                        = kmalloc_node(sizeof(struct sched_group)
+                                                        * MAX_NUMNODES,
+                                                  GFP_KERNEL,
+                                                  cpu_to_node(i));
                                 if (!sched_group_allnodes) {
                                         printk(KERN_WARNING
                                         "Can not alloc allnodes sched group\n");
@@ -6282,7 +6364,7 @@ static int build_sched_domains(const cpumask_t *cpu_map)
                         sd = &per_cpu(allnodes_domains, i);
                         *sd = SD_ALLNODES_INIT;
                         sd->span = *cpu_map;
-                        group = cpu_to_allnodes_group(i);
+                        group = cpu_to_allnodes_group(i, cpu_map);
                         sd->groups = &sched_group_allnodes[group];
                         p = sd;
                 } else
@@ -6292,60 +6374,42 @@ static int build_sched_domains(const cpumask_t *cpu_map)
                 *sd = SD_NODE_INIT;
                 sd->span = sched_domain_node_span(cpu_to_node(i));
                 sd->parent = p;
+                if (p)
+                        p->child = sd;
                 cpus_and(sd->span, sd->span, *cpu_map);
 #endif
 
-                if (!sched_group_phys) {
-                        sched_group_phys
-                                = kmalloc(sizeof(struct sched_group) * NR_CPUS,
-                                          GFP_KERNEL);
-                        if (!sched_group_phys) {
-                                printk (KERN_WARNING "Can not alloc phys sched"
-                                                     "group\n");
-                                goto error;
-                        }
-                        sched_group_phys_bycpu[i] = sched_group_phys;
-                }
-
                 p = sd;
                 sd = &per_cpu(phys_domains, i);
-                group = cpu_to_phys_group(i);
+                group = cpu_to_phys_group(i, cpu_map);
                 *sd = SD_CPU_INIT;
                 sd->span = nodemask;
                 sd->parent = p;
+                if (p)
+                        p->child = sd;
                 sd->groups = &sched_group_phys[group];
 
 #ifdef CONFIG_SCHED_MC
-                if (!sched_group_core) {
-                        sched_group_core
-                                = kmalloc(sizeof(struct sched_group) * NR_CPUS,
-                                          GFP_KERNEL);
-                        if (!sched_group_core) {
-                                printk (KERN_WARNING "Can not alloc core sched"
-                                                     "group\n");
-                                goto error;
-                        }
-                        sched_group_core_bycpu[i] = sched_group_core;
-                }
-
                 p = sd;
                 sd = &per_cpu(core_domains, i);
-                group = cpu_to_core_group(i);
+                group = cpu_to_core_group(i, cpu_map);
                 *sd = SD_MC_INIT;
                 sd->span = cpu_coregroup_map(i);
                 cpus_and(sd->span, sd->span, *cpu_map);
                 sd->parent = p;
+                p->child = sd;
                 sd->groups = &sched_group_core[group];
 #endif
 
 #ifdef CONFIG_SCHED_SMT
                 p = sd;
                 sd = &per_cpu(cpu_domains, i);
-                group = cpu_to_cpu_group(i);
+                group = cpu_to_cpu_group(i, cpu_map);
                 *sd = SD_SIBLING_INIT;
                 sd->span = cpu_sibling_map[i];
                 cpus_and(sd->span, sd->span, *cpu_map);
                 sd->parent = p;
+                p->child = sd;
                 sd->groups = &sched_group_cpus[group];
 #endif
         }
@@ -6359,7 +6423,7 @@ static int build_sched_domains(const cpumask_t *cpu_map)
                         continue;
 
                 init_sched_build_groups(sched_group_cpus, this_sibling_map,
-                                                &cpu_to_cpu_group);
+                                        cpu_map, &cpu_to_cpu_group);
         }
 #endif
 
@@ -6371,7 +6435,7 @@ static int build_sched_domains(const cpumask_t *cpu_map)
                 if (i != first_cpu(this_core_map))
                         continue;
                 init_sched_build_groups(sched_group_core, this_core_map,
-                                        &cpu_to_core_group);
+                                        cpu_map, &cpu_to_core_group);
         }
 #endif
 
@@ -6385,14 +6449,14 @@ static int build_sched_domains(const cpumask_t *cpu_map)
                         continue;
 
                 init_sched_build_groups(sched_group_phys, nodemask,
-                                                &cpu_to_phys_group);
+                                        cpu_map, &cpu_to_phys_group);
         }
 
 #ifdef CONFIG_NUMA
         /* Set up node groups */
         if (sched_group_allnodes)
                 init_sched_build_groups(sched_group_allnodes, *cpu_map,
-                                        &cpu_to_allnodes_group);
+                                        cpu_map, &cpu_to_allnodes_group);
 
         for (i = 0; i < MAX_NUMNODES; i++) {
                 /* Set up node groups */
@@ -6464,72 +6528,20 @@ static int build_sched_domains(const cpumask_t *cpu_map)
         /* Calculate CPU power for physical packages and nodes */
 #ifdef CONFIG_SCHED_SMT
         for_each_cpu_mask(i, *cpu_map) {
-                struct sched_domain *sd;
                 sd = &per_cpu(cpu_domains, i);
-                sd->groups->cpu_power = SCHED_LOAD_SCALE;
+                init_sched_groups_power(i, sd);
         }
 #endif
 #ifdef CONFIG_SCHED_MC
         for_each_cpu_mask(i, *cpu_map) {
-                int power;
-                struct sched_domain *sd;
                 sd = &per_cpu(core_domains, i);
-                if (sched_smt_power_savings)
-                        power = SCHED_LOAD_SCALE * cpus_weight(sd->groups->cpumask);
-                else
-                        power = SCHED_LOAD_SCALE + (cpus_weight(sd->groups->cpumask)-1)
-                                            * SCHED_LOAD_SCALE / 10;
-                sd->groups->cpu_power = power;
+                init_sched_groups_power(i, sd);
         }
 #endif
 
         for_each_cpu_mask(i, *cpu_map) {
-                struct sched_domain *sd;
-#ifdef CONFIG_SCHED_MC
                 sd = &per_cpu(phys_domains, i);
-                if (i != first_cpu(sd->groups->cpumask))
-                        continue;
-
-                sd->groups->cpu_power = 0;
-                if (sched_mc_power_savings || sched_smt_power_savings) {
-                        int j;
-
-                        for_each_cpu_mask(j, sd->groups->cpumask) {
-                                struct sched_domain *sd1;
-                                sd1 = &per_cpu(core_domains, j);
-                                /*
-                                 * for each core we will add once
-                                 * to the group in physical domain
-                                 */
-                                if (j != first_cpu(sd1->groups->cpumask))
-                                        continue;
-
-                                if (sched_smt_power_savings)
-                                        sd->groups->cpu_power += sd1->groups->cpu_power;
-                                else
-                                        sd->groups->cpu_power += SCHED_LOAD_SCALE;
-                        }
-                } else
-                        /*
-                         * This has to be < 2 * SCHED_LOAD_SCALE
-                         * Lets keep it SCHED_LOAD_SCALE, so that
-                         * while calculating NUMA group's cpu_power
-                         * we can simply do
-                         *  numa_group->cpu_power += phys_group->cpu_power;
-                         *
-                         * See "only add power once for each physical pkg"
-                         * comment below
-                         */
-                        sd->groups->cpu_power = SCHED_LOAD_SCALE;
-#else
-                int power;
-                sd = &per_cpu(phys_domains, i);
-                if (sched_smt_power_savings)
-                        power = SCHED_LOAD_SCALE * cpus_weight(sd->groups->cpumask);
-                else
-                        power = SCHED_LOAD_SCALE;
-                sd->groups->cpu_power = power;
-#endif
+                init_sched_groups_power(i, sd);
         }
 
 #ifdef CONFIG_NUMA
@@ -6537,7 +6549,7 @@ static int build_sched_domains(const cpumask_t *cpu_map)
                 init_numa_sched_groups_power(sched_group_nodes[i]);
 
         if (sched_group_allnodes) {
-                int group = cpu_to_allnodes_group(first_cpu(*cpu_map));
+                int group = cpu_to_allnodes_group(first_cpu(*cpu_map), cpu_map);
                 struct sched_group *sg = &sched_group_allnodes[group];
 
                 init_numa_sched_groups_power(sg);
@@ -6563,9 +6575,11 @@ static int build_sched_domains(const cpumask_t *cpu_map)
 
         return 0;
 
+#ifdef CONFIG_NUMA
 error:
         free_sched_groups(cpu_map);
         return -ENOMEM;
+#endif
 }
 /*
  * Set up scheduler domains and groups.  Callers must hold the hotplug lock.
@@ -6747,11 +6761,20 @@ static int update_sched_domains(struct notifier_block *nfb,
 
 void __init sched_init_smp(void)
 {
+        cpumask_t non_isolated_cpus;
+
         lock_cpu_hotplug();
         arch_init_sched_domains(&cpu_online_map);
+        cpus_andnot(non_isolated_cpus, cpu_online_map, cpu_isolated_map);
+        if (cpus_empty(non_isolated_cpus))
+                cpu_set(smp_processor_id(), non_isolated_cpus);
         unlock_cpu_hotplug();
         /* XXX: Theoretical race here - CPU may be hotplugged now */
         hotcpu_notifier(update_sched_domains, 0);
+
+        /* Move init over to a non-isolated CPU */
+        if (set_cpus_allowed(current, non_isolated_cpus) < 0)
+                BUG();
 }
 #else
 void __init sched_init_smp(void)
diff --git a/lib/sort.c b/lib/sort.c
index 5f3b51ffa1dc..488788b341cb 100644
--- a/lib/sort.c
+++ b/lib/sort.c
@@ -49,15 +49,15 @@ void sort(void *base, size_t num, size_t size,
           void (*swap)(void *, void *, int size))
 {
         /* pre-scale counters for performance */
-        int i = (num/2) * size, n = num * size, c, r;
+        int i = (num/2 - 1) * size, n = num * size, c, r;
 
         if (!swap)
                 swap = (size == 4 ? u32_swap : generic_swap);
 
         /* heapify */
         for ( ; i >= 0; i -= size) {
-                for (r = i; r * 2 < n; r  = c) {
-                        c = r * 2;
+                for (r = i; r * 2 + size < n; r  = c) {
+                        c = r * 2 + size;
                         if (c < n - size && cmp(base + c, base + c + size) < 0)
                                 c += size;
                         if (cmp(base + r, base + c) >= 0)
@@ -69,8 +69,8 @@ void sort(void *base, size_t num, size_t size,
         /* sort */
         for (i = n - size; i >= 0; i -= size) {
                 swap(base, base + i, size);
-                for (r = 0; r * 2 < i; r = c) {
-                        c = r * 2;
+                for (r = 0; r * 2 + size < i; r = c) {
+                        c = r * 2 + size;
                         if (c < i - size && cmp(base + c, base + c + size) < 0)
                                 c += size;
                         if (cmp(base + r, base + c) >= 0)
diff --git a/scripts/.gitignore b/scripts/.gitignore
index a234e524a490..a1f52cb47200 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -5,3 +5,4 @@ conmakehash
 kallsyms
 pnmtologo
 bin2c
+unifdef
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 4b2721ca97da..6c5469b1473b 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -32,6 +32,10 @@
 # Step 4 is solely used to allow module versioning in external modules,
 # where the CRC of each module is retrieved from the Module.symers file.
 
+# KBUILD_MODPOST_WARN can be set to avoid error out in case of undefined
+# symbols in the final module linking stage
+# KBUILD_MODPOST_NOFINAL can be set to skip the final link of modules.
+# This is solely usefull to speed up test compiles
 PHONY := _modpost
 _modpost: __modpost
 
@@ -46,7 +50,8 @@ modulesymfile := $(KBUILD_EXTMOD)/Module.symvers
 __modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
 modules   := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o)))
 
-_modpost: $(modules)
+# Stop after building .o files if NOFINAL is set. Makes compile tests quicker
+_modpost: $(if $(KBUILD_MODPOST_NOFINAL), $(modules:.ko:.o),$(modules))
 
 
 # Step 2), invoke modpost
@@ -58,7 +63,7 @@ quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
         $(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile) \
         $(if $(KBUILD_EXTMOD),-I $(modulesymfile)) \
         $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \
-        $(if $(KBUILD_EXTMOD),-w) \
+        $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \
         $(wildcard vmlinux) $(filter-out FORCE,$^)
 
 PHONY += __modpost
@@ -92,7 +97,7 @@ targets += $(modules:.ko=.mod.o)
 
 # Step 6), final link of the modules
 quiet_cmd_ld_ko_o = LD [M]  $@
-      cmd_ld_ko_o = $(LD) $(LDFLAGS) $(LDFLAGS_MODULE) -o $@            \
+      cmd_ld_ko_o = $(LD) $(LDFLAGS) $(LDFLAGS_MODULE) -o $@            \
                           $(filter-out FORCE,$^)
 
 $(modules): %.ko :%.o %.mod.o FORCE
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index a90d3cc76bfa..7e7e147875bf 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -11,7 +11,6 @@ gconfig: $(obj)/gconf
         $< arch/$(ARCH)/Kconfig
 
 menuconfig: $(obj)/mconf
-        $(Q)$(MAKE) $(build)=scripts/kconfig/lxdialog
         $< arch/$(ARCH)/Kconfig
 
 config: $(obj)/conf
@@ -81,6 +80,23 @@ help:
         @echo  '  allyesconfig    - New config where all options are accepted with yes'
         @echo  '  allnoconfig     - New config where all options are answered with no'
 
+# lxdialog stuff
+check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
+
+# Use reursively expanded variables so we do not call gcc unless
+# we really need to do so. (Do not call gcc as part of make mrproper)
+HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
+HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
+
+HOST_EXTRACFLAGS += -DLOCALE
+
+PHONY += $(obj)/dochecklxdialog
+$(obj)/dochecklxdialog:
+        $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBES)
+
+always := dochecklxdialog
+
+
 # ===========================================================================
 # Shared Makefile for the various kconfig executables:
 # conf:   Used for defconfig, oldconfig and related targets
@@ -92,11 +108,19 @@ help:
 #         Based on GTK which needs to be installed to compile it
 # object files used by all kconfig flavours
 
-hostprogs-y     := conf mconf qconf gconf kxgettext
+lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o
+lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o
+
 conf-objs       := conf.o  zconf.tab.o
-mconf-objs      := mconf.o zconf.tab.o
+mconf-objs      := mconf.o zconf.tab.o $(lxdialog)
 kxgettext-objs  := kxgettext.o zconf.tab.o
 
+hostprogs-y := conf qconf gconf kxgettext
+
+ifeq ($(MAKECMDGOALS),menuconfig)
+        hostprogs-y += mconf
+endif
+
 ifeq ($(MAKECMDGOALS),xconfig)
         qconf-target := 1
 endif
@@ -116,7 +140,6 @@ endif
 
 clean-files     := lkc_defs.h qconf.moc .tmp_qtcheck \
                    .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c
-subdir- += lxdialog
 
 # Needed for systems without gettext
 KBUILD_HAVE_NLS := $(shell \
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 69f96b398c22..66b15ef02931 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -517,7 +517,7 @@ int conf_write(const char *name)
         fclose(out);
 
         if (*tmpname) {
-                strcat(dirname, name ? name : conf_get_configname());
+                strcat(dirname, basename);
                 strcat(dirname, ".old");
                 rename(newname, dirname);
                 if (rename(tmpname, newname))
diff --git a/scripts/kconfig/lxdialog/Makefile b/scripts/kconfig/lxdialog/Makefile
deleted file mode 100644
index a8b026326247..000000000000
--- a/scripts/kconfig/lxdialog/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile to build lxdialog package
-#
-
-check-lxdialog  := $(srctree)/$(src)/check-lxdialog.sh
-
-# Use reursively expanded variables so we do not call gcc unless
-# we really need to do so. (Do not call gcc as part of make mrproper)
-HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
-HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-
-HOST_EXTRACFLAGS += -DLOCALE
-
-PHONY += dochecklxdialog
-$(obj)/dochecklxdialog:
-        $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBES)
-
-hostprogs-y     := lxdialog
-always          := $(hostprogs-y) dochecklxdialog
-
-lxdialog-objs := checklist.o menubox.o textbox.o yesno.o inputbox.o \
-                 util.o lxdialog.o msgbox.o
diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
index 79886413b6d5..cf697080dddd 100644
--- a/scripts/kconfig/lxdialog/checklist.c
+++ b/scripts/kconfig/lxdialog/checklist.c
@@ -28,25 +28,25 @@ static int list_width, check_x, item_x;
 /*
  * Print list item
  */
-static void print_item(WINDOW * win, const char *item, int status, int choice,
-                       int selected)
+static void print_item(WINDOW * win, int choice, int selected)
 {
         int i;
 
         /* Clear 'residue' of last item */
-        wattrset(win, menubox_attr);
+        wattrset(win, dlg.menubox.atr);
         wmove(win, choice, 0);
         for (i = 0; i < list_width; i++)
                 waddch(win, ' ');
 
         wmove(win, choice, check_x);
-        wattrset(win, selected ? check_selected_attr : check_attr);
-        wprintw(win, "(%c)", status ? 'X' : ' ');
-
-        wattrset(win, selected ? tag_selected_attr : tag_attr);
-        mvwaddch(win, choice, item_x, item[0]);
-        wattrset(win, selected ? item_selected_attr : item_attr);
-        waddstr(win, (char *)item + 1);
+        wattrset(win, selected ? dlg.check_selected.atr
+                 : dlg.check.atr);
+        wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' ');
+
+        wattrset(win, selected ? dlg.tag_selected.atr : dlg.tag.atr);
+        mvwaddch(win, choice, item_x, item_str()[0]);
+        wattrset(win, selected ? dlg.item_selected.atr : dlg.item.atr);
+        waddstr(win, (char *)item_str() + 1);
         if (selected) {
                 wmove(win, choice, check_x + 1);
                 wrefresh(win);
@@ -62,11 +62,11 @@ static void print_arrows(WINDOW * win, int choice, int item_no, int scroll,
         wmove(win, y, x);
 
         if (scroll > 0) {
-                wattrset(win, uarrow_attr);
+                wattrset(win, dlg.uarrow.atr);
                 waddch(win, ACS_UARROW);
                 waddstr(win, "(-)");
         } else {
-                wattrset(win, menubox_attr);
+                wattrset(win, dlg.menubox.atr);
                 waddch(win, ACS_HLINE);
                 waddch(win, ACS_HLINE);
                 waddch(win, ACS_HLINE);
@@ -77,11 +77,11 @@ static void print_arrows(WINDOW * win, int choice, int item_no, int scroll,
         wmove(win, y, x);
 
         if ((height < item_no) && (scroll + choice < item_no - 1)) {
-                wattrset(win, darrow_attr);
+                wattrset(win, dlg.darrow.atr);
                 waddch(win, ACS_DARROW);
                 waddstr(win, "(+)");
         } else {
-                wattrset(win, menubox_border_attr);
+                wattrset(win, dlg.menubox_border.atr);
                 waddch(win, ACS_HLINE);
                 waddch(win, ACS_HLINE);
                 waddch(win, ACS_HLINE);
@@ -109,32 +109,29 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
  * in the style of radiolist (only one option turned on at a time).
  */
 int dialog_checklist(const char *title, const char *prompt, int height,
-                     int width, int list_height, int item_no,
-                     const char *const *items)
+                     int width, int list_height)
 {
         int i, x, y, box_x, box_y;
-        int key = 0, button = 0, choice = 0, scroll = 0, max_choice, *status;
+        int key = 0, button = 0, choice = 0, scroll = 0, max_choice;
         WINDOW *dialog, *list;
 
-        /* Allocate space for storing item on/off status */
-        if ((status = malloc(sizeof(int) * item_no)) == NULL) {
-                endwin();
-                fprintf(stderr,
-                        "\nCan't allocate memory in dialog_checklist().\n");
-                exit(-1);
+        /* which item to highlight */
+        item_foreach() {
+                if (item_is_tag('X'))
+                        choice = item_n();
+                if (item_is_selected()) {
+                        choice = item_n();
+                        break;
+                }
         }
 
-        /* Initializes status */
-        for (i = 0; i < item_no; i++) {
-                status[i] = !strcasecmp(items[i * 3 + 2], "on");
-                if ((!choice && status[i])
-                    || !strcasecmp(items[i * 3 + 2], "selected"))
-                        choice = i + 1;
-        }
-        if (choice)
-                choice--;
+do_resize:
+        if (getmaxy(stdscr) < (height + 6))
+                return -ERRDISPLAYTOOSMALL;
+        if (getmaxx(stdscr) < (width + 6))
+                return -ERRDISPLAYTOOSMALL;
 
-        max_choice = MIN(list_height, item_no);
+        max_choice = MIN(list_height, item_count());
 
         /* center dialog box on screen */
         x = (COLS - width) / 2;
@@ -145,17 +142,18 @@ int dialog_checklist(const char *title, const char *prompt, int height,
         dialog = newwin(height, width, y, x);
         keypad(dialog, TRUE);
 
-        draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
-        wattrset(dialog, border_attr);
+        draw_box(dialog, 0, 0, height, width,
+                 dlg.dialog.atr, dlg.border.atr);
+        wattrset(dialog, dlg.border.atr);
         mvwaddch(dialog, height - 3, 0, ACS_LTEE);
         for (i = 0; i < width - 2; i++)
                 waddch(dialog, ACS_HLINE);
-        wattrset(dialog, dialog_attr);
+        wattrset(dialog, dlg.dialog.atr);
         waddch(dialog, ACS_RTEE);
 
         print_title(dialog, title, width);
 
-        wattrset(dialog, dialog_attr);
+        wattrset(dialog, dlg.dialog.atr);
         print_autowrap(dialog, prompt, width - 2, 1, 3);
 
         list_width = width - 6;
@@ -170,12 +168,12 @@ int dialog_checklist(const char *title, const char *prompt, int height,
 
         /* draw a box around the list items */
         draw_box(dialog, box_y, box_x, list_height + 2, list_width + 2,
-                 menubox_border_attr, menubox_attr);
+                 dlg.menubox_border.atr, dlg.menubox.atr);
 
         /* Find length of longest item in order to center checklist */
         check_x = 0;
-        for (i = 0; i < item_no; i++)
-                check_x = MAX(check_x, +strlen(items[i * 3 + 1]) + 4);
+        item_foreach()
+                check_x = MAX(check_x, strlen(item_str()) + 4);
 
         check_x = (list_width - check_x) / 2;
         item_x = check_x + 4;
@@ -187,14 +185,11 @@ int dialog_checklist(const char *title, const char *prompt, int height,
 
         /* Print the list */
         for (i = 0; i < max_choice; i++) {
-                if (i != choice)
-                        print_item(list, items[(scroll + i) * 3 + 1],
-                                   status[i + scroll], i, 0);
+                item_set(scroll + i);
+                print_item(list, i, i == choice);
         }
-        print_item(list, items[(scroll + choice) * 3 + 1],
-                   status[choice + scroll], choice, 1);
 
-        print_arrows(dialog, choice, item_no, scroll,
+        print_arrows(dialog, choice, item_count(), scroll,
                      box_y, box_x + check_x + 5, list_height);
 
         print_buttons(dialog, height, width, 0);
@@ -203,13 +198,14 @@ int dialog_checklist(const char *title, const char *prompt, int height,
         wnoutrefresh(list);
         doupdate();
 
-        while (key != ESC) {
+        while (key != KEY_ESC) {
                 key = wgetch(dialog);
 
-                for (i = 0; i < max_choice; i++)
-                        if (toupper(key) ==
-                            toupper(items[(scroll + i) * 3 + 1][0]))
+                for (i = 0; i < max_choice; i++) {
+                        item_set(i + scroll);
+                        if (toupper(key) == toupper(item_str()[0]))
                                 break;
+                }
 
                 if (i < max_choice || key == KEY_UP || key == KEY_DOWN ||
                     key == '+' || key == '-') {
@@ -220,15 +216,16 @@ int dialog_checklist(const char *title, const char *prompt, int height,
                                         /* Scroll list down */
                                         if (list_height > 1) {
                                                 /* De-highlight current first item */
-                                                print_item(list, items[scroll * 3 + 1],
-                                                           status[scroll], 0, FALSE);
+                                                item_set(scroll);
+                                                print_item(list, 0, FALSE);
                                                 scrollok(list, TRUE);
                                                 wscrl(list, -1);
                                                 scrollok(list, FALSE);
                                         }
                                         scroll--;
-                                        print_item(list, items[scroll * 3 + 1], status[scroll], 0, TRUE);
-                                        print_arrows(dialog, choice, item_no,
+                                        item_set(scroll);
+                                        print_item(list, 0, TRUE);
+                                        print_arrows(dialog, choice, item_count(),
                                                      scroll, box_y, box_x + check_x + 5, list_height);
 
                                         wnoutrefresh(dialog);
@@ -239,23 +236,24 @@ int dialog_checklist(const char *title, const char *prompt, int height,
                                         i = choice - 1;
                         } else if (key == KEY_DOWN || key == '+') {
                                 if (choice == max_choice - 1) {
-                                        if (scroll + choice >= item_no - 1)
+                                        if (scroll + choice >= item_count() - 1)
                                                 continue;
                                         /* Scroll list up */
                                         if (list_height > 1) {
                                                 /* De-highlight current last item before scrolling up */
-                                                print_item(list, items[(scroll + max_choice - 1) * 3 + 1],
-                                                           status[scroll + max_choice - 1],
-                                                           max_choice - 1, FALSE);
+                                                item_set(scroll + max_choice - 1);
+                                                print_item(list,
+                                                            max_choice - 1,
+                                                            FALSE);
                                                 scrollok(list, TRUE);
                                                 wscrl(list, 1);
                                                 scrollok(list, FALSE);
                                         }
                                         scroll++;
-                                        print_item(list, items[(scroll + max_choice - 1) * 3 + 1],
-                                                   status[scroll + max_choice - 1], max_choice - 1, TRUE);
+                                        item_set(scroll + max_choice - 1);
+                                        print_item(list, max_choice - 1, TRUE);
 
-                                        print_arrows(dialog, choice, item_no,
+                                        print_arrows(dialog, choice, item_count(),
                                                      scroll, box_y, box_x + check_x + 5, list_height);
 
                                         wnoutrefresh(dialog);
@@ -267,12 +265,12 @@ int dialog_checklist(const char *title, const char *prompt, int height,
                         }
                         if (i != choice) {
                                 /* De-highlight current item */
-                                print_item(list, items[(scroll + choice) * 3 + 1],
-                                           status[scroll + choice], choice, FALSE);
+                                item_set(scroll + choice);
+                                print_item(list, choice, FALSE);
                                 /* Highlight new item */
                                 choice = i;
-                                print_item(list, items[(scroll + choice) * 3 + 1],
-                                           status[scroll + choice], choice, TRUE);
+                                item_set(scroll + choice);
+                                print_item(list, choice, TRUE);
                                 wnoutrefresh(dialog);
                                 wrefresh(list);
                         }
@@ -282,10 +280,19 @@ int dialog_checklist(const char *title, const char *prompt, int height,
                 case 'H':
                 case 'h':
                 case '?':
-                        fprintf(stderr, "%s", items[(scroll + choice) * 3]);
+                        button = 1;
+                        /* fall-through */
+                case 'S':
+                case 's':
+                case ' ':
+                case '\n':
+                        item_foreach()
+                                item_set_selected(0);
+                        item_set(scroll + choice);
+                        item_set_selected(1);
+                        delwin(list);
                         delwin(dialog);
-                        free(status);
-                        return 1;
+                        return button;
                 case TAB:
                 case KEY_LEFT:
                 case KEY_RIGHT:
@@ -295,42 +302,24 @@ int dialog_checklist(const char *title, const char *prompt, int height,
                         print_buttons(dialog, height, width, button);
                         wrefresh(dialog);
                         break;
-                case 'S':
-                case 's':
-                case ' ':
-                case '\n':
-                        if (!button) {
-                                if (!status[scroll + choice]) {
-                                        for (i = 0; i < item_no; i++)
-                                                status[i] = 0;
-                                        status[scroll + choice] = 1;
-                                        for (i = 0; i < max_choice; i++)
-                                                print_item(list, items[(scroll + i) * 3 + 1],
-                                                           status[scroll + i], i, i == choice);
-                                }
-                                wnoutrefresh(dialog);
-                                wrefresh(list);
-
-                                for (i = 0; i < item_no; i++)
-                                        if (status[i])
-                                                fprintf(stderr, "%s", items[i * 3]);
-                        } else
-                                fprintf(stderr, "%s", items[(scroll + choice) * 3]);
-                        delwin(dialog);
-                        free(status);
-                        return button;
                 case 'X':
                 case 'x':
-                        key = ESC;
-                case ESC:
+                        key = KEY_ESC;
+                        break;
+                case KEY_ESC:
+                        key = on_key_esc(dialog);
                         break;
+                case KEY_RESIZE:
+                        delwin(list);
+                        delwin(dialog);
+                        on_key_resize();
+                        goto do_resize;
                 }
 
                 /* Now, update everything... */
                 doupdate();
         }
-
+        delwin(list);
         delwin(dialog);
-        free(status);
-        return -1;              /* ESC pressed */
+        return key;             /* ESC pressed */
 }
diff --git a/scripts/kconfig/lxdialog/colors.h b/scripts/kconfig/lxdialog/colors.h
deleted file mode 100644
index db071df12bbb..000000000000
--- a/scripts/kconfig/lxdialog/colors.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *  colors.h -- color attribute definitions
- *
- *  AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
- *
- *  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.
- */
-
-/*
- *   Default color definitions
- *
- *   *_FG = foreground
- *   *_BG = background
- *   *_HL = highlight?
- */
-#define SCREEN_FG                    COLOR_CYAN
-#define SCREEN_BG                    COLOR_BLUE
-#define SCREEN_HL                    TRUE
-
-#define SHADOW_FG                    COLOR_BLACK
-#define SHADOW_BG                    COLOR_BLACK
-#define SHADOW_HL                    TRUE
-
-#define DIALOG_FG                    COLOR_BLACK
-#define DIALOG_BG                    COLOR_WHITE
-#define DIALOG_HL                    FALSE
-
-#define TITLE_FG                     COLOR_YELLOW
-#define TITLE_BG                     COLOR_WHITE
-#define TITLE_HL                     TRUE
-
-#define BORDER_FG                    COLOR_WHITE
-#define BORDER_BG                    COLOR_WHITE
-#define BORDER_HL                    TRUE
-
-#define BUTTON_ACTIVE_FG             COLOR_WHITE
-#define BUTTON_ACTIVE_BG             COLOR_BLUE
-#define BUTTON_ACTIVE_HL             TRUE
-
-#define BUTTON_INACTIVE_FG           COLOR_BLACK
-#define BUTTON_INACTIVE_BG           COLOR_WHITE
-#define BUTTON_INACTIVE_HL           FALSE
-
-#define BUTTON_KEY_ACTIVE_FG         COLOR_WHITE
-#define BUTTON_KEY_ACTIVE_BG         COLOR_BLUE
-#define BUTTON_KEY_ACTIVE_HL         TRUE
-
-#define BUTTON_KEY_INACTIVE_FG       COLOR_RED
-#define BUTTON_KEY_INACTIVE_BG       COLOR_WHITE
-#define BUTTON_KEY_INACTIVE_HL       FALSE
-
-#define BUTTON_LABEL_ACTIVE_FG       COLOR_YELLOW
-#define BUTTON_LABEL_ACTIVE_BG       COLOR_BLUE
-#define BUTTON_LABEL_ACTIVE_HL       TRUE
-
-#define BUTTON_LABEL_INACTIVE_FG     COLOR_BLACK
-#define BUTTON_LABEL_INACTIVE_BG     COLOR_WHITE
-#define BUTTON_LABEL_INACTIVE_HL     TRUE
-
-#define INPUTBOX_FG                  COLOR_BLACK
-#define INPUTBOX_BG                  COLOR_WHITE
-#define INPUTBOX_HL                  FALSE
-
-#define INPUTBOX_BORDER_FG           COLOR_BLACK
-#define INPUTBOX_BORDER_BG           COLOR_WHITE
-#define INPUTBOX_BORDER_HL           FALSE
-
-#define SEARCHBOX_FG                 COLOR_BLACK
-#define SEARCHBOX_BG                 COLOR_WHITE
-#define SEARCHBOX_HL                 FALSE
-
-#define SEARCHBOX_TITLE_FG           COLOR_YELLOW
-#define SEARCHBOX_TITLE_BG           COLOR_WHITE
-#define SEARCHBOX_TITLE_HL           TRUE
-
-#define SEARCHBOX_BORDER_FG          COLOR_WHITE
-#define SEARCHBOX_BORDER_BG          COLOR_WHITE
-#define SEARCHBOX_BORDER_HL          TRUE
-
-#define POSITION_INDICATOR_FG        COLOR_YELLOW
-#define POSITION_INDICATOR_BG        COLOR_WHITE
-#define POSITION_INDICATOR_HL        TRUE
-
-#define MENUBOX_FG                   COLOR_BLACK
-#define MENUBOX_BG                   COLOR_WHITE
-#define MENUBOX_HL                   FALSE
-
-#define MENUBOX_BORDER_FG            COLOR_WHITE
-#define MENUBOX_BORDER_BG            COLOR_WHITE
-#define MENUBOX_BORDER_HL            TRUE
-
-#define ITEM_FG                      COLOR_BLACK
-#define ITEM_BG                      COLOR_WHITE
-#define ITEM_HL                      FALSE
-
-#define ITEM_SELECTED_FG             COLOR_WHITE
-#define ITEM_SELECTED_BG             COLOR_BLUE
-#define ITEM_SELECTED_HL             TRUE
-
-#define TAG_FG                       COLOR_YELLOW
-#define TAG_BG                       COLOR_WHITE
-#define TAG_HL                       TRUE
-
-#define TAG_SELECTED_FG              COLOR_YELLOW
-#define TAG_SELECTED_BG              COLOR_BLUE
-#define TAG_SELECTED_HL              TRUE
-
-#define TAG_KEY_FG                   COLOR_YELLOW
-#define TAG_KEY_BG                   COLOR_WHITE
-#define TAG_KEY_HL                   TRUE
-
-#define TAG_KEY_SELECTED_FG          COLOR_YELLOW
-#define TAG_KEY_SELECTED_BG          COLOR_BLUE
-#define TAG_KEY_SELECTED_HL          TRUE
-
-#define CHECK_FG                     COLOR_BLACK
-#define CHECK_BG                     COLOR_WHITE
-#define CHECK_HL                     FALSE
-
-#define CHECK_SELECTED_FG            COLOR_WHITE
-#define CHECK_SELECTED_BG            COLOR_BLUE
-#define CHECK_SELECTED_HL            TRUE
-
-#define UARROW_FG                    COLOR_GREEN
-#define UARROW_BG                    COLOR_WHITE
-#define UARROW_HL                    TRUE
-
-#define DARROW_FG                    COLOR_GREEN
-#define DARROW_BG                    COLOR_WHITE
-#define DARROW_HL                    TRUE
-
-/* End of default color definitions */
-
-#define C_ATTR(x,y)                  ((x ? A_BOLD : 0) | COLOR_PAIR((y)))
-#define COLOR_NAME_LEN               10
-#define COLOR_COUNT                  8
-
-/*
- * Global variables
- */
-
-extern int color_table[][3];
diff --git a/scripts/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h
index af3cf716e215..8dea47f9d3e4 100644
--- a/scripts/kconfig/lxdialog/dialog.h
+++ b/scripts/kconfig/lxdialog/dialog.h
@@ -48,7 +48,7 @@
 
 #define TR(params) _tracef params
 
-#define ESC 27
+#define KEY_ESC 27
 #define TAB 9
 #define MAX_LEN 2048
 #define BUF_SIZE (10*1024)
@@ -86,63 +86,111 @@
 #define ACS_DARROW 'v'
 #endif
 
+/* error return codes */
+#define ERRDISPLAYTOOSMALL (KEY_MAX + 1)
+
 /*
- * Attribute names
+ *   Color definitions
  */
-#define screen_attr                   attributes[0]
-#define shadow_attr                   attributes[1]
-#define dialog_attr                   attributes[2]
-#define title_attr                    attributes[3]
-#define border_attr                   attributes[4]
-#define button_active_attr            attributes[5]
-#define button_inactive_attr          attributes[6]
-#define button_key_active_attr        attributes[7]
-#define button_key_inactive_attr      attributes[8]
-#define button_label_active_attr      attributes[9]
-#define button_label_inactive_attr    attributes[10]
-#define inputbox_attr                 attributes[11]
-#define inputbox_border_attr          attributes[12]
-#define searchbox_attr                attributes[13]
-#define searchbox_title_attr          attributes[14]
-#define searchbox_border_attr         attributes[15]
-#define position_indicator_attr       attributes[16]
-#define menubox_attr                  attributes[17]
-#define menubox_border_attr           attributes[18]
-#define item_attr                     attributes[19]
-#define item_selected_attr            attributes[20]
-#define tag_attr                      attributes[21]
-#define tag_selected_attr             attributes[22]
-#define tag_key_attr                  attributes[23]
-#define tag_key_selected_attr         attributes[24]
-#define check_attr                    attributes[25]
-#define check_selected_attr           attributes[26]
-#define uarrow_attr                   attributes[27]
-#define darrow_attr                   attributes[28]
-
-/* number of attributes */
-#define ATTRIBUTE_COUNT               29
+struct dialog_color {
+        chtype atr;     /* Color attribute */
+        int fg;         /* foreground */
+        int bg;         /* background */
+        int hl;         /* highlight this item */
+};
+
+struct dialog_info {
+        const char *backtitle;
+        struct dialog_color screen;
+        struct dialog_color shadow;
+        struct dialog_color dialog;
+        struct dialog_color title;
+        struct dialog_color border;
+        struct dialog_color button_active;
+        struct dialog_color button_inactive;
+        struct dialog_color button_key_active;
+        struct dialog_color button_key_inactive;
+        struct dialog_color button_label_active;
+        struct dialog_color button_label_inactive;
+        struct dialog_color inputbox;
+        struct dialog_color inputbox_border;
+        struct dialog_color searchbox;
+        struct dialog_color searchbox_title;
+        struct dialog_color searchbox_border;
+        struct dialog_color position_indicator;
+        struct dialog_color menubox;
+        struct dialog_color menubox_border;
+        struct dialog_color item;
+        struct dialog_color item_selected;
+        struct dialog_color tag;
+        struct dialog_color tag_selected;
+        struct dialog_color tag_key;
+        struct dialog_color tag_key_selected;
+        struct dialog_color check;
+        struct dialog_color check_selected;
+        struct dialog_color uarrow;
+        struct dialog_color darrow;
+};
 
 /*
  * Global variables
  */
-extern bool use_colors;
-extern bool use_shadow;
-
-extern chtype attributes[];
-
-extern const char *backtitle;
+extern struct dialog_info dlg;
+extern char dialog_input_result[];
 
 /*
  * Function prototypes
  */
-extern void create_rc(const char *filename);
-extern int parse_rc(void);
 
-void init_dialog(void);
+/* item list as used by checklist and menubox */
+void item_reset(void);
+void item_make(const char *fmt, ...);
+void item_add_str(const char *fmt, ...);
+void item_set_tag(char tag);
+void item_set_data(void *p);
+void item_set_selected(int val);
+int item_activate_selected(void);
+void *item_data(void);
+char item_tag(void);
+
+/* item list manipulation for lxdialog use */
+#define MAXITEMSTR 200
+struct dialog_item {
+        char str[MAXITEMSTR];   /* promtp displayed */
+        char tag;
+        void *data;     /* pointer to menu item - used by menubox+checklist */
+        int selected;   /* Set to 1 by dialog_*() function if selected. */
+};
+
+/* list of lialog_items */
+struct dialog_list {
+        struct dialog_item node;
+        struct dialog_list *next;
+};
+
+extern struct dialog_list *item_cur;
+extern struct dialog_list item_nil;
+extern struct dialog_list *item_head;
+
+int item_count(void);
+void item_set(int n);
+int item_n(void);
+const char *item_str(void);
+int item_is_selected(void);
+int item_is_tag(char tag);
+#define item_foreach() \
+        for (item_cur = item_head ? item_head: item_cur; \
+             item_cur && (item_cur != &item_nil); item_cur = item_cur->next)
+
+/* generic key handlers */
+int on_key_esc(WINDOW *win);
+int on_key_resize(void);
+
+void init_dialog(const char *backtitle);
+void reset_dialog(void);
 void end_dialog(void);
 void attr_clear(WINDOW * win, int height, int width, chtype attr);
 void dialog_clear(void);
-void color_setup(void);
 void print_autowrap(WINDOW * win, const char *prompt, int width, int y, int x);
 void print_button(WINDOW * win, const char *label, int y, int x, int selected);
 void print_title(WINDOW *dialog, const char *title, int width);
@@ -155,12 +203,10 @@ int dialog_yesno(const char *title, const char *prompt, int height, int width);
 int dialog_msgbox(const char *title, const char *prompt, int height,
                   int width, int pause);
 int dialog_textbox(const char *title, const char *file, int height, int width);
-int dialog_menu(const char *title, const char *prompt, int height, int width,
-                int menu_height, const char *choice, int item_no,
-                const char *const *items);
+int dialog_menu(const char *title, const char *prompt,
+                const void *selected, int *s_scroll);
 int dialog_checklist(const char *title, const char *prompt, int height,
-                     int width, int list_height, int item_no,
-                     const char *const *items);
+                     int width, int list_height);
 extern char dialog_input_result[];
 int dialog_inputbox(const char *title, const char *prompt, int height,
                     int width, const char *init);
diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
index 779503726b0a..05e72066b359 100644
--- a/scripts/kconfig/lxdialog/inputbox.c
+++ b/scripts/kconfig/lxdialog/inputbox.c
@@ -49,6 +49,17 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
         char *instr = dialog_input_result;
         WINDOW *dialog;
 
+        if (!init)
+                instr[0] = '\0';
+        else
+                strcpy(instr, init);
+
+do_resize:
+        if (getmaxy(stdscr) <= (height - 2))
+                return -ERRDISPLAYTOOSMALL;
+        if (getmaxx(stdscr) <= (width - 2))
+                return -ERRDISPLAYTOOSMALL;
+
         /* center dialog box on screen */
         x = (COLS - width) / 2;
         y = (LINES - height) / 2;
@@ -58,17 +69,18 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
         dialog = newwin(height, width, y, x);
         keypad(dialog, TRUE);
 
-        draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
-        wattrset(dialog, border_attr);
+        draw_box(dialog, 0, 0, height, width,
+                 dlg.dialog.atr, dlg.border.atr);
+        wattrset(dialog, dlg.border.atr);
         mvwaddch(dialog, height - 3, 0, ACS_LTEE);
         for (i = 0; i < width - 2; i++)
                 waddch(dialog, ACS_HLINE);
-        wattrset(dialog, dialog_attr);
+        wattrset(dialog, dlg.dialog.atr);
         waddch(dialog, ACS_RTEE);
 
         print_title(dialog, title, width);
 
-        wattrset(dialog, dialog_attr);
+        wattrset(dialog, dlg.dialog.atr);
         print_autowrap(dialog, prompt, width - 2, 1, 3);
 
         /* Draw the input field box */
@@ -76,18 +88,14 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
         getyx(dialog, y, x);
         box_y = y + 2;
         box_x = (width - box_width) / 2;
-        draw_box(dialog, y + 1, box_x - 1, 3, box_width + 2, border_attr, dialog_attr);
+        draw_box(dialog, y + 1, box_x - 1, 3, box_width + 2,
+                 dlg.border.atr, dlg.dialog.atr);
 
         print_buttons(dialog, height, width, 0);
 
         /* Set up the initial value */
         wmove(dialog, box_y, box_x);
-        wattrset(dialog, inputbox_attr);
-
-        if (!init)
-                instr[0] = '\0';
-        else
-                strcpy(instr, init);
+        wattrset(dialog, dlg.inputbox.atr);
 
         input_x = strlen(instr);
 
@@ -104,7 +112,7 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
 
         wrefresh(dialog);
 
-        while (key != ESC) {
+        while (key != KEY_ESC) {
                 key = wgetch(dialog);
 
                 if (button == -1) {     /* Input box selected */
@@ -120,7 +128,7 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
                         case KEY_BACKSPACE:
                         case 127:
                                 if (input_x || scroll) {
-                                        wattrset(dialog, inputbox_attr);
+                                        wattrset(dialog, dlg.inputbox.atr);
                                         if (!input_x) {
                                                 scroll = scroll < box_width - 1 ? 0 : scroll - (box_width - 1);
                                                 wmove(dialog, box_y, box_x);
@@ -140,7 +148,7 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
                         default:
                                 if (key < 0x100 && isprint(key)) {
                                         if (scroll + input_x < MAX_LEN) {
-                                                wattrset(dialog, inputbox_attr);
+                                                wattrset(dialog, dlg.inputbox.atr);
                                                 instr[scroll + input_x] = key;
                                                 instr[scroll + input_x + 1] = '\0';
                                                 if (input_x == box_width - 1) {
@@ -213,12 +221,18 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
                         return (button == -1 ? 0 : button);
                 case 'X':
                 case 'x':
-                        key = ESC;
-                case ESC:
+                        key = KEY_ESC;
+                        break;
+                case KEY_ESC:
+                        key = on_key_esc(dialog);
                         break;
+                case KEY_RESIZE:
+                        delwin(dialog);
+                        on_key_resize();
+                        goto do_resize;
                 }
         }
 
         delwin(dialog);
-        return -1;              /* ESC pressed */
+        return KEY_ESC;         /* ESC pressed */
 }
diff --git a/scripts/kconfig/lxdialog/lxdialog.c b/scripts/kconfig/lxdialog/lxdialog.c
deleted file mode 100644
index 79f6c5fb5cef..000000000000
--- a/scripts/kconfig/lxdialog/lxdialog.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- *  dialog - Display simple dialog boxes from shell scripts
- *
- *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
- *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.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 "dialog.h"
-
-static void Usage(const char *name);
-
-typedef int (jumperFn) (const char *title, int argc, const char *const *argv);
-
-struct Mode {
-        char *name;
-        int argmin, argmax, argmod;
-        jumperFn *jumper;
-};
-
-jumperFn j_menu, j_radiolist, j_yesno, j_textbox, j_inputbox;
-jumperFn j_msgbox, j_infobox;
-
-static struct Mode modes[] = {
-        {"--menu", 9, 0, 3, j_menu},
-        {"--radiolist", 9, 0, 3, j_radiolist},
-        {"--yesno", 5, 5, 1, j_yesno},
-        {"--textbox", 5, 5, 1, j_textbox},
-        {"--inputbox", 5, 6, 1, j_inputbox},
-        {"--msgbox", 5, 5, 1, j_msgbox},
-        {"--infobox", 5, 5, 1, j_infobox},
-        {NULL, 0, 0, 0, NULL}
-};
-
-static struct Mode *modePtr;
-
-#ifdef LOCALE
-#include <locale.h>
-#endif
-
-int main(int argc, const char *const *argv)
-{
-        int offset = 0, opt_clear = 0, end_common_opts = 0, retval;
-        const char *title = NULL;
-
-#ifdef LOCALE
-        (void)setlocale(LC_ALL, "");
-#endif
-
-#ifdef TRACE
-        trace(TRACE_CALLS | TRACE_UPDATE);
-#endif
-        if (argc < 2) {
-                Usage(argv[0]);
-                exit(-1);
-        }
-
-        while (offset < argc - 1 && !end_common_opts) { /* Common options */
-                if (!strcmp(argv[offset + 1], "--title")) {
-                        if (argc - offset < 3 || title != NULL) {
-                                Usage(argv[0]);
-                                exit(-1);
-                        } else {
-                                title = argv[offset + 2];
-                                offset += 2;
-                        }
-                } else if (!strcmp(argv[offset + 1], "--backtitle")) {
-                        if (backtitle != NULL) {
-                                Usage(argv[0]);
-                                exit(-1);
-                        } else {
-                                backtitle = argv[offset + 2];
-                                offset += 2;
-                        }
-                } else if (!strcmp(argv[offset + 1], "--clear")) {
-                        if (opt_clear) {        /* Hey, "--clear" can't appear twice! */
-                                Usage(argv[0]);
-                                exit(-1);
-                        } else if (argc == 2) { /* we only want to clear the screen */
-                                init_dialog();
-                                refresh();      /* init_dialog() will clear the screen for us */
-                                end_dialog();
-                                return 0;
-                        } else {
-                                opt_clear = 1;
-                                offset++;
-                        }
-                } else          /* no more common options */
-                        end_common_opts = 1;
-        }
-
-        if (argc - 1 == offset) {       /* no more options */
-                Usage(argv[0]);
-                exit(-1);
-        }
-        /* use a table to look for the requested mode, to avoid code duplication */
-
-        for (modePtr = modes; modePtr->name; modePtr++) /* look for the mode */
-                if (!strcmp(argv[offset + 1], modePtr->name))
-                        break;
-
-        if (!modePtr->name)
-                Usage(argv[0]);
-        if (argc - offset < modePtr->argmin)
-                Usage(argv[0]);
-        if (modePtr->argmax && argc - offset > modePtr->argmax)
-                Usage(argv[0]);
-
-        init_dialog();
-        retval = (*(modePtr->jumper)) (title, argc - offset, argv + offset);
-
-        if (opt_clear) {        /* clear screen before exit */
-                attr_clear(stdscr, LINES, COLS, screen_attr);
-                refresh();
-        }
-        end_dialog();
-
-        exit(retval);
-}
-
-/*
- * Print program usage
- */
-static void Usage(const char *name)
-{
-        fprintf(stderr, "\
-\ndialog, by Savio Lam (lam836@cs.cuhk.hk).\
-\n  patched by Stuart Herbert (S.Herbert@shef.ac.uk)\
-\n  modified/gutted for use as a Linux kernel config tool by \
-\n  William Roadcap (roadcapw@cfw.com)\
-\n\
-\n* Display dialog boxes from shell scripts *\
-\n\
-\nUsage: %s --clear\
-\n       %s [--title <title>] [--backtitle <backtitle>] --clear <Box options>\
-\n\
-\nBox options:\
-\n\
-\n  --menu      <text> <height> <width> <menu height> <tag1> <item1>...\
-\n  --radiolist <text> <height> <width> <list height> <tag1> <item1> <status1>...\
-\n  --textbox   <file> <height> <width>\
-\n  --inputbox  <text> <height> <width> [<init>]\
-\n  --yesno     <text> <height> <width>\
-\n", name, name);
-        exit(-1);
-}
-
-/*
- * These are the program jumpers
- */
-
-int j_menu(const char *t, int ac, const char *const *av)
-{
-        return dialog_menu(t, av[2], atoi(av[3]), atoi(av[4]),
-                           atoi(av[5]), av[6], (ac - 6) / 2, av + 7);
-}
-
-int j_radiolist(const char *t, int ac, const char *const *av)
-{
-        return dialog_checklist(t, av[2], atoi(av[3]), atoi(av[4]),
-                                atoi(av[5]), (ac - 6) / 3, av + 6);
-}
-
-int j_textbox(const char *t, int ac, const char *const *av)
-{
-        return dialog_textbox(t, av[2], atoi(av[3]), atoi(av[4]));
-}
-
-int j_yesno(const char *t, int ac, const char *const *av)
-{
-        return dialog_yesno(t, av[2], atoi(av[3]), atoi(av[4]));
-}
-
-int j_inputbox(const char *t, int ac, const char *const *av)
-{
-        int ret = dialog_inputbox(t, av[2], atoi(av[3]), atoi(av[4]),
-                                  ac == 6 ? av[5] : (char *)NULL);
-        if (ret == 0)
-                fprintf(stderr, dialog_input_result);
-        return ret;
-}
-
-int j_msgbox(const char *t, int ac, const char *const *av)
-{
-        return dialog_msgbox(t, av[2], atoi(av[3]), atoi(av[4]), 1);
-}
-
-int j_infobox(const char *t, int ac, const char *const *av)
-{
-        return dialog_msgbox(t, av[2], atoi(av[3]), atoi(av[4]), 0);
-}
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index bf8052f4fd4a..0d83159d9012 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -63,19 +63,19 @@ static int menu_width, item_x;
 /*
  * Print menu item
  */
-static void do_print_item(WINDOW * win, const char *item, int choice,
+static void do_print_item(WINDOW * win, const char *item, int line_y,
                           int selected, int hotkey)
 {
         int j;
         char *menu_item = malloc(menu_width + 1);
 
         strncpy(menu_item, item, menu_width - item_x);
-        menu_item[menu_width] = 0;
+        menu_item[menu_width - item_x] = '\0';
         j = first_alpha(menu_item, "YyNnMmHh");
 
         /* Clear 'residue' of last item */
-        wattrset(win, menubox_attr);
-        wmove(win, choice, 0);
+        wattrset(win, dlg.menubox.atr);
+        wmove(win, line_y, 0);
 #if OLD_NCURSES
         {
                 int i;
@@ -85,23 +85,24 @@ static void do_print_item(WINDOW * win, const char *item, int choice,
 #else
         wclrtoeol(win);
 #endif
-        wattrset(win, selected ? item_selected_attr : item_attr);
-        mvwaddstr(win, choice, item_x, menu_item);
+        wattrset(win, selected ? dlg.item_selected.atr : dlg.item.atr);
+        mvwaddstr(win, line_y, item_x, menu_item);
         if (hotkey) {
-                wattrset(win, selected ? tag_key_selected_attr : tag_key_attr);
-                mvwaddch(win, choice, item_x + j, menu_item[j]);
+                wattrset(win, selected ? dlg.tag_key_selected.atr
+                         : dlg.tag_key.atr);
+                mvwaddch(win, line_y, item_x + j, menu_item[j]);
         }
         if (selected) {
-                wmove(win, choice, item_x + 1);
+                wmove(win, line_y, item_x + 1);
         }
         free(menu_item);
         wrefresh(win);
 }
 
-#define print_item(index, choice, selected) \
-do {\
-        int hotkey = (items[(index) * 2][0] != ':'); \
-        do_print_item(menu, items[(index) * 2 + 1], choice, selected, hotkey); \
+#define print_item(index, choice, selected)                             \
+do {                                                                    \
+        item_set(index);                                                \
+        do_print_item(menu, item_str(), choice, selected, !item_is_tag(':')); \
 } while (0)
 
 /*
@@ -117,11 +118,11 @@ static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x,
         wmove(win, y, x);
 
         if (scroll > 0) {
-                wattrset(win, uarrow_attr);
+                wattrset(win, dlg.uarrow.atr);
                 waddch(win, ACS_UARROW);
                 waddstr(win, "(-)");
         } else {
-                wattrset(win, menubox_attr);
+                wattrset(win, dlg.menubox.atr);
                 waddch(win, ACS_HLINE);
                 waddch(win, ACS_HLINE);
                 waddch(win, ACS_HLINE);
@@ -133,11 +134,11 @@ static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x,
         wrefresh(win);
 
         if ((height < item_no) && (scroll + height < item_no)) {
-                wattrset(win, darrow_attr);
+                wattrset(win, dlg.darrow.atr);
                 waddch(win, ACS_DARROW);
                 waddstr(win, "(+)");
         } else {
-                wattrset(win, menubox_border_attr);
+                wattrset(win, dlg.menubox_border.atr);
                 waddch(win, ACS_HLINE);
                 waddch(win, ACS_HLINE);
                 waddch(win, ACS_HLINE);
@@ -178,17 +179,26 @@ static void do_scroll(WINDOW *win, int *scroll, int n)
 /*
  * Display a menu for choosing among a number of options
  */
-int dialog_menu(const char *title, const char *prompt, int height, int width,
-                int menu_height, const char *current, int item_no,
-                const char *const *items)
+int dialog_menu(const char *title, const char *prompt,
+                const void *selected, int *s_scroll)
 {
         int i, j, x, y, box_x, box_y;
+        int height, width, menu_height;
         int key = 0, button = 0, scroll = 0, choice = 0;
         int first_item =  0, max_choice;
         WINDOW *dialog, *menu;
-        FILE *f;
 
-        max_choice = MIN(menu_height, item_no);
+do_resize:
+        height = getmaxy(stdscr);
+        width = getmaxx(stdscr);
+        if (height < 15 || width < 65)
+                return -ERRDISPLAYTOOSMALL;
+
+        height -= 4;
+        width  -= 5;
+        menu_height = height - 10;
+
+        max_choice = MIN(menu_height, item_count());
 
         /* center dialog box on screen */
         x = (COLS - width) / 2;
@@ -199,18 +209,19 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
         dialog = newwin(height, width, y, x);
         keypad(dialog, TRUE);
 
-        draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
-        wattrset(dialog, border_attr);
+        draw_box(dialog, 0, 0, height, width,
+                 dlg.dialog.atr, dlg.border.atr);
+        wattrset(dialog, dlg.border.atr);
         mvwaddch(dialog, height - 3, 0, ACS_LTEE);
         for (i = 0; i < width - 2; i++)
                 waddch(dialog, ACS_HLINE);
-        wattrset(dialog, dialog_attr);
-        wbkgdset(dialog, dialog_attr & A_COLOR);
+        wattrset(dialog, dlg.dialog.atr);
+        wbkgdset(dialog, dlg.dialog.atr & A_COLOR);
         waddch(dialog, ACS_RTEE);
 
         print_title(dialog, title, width);
 
-        wattrset(dialog, dialog_attr);
+        wattrset(dialog, dlg.dialog.atr);
         print_autowrap(dialog, prompt, width - 2, 1, 3);
 
         menu_width = width - 6;
@@ -224,33 +235,29 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
 
         /* draw a box around the menu items */
         draw_box(dialog, box_y, box_x, menu_height + 2, menu_width + 2,
-                 menubox_border_attr, menubox_attr);
+                 dlg.menubox_border.atr, dlg.menubox.atr);
 
-        item_x = (menu_width - 70) / 2;
+        if (menu_width >= 80)
+                item_x = (menu_width - 70) / 2;
+        else
+                item_x = 4;
 
         /* Set choice to default item */
-        for (i = 0; i < item_no; i++)
-                if (strcmp(current, items[i * 2]) == 0)
-                        choice = i;
-
-        /* get the scroll info from the temp file */
-        if ((f = fopen("lxdialog.scrltmp", "r")) != NULL) {
-                if ((fscanf(f, "%d\n", &scroll) == 1) && (scroll <= choice) &&
-                    (scroll + max_choice > choice) && (scroll >= 0) &&
-                    (scroll + max_choice <= item_no)) {
-                        first_item = scroll;
-                        choice = choice - scroll;
-                        fclose(f);
-                } else {
-                        scroll = 0;
-                        remove("lxdialog.scrltmp");
-                        fclose(f);
-                        f = NULL;
-                }
+        item_foreach()
+                if (selected && (selected == item_data()))
+                        choice = item_n();
+        /* get the saved scroll info */
+        scroll = *s_scroll;
+        if ((scroll <= choice) && (scroll + max_choice > choice) &&
+           (scroll >= 0) && (scroll + max_choice <= item_count())) {
+                first_item = scroll;
+                choice = choice - scroll;
+        } else {
+                scroll = 0;
         }
-        if ((choice >= max_choice) || (f == NULL && choice >= max_choice / 2)) {
-                if (choice >= item_no - max_choice / 2)
-                        scroll = first_item = item_no - max_choice;
+        if ((choice >= max_choice)) {
+                if (choice >= item_count() - max_choice / 2)
+                        scroll = first_item = item_count() - max_choice;
                 else
                         scroll = first_item = choice - max_choice / 2;
                 choice = choice - scroll;
@@ -263,14 +270,14 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
 
         wnoutrefresh(menu);
 
-        print_arrows(dialog, item_no, scroll,
+        print_arrows(dialog, item_count(), scroll,
                      box_y, box_x + item_x + 1, menu_height);
 
         print_buttons(dialog, height, width, 0);
         wmove(menu, choice, item_x + 1);
         wrefresh(menu);
 
-        while (key != ESC) {
+        while (key != KEY_ESC) {
                 key = wgetch(menu);
 
                 if (key < 256 && isalpha(key))
@@ -280,14 +287,16 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
                         i = max_choice;
                 else {
                         for (i = choice + 1; i < max_choice; i++) {
-                                j = first_alpha(items[(scroll + i) * 2 + 1], "YyNnMmHh");
-                                if (key == tolower(items[(scroll + i) * 2 + 1][j]))
+                                item_set(scroll + i);
+                                j = first_alpha(item_str(), "YyNnMmHh");
+                                if (key == tolower(item_str()[j]))
                                         break;
                         }
                         if (i == max_choice)
                                 for (i = 0; i < max_choice; i++) {
-                                        j = first_alpha(items [(scroll + i) * 2 + 1], "YyNnMmHh");
-                                        if (key == tolower(items[(scroll + i) * 2 + 1][j]))
+                                        item_set(scroll + i);
+                                        j = first_alpha(item_str(), "YyNnMmHh");
+                                        if (key == tolower(item_str()[j]))
                                                 break;
                                 }
                 }
@@ -312,7 +321,7 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
                                 print_item(scroll+choice, choice, FALSE);
 
                                 if ((choice > max_choice - 3) &&
-                                    (scroll + max_choice < item_no)) {
+                                    (scroll + max_choice < item_count())) {
                                         /* Scroll menu up */
                                         do_scroll(menu, &scroll, 1);
 
@@ -335,7 +344,7 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
 
                         } else if (key == KEY_NPAGE) {
                                 for (i = 0; (i < max_choice); i++) {
-                                        if (scroll + max_choice < item_no) {
+                                        if (scroll + max_choice < item_count()) {
                                                 do_scroll(menu, &scroll, 1);
                                                 print_item(scroll+max_choice-1,
                                                            max_choice - 1, FALSE);
@@ -349,7 +358,7 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
 
                         print_item(scroll + choice, choice, TRUE);
 
-                        print_arrows(dialog, item_no, scroll,
+                        print_arrows(dialog, item_count(), scroll,
                                      box_y, box_x + item_x + 1, menu_height);
 
                         wnoutrefresh(dialog);
@@ -375,12 +384,11 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
                 case 'm':
                 case '/':
                         /* save scroll info */
-                        if ((f = fopen("lxdialog.scrltmp", "w")) != NULL) {
-                                fprintf(f, "%d\n", scroll);
-                                fclose(f);
-                        }
+                        *s_scroll = scroll;
+                        delwin(menu);
                         delwin(dialog);
-                        fprintf(stderr, "%s\n", items[(scroll + choice) * 2]);
+                        item_set(scroll + choice);
+                        item_set_selected(1);
                         switch (key) {
                         case 's':
                                 return 3;
@@ -400,27 +408,27 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
                 case '?':
                         button = 2;
                 case '\n':
+                        *s_scroll = scroll;
+                        delwin(menu);
                         delwin(dialog);
-                        if (button == 2)
-                                fprintf(stderr, "%s \"%s\"\n",
-                                        items[(scroll + choice) * 2],
-                                        items[(scroll + choice) * 2 + 1] +
-                                        first_alpha(items [(scroll + choice) * 2 + 1], ""));
-                        else
-                                fprintf(stderr, "%s\n",
-                                        items[(scroll + choice) * 2]);
-
-                        remove("lxdialog.scrltmp");
+                        item_set(scroll + choice);
+                        item_set_selected(1);
                         return button;
                 case 'e':
                 case 'x':
-                        key = ESC;
-                case ESC:
+                        key = KEY_ESC;
+                        break;
+                case KEY_ESC:
+                        key = on_key_esc(menu);
                         break;
+                case KEY_RESIZE:
+                        on_key_resize();
+                        delwin(menu);
+                        delwin(dialog);
+                        goto do_resize;
                 }
         }
-
+        delwin(menu);
         delwin(dialog);
-        remove("lxdialog.scrltmp");
-        return -1;              /* ESC pressed */
+        return key;             /* ESC pressed */
 }
diff --git a/scripts/kconfig/lxdialog/msgbox.c b/scripts/kconfig/lxdialog/msgbox.c
deleted file mode 100644
index 7323f5471f69..000000000000
--- a/scripts/kconfig/lxdialog/msgbox.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  msgbox.c -- implements the message box and info box
- *
- *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
- *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcapw@cfw.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 "dialog.h"
-
-/*
- * Display a message box. Program will pause and display an "OK" button
- * if the parameter 'pause' is non-zero.
- */
-int dialog_msgbox(const char *title, const char *prompt, int height, int width,
-                  int pause)
-{
-        int i, x, y, key = 0;
-        WINDOW *dialog;
-
-        /* center dialog box on screen */
-        x = (COLS - width) / 2;
-        y = (LINES - height) / 2;
-
-        draw_shadow(stdscr, y, x, height, width);
-
-        dialog = newwin(height, width, y, x);
-        keypad(dialog, TRUE);
-
-        draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
-
-        print_title(dialog, title, width);
-
-        wattrset(dialog, dialog_attr);
-        print_autowrap(dialog, prompt, width - 2, 1, 2);
-
-        if (pause) {
-                wattrset(dialog, border_attr);
-                mvwaddch(dialog, height - 3, 0, ACS_LTEE);
-                for (i = 0; i < width - 2; i++)
-                        waddch(dialog, ACS_HLINE);
-                wattrset(dialog, dialog_attr);
-                waddch(dialog, ACS_RTEE);
-
-                print_button(dialog, "  Ok  ", height - 2, width / 2 - 4, TRUE);
-
-                wrefresh(dialog);
-                while (key != ESC && key != '\n' && key != ' ' &&
-                       key != 'O' && key != 'o' && key != 'X' && key != 'x')
-                        key = wgetch(dialog);
-        } else {
-                key = '\n';
-                wrefresh(dialog);
-        }
-
-        delwin(dialog);
-        return key == ESC ? -1 : 0;
-}
diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
index 77848bb8e07f..fabfc1ad789d 100644
--- a/scripts/kconfig/lxdialog/textbox.c
+++ b/scripts/kconfig/lxdialog/textbox.c
@@ -25,56 +25,62 @@ static void back_lines(int n);
 static void print_page(WINDOW * win, int height, int width);
 static void print_line(WINDOW * win, int row, int width);
 static char *get_line(void);
-static void print_position(WINDOW * win, int height, int width);
+static void print_position(WINDOW * win);
+
+static int hscroll;
+static int begin_reached, end_reached, page_length;
+static const char *buf;
+static const char *page;
+
+/*
+ * refresh window content
+ */
+static void refresh_text_box(WINDOW *dialog, WINDOW *box, int boxh, int boxw,
+                                                          int cur_y, int cur_x)
+{
+        print_page(box, boxh, boxw);
+        print_position(dialog);
+        wmove(dialog, cur_y, cur_x);    /* Restore cursor position */
+        wrefresh(dialog);
+}
 
-static int hscroll, fd, file_size, bytes_read;
-static int begin_reached = 1, end_reached, page_length;
-static char *buf, *page;
 
 /*
  * Display text from a file in a dialog box.
  */
-int dialog_textbox(const char *title, const char *file, int height, int width)
+int dialog_textbox(const char *title, const char *tbuf,
+                   int initial_height, int initial_width)
 {
-        int i, x, y, cur_x, cur_y, fpos, key = 0;
+        int i, x, y, cur_x, cur_y, key = 0;
+        int height, width, boxh, boxw;
         int passed_end;
-        char search_term[MAX_LEN + 1];
-        WINDOW *dialog, *text;
-
-        search_term[0] = '\0';  /* no search term entered yet */
+        WINDOW *dialog, *box;
 
-        /* Open input file for reading */
-        if ((fd = open(file, O_RDONLY)) == -1) {
-                endwin();
-                fprintf(stderr, "\nCan't open input file in dialog_textbox().\n");
-                exit(-1);
-        }
-        /* Get file size. Actually, 'file_size' is the real file size - 1,
-           since it's only the last byte offset from the beginning */
-        if ((file_size = lseek(fd, 0, SEEK_END)) == -1) {
-                endwin();
-                fprintf(stderr, "\nError getting file size in dialog_textbox().\n");
-                exit(-1);
-        }
-        /* Restore file pointer to beginning of file after getting file size */
-        if (lseek(fd, 0, SEEK_SET) == -1) {
-                endwin();
-                fprintf(stderr, "\nError moving file pointer in dialog_textbox().\n");
-                exit(-1);
-        }
-        /* Allocate space for read buffer */
-        if ((buf = malloc(BUF_SIZE + 1)) == NULL) {
-                endwin();
-                fprintf(stderr, "\nCan't allocate memory in dialog_textbox().\n");
-                exit(-1);
-        }
-        if ((bytes_read = read(fd, buf, BUF_SIZE)) == -1) {
-                endwin();
-                fprintf(stderr, "\nError reading file in dialog_textbox().\n");
-                exit(-1);
-        }
-        buf[bytes_read] = '\0'; /* mark end of valid data */
-        page = buf;             /* page is pointer to start of page to be displayed */
+        begin_reached = 1;
+        end_reached = 0;
+        page_length = 0;
+        hscroll = 0;
+        buf = tbuf;
+        page = buf;     /* page is pointer to start of page to be displayed */
+
+do_resize:
+        getmaxyx(stdscr, height, width);
+        if (height < 8 || width < 8)
+                return -ERRDISPLAYTOOSMALL;
+        if (initial_height != 0)
+                height = initial_height;
+        else
+                if (height > 4)
+                        height -= 4;
+                else
+                        height = 0;
+        if (initial_width != 0)
+                width = initial_width;
+        else
+                if (width > 5)
+                        width -= 5;
+                else
+                        width = 0;
 
         /* center dialog box on screen */
         x = (COLS - width) / 2;
@@ -85,22 +91,25 @@ int dialog_textbox(const char *title, const char *file, int height, int width)
         dialog = newwin(height, width, y, x);
         keypad(dialog, TRUE);
 
-        /* Create window for text region, used for scrolling text */
-        text = subwin(dialog, height - 4, width - 2, y + 1, x + 1);
-        wattrset(text, dialog_attr);
-        wbkgdset(text, dialog_attr & A_COLOR);
+        /* Create window for box region, used for scrolling text */
+        boxh = height - 4;
+        boxw = width - 2;
+        box = subwin(dialog, boxh, boxw, y + 1, x + 1);
+        wattrset(box, dlg.dialog.atr);
+        wbkgdset(box, dlg.dialog.atr & A_COLOR);
 
-        keypad(text, TRUE);
+        keypad(box, TRUE);
 
         /* register the new window, along with its borders */
-        draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
+        draw_box(dialog, 0, 0, height, width,
+                 dlg.dialog.atr, dlg.border.atr);
 
-        wattrset(dialog, border_attr);
+        wattrset(dialog, dlg.border.atr);
         mvwaddch(dialog, height - 3, 0, ACS_LTEE);
         for (i = 0; i < width - 2; i++)
                 waddch(dialog, ACS_HLINE);
-        wattrset(dialog, dialog_attr);
-        wbkgdset(dialog, dialog_attr & A_COLOR);
+        wattrset(dialog, dlg.dialog.atr);
+        wbkgdset(dialog, dlg.dialog.atr & A_COLOR);
         waddch(dialog, ACS_RTEE);
 
         print_title(dialog, title, width);
@@ -110,85 +119,37 @@ int dialog_textbox(const char *title, const char *file, int height, int width)
         getyx(dialog, cur_y, cur_x);    /* Save cursor position */
 
         /* Print first page of text */
-        attr_clear(text, height - 4, width - 2, dialog_attr);
-        print_page(text, height - 4, width - 2);
-        print_position(dialog, height, width);
-        wmove(dialog, cur_y, cur_x);    /* Restore cursor position */
-        wrefresh(dialog);
+        attr_clear(box, boxh, boxw, dlg.dialog.atr);
+        refresh_text_box(dialog, box, boxh, boxw, cur_y, cur_x);
 
-        while ((key != ESC) && (key != '\n')) {
+        while ((key != KEY_ESC) && (key != '\n')) {
                 key = wgetch(dialog);
                 switch (key) {
                 case 'E':       /* Exit */
                 case 'e':
                 case 'X':
                 case 'x':
+                        delwin(box);
                         delwin(dialog);
-                        free(buf);
-                        close(fd);
                         return 0;
                 case 'g':       /* First page */
                 case KEY_HOME:
                         if (!begin_reached) {
                                 begin_reached = 1;
-                                /* First page not in buffer? */
-                                if ((fpos = lseek(fd, 0, SEEK_CUR)) == -1) {
-                                        endwin();
-                                        fprintf(stderr, "\nError moving file pointer in dialog_textbox().\n");
-                                        exit(-1);
-                                }
-                                if (fpos > bytes_read) {        /* Yes, we have to read it in */
-                                        if (lseek(fd, 0, SEEK_SET) == -1) {
-                                                endwin();
-                                                fprintf(stderr, "\nError moving file pointer in "
-                                                                "dialog_textbox().\n");
-                                                exit(-1);
-                                        }
-                                        if ((bytes_read =
-                                             read(fd, buf, BUF_SIZE)) == -1) {
-                                                endwin();
-                                                fprintf(stderr, "\nError reading file in dialog_textbox().\n");
-                                                exit(-1);
-                                        }
-                                        buf[bytes_read] = '\0';
-                                }
                                 page = buf;
-                                print_page(text, height - 4, width - 2);
-                                print_position(dialog, height, width);
-                                wmove(dialog, cur_y, cur_x);    /* Restore cursor position */
-                                wrefresh(dialog);
+                                refresh_text_box(dialog, box, boxh, boxw,
+                                                 cur_y, cur_x);
                         }
                         break;
                 case 'G':       /* Last page */
                 case KEY_END:
 
                         end_reached = 1;
-                        /* Last page not in buffer? */
-                        if ((fpos = lseek(fd, 0, SEEK_CUR)) == -1) {
-                                endwin();
-                                fprintf(stderr, "\nError moving file pointer in dialog_textbox().\n");
-                                exit(-1);
-                        }
-                        if (fpos < file_size) { /* Yes, we have to read it in */
-                                if (lseek(fd, -BUF_SIZE, SEEK_END) == -1) {
-                                        endwin();
-                                        fprintf(stderr, "\nError moving file pointer in dialog_textbox().\n");
-                                        exit(-1);
-                                }
-                                if ((bytes_read =
-                                     read(fd, buf, BUF_SIZE)) == -1) {
-                                        endwin();
-                                        fprintf(stderr, "\nError reading file in dialog_textbox().\n");
-                                        exit(-1);
-                                }
-                                buf[bytes_read] = '\0';
-                        }
-                        page = buf + bytes_read;
-                        back_lines(height - 4);
-                        print_page(text, height - 4, width - 2);
-                        print_position(dialog, height, width);
-                        wmove(dialog, cur_y, cur_x);    /* Restore cursor position */
-                        wrefresh(dialog);
+                        /* point to last char in buf */
+                        page = buf + strlen(buf);
+                        back_lines(boxh);
+                        refresh_text_box(dialog, box, boxh, boxw,
+                                         cur_y, cur_x);
                         break;
                 case 'K':       /* Previous line */
                 case 'k':
@@ -196,21 +157,23 @@ int dialog_textbox(const char *title, const char *file, int height, int width)
                         if (!begin_reached) {
                                 back_lines(page_length + 1);
 
-                                /* We don't call print_page() here but use scrolling to ensure
-                                   faster screen update. However, 'end_reached' and
-                                   'page_length' should still be updated, and 'page' should
-                                   point to start of next page. This is done by calling
-                                   get_line() in the following 'for' loop. */
-                                scrollok(text, TRUE);
-                                wscrl(text, -1);        /* Scroll text region down one line */
-                                scrollok(text, FALSE);
+                                /* We don't call print_page() here but use
+                                 * scrolling to ensure faster screen update.
+                                 * However, 'end_reached' and 'page_length'
+                                 * should still be updated, and 'page' should
+                                 * point to start of next page. This is done
+                                 * by calling get_line() in the following
+                                 * 'for' loop. */
+                                scrollok(box, TRUE);
+                                wscrl(box, -1); /* Scroll box region down one line */
+                                scrollok(box, FALSE);
                                 page_length = 0;
                                 passed_end = 0;
-                                for (i = 0; i < height - 4; i++) {
+                                for (i = 0; i < boxh; i++) {
                                         if (!i) {
                                                 /* print first line of page */
-                                                print_line(text, 0, width - 2);
-                                                wnoutrefresh(text);
+                                                print_line(box, 0, boxw);
+                                                wnoutrefresh(box);
                                         } else
                                                 /* Called to update 'end_reached' and 'page' */
                                                 get_line();
@@ -220,7 +183,7 @@ int dialog_textbox(const char *title, const char *file, int height, int width)
                                                 passed_end = 1;
                                 }
 
-                                print_position(dialog, height, width);
+                                print_position(dialog);
                                 wmove(dialog, cur_y, cur_x);    /* Restore cursor position */
                                 wrefresh(dialog);
                         }
@@ -230,23 +193,21 @@ int dialog_textbox(const char *title, const char *file, int height, int width)
                 case KEY_PPAGE:
                         if (begin_reached)
                                 break;
-                        back_lines(page_length + height - 4);
-                        print_page(text, height - 4, width - 2);
-                        print_position(dialog, height, width);
-                        wmove(dialog, cur_y, cur_x);
-                        wrefresh(dialog);
+                        back_lines(page_length + boxh);
+                        refresh_text_box(dialog, box, boxh, boxw,
+                                         cur_y, cur_x);
                         break;
                 case 'J':       /* Next line */
                 case 'j':
                 case KEY_DOWN:
                         if (!end_reached) {
                                 begin_reached = 0;
-                                scrollok(text, TRUE);
-                                scroll(text);   /* Scroll text region up one line */
-                                scrollok(text, FALSE);
-                                print_line(text, height - 5, width - 2);
-                                wnoutrefresh(text);
-                                print_position(dialog, height, width);
+                                scrollok(box, TRUE);
+                                scroll(box);    /* Scroll box region up one line */
+                                scrollok(box, FALSE);
+                                print_line(box, boxh - 1, boxw);
+                                wnoutrefresh(box);
+                                print_position(dialog);
                                 wmove(dialog, cur_y, cur_x);    /* Restore cursor position */
                                 wrefresh(dialog);
                         }
@@ -257,10 +218,8 @@ int dialog_textbox(const char *title, const char *file, int height, int width)
                                 break;
 
                         begin_reached = 0;
-                        print_page(text, height - 4, width - 2);
-                        print_position(dialog, height, width);
-                        wmove(dialog, cur_y, cur_x);
-                        wrefresh(dialog);
+                        refresh_text_box(dialog, box, boxh, boxw,
+                                         cur_y, cur_x);
                         break;
                 case '0':       /* Beginning of line */
                 case 'H':       /* Scroll left */
@@ -275,9 +234,8 @@ int dialog_textbox(const char *title, const char *file, int height, int width)
                                 hscroll--;
                         /* Reprint current page to scroll horizontally */
                         back_lines(page_length);
-                        print_page(text, height - 4, width - 2);
-                        wmove(dialog, cur_y, cur_x);
-                        wrefresh(dialog);
+                        refresh_text_box(dialog, box, boxh, boxw,
+                                         cur_y, cur_x);
                         break;
                 case 'L':       /* Scroll right */
                 case 'l':
@@ -287,131 +245,56 @@ int dialog_textbox(const char *title, const char *file, int height, int width)
                         hscroll++;
                         /* Reprint current page to scroll horizontally */
                         back_lines(page_length);
-                        print_page(text, height - 4, width - 2);
-                        wmove(dialog, cur_y, cur_x);
-                        wrefresh(dialog);
+                        refresh_text_box(dialog, box, boxh, boxw,
+                                         cur_y, cur_x);
                         break;
-                case ESC:
+                case KEY_ESC:
+                        key = on_key_esc(dialog);
                         break;
+                case KEY_RESIZE:
+                        back_lines(height);
+                        delwin(box);
+                        delwin(dialog);
+                        on_key_resize();
+                        goto do_resize;
                 }
         }
-
+        delwin(box);
         delwin(dialog);
-        free(buf);
-        close(fd);
-        return -1;              /* ESC pressed */
+        return key;             /* ESC pressed */
 }
 
 /*
- * Go back 'n' lines in text file. Called by dialog_textbox().
+ * Go back 'n' lines in text. Called by dialog_textbox().
  * 'page' will be updated to point to the desired line in 'buf'.
  */
 static void back_lines(int n)
 {
-        int i, fpos;
+        int i;
 
         begin_reached = 0;
-        /* We have to distinguish between end_reached and !end_reached
-           since at end of file, the line is not ended by a '\n'.
-           The code inside 'if' basically does a '--page' to move one
-           character backward so as to skip '\n' of the previous line */
-        if (!end_reached) {
-                /* Either beginning of buffer or beginning of file reached? */
-                if (page == buf) {
-                        if ((fpos = lseek(fd, 0, SEEK_CUR)) == -1) {
-                                endwin();
-                                fprintf(stderr, "\nError moving file pointer in "
-                                                "back_lines().\n");
-                                exit(-1);
-                        }
-                        if (fpos > bytes_read) {        /* Not beginning of file yet */
-                                /* We've reached beginning of buffer, but not beginning of
-                                   file yet, so read previous part of file into buffer.
-                                   Note that we only move backward for BUF_SIZE/2 bytes,
-                                   but not BUF_SIZE bytes to avoid re-reading again in
-                                   print_page() later */
-                                /* Really possible to move backward BUF_SIZE/2 bytes? */
-                                if (fpos < BUF_SIZE / 2 + bytes_read) {
-                                        /* No, move less then */
-                                        if (lseek(fd, 0, SEEK_SET) == -1) {
-                                                endwin();
-                                                fprintf(stderr, "\nError moving file pointer in "
-                                                                "back_lines().\n");
-                                                exit(-1);
-                                        }
-                                        page = buf + fpos - bytes_read;
-                                } else {        /* Move backward BUF_SIZE/2 bytes */
-                                        if (lseek (fd, -(BUF_SIZE / 2 + bytes_read), SEEK_CUR) == -1) {
-                                                endwin();
-                                                fprintf(stderr, "\nError moving file pointer "
-                                                                "in back_lines().\n");
-                                                exit(-1);
-                                        }
-                                        page = buf + BUF_SIZE / 2;
-                                }
-                                if ((bytes_read =
-                                     read(fd, buf, BUF_SIZE)) == -1) {
-                                        endwin();
-                                        fprintf(stderr, "\nError reading file in back_lines().\n");
-                                        exit(-1);
-                                }
-                                buf[bytes_read] = '\0';
-                        } else {        /* Beginning of file reached */
-                                begin_reached = 1;
-                                return;
+        /* Go back 'n' lines */
+        for (i = 0; i < n; i++) {
+                if (*page == '\0') {
+                        if (end_reached) {
+                                end_reached = 0;
+                                continue;
                         }
                 }
-                if (*(--page) != '\n') {        /* '--page' here */
-                        /* Something's wrong... */
-                        endwin();
-                        fprintf(stderr, "\nInternal error in back_lines().\n");
-                        exit(-1);
+                if (page == buf) {
+                        begin_reached = 1;
+                        return;
                 }
-        }
-        /* Go back 'n' lines */
-        for (i = 0; i < n; i++)
+                page--;
                 do {
                         if (page == buf) {
-                                if ((fpos = lseek(fd, 0, SEEK_CUR)) == -1) {
-                                        endwin();
-                                        fprintf(stderr, "\nError moving file pointer in back_lines().\n");
-                                        exit(-1);
-                                }
-                                if (fpos > bytes_read) {
-                                        /* Really possible to move backward BUF_SIZE/2 bytes? */
-                                        if (fpos < BUF_SIZE / 2 + bytes_read) {
-                                                /* No, move less then */
-                                                if (lseek(fd, 0, SEEK_SET) == -1) {
-                                                        endwin();
-                                                        fprintf(stderr, "\nError moving file pointer "
-                                                                        "in back_lines().\n");
-                                                        exit(-1);
-                                                }
-                                                page = buf + fpos - bytes_read;
-                                        } else {        /* Move backward BUF_SIZE/2 bytes */
-                                                if (lseek (fd, -(BUF_SIZE / 2 + bytes_read), SEEK_CUR) == -1) {
-                                                        endwin();
-                                                        fprintf(stderr, "\nError moving file pointer"
-                                                                        " in back_lines().\n");
-                                                        exit(-1);
-                                                }
-                                                page = buf + BUF_SIZE / 2;
-                                        }
-                                        if ((bytes_read =
-                                             read(fd, buf, BUF_SIZE)) == -1) {
-                                                endwin();
-                                                fprintf(stderr, "\nError reading file in "
-                                                                "back_lines().\n");
-                                                exit(-1);
-                                        }
-                                        buf[bytes_read] = '\0';
-                                } else {        /* Beginning of file reached */
-                                        begin_reached = 1;
-                                        return;
-                                }
+                                begin_reached = 1;
+                                return;
                         }
-                } while (*(--page) != '\n');
-        page++;
+                        page--;
+                } while (*page != '\n');
+                page++;
+        }
 }
 
 /*
@@ -466,33 +349,14 @@ static void print_line(WINDOW * win, int row, int width)
  */
 static char *get_line(void)
 {
-        int i = 0, fpos;
+        int i = 0;
         static char line[MAX_LEN + 1];
 
         end_reached = 0;
         while (*page != '\n') {
                 if (*page == '\0') {
-                        /* Either end of file or end of buffer reached */
-                        if ((fpos = lseek(fd, 0, SEEK_CUR)) == -1) {
-                                endwin();
-                                fprintf(stderr, "\nError moving file pointer in "
-                                                "get_line().\n");
-                                exit(-1);
-                        }
-                        if (fpos < file_size) { /* Not end of file yet */
-                                /* We've reached end of buffer, but not end of file yet,
-                                   so read next part of file into buffer */
-                                if ((bytes_read =
-                                     read(fd, buf, BUF_SIZE)) == -1) {
-                                        endwin();
-                                        fprintf(stderr, "\nError reading file in get_line().\n");
-                                        exit(-1);
-                                }
-                                buf[bytes_read] = '\0';
-                                page = buf;
-                        } else {
-                                if (!end_reached)
-                                        end_reached = 1;
+                        if (!end_reached) {
+                                end_reached = 1;
                                 break;
                         }
                 } else if (i < MAX_LEN)
@@ -515,19 +379,13 @@ static char *get_line(void)
 /*
  * Print current position
  */
-static void print_position(WINDOW * win, int height, int width)
+static void print_position(WINDOW * win)
 {
-        int fpos, percent;
+        int percent;
 
-        if ((fpos = lseek(fd, 0, SEEK_CUR)) == -1) {
-                endwin();
-                fprintf(stderr, "\nError moving file pointer in print_position().\n");
-                exit(-1);
-        }
-        wattrset(win, position_indicator_attr);
-        wbkgdset(win, position_indicator_attr & A_COLOR);
-        percent = !file_size ?
-            100 : ((fpos - bytes_read + page - buf) * 100) / file_size;
-        wmove(win, height - 3, width - 9);
+        wattrset(win, dlg.position_indicator.atr);
+        wbkgdset(win, dlg.position_indicator.atr & A_COLOR);
+        percent = (page - buf) * 100 / strlen(buf);
+        wmove(win, getmaxy(win) - 3, getmaxx(win) - 9);
         wprintw(win, "(%3d%%)", percent);
 }
diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
index f82cebb9ff06..ebc781b493d7 100644
--- a/scripts/kconfig/lxdialog/util.c
+++ b/scripts/kconfig/lxdialog/util.c
@@ -21,85 +21,217 @@
 
 #include "dialog.h"
 
-/* use colors by default? */
-bool use_colors = 1;
+struct dialog_info dlg;
 
-const char *backtitle = NULL;
+static void set_mono_theme(void)
+{
+        dlg.screen.atr = A_NORMAL;
+        dlg.shadow.atr = A_NORMAL;
+        dlg.dialog.atr = A_NORMAL;
+        dlg.title.atr = A_BOLD;
+        dlg.border.atr = A_NORMAL;
+        dlg.button_active.atr = A_REVERSE;
+        dlg.button_inactive.atr = A_DIM;
+        dlg.button_key_active.atr = A_REVERSE;
+        dlg.button_key_inactive.atr = A_BOLD;
+        dlg.button_label_active.atr = A_REVERSE;
+        dlg.button_label_inactive.atr = A_NORMAL;
+        dlg.inputbox.atr = A_NORMAL;
+        dlg.inputbox_border.atr = A_NORMAL;
+        dlg.searchbox.atr = A_NORMAL;
+        dlg.searchbox_title.atr = A_BOLD;
+        dlg.searchbox_border.atr = A_NORMAL;
+        dlg.position_indicator.atr = A_BOLD;
+        dlg.menubox.atr = A_NORMAL;
+        dlg.menubox_border.atr = A_NORMAL;
+        dlg.item.atr = A_NORMAL;
+        dlg.item_selected.atr = A_REVERSE;
+        dlg.tag.atr = A_BOLD;
+        dlg.tag_selected.atr = A_REVERSE;
+        dlg.tag_key.atr = A_BOLD;
+        dlg.tag_key_selected.atr = A_REVERSE;
+        dlg.check.atr = A_BOLD;
+        dlg.check_selected.atr = A_REVERSE;
+        dlg.uarrow.atr = A_BOLD;
+        dlg.darrow.atr = A_BOLD;
+}
+
+#define DLG_COLOR(dialog, f, b, h) \
+do {                               \
+        dlg.dialog.fg = (f);       \
+        dlg.dialog.bg = (b);       \
+        dlg.dialog.hl = (h);       \
+} while (0)
+
+static void set_classic_theme(void)
+{
+        DLG_COLOR(screen,                COLOR_CYAN,   COLOR_BLUE,   true);
+        DLG_COLOR(shadow,                COLOR_BLACK,  COLOR_BLACK,  true);
+        DLG_COLOR(dialog,                COLOR_BLACK,  COLOR_WHITE,  false);
+        DLG_COLOR(title,                 COLOR_YELLOW, COLOR_WHITE,  true);
+        DLG_COLOR(border,                COLOR_WHITE,  COLOR_WHITE,  true);
+        DLG_COLOR(button_active,         COLOR_WHITE,  COLOR_BLUE,   true);
+        DLG_COLOR(button_inactive,       COLOR_BLACK,  COLOR_WHITE,  false);
+        DLG_COLOR(button_key_active,     COLOR_WHITE,  COLOR_BLUE,   true);
+        DLG_COLOR(button_key_inactive,   COLOR_RED,    COLOR_WHITE,  false);
+        DLG_COLOR(button_label_active,   COLOR_YELLOW, COLOR_BLUE,   true);
+        DLG_COLOR(button_label_inactive, COLOR_BLACK,  COLOR_WHITE,  true);
+        DLG_COLOR(inputbox,              COLOR_BLACK,  COLOR_WHITE,  false);
+        DLG_COLOR(inputbox_border,       COLOR_BLACK,  COLOR_WHITE,  false);
+        DLG_COLOR(searchbox,             COLOR_BLACK,  COLOR_WHITE,  false);
+        DLG_COLOR(searchbox_title,       COLOR_YELLOW, COLOR_WHITE,  true);
+        DLG_COLOR(searchbox_border,      COLOR_WHITE,  COLOR_WHITE,  true);
+        DLG_COLOR(position_indicator,    COLOR_YELLOW, COLOR_WHITE,  true);
+        DLG_COLOR(menubox,               COLOR_BLACK,  COLOR_WHITE,  false);
+        DLG_COLOR(menubox_border,        COLOR_WHITE,  COLOR_WHITE,  true);
+        DLG_COLOR(item,                  COLOR_BLACK,  COLOR_WHITE,  false);
+        DLG_COLOR(item_selected,         COLOR_WHITE,  COLOR_BLUE,   true);
+        DLG_COLOR(tag,                   COLOR_YELLOW, COLOR_WHITE,  true);
+        DLG_COLOR(tag_selected,          COLOR_YELLOW, COLOR_BLUE,   true);
+        DLG_COLOR(tag_key,               COLOR_YELLOW, COLOR_WHITE,  true);
+        DLG_COLOR(tag_key_selected,      COLOR_YELLOW, COLOR_BLUE,   true);
+        DLG_COLOR(check,                 COLOR_BLACK,  COLOR_WHITE,  false);
+        DLG_COLOR(check_selected,        COLOR_WHITE,  COLOR_BLUE,   true);
+        DLG_COLOR(uarrow,                COLOR_GREEN,  COLOR_WHITE,  true);
+        DLG_COLOR(darrow,                COLOR_GREEN,  COLOR_WHITE,  true);
+}
+
+static void set_blackbg_theme(void)
+{
+        DLG_COLOR(screen, COLOR_RED,   COLOR_BLACK, true);
+        DLG_COLOR(shadow, COLOR_BLACK, COLOR_BLACK, false);
+        DLG_COLOR(dialog, COLOR_WHITE, COLOR_BLACK, false);
+        DLG_COLOR(title,  COLOR_RED,   COLOR_BLACK, false);
+        DLG_COLOR(border, COLOR_BLACK, COLOR_BLACK, true);
+
+        DLG_COLOR(button_active,         COLOR_YELLOW, COLOR_RED,   false);
+        DLG_COLOR(button_inactive,       COLOR_YELLOW, COLOR_BLACK, false);
+        DLG_COLOR(button_key_active,     COLOR_YELLOW, COLOR_RED,   true);
+        DLG_COLOR(button_key_inactive,   COLOR_RED,    COLOR_BLACK, false);
+        DLG_COLOR(button_label_active,   COLOR_WHITE,  COLOR_RED,   false);
+        DLG_COLOR(button_label_inactive, COLOR_BLACK,  COLOR_BLACK, true);
+
+        DLG_COLOR(inputbox,         COLOR_YELLOW, COLOR_BLACK, false);
+        DLG_COLOR(inputbox_border,  COLOR_YELLOW, COLOR_BLACK, false);
+
+        DLG_COLOR(searchbox,        COLOR_YELLOW, COLOR_BLACK, false);
+        DLG_COLOR(searchbox_title,  COLOR_YELLOW, COLOR_BLACK, true);
+        DLG_COLOR(searchbox_border, COLOR_BLACK,  COLOR_BLACK, true);
+
+        DLG_COLOR(position_indicator, COLOR_RED, COLOR_BLACK,  false);
+
+        DLG_COLOR(menubox,          COLOR_YELLOW, COLOR_BLACK, false);
+        DLG_COLOR(menubox_border,   COLOR_BLACK,  COLOR_BLACK, true);
+
+        DLG_COLOR(item,             COLOR_WHITE, COLOR_BLACK, false);
+        DLG_COLOR(item_selected,    COLOR_WHITE, COLOR_RED,   false);
+
+        DLG_COLOR(tag,              COLOR_RED,    COLOR_BLACK, false);
+        DLG_COLOR(tag_selected,     COLOR_YELLOW, COLOR_RED,   true);
+        DLG_COLOR(tag_key,          COLOR_RED,    COLOR_BLACK, false);
+        DLG_COLOR(tag_key_selected, COLOR_YELLOW, COLOR_RED,   true);
+
+        DLG_COLOR(check,            COLOR_YELLOW, COLOR_BLACK, false);
+        DLG_COLOR(check_selected,   COLOR_YELLOW, COLOR_RED,   true);
+
+        DLG_COLOR(uarrow, COLOR_RED, COLOR_BLACK, false);
+        DLG_COLOR(darrow, COLOR_RED, COLOR_BLACK, false);
+}
+
+static void set_bluetitle_theme(void)
+{
+        set_classic_theme();
+        DLG_COLOR(title,               COLOR_BLUE,   COLOR_WHITE, true);
+        DLG_COLOR(button_key_active,   COLOR_YELLOW, COLOR_BLUE,  true);
+        DLG_COLOR(button_label_active, COLOR_WHITE,  COLOR_BLUE,  true);
+        DLG_COLOR(searchbox_title,     COLOR_BLUE,   COLOR_WHITE, true);
+        DLG_COLOR(position_indicator,  COLOR_BLUE,   COLOR_WHITE, true);
+        DLG_COLOR(tag,                 COLOR_BLUE,   COLOR_WHITE, true);
+        DLG_COLOR(tag_key,             COLOR_BLUE,   COLOR_WHITE, true);
+
+}
 
 /*
- * Attribute values, default is for mono display
+ * Select color theme
  */
-chtype attributes[] = {
-        A_NORMAL,               /* screen_attr */
-        A_NORMAL,               /* shadow_attr */
-        A_NORMAL,               /* dialog_attr */
-        A_BOLD,                 /* title_attr */
-        A_NORMAL,               /* border_attr */
-        A_REVERSE,              /* button_active_attr */
-        A_DIM,                  /* button_inactive_attr */
-        A_REVERSE,              /* button_key_active_attr */
-        A_BOLD,                 /* button_key_inactive_attr */
-        A_REVERSE,              /* button_label_active_attr */
-        A_NORMAL,               /* button_label_inactive_attr */
-        A_NORMAL,               /* inputbox_attr */
-        A_NORMAL,               /* inputbox_border_attr */
-        A_NORMAL,               /* searchbox_attr */
-        A_BOLD,                 /* searchbox_title_attr */
-        A_NORMAL,               /* searchbox_border_attr */
-        A_BOLD,                 /* position_indicator_attr */
-        A_NORMAL,               /* menubox_attr */
-        A_NORMAL,               /* menubox_border_attr */
-        A_NORMAL,               /* item_attr */
-        A_REVERSE,              /* item_selected_attr */
-        A_BOLD,                 /* tag_attr */
-        A_REVERSE,              /* tag_selected_attr */
-        A_BOLD,                 /* tag_key_attr */
-        A_REVERSE,              /* tag_key_selected_attr */
-        A_BOLD,                 /* check_attr */
-        A_REVERSE,              /* check_selected_attr */
-        A_BOLD,                 /* uarrow_attr */
-        A_BOLD                  /* darrow_attr */
-};
-
-#include "colors.h"
+static int set_theme(const char *theme)
+{
+        int use_color = 1;
+        if (!theme)
+                set_bluetitle_theme();
+        else if (strcmp(theme, "classic") == 0)
+                set_classic_theme();
+        else if (strcmp(theme, "bluetitle") == 0)
+                set_bluetitle_theme();
+        else if (strcmp(theme, "blackbg") == 0)
+                set_blackbg_theme();
+        else if (strcmp(theme, "mono") == 0)
+                use_color = 0;
+
+        return use_color;
+}
+
+static void init_one_color(struct dialog_color *color)
+{
+        static int pair = 0;
+
+        pair++;
+        init_pair(pair, color->fg, color->bg);
+        if (color->hl)
+                color->atr = A_BOLD | COLOR_PAIR(pair);
+        else
+                color->atr = COLOR_PAIR(pair);
+}
+
+static void init_dialog_colors(void)
+{
+        init_one_color(&dlg.screen);
+        init_one_color(&dlg.shadow);
+        init_one_color(&dlg.dialog);
+        init_one_color(&dlg.title);
+        init_one_color(&dlg.border);
+        init_one_color(&dlg.button_active);
+        init_one_color(&dlg.button_inactive);
+        init_one_color(&dlg.button_key_active);
+        init_one_color(&dlg.button_key_inactive);
+        init_one_color(&dlg.button_label_active);
+        init_one_color(&dlg.button_label_inactive);
+        init_one_color(&dlg.inputbox);
+        init_one_color(&dlg.inputbox_border);
+        init_one_color(&dlg.searchbox);
+        init_one_color(&dlg.searchbox_title);
+        init_one_color(&dlg.searchbox_border);
+        init_one_color(&dlg.position_indicator);
+        init_one_color(&dlg.menubox);
+        init_one_color(&dlg.menubox_border);
+        init_one_color(&dlg.item);
+        init_one_color(&dlg.item_selected);
+        init_one_color(&dlg.tag);
+        init_one_color(&dlg.tag_selected);
+        init_one_color(&dlg.tag_key);
+        init_one_color(&dlg.tag_key_selected);
+        init_one_color(&dlg.check);
+        init_one_color(&dlg.check_selected);
+        init_one_color(&dlg.uarrow);
+        init_one_color(&dlg.darrow);
+}
 
 /*
- * Table of color values
+ * Setup for color display
  */
-int color_table[][3] = {
-        {SCREEN_FG, SCREEN_BG, SCREEN_HL},
-        {SHADOW_FG, SHADOW_BG, SHADOW_HL},
-        {DIALOG_FG, DIALOG_BG, DIALOG_HL},
-        {TITLE_FG, TITLE_BG, TITLE_HL},
-        {BORDER_FG, BORDER_BG, BORDER_HL},
-        {BUTTON_ACTIVE_FG, BUTTON_ACTIVE_BG, BUTTON_ACTIVE_HL},
-        {BUTTON_INACTIVE_FG, BUTTON_INACTIVE_BG, BUTTON_INACTIVE_HL},
-        {BUTTON_KEY_ACTIVE_FG, BUTTON_KEY_ACTIVE_BG, BUTTON_KEY_ACTIVE_HL},
-        {BUTTON_KEY_INACTIVE_FG, BUTTON_KEY_INACTIVE_BG,
-         BUTTON_KEY_INACTIVE_HL},
-        {BUTTON_LABEL_ACTIVE_FG, BUTTON_LABEL_ACTIVE_BG,
-         BUTTON_LABEL_ACTIVE_HL},
-        {BUTTON_LABEL_INACTIVE_FG, BUTTON_LABEL_INACTIVE_BG,
-         BUTTON_LABEL_INACTIVE_HL},
-        {INPUTBOX_FG, INPUTBOX_BG, INPUTBOX_HL},
-        {INPUTBOX_BORDER_FG, INPUTBOX_BORDER_BG, INPUTBOX_BORDER_HL},
-        {SEARCHBOX_FG, SEARCHBOX_BG, SEARCHBOX_HL},
-        {SEARCHBOX_TITLE_FG, SEARCHBOX_TITLE_BG, SEARCHBOX_TITLE_HL},
-        {SEARCHBOX_BORDER_FG, SEARCHBOX_BORDER_BG, SEARCHBOX_BORDER_HL},
-        {POSITION_INDICATOR_FG, POSITION_INDICATOR_BG, POSITION_INDICATOR_HL},
-        {MENUBOX_FG, MENUBOX_BG, MENUBOX_HL},
-        {MENUBOX_BORDER_FG, MENUBOX_BORDER_BG, MENUBOX_BORDER_HL},
-        {ITEM_FG, ITEM_BG, ITEM_HL},
-        {ITEM_SELECTED_FG, ITEM_SELECTED_BG, ITEM_SELECTED_HL},
-        {TAG_FG, TAG_BG, TAG_HL},
-        {TAG_SELECTED_FG, TAG_SELECTED_BG, TAG_SELECTED_HL},
-        {TAG_KEY_FG, TAG_KEY_BG, TAG_KEY_HL},
-        {TAG_KEY_SELECTED_FG, TAG_KEY_SELECTED_BG, TAG_KEY_SELECTED_HL},
-        {CHECK_FG, CHECK_BG, CHECK_HL},
-        {CHECK_SELECTED_FG, CHECK_SELECTED_BG, CHECK_SELECTED_HL},
-        {UARROW_FG, UARROW_BG, UARROW_HL},
-        {DARROW_FG, DARROW_BG, DARROW_HL},
-};                              /* color_table */
+static void color_setup(const char *theme)
+{
+        if (set_theme(theme)) {
+                if (has_colors()) {     /* Terminal supports color? */
+                        start_color();
+                        init_dialog_colors();
+                }
+        }
+        else
+        {
+                set_mono_theme();
+        }
+}
 
 /*
  * Set window to attribute 'attr'
@@ -119,13 +251,13 @@ void attr_clear(WINDOW * win, int height, int width, chtype attr)
 
 void dialog_clear(void)
 {
-        attr_clear(stdscr, LINES, COLS, screen_attr);
+        attr_clear(stdscr, LINES, COLS, dlg.screen.atr);
         /* Display background title if it exists ... - SLH */
-        if (backtitle != NULL) {
+        if (dlg.backtitle != NULL) {
                 int i;
 
-                wattrset(stdscr, screen_attr);
-                mvwaddstr(stdscr, 0, 1, (char *)backtitle);
+                wattrset(stdscr, dlg.screen.atr);
+                mvwaddstr(stdscr, 0, 1, (char *)dlg.backtitle);
                 wmove(stdscr, 1, 1);
                 for (i = 1; i < COLS - 1; i++)
                         waddch(stdscr, ACS_HLINE);
@@ -136,40 +268,22 @@ void dialog_clear(void)
 /*
  * Do some initialization for dialog
  */
-void init_dialog(void)
+void init_dialog(const char *backtitle)
+{
+        dlg.backtitle = backtitle;
+        color_setup(getenv("MENUCONFIG_COLOR"));
+}
+
+void reset_dialog(void)
 {
         initscr();              /* Init curses */
         keypad(stdscr, TRUE);
         cbreak();
         noecho();
-
-        if (use_colors)         /* Set up colors */
-                color_setup();
-
         dialog_clear();
 }
 
 /*
- * Setup for color display
- */
-void color_setup(void)
-{
-        int i;
-
-        if (has_colors()) {     /* Terminal supports color? */
-                start_color();
-
-                /* Initialize color pairs */
-                for (i = 0; i < ATTRIBUTE_COUNT; i++)
-                        init_pair(i + 1, color_table[i][0], color_table[i][1]);
-
-                /* Setup color attributes */
-                for (i = 0; i < ATTRIBUTE_COUNT; i++)
-                        attributes[i] = C_ATTR(color_table[i][2], i + 1);
-        }
-}
-
-/*
  * End using dialog functions.
  */
 void end_dialog(void)
@@ -184,7 +298,7 @@ void print_title(WINDOW *dialog, const char *title, int width)
 {
         if (title) {
                 int tlen = MIN(width - 2, strlen(title));
-                wattrset(dialog, title_attr);
+                wattrset(dialog, dlg.title.atr);
                 mvwaddch(dialog, 0, (width - tlen) / 2 - 1, ' ');
                 mvwaddnstr(dialog, 0, (width - tlen)/2, title, tlen);
                 waddch(dialog, ' ');
@@ -264,21 +378,23 @@ void print_button(WINDOW * win, const char *label, int y, int x, int selected)
         int i, temp;
 
         wmove(win, y, x);
-        wattrset(win, selected ? button_active_attr : button_inactive_attr);
+        wattrset(win, selected ? dlg.button_active.atr
+                 : dlg.button_inactive.atr);
         waddstr(win, "<");
         temp = strspn(label, " ");
         label += temp;
-        wattrset(win, selected ? button_label_active_attr
-                 : button_label_inactive_attr);
+        wattrset(win, selected ? dlg.button_label_active.atr
+                 : dlg.button_label_inactive.atr);
         for (i = 0; i < temp; i++)
                 waddch(win, ' ');
-        wattrset(win, selected ? button_key_active_attr
-                 : button_key_inactive_attr);
+        wattrset(win, selected ? dlg.button_key_active.atr
+                 : dlg.button_key_inactive.atr);
         waddch(win, label[0]);
-        wattrset(win, selected ? button_label_active_attr
-                 : button_label_inactive_attr);
+        wattrset(win, selected ? dlg.button_label_active.atr
+                 : dlg.button_label_inactive.atr);
         waddstr(win, (char *)label + 1);
-        wattrset(win, selected ? button_active_attr : button_inactive_attr);
+        wattrset(win, selected ? dlg.button_active.atr
+                 : dlg.button_inactive.atr);
         waddstr(win, ">");
         wmove(win, y, x + temp + 1);
 }
@@ -326,7 +442,7 @@ void draw_shadow(WINDOW * win, int y, int x, int height, int width)
         int i;
 
         if (has_colors()) {     /* Whether terminal supports color? */
-                wattrset(win, shadow_attr);
+                wattrset(win, dlg.shadow.atr);
                 wmove(win, y + height, x + 2);
                 for (i = 0; i < width; i++)
                         waddch(win, winch(win) & A_CHARTEXT);
@@ -360,3 +476,167 @@ int first_alpha(const char *string, const char *exempt)
 
         return 0;
 }
+
+/*
+ * ncurses uses ESC to detect escaped char sequences. This resutl in
+ * a small timeout before ESC is actually delivered to the application.
+ * lxdialog suggest <ESC> <ESC> which is correctly translated to two
+ * times esc. But then we need to ignore the second esc to avoid stepping
+ * out one menu too much. Filter away all escaped key sequences since
+ * keypad(FALSE) turn off ncurses support for escape sequences - and thats
+ * needed to make notimeout() do as expected.
+ */
+int on_key_esc(WINDOW *win)
+{
+        int key;
+        int key2;
+        int key3;
+
+        nodelay(win, TRUE);
+        keypad(win, FALSE);
+        key = wgetch(win);
+        key2 = wgetch(win);
+        do {
+                key3 = wgetch(win);
+        } while (key3 != ERR);
+        nodelay(win, FALSE);
+        keypad(win, TRUE);
+        if (key == KEY_ESC && key2 == ERR)
+                return KEY_ESC;
+        else if (key != ERR && key != KEY_ESC && key2 == ERR)
+                ungetch(key);
+
+        return -1;
+}
+
+/* redraw screen in new size */
+int on_key_resize(void)
+{
+        dialog_clear();
+        return KEY_RESIZE;
+}
+
+struct dialog_list *item_cur;
+struct dialog_list item_nil;
+struct dialog_list *item_head;
+
+void item_reset(void)
+{
+        struct dialog_list *p, *next;
+
+        for (p = item_head; p; p = next) {
+                next = p->next;
+                free(p);
+        }
+        item_head = NULL;
+        item_cur = &item_nil;
+}
+
+void item_make(const char *fmt, ...)
+{
+        va_list ap;
+        struct dialog_list *p = malloc(sizeof(*p));
+
+        if (item_head)
+                item_cur->next = p;
+        else
+                item_head = p;
+        item_cur = p;
+        memset(p, 0, sizeof(*p));
+
+        va_start(ap, fmt);
+        vsnprintf(item_cur->node.str, sizeof(item_cur->node.str), fmt, ap);
+        va_end(ap);
+}
+
+void item_add_str(const char *fmt, ...)
+{
+        va_list ap;
+        size_t avail;
+
+        avail = sizeof(item_cur->node.str) - strlen(item_cur->node.str);
+
+        va_start(ap, fmt);
+        vsnprintf(item_cur->node.str + strlen(item_cur->node.str),
+                  avail, fmt, ap);
+        item_cur->node.str[sizeof(item_cur->node.str) - 1] = '\0';
+        va_end(ap);
+}
+
+void item_set_tag(char tag)
+{
+        item_cur->node.tag = tag;
+}
+void item_set_data(void *ptr)
+{
+        item_cur->node.data = ptr;
+}
+
+void item_set_selected(int val)
+{
+        item_cur->node.selected = val;
+}
+
+int item_activate_selected(void)
+{
+        item_foreach()
+                if (item_is_selected())
+                        return 1;
+        return 0;
+}
+
+void *item_data(void)
+{
+        return item_cur->node.data;
+}
+
+char item_tag(void)
+{
+        return item_cur->node.tag;
+}
+
+int item_count(void)
+{
+        int n = 0;
+        struct dialog_list *p;
+
+        for (p = item_head; p; p = p->next)
+                n++;
+        return n;
+}
+
+void item_set(int n)
+{
+        int i = 0;
+        item_foreach()
+                if (i++ == n)
+                        return;
+}
+
+int item_n(void)
+{
+        int n = 0;
+        struct dialog_list *p;
+
+        for (p = item_head; p; p = p->next) {
+                if (p == item_cur)
+                        return n;
+                n++;
+        }
+        return 0;
+}
+
+const char *item_str(void)
+{
+        return item_cur->node.str;
+}
+
+int item_is_selected(void)
+{
+        return (item_cur->node.selected != 0);
+}
+
+int item_is_tag(char tag)
+{
+        return (item_cur->node.tag == tag);
+}
diff --git a/scripts/kconfig/lxdialog/yesno.c b/scripts/kconfig/lxdialog/yesno.c
index cb2568aae3ed..ee0a04e3e012 100644
--- a/scripts/kconfig/lxdialog/yesno.c
+++ b/scripts/kconfig/lxdialog/yesno.c
@@ -44,6 +44,12 @@ int dialog_yesno(const char *title, const char *prompt, int height, int width)
         int i, x, y, key = 0, button = 0;
         WINDOW *dialog;
 
+do_resize:
+        if (getmaxy(stdscr) < (height + 4))
+                return -ERRDISPLAYTOOSMALL;
+        if (getmaxx(stdscr) < (width + 4))
+                return -ERRDISPLAYTOOSMALL;
+
         /* center dialog box on screen */
         x = (COLS - width) / 2;
         y = (LINES - height) / 2;
@@ -53,22 +59,23 @@ int dialog_yesno(const char *title, const char *prompt, int height, int width)
         dialog = newwin(height, width, y, x);
         keypad(dialog, TRUE);
 
-        draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
-        wattrset(dialog, border_attr);
+        draw_box(dialog, 0, 0, height, width,
+                 dlg.dialog.atr, dlg.border.atr);
+        wattrset(dialog, dlg.border.atr);
         mvwaddch(dialog, height - 3, 0, ACS_LTEE);
         for (i = 0; i < width - 2; i++)
                 waddch(dialog, ACS_HLINE);
-        wattrset(dialog, dialog_attr);
+        wattrset(dialog, dlg.dialog.atr);
         waddch(dialog, ACS_RTEE);
 
         print_title(dialog, title, width);
 
-        wattrset(dialog, dialog_attr);
+        wattrset(dialog, dlg.dialog.atr);
         print_autowrap(dialog, prompt, width - 2, 1, 3);
 
         print_buttons(dialog, height, width, 0);
 
-        while (key != ESC) {
+        while (key != KEY_ESC) {
                 key = wgetch(dialog);
                 switch (key) {
                 case 'Y':
@@ -92,11 +99,16 @@ int dialog_yesno(const char *title, const char *prompt, int height, int width)
                 case '\n':
                         delwin(dialog);
                         return button;
-                case ESC:
+                case KEY_ESC:
+                        key = on_key_esc(dialog);
                         break;
+                case KEY_RESIZE:
+                        delwin(dialog);
+                        on_key_resize();
+                        goto do_resize;
                 }
         }
 
         delwin(dialog);
-        return -1;              /* ESC pressed */
+        return key;             /* ESC pressed */
 }
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 7f973195e79a..08a4c7af93ea 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -24,6 +24,7 @@
 
 #define LKC_DIRECT_LINK
 #include "lkc.h"
+#include "lxdialog/dialog.h"
 
 static char menu_backtitle[128];
 static const char mconf_readme[] = N_(
@@ -159,7 +160,21 @@ static const char mconf_readme[] = N_(
 "\n"
 "Note that this mode can eventually be a little more CPU expensive\n"
 "(especially with a larger number of unrolled categories) than the\n"
-"default mode.\n"),
+"default mode.\n"
+"\n"
+"Different color themes available\n"
+"--------------------------------\n"
+"It is possible to select different color themes using the variable\n"
+"MENUCONFIG_COLOR. To select a theme use:\n"
+"\n"
+"make MENUCONFIG_COLOR=<theme> menuconfig\n"
+"\n"
+"Available themes are\n"
+" mono       => selects colors suitable for monochrome displays\n"
+" blackbg    => selects a color scheme with black background\n"
+" classic    => theme with blue background. The classic look\n"
+" bluetitle  => a LCD friendly version of classic. (default)\n"
+"\n"),
 menu_instructions[] = N_(
         "Arrow keys navigate the menu.  "
         "<Enter> selects submenus --->.  "
@@ -256,16 +271,12 @@ search_help[] = N_(
         "          USB$ => find all CONFIG_ symbols ending with USB\n"
         "\n");
 
-static char buf[4096], *bufptr = buf;
-static char input_buf[4096];
 static char filename[PATH_MAX+1] = ".config";
-static char *args[1024], **argptr = args;
 static int indent;
 static struct termios ios_org;
 static int rows = 0, cols = 0;
 static struct menu *current_menu;
 static int child_count;
-static int do_resize;
 static int single_menu_mode;
 
 static void conf(struct menu *menu);
@@ -276,12 +287,6 @@ static void conf_save(void);
 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 show_file(const char *filename, const char *title, int r, int c);
-
-static void cprint_init(void);
-static int cprint1(const char *fmt, ...);
-static void cprint_done(void);
-static int cprint(const char *fmt, ...);
 
 static void init_wsize(void)
 {
@@ -318,54 +323,6 @@ static void init_wsize(void)
         cols -= 5;
 }
 
-static void cprint_init(void)
-{
-        bufptr = buf;
-        argptr = args;
-        memset(args, 0, sizeof(args));
-        indent = 0;
-        child_count = 0;
-        cprint("./scripts/kconfig/lxdialog/lxdialog");
-        cprint("--backtitle");
-        cprint(menu_backtitle);
-}
-
-static int cprint1(const char *fmt, ...)
-{
-        va_list ap;
-        int res;
-
-        if (!*argptr)
-                *argptr = bufptr;
-        va_start(ap, fmt);
-        res = vsprintf(bufptr, fmt, ap);
-        va_end(ap);
-        bufptr += res;
-
-        return res;
-}
-
-static void cprint_done(void)
-{
-        *bufptr++ = 0;
-        argptr++;
-}
-
-static int cprint(const char *fmt, ...)
-{
-        va_list ap;
-        int res;
-
-        *argptr++ = bufptr;
-        va_start(ap, fmt);
-        res = vsprintf(bufptr, fmt, ap);
-        va_end(ap);
-        bufptr += res;
-        *bufptr++ = 0;
-
-        return res;
-}
-
 static void get_prompt_str(struct gstr *r, struct property *prop)
 {
         int i, j;
@@ -438,108 +395,17 @@ static struct gstr get_relations_str(struct symbol **sym_arr)
         return res;
 }
 
-pid_t pid;
-
-static void winch_handler(int sig)
-{
-        if (!do_resize) {
-                kill(pid, SIGINT);
-                do_resize = 1;
-        }
-}
-
-static int exec_conf(void)
-{
-        int pipefd[2], stat, size;
-        struct sigaction sa;
-        sigset_t sset, osset;
-
-        sigemptyset(&sset);
-        sigaddset(&sset, SIGINT);
-        sigprocmask(SIG_BLOCK, &sset, &osset);
-
-        signal(SIGINT, SIG_DFL);
-
-        sa.sa_handler = winch_handler;
-        sigemptyset(&sa.sa_mask);
-        sa.sa_flags = SA_RESTART;
-        sigaction(SIGWINCH, &sa, NULL);
-
-        *argptr++ = NULL;
-
-        pipe(pipefd);
-        pid = fork();
-        if (pid == 0) {
-                sigprocmask(SIG_SETMASK, &osset, NULL);
-                dup2(pipefd[1], 2);
-                close(pipefd[0]);
-                close(pipefd[1]);
-                execv(args[0], args);
-                _exit(EXIT_FAILURE);
-        }
-
-        close(pipefd[1]);
-        bufptr = input_buf;
-        while (1) {
-                size = input_buf + sizeof(input_buf) - bufptr;
-                size = read(pipefd[0], bufptr, size);
-                if (size <= 0) {
-                        if (size < 0) {
-                                if (errno == EINTR || errno == EAGAIN)
-                                        continue;
-                                perror("read");
-                        }
-                        break;
-                }
-                bufptr += size;
-        }
-        *bufptr++ = 0;
-        close(pipefd[0]);
-        waitpid(pid, &stat, 0);
-
-        if (do_resize) {
-                init_wsize();
-                do_resize = 0;
-                sigprocmask(SIG_SETMASK, &osset, NULL);
-                return -1;
-        }
-        if (WIFSIGNALED(stat)) {
-                printf("\finterrupted(%d)\n", WTERMSIG(stat));
-                exit(1);
-        }
-#if 0
-        printf("\fexit state: %d\nexit data: '%s'\n", WEXITSTATUS(stat), input_buf);
-        sleep(1);
-#endif
-        sigpending(&sset);
-        if (sigismember(&sset, SIGINT)) {
-                printf("\finterrupted\n");
-                exit(1);
-        }
-        sigprocmask(SIG_SETMASK, &osset, NULL);
-
-        return WEXITSTATUS(stat);
-}
-
 static void search_conf(void)
 {
         struct symbol **sym_arr;
-        int stat;
         struct gstr res;
-
+        int dres;
 again:
-        cprint_init();
-        cprint("--title");
-        cprint(_("Search Configuration Parameter"));
-        cprint("--inputbox");
-        cprint(_("Enter CONFIG_ (sub)string to search for (omit CONFIG_)"));
-        cprint("10");
-        cprint("75");
-        cprint("");
-        stat = exec_conf();
-        if (stat < 0)
-                goto again;
-        switch (stat) {
+        dialog_clear();
+        dres = dialog_inputbox(_("Search Configuration Parameter"),
+                              _("Enter CONFIG_ (sub)string to search for (omit CONFIG_)"),
+                              10, 75, "");
+        switch (dres) {
         case 0:
                 break;
         case 1:
@@ -549,7 +415,7 @@ again:
                 return;
         }
 
-        sym_arr = sym_re_search(input_buf);
+        sym_arr = sym_re_search(dialog_input_result);
         res = get_relations_str(sym_arr);
         free(sym_arr);
         show_textbox(_("Search Results"), str_get(&res), 0, 0);
@@ -576,24 +442,24 @@ static void build_conf(struct menu *menu)
                         switch (prop->type) {
                         case P_MENU:
                                 child_count++;
-                                cprint("m%p", menu);
-
                                 if (single_menu_mode) {
-                                        cprint1("%s%*c%s",
-                                                menu->data ? "-->" : "++>",
-                                                indent + 1, ' ', prompt);
+                                        item_make("%s%*c%s",
+                                                  menu->data ? "-->" : "++>",
+                                                  indent + 1, ' ', prompt);
                                 } else
-                                        cprint1("   %*c%s  --->", indent + 1, ' ', prompt);
+                                        item_make("   %*c%s  --->", indent + 1, ' ', prompt);
 
-                                cprint_done();
+                                item_set_tag('m');
+                                item_set_data(menu);
                                 if (single_menu_mode && menu->data)
                                         goto conf_childs;
                                 return;
                         default:
                                 if (prompt) {
                                         child_count++;
-                                        cprint(":%p", menu);
-                                        cprint("---%*c%s", indent + 1, ' ', prompt);
+                                        item_make("---%*c%s", indent + 1, ' ', prompt);
+                                        item_set_tag(':');
+                                        item_set_data(menu);
                                 }
                         }
                 } else
@@ -614,10 +480,9 @@ static void build_conf(struct menu *menu)
 
                 val = sym_get_tristate_value(sym);
                 if (sym_is_changable(sym)) {
-                        cprint("t%p", menu);
                         switch (type) {
                         case S_BOOLEAN:
-                                cprint1("[%c]", val == no ? ' ' : '*');
+                                item_make("[%c]", val == no ? ' ' : '*');
                                 break;
                         case S_TRISTATE:
                                 switch (val) {
@@ -625,84 +490,87 @@ static void build_conf(struct menu *menu)
                                 case mod: ch = 'M'; break;
                                 default:  ch = ' '; break;
                                 }
-                                cprint1("<%c>", ch);
+                                item_make("<%c>", ch);
                                 break;
                         }
+                        item_set_tag('t');
+                        item_set_data(menu);
                 } else {
-                        cprint("%c%p", def_menu ? 't' : ':', menu);
-                        cprint1("   ");
+                        item_make("   ");
+                        item_set_tag(def_menu ? 't' : ':');
+                        item_set_data(menu);
                 }
 
-                cprint1("%*c%s", indent + 1, ' ', menu_get_prompt(menu));
+                item_add_str("%*c%s", indent + 1, ' ', menu_get_prompt(menu));
                 if (val == yes) {
                         if (def_menu) {
-                                cprint1(" (%s)", menu_get_prompt(def_menu));
-                                cprint1("  --->");
-                                cprint_done();
+                                item_add_str(" (%s)", menu_get_prompt(def_menu));
+                                item_add_str("  --->");
                                 if (def_menu->list) {
                                         indent += 2;
                                         build_conf(def_menu);
                                         indent -= 2;
                                 }
-                        } else
-                                cprint_done();
+                        }
                         return;
                 }
-                cprint_done();
         } else {
                 if (menu == current_menu) {
-                        cprint(":%p", menu);
-                        cprint("---%*c%s", indent + 1, ' ', menu_get_prompt(menu));
+                        item_make("---%*c%s", indent + 1, ' ', menu_get_prompt(menu));
+                        item_set_tag(':');
+                        item_set_data(menu);
                         goto conf_childs;
                 }
                 child_count++;
                 val = sym_get_tristate_value(sym);
                 if (sym_is_choice_value(sym) && val == yes) {
-                        cprint(":%p", menu);
-                        cprint1("   ");
+                        item_make("   ");
+                        item_set_tag(':');
+                        item_set_data(menu);
                 } else {
                         switch (type) {
                         case S_BOOLEAN:
-                                cprint("t%p", menu);
                                 if (sym_is_changable(sym))
-                                        cprint1("[%c]", val == no ? ' ' : '*');
+                                        item_make("[%c]", val == no ? ' ' : '*');
                                 else
-                                        cprint1("---");
+                                        item_make("---");
+                                item_set_tag('t');
+                                item_set_data(menu);
                                 break;
                         case S_TRISTATE:
-                                cprint("t%p", menu);
                                 switch (val) {
                                 case yes: ch = '*'; break;
                                 case mod: ch = 'M'; break;
                                 default:  ch = ' '; break;
                                 }
                                 if (sym_is_changable(sym))
-                                        cprint1("<%c>", ch);
+                                        item_make("<%c>", ch);
                                 else
-                                        cprint1("---");
+                                        item_make("---");
+                                item_set_tag('t');
+                                item_set_data(menu);
                                 break;
                         default:
-                                cprint("s%p", menu);
-                                tmp = cprint1("(%s)", sym_get_string_value(sym));
+                                tmp = 2 + strlen(sym_get_string_value(sym)); /* () = 2 */
+                                item_make("(%s)", sym_get_string_value(sym));
                                 tmp = indent - tmp + 4;
                                 if (tmp < 0)
                                         tmp = 0;
-                                cprint1("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
-                                        (sym_has_value(sym) || !sym_is_changable(sym)) ?
-                                        "" : " (NEW)");
-                                cprint_done();
+                                item_add_str("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
+                                             (sym_has_value(sym) || !sym_is_changable(sym)) ?
+                                             "" : " (NEW)");
+                                item_set_tag('s');
+                                item_set_data(menu);
                                 goto conf_childs;
                         }
                 }
-                cprint1("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),
-                        (sym_has_value(sym) || !sym_is_changable(sym)) ?
-                        "" : " (NEW)");
+                item_add_str("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),
+                          (sym_has_value(sym) || !sym_is_changable(sym)) ?
+                          "" : " (NEW)");
                 if (menu->prompt->type == P_MENU) {
-                        cprint1("  --->");
-                        cprint_done();
+                        item_add_str("  --->");
                         return;
                 }
-                cprint_done();
         }
 
 conf_childs:
@@ -717,59 +585,45 @@ static void conf(struct menu *menu)
         struct menu *submenu;
         const char *prompt = menu_get_prompt(menu);
         struct symbol *sym;
-        char active_entry[40];
-        int stat, type, i;
+        struct menu *active_menu = NULL;
+        int res;
+        int s_scroll = 0;
 
-        unlink("lxdialog.scrltmp");
-        active_entry[0] = 0;
         while (1) {
-                cprint_init();
-                cprint("--title");
-                cprint("%s", prompt ? prompt : _("Main Menu"));
-                cprint("--menu");
-                cprint(_(menu_instructions));
-                cprint("%d", rows);
-                cprint("%d", cols);
-                cprint("%d", rows - 10);
-                cprint("%s", active_entry);
+                item_reset();
                 current_menu = menu;
                 build_conf(menu);
                 if (!child_count)
                         break;
                 if (menu == &rootmenu) {
-                        cprint(":");
-                        cprint("--- ");
-                        cprint("L");
-                        cprint(_("    Load an Alternate Configuration File"));
-                        cprint("S");
-                        cprint(_("    Save Configuration to an Alternate File"));
+                        item_make("--- ");
+                        item_set_tag(':');
+                        item_make(_("    Load an Alternate Configuration File"));
+                        item_set_tag('L');
+                        item_make(_("    Save an Alternate Configuration File"));
+                        item_set_tag('S');
                 }
-                stat = exec_conf();
-                if (stat < 0)
-                        continue;
-
-                if (stat == 1 || stat == 255)
+                dialog_clear();
+                res = dialog_menu(prompt ? prompt : _("Main Menu"),
+                                  _(menu_instructions),
+                                  active_menu, &s_scroll);
+                if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL)
                         break;
-
-                type = input_buf[0];
-                if (!type)
+                if (!item_activate_selected())
+                        continue;
+                if (!item_tag())
                         continue;
 
-                for (i = 0; input_buf[i] && !isspace(input_buf[i]); i++)
-                        ;
-                if (i >= sizeof(active_entry))
-                        i = sizeof(active_entry) - 1;
-                input_buf[i] = 0;
-                strcpy(active_entry, input_buf);
-
-                sym = NULL;
-                submenu = NULL;
-                if (sscanf(input_buf + 1, "%p", &submenu) == 1)
+                submenu = item_data();
+                active_menu = item_data();
+                if (submenu)
                         sym = submenu->sym;
+                else
+                        sym = NULL;
 
-                switch (stat) {
+                switch (res) {
                 case 0:
-                        switch (type) {
+                        switch (item_tag()) {
                         case 'm':
                                 if (single_menu_mode)
                                         submenu->data = (void *) (long) !submenu->data;
@@ -800,7 +654,7 @@ static void conf(struct menu *menu)
                                 show_helptext("README", _(mconf_readme));
                         break;
                 case 3:
-                        if (type == 't') {
+                        if (item_is_tag('t')) {
                                 if (sym_set_tristate_value(sym, yes))
                                         break;
                                 if (sym_set_tristate_value(sym, mod))
@@ -808,17 +662,17 @@ static void conf(struct menu *menu)
                         }
                         break;
                 case 4:
-                        if (type == 't')
+                        if (item_is_tag('t'))
                                 sym_set_tristate_value(sym, no);
                         break;
                 case 5:
-                        if (type == 't')
+                        if (item_is_tag('t'))
                                 sym_set_tristate_value(sym, mod);
                         break;
                 case 6:
-                        if (type == 't')
+                        if (item_is_tag('t'))
                                 sym_toggle_tristate_value(sym);
-                        else if (type == 'm')
+                        else if (item_is_tag('m'))
                                 conf(submenu);
                         break;
                 case 7:
@@ -830,13 +684,8 @@ static void conf(struct menu *menu)
 
 static void show_textbox(const char *title, const char *text, int r, int c)
 {
-        int fd;
-
-        fd = creat(".help.tmp", 0777);
-        write(fd, text, strlen(text));
-        close(fd);
-        show_file(".help.tmp", title, r, c);
-        unlink(".help.tmp");
+        dialog_clear();
+        dialog_textbox(title, text, r, c);
 }
 
 static void show_helptext(const char *title, const char *text)
@@ -864,68 +713,52 @@ static void show_help(struct menu *menu)
         str_free(&help);
 }
 
-static void show_file(const char *filename, const char *title, int r, int c)
-{
-        do {
-                cprint_init();
-                if (title) {
-                        cprint("--title");
-                        cprint("%s", title);
-                }
-                cprint("--textbox");
-                cprint("%s", filename);
-                cprint("%d", r ? r : rows);
-                cprint("%d", c ? c : cols);
-        } while (exec_conf() < 0);
-}
-
 static void conf_choice(struct menu *menu)
 {
         const char *prompt = menu_get_prompt(menu);
         struct menu *child;
         struct symbol *active;
-        int stat;
 
         active = sym_get_choice_value(menu->sym);
         while (1) {
-                cprint_init();
-                cprint("--title");
-                cprint("%s", prompt ? prompt : _("Main Menu"));
-                cprint("--radiolist");
-                cprint(_(radiolist_instructions));
-                cprint("15");
-                cprint("70");
-                cprint("6");
+                int res;
+                int selected;
+                item_reset();
 
                 current_menu = menu;
                 for (child = menu->list; child; child = child->next) {
                         if (!menu_is_visible(child))
                                 continue;
-                        cprint("%p", child);
-                        cprint("%s", menu_get_prompt(child));
+                        item_make("%s", menu_get_prompt(child));
+                        item_set_data(child);
+                        if (child->sym == active)
+                                item_set_selected(1);
                         if (child->sym == sym_get_choice_value(menu->sym))
-                                cprint("ON");
-                        else if (child->sym == active)
-                                cprint("SELECTED");
-                        else
-                                cprint("OFF");
+                                item_set_tag('X');
                 }
-
-                stat = exec_conf();
-                switch (stat) {
+                dialog_clear();
+                res = dialog_checklist(prompt ? prompt : _("Main Menu"),
+                                        _(radiolist_instructions),
+                                         15, 70, 6);
+                selected = item_activate_selected();
+                switch (res) {
                 case 0:
-                        if (sscanf(input_buf, "%p", &child) != 1)
-                                break;
-                        sym_set_tristate_value(child->sym, yes);
+                        if (selected) {
+                                child = item_data();
+                                sym_set_tristate_value(child->sym, yes);
+                        }
                         return;
                 case 1:
-                        if (sscanf(input_buf, "%p", &child) == 1) {
+                        if (selected) {
+                                child = item_data();
                                 show_help(child);
                                 active = child->sym;
                         } else
                                 show_help(menu);
                         break;
-                case 255:
+                case KEY_ESC:
+                        return;
+                case -ERRDISPLAYTOOSMALL:
                         return;
                 }
         }
@@ -934,40 +767,38 @@ static void conf_choice(struct menu *menu)
 static void conf_string(struct menu *menu)
 {
         const char *prompt = menu_get_prompt(menu);
-        int stat;
 
         while (1) {
-                cprint_init();
-                cprint("--title");
-                cprint("%s", prompt ? prompt : _("Main Menu"));
-                cprint("--inputbox");
+                int res;
+                char *heading;
+
                 switch (sym_get_type(menu->sym)) {
                 case S_INT:
-                        cprint(_(inputbox_instructions_int));
+                        heading = _(inputbox_instructions_int);
                         break;
                 case S_HEX:
-                        cprint(_(inputbox_instructions_hex));
+                        heading = _(inputbox_instructions_hex);
                         break;
                 case S_STRING:
-                        cprint(_(inputbox_instructions_string));
+                        heading = _(inputbox_instructions_string);
                         break;
                 default:
-                        /* panic? */;
+                        heading = "Internal mconf error!";
                 }
-                cprint("10");
-                cprint("75");
-                cprint("%s", sym_get_string_value(menu->sym));
-                stat = exec_conf();
-                switch (stat) {
+                dialog_clear();
+                res = dialog_inputbox(prompt ? prompt : _("Main Menu"),
+                                      heading, 10, 75,
+                                      sym_get_string_value(menu->sym));
+                switch (res) {
                 case 0:
-                        if (sym_set_string_value(menu->sym, input_buf))
+                        if (sym_set_string_value(menu->sym, dialog_input_result))
                                 return;
                         show_textbox(NULL, _("You have made an invalid entry."), 5, 43);
                         break;
                 case 1:
                         show_help(menu);
                         break;
-                case 255:
+                case KEY_ESC:
                         return;
                 }
         }
@@ -975,28 +806,24 @@ static void conf_string(struct menu *menu)
 
 static void conf_load(void)
 {
-        int stat;
 
         while (1) {
-                cprint_init();
-                cprint("--inputbox");
-                cprint(load_config_text);
-                cprint("11");
-                cprint("55");
-                cprint("%s", filename);
-                stat = exec_conf();
-                switch(stat) {
+                int res;
+                dialog_clear();
+                res = dialog_inputbox(NULL, load_config_text,
+                                      11, 55, filename);
+                switch(res) {
                 case 0:
-                        if (!input_buf[0])
+                        if (!dialog_input_result[0])
                                 return;
-                        if (!conf_read(input_buf))
+                        if (!conf_read(dialog_input_result))
                                 return;
                         show_textbox(NULL, _("File does not exist!"), 5, 38);
                         break;
                 case 1:
                         show_helptext(_("Load Alternate Configuration"), load_config_help);
                         break;
-                case 255:
+                case KEY_ESC:
                         return;
                 }
         }
@@ -1004,28 +831,23 @@ static void conf_load(void)
 
 static void conf_save(void)
 {
-        int stat;
-
         while (1) {
-                cprint_init();
-                cprint("--inputbox");
-                cprint(save_config_text);
-                cprint("11");
-                cprint("55");
-                cprint("%s", filename);
-                stat = exec_conf();
-                switch(stat) {
+                int res;
+                dialog_clear();
+                res = dialog_inputbox(NULL, save_config_text,
+                                      11, 55, filename);
+                switch(res) {
                 case 0:
-                        if (!input_buf[0])
+                        if (!dialog_input_result[0])
                                 return;
-                        if (!conf_write(input_buf))
+                        if (!conf_write(dialog_input_result))
                                 return;
                         show_textbox(NULL, _("Can't create file!  Probably a nonexistent directory."), 5, 60);
                         break;
                 case 1:
                         show_helptext(_("Save Alternate Configuration"), save_config_help);
                         break;
-                case 255:
+                case KEY_ESC:
                         return;
                 }
         }
@@ -1034,15 +856,13 @@ static void conf_save(void)
 static void conf_cleanup(void)
 {
         tcsetattr(1, TCSAFLUSH, &ios_org);
-        unlink(".help.tmp");
-        unlink("lxdialog.scrltmp");
 }
 
 int main(int ac, char **av)
 {
         struct symbol *sym;
         char *mode;
-        int stat;
+        int res;
 
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
@@ -1065,18 +885,19 @@ int main(int ac, char **av)
         tcgetattr(1, &ios_org);
         atexit(conf_cleanup);
         init_wsize();
-        conf(&rootmenu);
-
+        reset_dialog();
+        init_dialog(menu_backtitle);
         do {
-                cprint_init();
-                cprint("--yesno");
-                cprint(_("Do you wish to save your new kernel configuration?"));
-                cprint("5");
-                cprint("60");
-                stat = exec_conf();
-        } while (stat < 0);
-
-        if (stat == 0) {
+                conf(&rootmenu);
+                dialog_clear();
+                res = dialog_yesno(NULL,
+                                   _("Do you wish to save your "
+                                     "new kernel configuration?\n"
+                                     "<ESC><ESC> to continue."),
+                                   6, 60);
+        } while (res == KEY_ESC);
+        end_dialog();
+        if (res == 0) {
                 if (conf_write(NULL)) {
                         fprintf(stderr, _("\n\n"
                                 "Error during writing of the kernel configuration.\n"
diff --git a/sound/oss/trident.c b/sound/oss/trident.c
index ce79cd82478a..147c816a1f22 100644
--- a/sound/oss/trident.c
+++ b/sound/oss/trident.c
@@ -1862,7 +1862,7 @@ trident_read(struct file *file, char __user *buffer, size_t count, loff_t * ppos
         unsigned swptr;
         int cnt;
 
-        pr_debug("trident: trident_read called, count = %d\n", count);
+        pr_debug("trident: trident_read called, count = %zd\n", count);
 
         VALIDATE_STATE(state);
 
@@ -1978,7 +1978,7 @@ trident_write(struct file *file, const char __user *buffer, size_t count, loff_t
         unsigned int copy_count;
         int lret; /* for lock_set_fmt */
 
-        pr_debug("trident: trident_write called, count = %d\n", count);
+        pr_debug("trident: trident_write called, count = %zd\n", count);
 
         VALIDATE_STATE(state);