503 files changed, 8078 insertions, 7599 deletions

diff --git a/CREDITS b/CREDITS
index 0bf31eac6dc2..787564bc248b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3382,7 +3382,7 @@ S: Germany
 
 N: Geert Uytterhoeven
 E: geert@linux-m68k.org
-W: http://home.tvd.be/cr26864/
+W: http://users.telenet.be/geertu/
 P: 1024/862678A6 C51D 361C 0BD1 4C90 B275  C553 6EEA 11BA 8626 78A6
 D: m68k/Amiga and PPC/CHRP Longtrail coordinator
 D: Frame buffer device and XF68_FBDev maintainer
@@ -3392,8 +3392,8 @@ D: Amiga Buddha and Catweasel chipset IDE
 D: Atari Falcon chipset IDE
 D: Amiga Gayle chipset IDE
 D: mipsel NEC DDB Vrc-5074
-S: Emiel Vlieberghlaan 2A/21
-S: B-3010 Kessel-Lo
+S: Haterbeekstraat 55B
+S: B-3200 Aarschot
 S: Belgium
 
 N: Chris Vance
diff --git a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt
index ee4bb73683cd..10bf4deb96aa 100644
--- a/Documentation/DMA-mapping.txt
+++ b/Documentation/DMA-mapping.txt
@@ -194,7 +194,7 @@ document for how to handle this case.
 Finally, if your device can only drive the low 24-bits of
 address during PCI bus mastering you might do something like:
 
-        if (pci_set_dma_mask(pdev, 0x00ffffff)) {
+        if (pci_set_dma_mask(pdev, DMA_24BIT_MASK)) {
                 printk(KERN_WARNING
                        "mydev: 24-bit DMA addressing not available.\n");
                 goto ignore_this_device;
@@ -212,7 +212,7 @@ functions (for example a sound card provides playback and record
 functions) and the various different functions have _different_
 DMA addressing limitations, you may wish to probe each mask and
 only provide the functionality which the machine can handle.  It
-is important that the last call to pci_set_dma_mask() be for the 
+is important that the last call to pci_set_dma_mask() be for the
 most specific mask.
 
 Here is pseudo-code showing how this might be done:
diff --git a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl
index 5bcbb6ee3bc0..f869b03929db 100644
--- a/Documentation/DocBook/libata.tmpl
+++ b/Documentation/DocBook/libata.tmpl
@@ -705,7 +705,7 @@ and other resources, etc.
 
         <sect1><title>ata_scsi_error()</title>
         <para>
-        ata_scsi_error() is the current hostt->eh_strategy_handler()
+        ata_scsi_error() is the current transportt->eh_strategy_handler()
         for libata.  As discussed above, this will be entered in two
         cases - timeout and ATAPI error completion.  This function
         calls low level libata driver's eng_timeout() callback, the
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 59d0c74c79c9..293fed113dff 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -71,14 +71,6 @@ Who:	Mauro Carvalho Chehab <mchehab@brturbo.com.br>
 
 ---------------------------
 
-What:   remove EXPORT_SYMBOL(panic_timeout)
-When:   April 2006
-Files:  kernel/panic.c
-Why:    No modular usage in the kernel.
-Who:    Adrian Bunk <bunk@stusta.de>
-
----------------------------
-
 What:   remove EXPORT_SYMBOL(insert_resource)
 When:   April 2006
 Files:  kernel/resource.c
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index adaa899e5c90..3a2e5520c1e3 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -694,7 +694,7 @@ struct file_operations
 ----------------------
 
 This describes how the VFS can manipulate an open file. As of kernel
-2.6.13, the following members are defined:
+2.6.17, the following members are defined:
 
 struct file_operations {
         loff_t (*llseek) (struct file *, loff_t, int);
@@ -723,6 +723,10 @@ struct file_operations {
         int (*check_flags)(int);
         int (*dir_notify)(struct file *filp, unsigned long arg);
         int (*flock) (struct file *, int, struct file_lock *);
+        ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, size_t, unsigned 
+int);
+        ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned  
+int);
 };
 
 Again, all methods are called without any locks being held, unless
@@ -790,6 +794,12 @@ otherwise noted.
 
   flock: called by the flock(2) system call
 
+  splice_write: called by the VFS to splice data from a pipe to a file. This
+                method is used by the splice(2) system call
+
+  splice_read: called by the VFS to splice data from file to a pipe. This
+               method is used by the splice(2) system call
+
 Note that the file operations are implemented by the specific
 filesystem in which the inode resides. When opening a device node
 (character or block special) most filesystems will call special
diff --git a/Documentation/isdn/README.gigaset b/Documentation/isdn/README.gigaset
new file mode 100644
index 000000000000..85a64defd385
--- /dev/null
+++ b/Documentation/isdn/README.gigaset
@@ -0,0 +1,286 @@
+GigaSet 307x Device Driver
+==========================
+
+1.   Requirements
+     ------------
+1.1. Hardware
+     --------
+     This release supports the connection of the Gigaset 307x/417x family of
+     ISDN DECT bases via Gigaset M101 Data, Gigaset M105 Data or direct USB
+     connection. The following devices are reported to be compatible:
+     307x/417x:
+        Gigaset SX255isdn
+        Gigaset SX353isdn
+        Sinus 45 [AB] isdn (Deutsche Telekom)
+        Sinus 721X/XA
+        Vox Chicago 390 ISDN (KPN Telecom)
+     M101:
+        Sinus 45 Data 1 (Telekom)
+     M105:
+        Gigaset USB Adapter DECT
+        Sinus 45 Data 2 (Telekom)
+        Sinus 721 data
+        Chicago 390 USB (KPN)
+     See also http://www.erbze.info/sinus_gigaset.htm and
+              http://gigaset307x.sourceforge.net/
+
+     We had also reports from users of Gigaset M105 who could use the drivers
+     with SX 100 and CX 100 ISDN bases (only in unimodem mode, see section 2.4.)
+     If you have another device that works with our driver, please let us know.
+     For example, Gigaset SX205isdn/Sinus 721 X SE and Gigaset SX303isdn bases
+     are just versions without answering machine of models known to work, so
+     they should work just as well; but so far we are lacking positive reports
+     on these.
+
+     Chances of getting an USB device to work are good if the output of
+        lsusb
+     at the command line contains one of the following:
+        ID 0681:0001
+        ID 0681:0002
+        ID 0681:0009
+        ID 0681:0021
+        ID 0681:0022
+
+1.2. Software
+     --------
+     The driver works with ISDN4linux and so can be used with any software
+     which is able to use ISDN4linux for ISDN connections (voice or data).
+     CAPI4Linux support is planned but not yet available.
+
+     There are some user space tools available at
+     http://sourceforge.net/projects/gigaset307x/
+     which provide access to additional device specific functions like SMS,
+     phonebook or call journal.
+
+
+2.   How to use the driver
+     ---------------------
+2.1. Modules
+     -------
+     To get the device working, you have to load the proper kernel module. You
+     can do this using
+         modprobe modulename
+     where modulename is usb_gigaset (M105) or bas_gigaset (direct USB
+     connection to the base).
+
+2.2. Device nodes for user space programs
+     ------------------------------------
+     The device can be accessed from user space (eg. by the user space tools
+     mentioned in 1.2.) through the device nodes:
+
+     - /dev/ttyGU0 for M105 (USB data boxes)
+     - /dev/ttyGB0 for the base driver (direct USB connection)
+
+     You can also select a "default device" which is used by the frontends when
+     no device node is given as parameter, by creating a symlink /dev/ttyG to
+     one of them, eg.:
+
+        ln -s /dev/ttyGB0 /dev/ttyG
+
+2.3. ISDN4linux
+     ----------
+     This is the "normal" mode of operation. After loading the module you can
+     set up the ISDN system just as you'd do with any ISDN card.
+     Your distribution should provide some configuration utility.
+     If not, you can use some HOWTOs like
+         http://www.linuxhaven.de/dlhp/HOWTO/DE-ISDN-HOWTO-5.html
+     If this doesn't work, because you have some recent device like SX100 where
+     debug output (see section 3.2.) shows something like this when dialing
+         CMD Received: ERROR
+         Available Params: 0
+         Connection State: 0, Response: -1
+         gigaset_process_response: resp_code -1 in ConState 0 !
+         Timeout occurred
+     you might need to use unimodem mode:
+
+2.4. Unimodem mode
+     -------------
+     This is needed for some devices [e.g. SX100] as they have problems with
+     the "normal" commands.
+
+     If you have installed the command line tool gigacontr, you can enter
+     unimodem mode using
+         gigacontr --mode unimodem
+     You can switch back using
+         gigacontr --mode isdn
+
+     You can also load the driver using e.g.
+         modprobe usb_gigaset startmode=0
+     to prevent the driver from starting in "isdn4linux mode".
+
+     In this mode the device works like a modem connected to a serial port
+     (the /dev/ttyGU0, ... mentioned above) which understands the commands
+         ATZ                 init, reset
+             => OK or ERROR
+         ATD
+         ATDT                dial
+             => OK, CONNECT,
+                BUSY,
+                NO DIAL TONE,
+                NO CARRIER,
+                NO ANSWER
+         <pause>+++<pause>   change to command mode when connected
+         ATH                 hangup
+
+     You can use some configuration tool of your distribution to configure this
+     "modem" or configure pppd/wvdial manually. There are some example ppp
+     configuration files and chat scripts in the gigaset-VERSION/ppp directory.
+     Please note that the USB drivers are not able to change the state of the
+     control lines (the M105 driver can be configured to use some undocumented
+     control requests, if you really need the control lines, though). This means
+     you must use "Stupid Mode" if you are using wvdial or you should use the
+     nocrtscts option of pppd.
+     You must also assure that the ppp_async module is loaded with the parameter
+     flag_time=0. You can do this e.g. by adding a line like
+
+        options ppp_async flag_time=0
+
+     to /etc/modprobe.conf. If your distribution has some local module
+     configuration file like /etc/modprobe.conf.local,
+     using that should be preferred.
+
+2.5. Call-ID (CID) mode
+     ------------------
+     Call-IDs are numbers used to tag commands to, and responses from, the
+     Gigaset base in order to support the simultaneous handling of multiple
+     ISDN calls. Their use can be enabled ("CID mode") or disabled ("Unimodem
+     mode"). Without Call-IDs (in Unimodem mode), only a very limited set of
+     functions is available. It allows outgoing data connections only, but
+     does not signal incoming calls or other base events.
+
+     DECT cordless data devices (M10x) permanently occupy the cordless
+     connection to the base while Call-IDs are activated. As the Gigaset
+     bases only support one DECT data connection at a time, this prevents
+     other DECT cordless data devices from accessing the base.
+
+     During active operation, the driver switches to the necessary mode
+     automatically. However, for the reasons above, the mode chosen when
+     the device is not in use (idle) can be selected by the user.
+     - If you want to receive incoming calls, you can use the default
+       settings (CID mode).
+     - If you have several DECT data devices (M10x) which you want to use
+       in turn, select Unimodem mode by passing the parameter "cidmode=0" to
+       the driver ("modprobe usb_gigaset cidmode=0" or modprobe.conf).
+
+     If you want both of these at once, you are out of luck.
+
+     You can also use /sys/module/<name>/parameters/cidmode for changing
+     the CID mode setting (<name> is usb_gigaset or bas_gigaset).
+
+
+3.   Troubleshooting
+     ---------------
+3.1. Solutions to frequently reported problems
+     -----------------------------------------
+     Problem:
+        You have a slow provider and isdn4linux gives up dialing too early.
+     Solution:
+        Load the isdn module using the dialtimeout option. You can do this e.g.
+        by adding a line like
+
+           options isdn dialtimeout=15
+
+        to /etc/modprobe.conf. If your distribution has some local module
+        configuration file like /etc/modprobe.conf.local,
+        using that should be preferred.
+
+     Problem:
+        Your isdn script aborts with a message about isdnlog.
+     Solution:
+        Try deactivating (or commenting out) isdnlog. This driver does not
+        support it.
+
+     Problem:
+        You have two or more DECT data adapters (M101/M105) and only the
+        first one you turn on works.
+     Solution:
+        Select Unimodem mode for all DECT data adapters. (see section 2.4.)
+
+3.2. Telling the driver to provide more information
+     ----------------------------------------------
+     Building the driver with the "Gigaset debugging" kernel configuration
+     option (CONFIG_GIGASET_DEBUG) gives it the ability to produce additional
+     information useful for debugging.
+
+     You can control the amount of debugging information the driver produces by
+     writing an appropriate value to /sys/module/gigaset/parameters/debug, e.g.
+        echo 0 > /sys/module/gigaset/parameters/debug
+     switches off debugging output completely,
+        echo 0x10a020 > /sys/module/gigaset/parameters/debug
+     enables the standard set of debugging output messages. These values are
+     bit patterns where every bit controls a certain type of debugging output.
+     See the constants DEBUG_* in the source file gigaset.h for details.
+
+     The initial value can be set using the debug parameter when loading the
+     module "gigaset", e.g. by adding a line
+        options gigaset debug=0
+     to /etc/modprobe.conf, ...
+
+     Generated debugging information can be found
+     - as output of the command
+         dmesg
+     - in system log files written by your syslog daemon, usually
+       in /var/log/, e.g. /var/log/messages.
+
+3.3. Reporting problems and bugs
+     ---------------------------
+     If you can't solve problems with the driver on your own, feel free to
+     use one of the forums, bug trackers, or mailing lists on
+         http://sourceforge.net/projects/gigaset307x
+     or write an electronic mail to the maintainers.
+
+     Try to provide as much information as possible, such as
+     - distribution
+     - kernel version (uname -r)
+     - gcc version (gcc --version)
+     - hardware architecture (uname -m, ...)
+     - type and firmware version of your device (base and wireless module,
+       if any)
+     - output of "lsusb -v" (if using an USB device)
+     - error messages
+     - relevant system log messages (it would help if you activate debug
+       output as described in 3.2.)
+
+     For help with general configuration problems not specific to our driver,
+     such as isdn4linux and network configuration issues, please refer to the
+     appropriate forums and newsgroups.
+
+3.4. Reporting problem solutions
+     ---------------------------
+     If you solved a problem with our drivers, wrote startup scripts for your
+     distribution, ... feel free to contact us (using one of the places
+     mentioned in 3.3.). We'd like to add scripts, hints, documentation
+     to the driver and/or the project web page.
+
+
+4.   Links, other software
+     ---------------------
+     - Sourceforge project developing this driver and associated tools
+         http://sourceforge.net/projects/gigaset307x
+     - Yahoo! Group on the Siemens Gigaset family of devices
+         http://de.groups.yahoo.com/group/Siemens-Gigaset
+     - Siemens Gigaset/T-Sinus compatibility table
+         http://www.erbze.info/sinus_gigaset.htm
+
+
+5.   Credits
+     -------
+     Thanks to
+
+     Karsten Keil
+        for his help with isdn4linux
+     Deti Fliegl
+        for his base driver code
+     Dennis Dietrich
+        for his kernel 2.6 patches
+     Andreas Rummel
+        for his work and logs to get unimodem mode working
+     Andreas Degert
+        for his logs and patches to get cx 100 working
+     Dietrich Feist
+        for his generous donation of one M105 and two M101 cordless adapters
+     Christoph Schweers
+        for his generous donation of a M34 device
+
+     and all the other people who sent logs and other information.
+
diff --git a/Documentation/kbuild/modules.txt b/Documentation/kbuild/modules.txt
index fcccf2432f98..61fc079eb966 100644
--- a/Documentation/kbuild/modules.txt
+++ b/Documentation/kbuild/modules.txt
@@ -44,7 +44,7 @@ What is covered within this file is mainly information to authors
 of modules. The author of an external modules 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
-chapter ¤. Creating a kbuild file for an external module".
+chapter 4, "Creating a kbuild file for an external module".
 
 
 === 2. How to build external modules
diff --git a/Documentation/laptop-mode.txt b/Documentation/laptop-mode.txt
index b18e21675906..5696e879449b 100644
--- a/Documentation/laptop-mode.txt
+++ b/Documentation/laptop-mode.txt
@@ -919,11 +919,11 @@ int main(int argc, char **argv)
     int settle_time = 60;
 
     /* Parse the simple command-line */
-    if (ac == 2)
-        disk = av[1];
-    else if (ac == 4) {
-        settle_time = atoi(av[2]);
-        disk = av[3];
+    if (argc == 2)
+        disk = argv[1];
+    else if (argc == 4) {
+        settle_time = atoi(argv[2]);
+        disk = argv[3];
     } else
         usage();
 
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt
index f8550310a6d5..92f0056d928c 100644
--- a/Documentation/memory-barriers.txt
+++ b/Documentation/memory-barriers.txt
@@ -610,6 +610,7 @@ loads.  Consider the following sequence of events:
 
         CPU 1                   CPU 2
         ======================= =======================
+                { B = 7; X = 9; Y = 8; C = &Y }
         STORE A = 1
         STORE B = 2
         <write barrier>
@@ -651,7 +652,20 @@ In the above example, CPU 2 perceives that B is 7, despite the load of *C
 (which would be B) coming after the the LOAD of C.
 
 If, however, a data dependency barrier were to be placed between the load of C
-and the load of *C (ie: B) on CPU 2, then the following will occur:
+and the load of *C (ie: B) on CPU 2:
+
+        CPU 1                   CPU 2
+        ======================= =======================
+                { B = 7; X = 9; Y = 8; C = &Y }
+        STORE A = 1
+        STORE B = 2
+        <write barrier>
+        STORE C = &B            LOAD X
+        STORE D = 4             LOAD C (gets &B)
+                                <data dependency barrier>
+                                LOAD *C (reads B)
+
+then the following will occur:
 
         +-------+       :      :                :       :
         |       |       +------+                +-------+
@@ -829,8 +843,8 @@ There are some more advanced barrier functions:
  (*) smp_mb__after_atomic_inc();
 
      These are for use with atomic add, subtract, increment and decrement
-     functions, especially when used for reference counting.  These functions
-     do not imply memory barriers.
+     functions that don't return a value, especially when used for reference
+     counting.  These functions do not imply memory barriers.
 
      As an example, consider a piece of code that marks an object as being dead
      and then decrements the object's reference count:
@@ -1263,15 +1277,17 @@ else.
 ATOMIC OPERATIONS
 -----------------
 
-Though they are technically interprocessor interaction considerations, atomic
-operations are noted specially as they do _not_ generally imply memory
-barriers.  The possible offenders include:
+Whilst they are technically interprocessor interaction considerations, atomic
+operations are noted specially as some of them imply full memory barriers and
+some don't, but they're very heavily relied on as a group throughout the
+kernel.
+
+Any atomic operation that modifies some state in memory and returns information
+about the state (old or new) implies an SMP-conditional general memory barrier
+(smp_mb()) on each side of the actual operation.  These include:
 
         xchg();
         cmpxchg();
-        test_and_set_bit();
-        test_and_clear_bit();
-        test_and_change_bit();
         atomic_cmpxchg();
         atomic_inc_return();
         atomic_dec_return();
@@ -1282,21 +1298,31 @@ barriers.  The possible offenders include:
         atomic_sub_and_test();
         atomic_add_negative();
         atomic_add_unless();
+        test_and_set_bit();
+        test_and_clear_bit();
+        test_and_change_bit();
 
-These may be used for such things as implementing LOCK operations or controlling
-the lifetime of objects by decreasing their reference counts.  In such cases
-they need preceding memory barriers.
+These are used for such things as implementing LOCK-class and UNLOCK-class
+operations and adjusting reference counters towards object destruction, and as
+such the implicit memory barrier effects are necessary.
 
-The following may also be possible offenders as they may be used as UNLOCK
-operations.
 
+The following operation are potential problems as they do _not_ imply memory
+barriers, but might be used for implementing such things as UNLOCK-class
+operations:
+
+        atomic_set();
         set_bit();
         clear_bit();
         change_bit();
-        atomic_set();
 
+With these the appropriate explicit memory barrier should be used if necessary
+(smp_mb__before_clear_bit() for instance).
 
-The following are a little tricky:
+
+The following also do _not_ imply memory barriers, and so may require explicit
+memory barriers under some circumstances (smp_mb__before_atomic_dec() for
+instance)):
 
         atomic_add();
         atomic_sub();
@@ -1317,10 +1343,12 @@ specific order.
 
 
 Basically, each usage case has to be carefully considered as to whether memory
-barriers are needed or not.  The simplest rule is probably: if the atomic
-operation is protected by a lock, then it does not require a barrier unless
-there's another operation within the critical section with respect to which an
-ordering must be maintained.
+barriers are needed or not.
+
+[!] Note that special memory barrier primitives are available for these
+situations because on some CPUs the atomic instructions used imply full memory
+barriers, and so barrier instructions are superfluous in conjunction with them,
+and in such cases the special barrier primitives will be no-ops.
 
 See Documentation/atomic_ops.txt for more information.
 
diff --git a/Documentation/mtrr.txt b/Documentation/mtrr.txt
index b78af1c32996..c39ac395970e 100644
--- a/Documentation/mtrr.txt
+++ b/Documentation/mtrr.txt
@@ -138,19 +138,29 @@ Reading MTRRs from a C program using ioctl()'s:
 
 */
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#define MTRR_NEED_STRINGS
 #include <asm/mtrr.h>
 
 #define TRUE 1
 #define FALSE 0
 #define ERRSTRING strerror (errno)
 
+static char *mtrr_strings[MTRR_NUM_TYPES] =
+{
+    "uncachable",               /* 0 */
+    "write-combining",          /* 1 */
+    "?",                        /* 2 */
+    "?",                        /* 3 */
+    "write-through",            /* 4 */
+    "write-protect",            /* 5 */
+    "write-back",               /* 6 */
+};
 
 int main ()
 {
@@ -232,13 +242,22 @@ Creating MTRRs from a C programme using ioctl()'s:
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#define MTRR_NEED_STRINGS
 #include <asm/mtrr.h>
 
 #define TRUE 1
 #define FALSE 0
 #define ERRSTRING strerror (errno)
 
+static char *mtrr_strings[MTRR_NUM_TYPES] =
+{
+    "uncachable",               /* 0 */
+    "write-combining",          /* 1 */
+    "?",                        /* 2 */
+    "?",                        /* 3 */
+    "write-through",            /* 4 */
+    "write-protect",            /* 5 */
+    "write-back",               /* 6 */
+};
 
 int main (int argc, char **argv)
 {
diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt
index 331afd791cbb..ce767b90bb0d 100644
--- a/Documentation/scsi/scsi_eh.txt
+++ b/Documentation/scsi/scsi_eh.txt
@@ -19,9 +19,9 @@ TABLE OF CONTENTS
         [2-1-1] Overview
         [2-1-2] Flow of scmds through EH
         [2-1-3] Flow of control
-    [2-2] EH through hostt->eh_strategy_handler()
-        [2-2-1] Pre hostt->eh_strategy_handler() SCSI midlayer conditions
-        [2-2-2] Post hostt->eh_strategy_handler() SCSI midlayer conditions
+    [2-2] EH through transportt->eh_strategy_handler()
+        [2-2-1] Pre transportt->eh_strategy_handler() SCSI midlayer conditions
+        [2-2-2] Post transportt->eh_strategy_handler() SCSI midlayer conditions
         [2-2-3] Things to consider
 
 
@@ -413,9 +413,9 @@ scmd->allowed.
             layer of failure of the scmds.
 
 
-[2-2] EH through hostt->eh_strategy_handler()
+[2-2] EH through transportt->eh_strategy_handler()
 
- hostt->eh_strategy_handler() is invoked in the place of
+ transportt->eh_strategy_handler() is invoked in the place of
 scsi_unjam_host() and it is responsible for whole recovery process.
 On completion, the handler should have made lower layers forget about
 all failed scmds and either ready for new commands or offline.  Also,
@@ -424,7 +424,7 @@ SCSI midlayer.  IOW, of the steps described in [2-1-2], all steps
 except for #1 must be implemented by eh_strategy_handler().
 
 
-[2-2-1] Pre hostt->eh_strategy_handler() SCSI midlayer conditions
+[2-2-1] Pre transportt->eh_strategy_handler() SCSI midlayer conditions
 
  The following conditions are true on entry to the handler.
 
@@ -437,7 +437,7 @@ except for #1 must be implemented by eh_strategy_handler().
  - shost->host_failed == shost->host_busy
 
 
-[2-2-2] Post hostt->eh_strategy_handler() SCSI midlayer conditions
+[2-2-2] Post transportt->eh_strategy_handler() SCSI midlayer conditions
 
  The following conditions must be true on exit from the handler.
 
diff --git a/Documentation/scsi/scsi_mid_low_api.txt b/Documentation/scsi/scsi_mid_low_api.txt
index 8bbae3e1abdf..75a535a975c3 100644
--- a/Documentation/scsi/scsi_mid_low_api.txt
+++ b/Documentation/scsi/scsi_mid_low_api.txt
@@ -804,7 +804,6 @@ Summary:
    eh_bus_reset_handler - issue SCSI bus reset
    eh_device_reset_handler - issue SCSI device reset
    eh_host_reset_handler - reset host (host bus adapter)
-   eh_strategy_handler - driver supplied alternate to scsi_unjam_host()
    info - supply information about given host
    ioctl - driver can respond to ioctls
    proc_info - supports /proc/scsi/{driver_name}/{host_no}
@@ -970,24 +969,6 @@ Details:
 
 
 /**
- *      eh_strategy_handler - driver supplied alternate to scsi_unjam_host()
- *      @shp: host on which error has occurred
- *
- *      Returns TRUE if host unjammed, else FALSE.
- *
- *      Locks: none
- *
- *      Calling context: kernel thread
- *
- *      Notes: Invoked from scsi_eh thread. LLD supplied alternate to 
- *      scsi_unjam_host() found in scsi_error.c
- *
- *      Optionally defined in: LLD
- **/
-     int eh_strategy_handler(struct Scsi_Host * shp)
-
-
-/**
  *      info - supply information about given host: driver name plus data
  *             to distinguish given host
  *      @shp: host to supply information about
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index 6feef9e82b63..68eeebc17ff4 100644
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -1123,8 +1123,8 @@
           if ((err = pci_enable_device(pci)) < 0)
                   return err;
           /* check PCI availability (28bit DMA) */
-          if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
-              pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
+          if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
+              pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
                   printk(KERN_ERR "error to set 28bit mask DMA\n");
                   pci_disable_device(pci);
                   return -ENXIO;
@@ -1216,7 +1216,7 @@
         The allocation of PCI resources is done in the
       <function>probe()</function> function, and usually an extra
       <function>xxx_create()</function> function is written for this
-      purpose. 
+      purpose.
       </para>
 
       <para>
@@ -1225,7 +1225,7 @@
       allocating resources. Also, you need to set the proper PCI DMA
       mask to limit the accessed i/o range. In some cases, you might
       need to call <function>pci_set_master()</function> function,
-      too. 
+      too.
       </para>
 
       <para>
@@ -1236,8 +1236,8 @@
 <![CDATA[
   if ((err = pci_enable_device(pci)) < 0)
           return err;
-  if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
-      pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
+  if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
+      pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
           printk(KERN_ERR "error to set 28bit mask DMA\n");
           pci_disable_device(pci);
           return -ENXIO;
@@ -1256,13 +1256,13 @@
       functions. Unlike ALSA ver.0.5.x., there are no helpers for
       that. And these resources must be released in the destructor
       function (see below). Also, on ALSA 0.9.x, you don't need to
-      allocate (pseudo-)DMA for PCI like ALSA 0.5.x. 
+      allocate (pseudo-)DMA for PCI like ALSA 0.5.x.
       </para>
 
       <para>
         Now assume that this PCI device has an I/O port with 8 bytes
         and an interrupt. Then struct <structname>mychip</structname> will have the
-        following fields: 
+        following fields:
 
         <informalexample>
           <programlisting>
diff --git a/Documentation/vm/hugetlbpage.txt b/Documentation/vm/hugetlbpage.txt
index 1ad9af1ca4d0..2803f63c1a27 100644
--- a/Documentation/vm/hugetlbpage.txt
+++ b/Documentation/vm/hugetlbpage.txt
@@ -27,7 +27,7 @@ number of free hugetlb pages at any time.  It also displays information about
 the configured hugepage size - this is needed for generating the proper
 alignment and size of the arguments to the above system calls.
 
-The output of "cat /proc/meminfo" will have output like:
+The output of "cat /proc/meminfo" will have lines like:
 
 .....
 HugePages_Total: xxx
@@ -42,11 +42,11 @@ pages in the kernel.  Super user can dynamically request more (or free some
 pre-configured) hugepages.
 The allocation (or deallocation) of hugetlb pages is possible only if there are
 enough physically contiguous free pages in system (freeing of hugepages is
-possible only if there are enough hugetlb pages free that can be transfered
+possible only if there are enough hugetlb pages free that can be transferred
 back to regular memory pool).
 
-Pages that are used as hugetlb pages are reserved inside the kernel and can
-not be used for other purposes.
+Pages that are used as hugetlb pages are reserved inside the kernel and cannot
+be used for other purposes.
 
 Once the kernel with Hugetlb page support is built and running, a user can
 use either the mmap system call or shared memory system calls to start using
@@ -60,7 +60,7 @@ Use the following command to dynamically allocate/deallocate hugepages:
 This command will try to configure 20 hugepages in the system.  The success
 or failure of allocation depends on the amount of physically contiguous
 memory that is preset in system at this time.  System administrators may want
-to put this command in one of the local rc init file.  This will enable the
+to put this command in one of the local rc init files.  This will enable the
 kernel to request huge pages early in the boot process (when the possibility
 of getting physical contiguous pages is still very high).
 
@@ -78,8 +78,8 @@ the uid and gid of the current process are taken.  The mode option sets the
 mode of root of file system to value & 0777.  This value is given in octal.
 By default the value 0755 is picked. The size option sets the maximum value of
 memory (huge pages) allowed for that filesystem (/mnt/huge). The size is
-rounded down to HPAGE_SIZE.  The option nr_inode sets the maximum number of
-inodes that /mnt/huge can use.  If the size or nr_inode options are not
+rounded down to HPAGE_SIZE.  The option nr_inodes sets the maximum number of
+inodes that /mnt/huge can use.  If the size or nr_inodes options are not
 provided on command line then no limits are set.  For size and nr_inodes
 options, you can use [G|g]/[M|m]/[K|k] to represent giga/mega/kilo. For
 example, size=2K has the same meaning as size=2048. An example is given at
@@ -88,7 +88,7 @@ the end of this document.
 read and write system calls are not supported on files that reside on hugetlb
 file systems.
 
-A regular chown, chgrp and chmod commands (with right permissions) could be
+Regular chown, chgrp, and chmod commands (with right permissions) could be
 used to change the file attributes on hugetlbfs.
 
 Also, it is important to note that no such mount command is required if the
@@ -96,8 +96,8 @@ applications are going to use only shmat/shmget system calls.  Users who
 wish to use hugetlb page via shared memory segment should be a member of
 a supplementary group and system admin needs to configure that gid into
 /proc/sys/vm/hugetlb_shm_group.  It is possible for same or different
-applications to use any combination of mmaps and shm* calls.  Though the
-mount of filesystem will be required for using mmaps.
+applications to use any combination of mmaps and shm* calls, though the
+mount of filesystem will be required for using mmap calls.
 
 *******************************************************************
 
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 1921353259ae..f2cd6ef53ff3 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -151,6 +151,11 @@ NUMA
 
   numa=fake=X   Fake X nodes and ignore NUMA setup of the actual machine.
 
+  numa=hotadd=percent
+                Only allow hotadd memory to preallocate page structures upto
+                percent of already available memory.
+                numa=hotadd=0 will disable hotadd memory.
+
 ACPI
 
   acpi=off      Don't enable ACPI
diff --git a/Kbuild b/Kbuild
index 95d6a00bace0..2d4f95e4b89f 100644
--- a/Kbuild
+++ b/Kbuild
@@ -18,7 +18,7 @@ define sed-y
         "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"
 endef
 # Override default regexp for specific architectures
-sed-$(CONFIG_MIPS) := "/^@@@/s///p"
+sed-$(CONFIG_MIPS) := "/^@@@/{s/^@@@//; s/ \#.*\$$//; p;}"
 
 quiet_cmd_offsets = GEN     $@
 define cmd_offsets
diff --git a/MAINTAINERS b/MAINTAINERS
index f97657b7e2c7..d00dea52123f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1556,9 +1556,7 @@ S:	Maintained
 
 KEXEC
 P:      Eric Biederman
-P:      Randy Dunlap
 M:      ebiederm@xmission.com
-M:      rdunlap@xenotime.net
 W:      http://www.xmission.com/~ebiederm/files/kexec/
 L:      linux-kernel@vger.kernel.org
 L:      fastboot@osdl.org
diff --git a/Makefile b/Makefile
index b4019426fa25..fc8e08c419f0 100644
--- a/Makefile
+++ b/Makefile
@@ -1112,7 +1112,6 @@ modules_install: _emodinst_ _emodinst_post
 install-dir := $(if $(INSTALL_MOD_DIR),$(INSTALL_MOD_DIR),extra)
 PHONY += _emodinst_
 _emodinst_:
-        $(Q)rm -rf $(MODLIB)/$(install-dir)
         $(Q)mkdir -p $(MODLIB)/$(install-dir)
         $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modinst
 
@@ -1275,40 +1274,43 @@ kernelversion:
 
 # Single targets
 # ---------------------------------------------------------------------------
-# The directory part is taken from first prerequisite, so this
-# works even with external modules
+# Single targets are compatible with:
+# - build whith mixed source and output
+# - build with separate output dir 'make O=...'
+# - external modules
+#
+#  target-dir => where to store outputfile
+#  build-dir  => directory in kernel source tree to use
+
+ifeq ($(KBUILD_EXTMOD),)
+        build-dir  = $(patsubst %/,%,$(dir $@))
+        target-dir = $(dir $@)
+else
+        zap-slash=$(filter-out .,$(patsubst %/,%,$(dir $@)))
+        build-dir  = $(KBUILD_EXTMOD)$(if $(zap-slash),/$(zap-slash))
+        target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
+endif
+
 %.s: %.c prepare scripts FORCE
-        $(Q)$(MAKE) $(build)=$(dir $<) $(dir $<)$(notdir $@)
+        $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
 %.i: %.c prepare scripts FORCE
-        $(Q)$(MAKE) $(build)=$(dir $<) $(dir $<)$(notdir $@)
+        $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
 %.o: %.c prepare scripts FORCE
-        $(Q)$(MAKE) $(build)=$(dir $<) $(dir $<)$(notdir $@)
+        $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
 %.lst: %.c prepare scripts FORCE
-        $(Q)$(MAKE) $(build)=$(dir $<) $(dir $<)$(notdir $@)
+        $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
 %.s: %.S prepare scripts FORCE
-        $(Q)$(MAKE) $(build)=$(dir $<) $(dir $<)$(notdir $@)
+        $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
 %.o: %.S prepare scripts FORCE
-        $(Q)$(MAKE) $(build)=$(dir $<) $(dir $<)$(notdir $@)
-
-# For external modules we shall include any directory of the target,
-# but usual case there is no directory part.
-# make M=`pwd` module.o     => $(dir $@)=./
-# make M=`pwd` foo/module.o => $(dir $@)=foo/
-# make M=`pwd` /            => $(dir $@)=/
- 
-ifeq ($(KBUILD_EXTMOD),)
-        target-dir = $(@D)
-else
-        zap-slash=$(filter-out .,$(patsubst %/,%,$(dir $@)))
-        target-dir = $(KBUILD_EXTMOD)$(if $(zap-slash),/$(zap-slash))
-endif
+        $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
 
-/ %/:      scripts prepare FORCE
+# Modules
+/ %/: prepare scripts FORCE
         $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
-        $(build)=$(target-dir)
-%.ko: scripts FORCE
+        $(build)=$(build-dir)
+%.ko: prepare scripts FORCE
         $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
-        $(build)=$(target-dir) $(@:.ko=.o)
+        $(build)=$(build-dir) $(@:.ko=.o)
         $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modpost
 
 # FIXME Should go into a make.lib or something 
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 9bef61b30367..8290b69da202 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -549,6 +549,11 @@ config NUMA
           Access).  This option is for configuring high-end multiprocessor
           server machines.  If in doubt, say N.
 
+config NODES_SHIFT
+        int
+        default "7"
+        depends on NEED_MULTIPLE_NODES
+
 # LARGE_VMALLOC is racy, if you *really* need it then fix it first
 config ALPHA_LARGE_VMALLOC
         bool
diff --git a/arch/alpha/kernel/alpha_ksyms.c b/arch/alpha/kernel/alpha_ksyms.c
index 9d6186d50245..c645c5e14786 100644
--- a/arch/alpha/kernel/alpha_ksyms.c
+++ b/arch/alpha/kernel/alpha_ksyms.c
@@ -76,7 +76,6 @@ EXPORT_SYMBOL(strncpy);
 EXPORT_SYMBOL(strnlen);
 EXPORT_SYMBOL(strncat);
 EXPORT_SYMBOL(strstr);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strchr);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(memcmp);
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index a15e18a00258..558b83368559 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -24,6 +24,7 @@
 #include <linux/config.h>       /* CONFIG_ALPHA_LCA etc */
 #include <linux/mc146818rtc.h>
 #include <linux/console.h>
+#include <linux/cpu.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/string.h>
@@ -471,6 +472,22 @@ page_is_ram(unsigned long pfn)
         return 0;
 }
 
+static int __init
+register_cpus(void)
+{
+        int i;
+
+        for_each_possible_cpu(i) {
+                struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);
+                if (!p)
+                        return -ENOMEM;
+                register_cpu(p, i, NULL);
+        }
+        return 0;
+}
+
+arch_initcall(register_cpus);
+
 void __init
 setup_arch(char **cmdline_p)
 {
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 02c2db08114a..185255416e85 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -439,7 +439,7 @@ setup_smp(void)
                         if ((cpu->flags & 0x1cc) == 0x1cc) {
                                 smp_num_probed++;
                                 /* Assume here that "whami" == index */
-                                cpu_set(i, cpu_possible_map);
+                                cpu_set(i, cpu_present_mask);
                                 cpu->pal_revision = boot_cpu_palrev;
                         }
 
@@ -450,9 +450,8 @@ setup_smp(void)
                 }
         } else {
                 smp_num_probed = 1;
-                cpu_set(boot_cpuid, cpu_possible_map);
+                cpu_set(boot_cpuid, cpu_present_mask);
         }
-        cpu_present_mask = cpumask_of_cpu(boot_cpuid);
 
         printk(KERN_INFO "SMP: %d CPUs probed -- cpu_present_mask = %lx\n",
                smp_num_probed, cpu_possible_map.bits[0]);
@@ -488,9 +487,8 @@ void __devinit
 smp_prepare_boot_cpu(void)
 {
         /*
-         * Mark the boot cpu (current cpu) as both present and online
+         * Mark the boot cpu (current cpu) as online
          */ 
-        cpu_set(smp_processor_id(), cpu_present_mask);
         cpu_set(smp_processor_id(), cpu_online_map);
 }
 
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dc5a9332c915..1dbf6ddb300d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -512,6 +512,12 @@ config ARCH_DISCONTIGMEM_ENABLE
           or have huge holes in the physical address space for other reasons.
           See <file:Documentation/vm/numa> for more.
 
+config NODES_SHIFT
+        int
+        default "4" if ARCH_LH7A40X
+        default "2"
+        depends on NEED_MULTIPLE_NODES
+
 source "mm/Kconfig"
 
 config LEDS
diff --git a/arch/arm/boot/compressed/vmlinux.lds.in b/arch/arm/boot/compressed/vmlinux.lds.in
index eed616113e47..153a07e7222b 100644
--- a/arch/arm/boot/compressed/vmlinux.lds.in
+++ b/arch/arm/boot/compressed/vmlinux.lds.in
@@ -18,6 +18,7 @@ SECTIONS
     _start = .;
     *(.start)
     *(.text)
+    *(.text.*)
     *(.fixup)
     *(.gnu.warning)
     *(.rodata)
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index ee083b3f0522..c49b5d4d7fca 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -101,7 +101,6 @@ EXPORT_SYMBOL(__raw_writesl);
 
         /* string / mem functions */
 EXPORT_SYMBOL(strchr);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(memset);
 EXPORT_SYMBOL(memcpy);
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 437528403959..8cff73e668b3 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -322,6 +322,12 @@ static void __init setup_processor(void)
         sprintf(system_utsname.machine, "%s%c", list->arch_name, ENDIANNESS);
         sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS);
         elf_hwcap = list->elf_hwcap;
+#ifndef CONFIG_ARM_THUMB
+        elf_hwcap &= ~HWCAP_THUMB;
+#endif
+#ifndef CONFIG_VFP
+        elf_hwcap &= ~HWCAP_VFP;
+#endif
 
         cpu_proc_init();
 }
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 876c38da14f7..847329cafc5c 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -25,10 +25,6 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/gpio.h>
 
-extern void omap_nop_release(struct device *dev);
-
-/*-------------------------------------------------------------------------*/
-
 #if     defined(CONFIG_OMAP1610_IR) || defined(CONFIG_OMAP161O_IR_MODULE)
 
 static u64 irda_dmamask = 0xffffffff;
@@ -37,7 +33,6 @@ static struct platform_device omap1610ir_device = {
         .name = "omap1610-ir",
         .id = -1,
         .dev = {
-                .release        = omap_nop_release,
                 .dma_mask       = &irda_dmamask,
         },
 };
@@ -84,9 +79,6 @@ static struct resource rtc_resources[] = {
 static struct platform_device omap_rtc_device = {
         .name           = "omap_rtc",
         .id             = -1,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(rtc_resources),
         .resource       = rtc_resources,
 };
@@ -124,9 +116,6 @@ static struct resource sti_resources[] = {
 static struct platform_device sti_device = {
         .name           = "sti",
         .id             = -1,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(sti_resources),
         .resource       = sti_resources,
 };
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index def9e5370edf..fb7f91da1aad 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -25,10 +25,6 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/gpio.h>
 
-extern void omap_nop_release(struct device *dev);
-
-/*-------------------------------------------------------------------------*/
-
 #if     defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
 
 #define OMAP2_I2C_BASE2         0x48072000
@@ -49,9 +45,6 @@ static struct resource i2c_resources2[] = {
 static struct platform_device omap_i2c_device2 = {
         .name           = "i2c_omap",
         .id             = 2,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(i2c_resources2),
         .resource       = i2c_resources2,
 };
@@ -100,9 +93,6 @@ static struct resource sti_resources[] = {
 static struct platform_device sti_device = {
         .name           = "sti",
         .id             = -1,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(sti_resources),
         .resource       = sti_resources,
 };
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c
index b7f85e6d6b76..6de713ad319a 100644
--- a/arch/arm/mach-s3c2410/clock.c
+++ b/arch/arm/mach-s3c2410/clock.c
@@ -367,6 +367,8 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent)
                 source = S3C2410_MISCCR_CLK0_UPLL;
         else if (parent == &clk_f)
                 source = S3C2410_MISCCR_CLK0_FCLK;
+        else if (parent == &clk_h)
+                source = S3C2410_MISCCR_CLK0_HCLK;
         else if (parent == &clk_p)
                 source = S3C2410_MISCCR_CLK0_PCLK;
         else if (clk == &s3c24xx_clkout0 && parent == &s3c24xx_dclk0)
@@ -376,6 +378,8 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent)
         else
                 return -EINVAL;
 
+        clk->parent = parent;
+
         if (clk == &s3c24xx_dclk0)
                 mask = S3C2410_MISCCR_CLK0_MASK;
         else {
diff --git a/arch/arm/mach-s3c2410/common-smdk.c b/arch/arm/mach-s3c2410/common-smdk.c
index 36b8291b5e03..f372fbda124e 100644
--- a/arch/arm/mach-s3c2410/common-smdk.c
+++ b/arch/arm/mach-s3c2410/common-smdk.c
@@ -37,6 +37,7 @@
 
 #include <asm/arch/nand.h>
 
+#include "common-smdk.h"
 #include "devs.h"
 #include "pm.h"
 
diff --git a/arch/arm/mm/cache-v4wb.S b/arch/arm/mm/cache-v4wb.S
index 5c4055b62d97..54e3c5bb5186 100644
--- a/arch/arm/mm/cache-v4wb.S
+++ b/arch/arm/mm/cache-v4wb.S
@@ -10,7 +10,7 @@
 #include <linux/config.h>
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/hardware.h>
+#include <asm/memory.h>
 #include <asm/page.h>
 #include "proc-macros.S"
 
@@ -46,6 +46,11 @@
  */
 #define CACHE_DLIMIT    (CACHE_DSIZE * 4)
 
+        .data
+flush_base:
+        .long   FLUSH_BASE
+        .text
+
 /*
  *      flush_user_cache_all()
  *
@@ -63,11 +68,21 @@ ENTRY(v4wb_flush_kern_cache_all)
         mov     ip, #0
         mcr     p15, 0, ip, c7, c5, 0           @ invalidate I cache
 __flush_whole_cache:
-        mov     r0, #FLUSH_BASE
-        add     r1, r0, #CACHE_DSIZE
-1:      ldr     r2, [r0], #32
-        cmp     r0, r1
+        ldr     r3, =flush_base
+        ldr     r1, [r3, #0]
+        eor     r1, r1, #CACHE_DSIZE
+        str     r1, [r3, #0]
+        add     r2, r1, #CACHE_DSIZE
+1:      ldr     r3, [r1], #32
+        cmp     r1, r2
+        blo     1b
+#ifdef FLUSH_BASE_MINICACHE
+        add     r2, r2, #FLUSH_BASE_MINICACHE - FLUSH_BASE
+        sub     r1, r2, #512                    @ only 512 bytes
+1:      ldr     r3, [r1], #32
+        cmp     r1, r2
         blo     1b
+#endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain write buffer
         mov     pc, lr
 
@@ -82,6 +97,7 @@ __flush_whole_cache:
  *      - flags - vma_area_struct flags describing address space
  */
 ENTRY(v4wb_flush_user_cache_range)
+        mov     ip, #0
         sub     r3, r1, r0                      @ calculate total size
         tst     r2, #VM_EXEC                    @ executable region?
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 88279124317a..9ea1f87a7079 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -20,6 +20,7 @@
 
 #include <asm/mach-types.h>
 #include <asm/setup.h>
+#include <asm/sizes.h>
 #include <asm/tlb.h>
 
 #include <asm/mach/arch.h>
@@ -455,14 +456,14 @@ static void __init devicemaps_init(struct machine_desc *mdesc)
 #ifdef FLUSH_BASE
         map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
         map.virtual = FLUSH_BASE;
-        map.length = PGDIR_SIZE;
+        map.length = SZ_1M;
         map.type = MT_CACHECLEAN;
         create_mapping(&map);
 #endif
 #ifdef FLUSH_BASE_MINICACHE
-        map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + PGDIR_SIZE);
+        map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
         map.virtual = FLUSH_BASE_MINICACHE;
-        map.length = PGDIR_SIZE;
+        map.length = SZ_1M;
         map.type = MT_MINICLEAN;
         create_mapping(&map);
 #endif
diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
index c916a6cae404..a2dd5ae1077d 100644
--- a/arch/arm/mm/proc-sa110.S
+++ b/arch/arm/mm/proc-sa110.S
@@ -26,22 +26,7 @@
  * the cache line size of the I and D cache
  */
 #define DCACHELINESIZE  32
-#define FLUSH_OFFSET    32768
 
-        .macro flush_110_dcache rd, ra, re
-        ldr     \rd, =flush_base
-        ldr     \ra, [\rd]
-        eor     \ra, \ra, #FLUSH_OFFSET
-        str     \ra, [\rd]
-        add     \re, \ra, #16384                @ only necessary for 16k
-1001:   ldr     \rd, [\ra], #DCACHELINESIZE
-        teq     \re, \ra
-        bne     1001b
-        .endm
-
-        .data
-flush_base:
-        .long   FLUSH_BASE
         .text
 
 /*
@@ -145,13 +130,11 @@ ENTRY(cpu_sa110_dcache_clean_area)
  */
         .align  5
 ENTRY(cpu_sa110_switch_mm)
-        flush_110_dcache        r3, ip, r1
-        mov     r1, #0
-        mcr     p15, 0, r1, c7, c5, 0           @ invalidate I cache
-        mcr     p15, 0, r1, c7, c10, 4          @ drain WB
+        str     lr, [sp, #-4]!
+        bl      v4wb_flush_kern_cache_all       @ clears IP
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
-        mcr     p15, 0, r1, c8, c7, 0           @ invalidate I & D TLBs
-        mov     pc, lr
+        mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+        ldr     pc, [sp], #4
 
 /*
  * cpu_sa110_set_pte(ptep, pte)
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
index 41f21f2dd8ff..777ad99c1439 100644
--- a/arch/arm/mm/proc-sa1100.S
+++ b/arch/arm/mm/proc-sa1100.S
@@ -30,30 +30,6 @@
  * the cache line size of the I and D cache
  */
 #define DCACHELINESIZE  32
-#define FLUSH_OFFSET    32768
-
-        .macro flush_1100_dcache rd, ra, re
-        ldr     \rd, =flush_base
-        ldr     \ra, [\rd]
-        eor     \ra, \ra, #FLUSH_OFFSET
-        str     \ra, [\rd]
-        add     \re, \ra, #8192                 @ only necessary for 8k
-1001:   ldr     \rd, [\ra], #DCACHELINESIZE
-        teq     \re, \ra
-        bne     1001b
-#ifdef FLUSH_BASE_MINICACHE
-        add     \ra, \ra, #FLUSH_BASE_MINICACHE - FLUSH_BASE
-        add     \re, \ra, #512                  @ only 512 bytes
-1002:   ldr     \rd, [\ra], #DCACHELINESIZE
-        teq     \re, \ra
-        bne     1002b
-#endif
-        .endm
-
-        .data
-flush_base:
-        .long   FLUSH_BASE
-        .text
 
         __INIT
 
@@ -79,9 +55,8 @@ ENTRY(cpu_sa1100_proc_fin)
         stmfd   sp!, {lr}
         mov     ip, #PSR_F_BIT | PSR_I_BIT | SVC_MODE
         msr     cpsr_c, ip
-        flush_1100_dcache r0, r1, r2            @ clean caches
-        mov     r0, #0
-        mcr     p15, 0, r0, c15, c2, 2          @ Disable clock switching
+        bl      v4wb_flush_kern_cache_all
+        mcr     p15, 0, ip, c15, c2, 2          @ Disable clock switching
         mrc     p15, 0, r0, c1, c0, 0           @ ctrl register
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x000e                 @ ............wca.
@@ -167,14 +142,12 @@ ENTRY(cpu_sa1100_dcache_clean_area)
  */
         .align  5
 ENTRY(cpu_sa1100_switch_mm)
-        flush_1100_dcache r3, ip, r1
-        mov     ip, #0
-        mcr     p15, 0, ip, c7, c5, 0           @ invalidate I cache
+        str     lr, [sp, #-4]!
+        bl      v4wb_flush_kern_cache_all       @ clears IP
         mcr     p15, 0, ip, c9, c0, 0           @ invalidate RB
-        mcr     p15, 0, ip, c7, c10, 4          @ drain WB
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
-        mov     pc, lr
+        ldr     pc, [sp], #4
 
 /*
  * cpu_sa1100_set_pte(ptep, pte)
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 06485c193ee3..32ec04c58bcd 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -58,7 +58,7 @@ struct clk * clk_get(struct device *dev, const char *id)
                 if (p->id == idno &&
                     strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
                         clk = p;
-                        break;
+                        goto found;
                 }
         }
 
@@ -69,6 +69,7 @@ struct clk * clk_get(struct device *dev, const char *id)
                 }
         }
 
+found:
         mutex_unlock(&clocks_mutex);
 
         return clk;
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 079b67deac0f..5d5d6eb222dd 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -26,14 +26,6 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/menelaus.h>
 
-
-void omap_nop_release(struct device *dev)
-{
-        /* Nothing */
-}
-
-/*-------------------------------------------------------------------------*/
-
 #if     defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
 
 #define OMAP1_I2C_BASE          0xfffb3800
@@ -59,9 +51,6 @@ static struct resource i2c_resources1[] = {
 static struct platform_device omap_i2c_device1 = {
         .name           = "i2c_omap",
         .id             = 1,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(i2c_resources1),
         .resource       = i2c_resources1,
 };
@@ -187,7 +176,6 @@ static struct platform_device mmc_omap_device1 = {
         .name           = "mmci-omap",
         .id             = 1,
         .dev = {
-                .release        = omap_nop_release,
                 .dma_mask       = &mmc1_dmamask,
                 .platform_data  = &mmc1_conf,
         },
@@ -217,7 +205,6 @@ static struct platform_device mmc_omap_device2 = {
         .name           = "mmci-omap",
         .id             = 2,
         .dev = {
-                .release        = omap_nop_release,
                 .dma_mask       = &mmc2_dmamask,
                 .platform_data  = &mmc2_conf,
         },
@@ -321,9 +308,6 @@ static struct resource uwire_resources[] = {
 static struct platform_device omap_uwire_device = {
         .name      = "omap_uwire",
         .id          = -1,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(uwire_resources),
         .resource       = uwire_resources,
 };
@@ -365,9 +349,6 @@ static struct resource wdt_resources[] = {
 static struct platform_device omap_wdt_device = {
         .name      = "omap_wdt",
         .id          = -1,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(wdt_resources),
         .resource       = wdt_resources,
 };
@@ -401,9 +382,6 @@ static struct resource rng_resources[] = {
 static struct platform_device omap_rng_device = {
         .name      = "omap_rng",
         .id          = -1,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(rng_resources),
         .resource       = rng_resources,
 };
diff --git a/arch/arm/vfp/vfpdouble.c b/arch/arm/vfp/vfpdouble.c
index 9b367a65cb4d..febd115dba28 100644
--- a/arch/arm/vfp/vfpdouble.c
+++ b/arch/arm/vfp/vfpdouble.c
@@ -588,6 +588,7 @@ static u32 vfp_double_ftosi(int sd, int unused, int dm, u32 fpscr)
         struct vfp_double vdm;
         u32 d, exceptions = 0;
         int rmode = fpscr & FPSCR_RMODE_MASK;
+        int tm;
 
         vfp_double_unpack(&vdm, vfp_get_double(dm));
         vfp_double_dump("VDM", &vdm);
@@ -595,10 +596,14 @@ static u32 vfp_double_ftosi(int sd, int unused, int dm, u32 fpscr)
         /*
          * Do we have denormalised number?
          */
-        if (vfp_double_type(&vdm) & VFP_DENORMAL)
+        tm = vfp_double_type(&vdm);
+        if (tm & VFP_DENORMAL)
                 exceptions |= FPSCR_IDC;
 
-        if (vdm.exponent >= 1023 + 32) {
+        if (tm & VFP_NAN) {
+                d = 0;
+                exceptions |= FPSCR_IOC;
+        } else if (vdm.exponent >= 1023 + 32) {
                 d = 0x7fffffff;
                 if (vdm.sign)
                         d = ~d;
@@ -1122,9 +1127,9 @@ u32 vfp_double_cpdo(u32 inst, u32 fpscr)
 {
         u32 op = inst & FOP_MASK;
         u32 exceptions = 0;
-        unsigned int dd = vfp_get_sd(inst);
-        unsigned int dn = vfp_get_sn(inst);
-        unsigned int dm = vfp_get_sm(inst);
+        unsigned int dd = vfp_get_dd(inst);
+        unsigned int dn = vfp_get_dn(inst);
+        unsigned int dm = vfp_get_dm(inst);
         unsigned int vecitr, veclen, vecstride;
         u32 (*fop)(int, int, s32, u32);
 
@@ -1141,7 +1146,7 @@ u32 vfp_double_cpdo(u32 inst, u32 fpscr)
         pr_debug("VFP: vecstride=%u veclen=%u\n", vecstride,
                  (veclen >> FPSCR_LENGTH_BIT) + 1);
 
-        fop = (op == FOP_EXT) ? fop_extfns[dn] : fop_fns[FOP_TO_IDX(op)];
+        fop = (op == FOP_EXT) ? fop_extfns[FEXT_TO_IDX(inst)] : fop_fns[FOP_TO_IDX(op)];
         if (!fop)
                 goto invalid;
 
@@ -1149,17 +1154,13 @@ u32 vfp_double_cpdo(u32 inst, u32 fpscr)
                 u32 except;
 
                 if (op == FOP_EXT)
-                        pr_debug("VFP: itr%d (d%u.%u) = op[%u] (d%u.%u)\n",
+                        pr_debug("VFP: itr%d (d%u) = op[%u] (d%u)\n",
                                  vecitr >> FPSCR_LENGTH_BIT,
-                                 dd >> 1, dd & 1, dn,
-                                 dm >> 1, dm & 1);
+                                 dd, dn, dm);
                 else
-                        pr_debug("VFP: itr%d (d%u.%u) = (d%u.%u) op[%u] (d%u.%u)\n",
+                        pr_debug("VFP: itr%d (d%u) = (d%u) op[%u] (d%u)\n",
                                  vecitr >> FPSCR_LENGTH_BIT,
-                                 dd >> 1, dd & 1,
-                                 dn >> 1, dn & 1,
-                                 FOP_TO_IDX(op),
-                                 dm >> 1, dm & 1);
+                                 dd, dn, FOP_TO_IDX(op), dm);
 
                 except = fop(dd, dn, dm, fpscr);
                 pr_debug("VFP: itr%d: exceptions=%08x\n",
diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
index b7ed57e00cd4..a3f65b47aea9 100644
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
@@ -189,11 +189,10 @@ vfp_put_float:
 
         .globl  vfp_get_double
 vfp_get_double:
-        mov     r0, r0, lsr #1
         add     pc, pc, r0, lsl #3
         mov     r0, r0
         .irp    dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
-        mrrc    p10, 1, r0, r1, c\dr    @ fmrrd r0, r1, d\dr
+        mrrc    p11, 1, r0, r1, c\dr    @ fmrrd r0, r1, d\dr
         mov     pc, lr
         .endr
 
@@ -204,10 +203,9 @@ vfp_get_double:
 
         .globl  vfp_put_double
 vfp_put_double:
-        mov     r0, r0, lsr #1
         add     pc, pc, r0, lsl #3
         mov     r0, r0
         .irp    dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
-        mcrr    p10, 1, r1, r2, c\dr    @ fmrrd r1, r2, d\dr
+        mcrr    p11, 1, r1, r2, c\dr    @ fmdrr r1, r2, d\dr
         mov     pc, lr
         .endr
diff --git a/arch/arm/vfp/vfpsingle.c b/arch/arm/vfp/vfpsingle.c
index 14dd696ddeb1..4ac27f193934 100644
--- a/arch/arm/vfp/vfpsingle.c
+++ b/arch/arm/vfp/vfpsingle.c
@@ -632,6 +632,7 @@ static u32 vfp_single_ftosi(int sd, int unused, s32 m, u32 fpscr)
         struct vfp_single vsm;
         u32 d, exceptions = 0;
         int rmode = fpscr & FPSCR_RMODE_MASK;
+        int tm;
 
         vfp_single_unpack(&vsm, m);
         vfp_single_dump("VSM", &vsm);
@@ -639,10 +640,14 @@ static u32 vfp_single_ftosi(int sd, int unused, s32 m, u32 fpscr)
         /*
          * Do we have a denormalised number?
          */
+        tm = vfp_single_type(&vsm);
         if (vfp_single_type(&vsm) & VFP_DENORMAL)
                 exceptions |= FPSCR_IDC;
 
-        if (vsm.exponent >= 127 + 32) {
+        if (tm & VFP_NAN) {
+                d = 0;
+                exceptions |= FPSCR_IOC;
+        } else if (vsm.exponent >= 127 + 32) {
                 /*
                  * m >= 2^31-2^7: invalid
                  */
@@ -1188,7 +1193,7 @@ u32 vfp_single_cpdo(u32 inst, u32 fpscr)
         pr_debug("VFP: vecstride=%u veclen=%u\n", vecstride,
                  (veclen >> FPSCR_LENGTH_BIT) + 1);
 
-        fop = (op == FOP_EXT) ? fop_extfns[sn] : fop_fns[FOP_TO_IDX(op)];
+        fop = (op == FOP_EXT) ? fop_extfns[FEXT_TO_IDX(inst)] : fop_fns[FOP_TO_IDX(op)];
         if (!fop)
                 goto invalid;
 
diff --git a/arch/arm26/kernel/armksyms.c b/arch/arm26/kernel/armksyms.c
index a6a1b3373444..9d66c27f2724 100644
--- a/arch/arm26/kernel/armksyms.c
+++ b/arch/arm26/kernel/armksyms.c
@@ -152,7 +152,6 @@ EXPORT_SYMBOL(strncmp);
 EXPORT_SYMBOL(strchr);
 EXPORT_SYMBOL(strlen);
 EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(memset);
diff --git a/arch/cris/kernel/crisksyms.c b/arch/cris/kernel/crisksyms.c
index de39725da920..d57859053ce7 100644
--- a/arch/cris/kernel/crisksyms.c
+++ b/arch/cris/kernel/crisksyms.c
@@ -39,7 +39,6 @@ EXPORT_SYMBOL(loops_per_usec);
 /* String functions */
 EXPORT_SYMBOL(memcmp);
 EXPORT_SYMBOL(memmove);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(strcpy);
 EXPORT_SYMBOL(strchr);
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S
index 1d21c8d34d8a..a9b59527a741 100644
--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
@@ -1170,12 +1170,6 @@ __syscall_badsys:
 # syscall vector table
 #
 ###############################################################################
-#ifdef CONFIG_MMU
-#define __MMU(X) X
-#else
-#define __MMU(X) sys_ni_syscall
-#endif
-
         .section .rodata
 ALIGN
         .globl          sys_call_table
@@ -1305,7 +1299,7 @@ sys_call_table:
         .long sys_newuname
         .long sys_ni_syscall    /* old "cacheflush" */
         .long sys_adjtimex
-        .long __MMU(sys_mprotect) /* 125 */
+        .long sys_mprotect      /* 125 */
         .long sys_sigprocmask
         .long sys_ni_syscall    /* old "create_module" */
         .long sys_init_module
@@ -1324,16 +1318,16 @@ sys_call_table:
         .long sys_getdents
         .long sys_select
         .long sys_flock
-        .long __MMU(sys_msync)
+        .long sys_msync
         .long sys_readv         /* 145 */
         .long sys_writev
         .long sys_getsid
         .long sys_fdatasync
         .long sys_sysctl
-        .long __MMU(sys_mlock)          /* 150 */
-        .long __MMU(sys_munlock)
-        .long __MMU(sys_mlockall)
-        .long __MMU(sys_munlockall)
+        .long sys_mlock         /* 150 */
+        .long sys_munlock
+        .long sys_mlockall
+        .long sys_munlockall
         .long sys_sched_setparam
         .long sys_sched_getparam   /* 155 */
         .long sys_sched_setscheduler
@@ -1343,7 +1337,7 @@ sys_call_table:
         .long sys_sched_get_priority_min  /* 160 */
         .long sys_sched_rr_get_interval
         .long sys_nanosleep
-        .long __MMU(sys_mremap)
+        .long sys_mremap
         .long sys_setresuid16
         .long sys_getresuid16   /* 165 */
         .long sys_ni_syscall    /* for vm86 */
@@ -1398,8 +1392,8 @@ sys_call_table:
         .long sys_setfsuid              /* 215 */
         .long sys_setfsgid
         .long sys_pivot_root
-        .long __MMU(sys_mincore)
-        .long __MMU(sys_madvise)
+        .long sys_mincore
+        .long sys_madvise
         .long sys_getdents64    /* 220 */
         .long sys_fcntl64
         .long sys_ni_syscall    /* reserved for TUX */
@@ -1437,7 +1431,7 @@ sys_call_table:
         .long sys_epoll_create
         .long sys_epoll_ctl     /* 255 */
         .long sys_epoll_wait
-        .long __MMU(sys_remap_file_pages)
+        .long sys_remap_file_pages
         .long sys_set_tid_address
         .long sys_timer_create
         .long sys_timer_settime         /* 260 */
diff --git a/arch/frv/kernel/frv_ksyms.c b/arch/frv/kernel/frv_ksyms.c
index 07c8ffa0dd39..0f273a7aca5a 100644
--- a/arch/frv/kernel/frv_ksyms.c
+++ b/arch/frv/kernel/frv_ksyms.c
@@ -27,7 +27,6 @@ EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(iounmap);
 
 EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(strchr);
diff --git a/arch/h8300/kernel/h8300_ksyms.c b/arch/h8300/kernel/h8300_ksyms.c
index b6cd78c972bb..f8d6dee84781 100644
--- a/arch/h8300/kernel/h8300_ksyms.c
+++ b/arch/h8300/kernel/h8300_ksyms.c
@@ -25,7 +25,6 @@ extern char h8300_debug_device[];
 /* platform dependent support */
 
 EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(strchr);
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index f17bd1d2707e..18ec9fe6deb6 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -53,6 +53,35 @@ source "init/Kconfig"
 
 menu "Processor type and features"
 
+config SMP
+        bool "Symmetric multi-processing support"
+        ---help---
+          This enables support for systems with more than one CPU. If you have
+          a system with only one CPU, like most personal computers, say N. If
+          you have a system with more than one CPU, say Y.
+
+          If you say N here, the kernel will run on single and multiprocessor
+          machines, but will use only one CPU of a multiprocessor machine. If
+          you say Y here, the kernel will run on many, but not all,
+          singleprocessor machines. On a singleprocessor machine, the kernel
+          will run faster if you say N here.
+
+          Note that if you say Y here and choose architecture "586" or
+          "Pentium" under "Processor family", the kernel will not work on 486
+          architectures. Similarly, multiprocessor kernels for the "PPro"
+          architecture may not work on all Pentium based boards.
+
+          People using multiprocessor machines who say Y here should also say
+          Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
+          Management" code will be disabled if you say Y here.
+
+          See also the <file:Documentation/smp.txt>,
+          <file:Documentation/i386/IO-APIC.txt>,
+          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
+          <http://www.tldp.org/docs.html#howto>.
+
+          If you don't know what to do here, say N.
+
 choice
         prompt "Subarchitecture Type"
         default X86_PC
@@ -178,35 +207,6 @@ config HPET_EMULATE_RTC
         depends on HPET_TIMER && RTC=y
         default y
 
-config SMP
-        bool "Symmetric multi-processing support"
-        ---help---
-          This enables support for systems with more than one CPU. If you have
-          a system with only one CPU, like most personal computers, say N. If
-          you have a system with more than one CPU, say Y.
-
-          If you say N here, the kernel will run on single and multiprocessor
-          machines, but will use only one CPU of a multiprocessor machine. If
-          you say Y here, the kernel will run on many, but not all,
-          singleprocessor machines. On a singleprocessor machine, the kernel
-          will run faster if you say N here.
-
-          Note that if you say Y here and choose architecture "586" or
-          "Pentium" under "Processor family", the kernel will not work on 486
-          architectures. Similarly, multiprocessor kernels for the "PPro"
-          architecture may not work on all Pentium based boards.
-
-          People using multiprocessor machines who say Y here should also say
-          Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
-          Management" code will be disabled if you say Y here.
-
-          See also the <file:Documentation/smp.txt>,
-          <file:Documentation/i386/IO-APIC.txt>,
-          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
-          <http://www.tldp.org/docs.html#howto>.
-
-          If you don't know what to do here, say N.
-
 config NR_CPUS
         int "Maximum number of CPUs (2-255)"
         range 2 255
@@ -522,6 +522,12 @@ config NUMA
 comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
         depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI)
 
+config NODES_SHIFT
+        int
+        default "4" if X86_NUMAQ
+        default "3"
+        depends on NEED_MULTIPLE_NODES
+
 config HAVE_ARCH_BOOTMEM_NODE
         bool
         depends on NUMA
@@ -757,15 +763,6 @@ config HOTPLUG_CPU
 
           Say N.
 
-config DOUBLEFAULT
-        default y
-        bool "Enable doublefault exception handler" if EMBEDDED
-        help
-          This option allows trapping of rare doublefault exceptions that
-          would otherwise cause a system to silently reboot. Disabling this
-          option saves about 4k and might cause you much additional grey
-          hair.
-
 endmenu
 
 
diff --git a/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu
index 79603b3471f9..eb130482ba18 100644
--- a/arch/i386/Kconfig.cpu
+++ b/arch/i386/Kconfig.cpu
@@ -311,5 +311,5 @@ config X86_OOSTORE
 
 config X86_TSC
         bool
-        depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ
+        depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ
         default y
diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 0000a2674537..c9343c3a8082 100644
--- a/arch/i386/boot/video.S
+++ b/arch/i386/boot/video.S
@@ -97,6 +97,7 @@
 #define PARAM_VESAPM_OFF        0x30
 #define PARAM_LFB_PAGES         0x32
 #define PARAM_VESA_ATTRIB       0x34
+#define PARAM_CAPABILITIES      0x36
 
 /* Define DO_STORE according to CONFIG_VIDEO_RETAIN */
 #ifdef CONFIG_VIDEO_RETAIN
@@ -233,6 +234,10 @@ mopar_gr:
         movw    18(%di), %ax
         movl    %eax, %fs:(PARAM_LFB_SIZE)
 
+# store mode capabilities
+        movl 10(%di), %eax
+        movl %eax, %fs:(PARAM_CAPABILITIES)
+
 # switching the DAC to 8-bit is for <= 8 bpp only
         movw    %fs:(PARAM_LFB_DEPTH), %ax
         cmpw    $8, %ax
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 033066176b3e..030a0007a4e0 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -168,7 +168,7 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size)
         unsigned long i;
         int config_size;
 
-        if (!phys_addr || !size)
+        if (!phys_addr || !size || !cpu_has_apic)
                 return -EINVAL;
 
         mcfg = (struct acpi_table_mcfg *)__acpi_map_table(phys_addr, size);
@@ -215,7 +215,7 @@ static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size)
 {
         struct acpi_table_madt *madt = NULL;
 
-        if (!phys_addr || !size)
+        if (!phys_addr || !size || !cpu_has_apic)
                 return -EINVAL;
 
         madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size);
@@ -693,6 +693,9 @@ static int __init acpi_parse_madt_lapic_entries(void)
 {
         int count;
 
+        if (!cpu_has_apic)
+                return -ENODEV;
+
         /* 
          * Note that the LAPIC address is obtained from the MADT (32-bit value)
          * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).
@@ -751,6 +754,9 @@ static int __init acpi_parse_madt_ioapic_entries(void)
                 return -ENODEV;
         }
 
+        if (!cpu_has_apic)
+                return -ENODEV;
+
         /*
          * if "noapic" boot option, don't look for IO-APICs
          */
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c
index 6273bf74c203..254cee9f0b7b 100644
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
@@ -62,6 +62,18 @@ int apic_verbosity;
 
 static void apic_pm_activate(void);
 
+int modern_apic(void)
+{
+        unsigned int lvr, version;
+        /* AMD systems use old APIC versions, so check the CPU */
+        if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD &&
+                boot_cpu_data.x86 >= 0xf)
+                return 1;
+        lvr = apic_read(APIC_LVR);
+        version = GET_APIC_VERSION(lvr);
+        return version >= 0x14;
+}
+
 /*
  * 'what should we do if we get a hw irq event on an illegal vector'.
  * each architecture has to answer this themselves.
@@ -119,10 +131,7 @@ void enable_NMI_through_LVT0 (void * dummy)
 
 int get_physical_broadcast(void)
 {
-        unsigned int lvr, version;
-        lvr = apic_read(APIC_LVR);
-        version = GET_APIC_VERSION(lvr);
-        if (!APIC_INTEGRATED(version) || version >= 0x14)
+        if (modern_apic())
                 return 0xff;
         else
                 return 0xf;
@@ -349,9 +358,9 @@ int __init verify_local_APIC(void)
 
 void __init sync_Arb_IDs(void)
 {
-        /* Unsupported on P4 - see Intel Dev. Manual Vol. 3, Ch. 8.6.1 */
-        unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));
-        if (ver >= 0x14)        /* P4 or higher */
+        /* Unsupported on P4 - see Intel Dev. Manual Vol. 3, Ch. 8.6.1
+           And not needed on AMD */
+        if (modern_apic())
                 return;
         /*
          * Wait for idle.
diff --git a/arch/i386/kernel/cpu/amd.c b/arch/i386/kernel/cpu/amd.c
index 0810f81f2a05..ff2b2154ac1b 100644
--- a/arch/i386/kernel/cpu/amd.c
+++ b/arch/i386/kernel/cpu/amd.c
@@ -212,8 +212,6 @@ static void __init init_amd(struct cpuinfo_x86 *c)
 
         if (cpuid_eax(0x80000000) >= 0x80000008) {
                 c->x86_max_cores = (cpuid_ecx(0x80000008) & 0xff) + 1;
-                if (c->x86_max_cores & (c->x86_max_cores - 1))
-                        c->x86_max_cores = 1;
         }
 
         if (cpuid_eax(0x80000000) >= 0x80000007) {
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
index 712a26bd4457..7c0e160a2145 100644
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
@@ -46,7 +46,7 @@
 
 #define PFX "powernow-k8: "
 #define BFX PFX "BIOS error: "
-#define VERSION "version 1.60.1"
+#define VERSION "version 1.60.2"
 #include "powernow-k8.h"
 
 /* serialize freq changes  */
@@ -55,7 +55,7 @@ static DEFINE_MUTEX(fidvid_mutex);
 static struct powernow_k8_data *powernow_data[NR_CPUS];
 
 #ifndef CONFIG_SMP
-static cpumask_t cpu_core_map[1] = { CPU_MASK_ALL };
+static cpumask_t cpu_core_map[1];
 #endif
 
 /* Return a frequency in MHz, given an input fid */
@@ -910,6 +910,9 @@ static int powernowk8_target(struct cpufreq_policy *pol, unsigned targfreq, unsi
         unsigned int newstate;
         int ret = -EIO;
 
+        if (!data)
+                return -EINVAL;
+
         /* only run on specific CPU from here on */
         oldmask = current->cpus_allowed;
         set_cpus_allowed(current, cpumask_of_cpu(pol->cpu));
@@ -969,6 +972,9 @@ static int powernowk8_verify(struct cpufreq_policy *pol)
 {
         struct powernow_k8_data *data = powernow_data[pol->cpu];
 
+        if (!data)
+                return -EINVAL;
+
         return cpufreq_frequency_table_verify(pol, data->powernow_table);
 }
 
@@ -977,7 +983,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
 {
         struct powernow_k8_data *data;
         cpumask_t oldmask = CPU_MASK_ALL;
-        int rc, i;
+        int rc;
 
         if (!cpu_online(pol->cpu))
                 return -ENODEV;
@@ -1063,8 +1069,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
         printk("cpu_init done, current fid 0x%x, vid 0x%x\n",
                data->currfid, data->currvid);
 
-        for_each_cpu_mask(i, cpu_core_map[pol->cpu])
-                powernow_data[i] = data;
+        powernow_data[pol->cpu] = data;
 
         return 0;
 
@@ -1104,6 +1109,9 @@ static unsigned int powernowk8_get (unsigned int cpu)
         if (!data)
                 return -EINVAL;
 
+        if (!data)
+                return -EINVAL;
+
         set_cpus_allowed(current, cpumask_of_cpu(cpu));
         if (smp_processor_id() != cpu) {
                 printk(KERN_ERR PFX "limiting to CPU %d failed in powernowk8_get\n", cpu);
diff --git a/arch/i386/kernel/i386_ksyms.c b/arch/i386/kernel/i386_ksyms.c
index 055325056a74..036a9857936f 100644
--- a/arch/i386/kernel/i386_ksyms.c
+++ b/arch/i386/kernel/i386_ksyms.c
@@ -19,7 +19,6 @@ EXPORT_SYMBOL(__put_user_2);
 EXPORT_SYMBOL(__put_user_4);
 EXPORT_SYMBOL(__put_user_8);
 
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strstr);
 
 #ifdef CONFIG_SMP
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index 8d8aa9d1796d..34d21e21e012 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -38,12 +38,6 @@
 int smp_found_config;
 unsigned int __initdata maxcpus = NR_CPUS;
 
-#ifdef CONFIG_HOTPLUG_CPU
-#define CPU_HOTPLUG_ENABLED     (1)
-#else
-#define CPU_HOTPLUG_ENABLED     (0)
-#endif
-
 /*
  * Various Linux-internal data structures created from the
  * MP-table.
@@ -110,21 +104,6 @@ static int __init mpf_checksum(unsigned char *mp, int len)
 static int mpc_record; 
 static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY] __initdata;
 
-#ifdef CONFIG_X86_NUMAQ
-static int MP_valid_apicid(int apicid, int version)
-{
-        return hweight_long(apicid & 0xf) == 1 && (apicid >> 4) != 0xf;
-}
-#else
-static int MP_valid_apicid(int apicid, int version)
-{
-        if (version >= 0x14)
-                return apicid < 0xff;
-        else
-                return apicid < 0xf;
-}
-#endif
-
 static void __devinit MP_processor_info (struct mpc_config_processor *m)
 {
         int ver, apicid;
@@ -190,12 +169,6 @@ static void __devinit MP_processor_info (struct mpc_config_processor *m)
 
         ver = m->mpc_apicver;
 
-        if (!MP_valid_apicid(apicid, ver)) {
-                printk(KERN_WARNING "Processor #%d INVALID. (Max ID: %d).\n",
-                        m->mpc_apicid, MAX_APICS);
-                return;
-        }
-
         /*
          * Validate version
          */
@@ -225,7 +198,14 @@ static void __devinit MP_processor_info (struct mpc_config_processor *m)
         cpu_set(num_processors, cpu_possible_map);
         num_processors++;
 
-        if (CPU_HOTPLUG_ENABLED || (num_processors > 8)) {
+        /*
+         * Would be preferable to switch to bigsmp when CONFIG_HOTPLUG_CPU=y
+         * but we need to work other dependencies like SMP_SUSPEND etc
+         * before this can be done without some confusion.
+         * if (CPU_HOTPLUG_ENABLED || num_processors > 8)
+         *       - Ashok Raj <ashok.raj@intel.com>
+         */
+        if (num_processors > 8) {
                 switch (boot_cpu_data.x86_vendor) {
                 case X86_VENDOR_INTEL:
                         if (!APIC_XAPIC(ver)) {
@@ -249,6 +229,13 @@ static void __init MP_bus_info (struct mpc_config_bus *m)
 
         mpc_oem_bus_info(m, str, translation_table[mpc_record]);
 
+        if (m->mpc_busid >= MAX_MP_BUSSES) {
+                printk(KERN_WARNING "MP table busid value (%d) for bustype %s "
+                        " is too large, max. supported is %d\n",
+                        m->mpc_busid, str, MAX_MP_BUSSES - 1);
+                return;
+        }
+
         if (strncmp(str, BUSTYPE_ISA, sizeof(BUSTYPE_ISA)-1) == 0) {
                 mp_bus_id_to_type[m->mpc_busid] = MP_BUS_ISA;
         } else if (strncmp(str, BUSTYPE_EISA, sizeof(BUSTYPE_EISA)-1) == 0) {
diff --git a/arch/i386/kernel/reboot_fixups.c b/arch/i386/kernel/reboot_fixups.c
index 10e21a4773dd..99aab41a05b0 100644
--- a/arch/i386/kernel/reboot_fixups.c
+++ b/arch/i386/kernel/reboot_fixups.c
@@ -51,7 +51,5 @@ void mach_reboot_fixups(void)
 
                 cur->reboot_fixup(dev);
         }
-
-        printk(KERN_WARNING "No reboot fixup found for your hardware\n");
 }
 
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index eacc3f0a2ea4..80cb3b2d0997 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -963,6 +963,36 @@ efi_memory_present_wrapper(unsigned long start, unsigned long end, void *arg)
         return 0;
 }
 
+ /*
+  * This function checks if the entire range <start,end> is mapped with type.
+  *
+  * Note: this function only works correct if the e820 table is sorted and
+  * not-overlapping, which is the case
+  */
+int __init
+e820_all_mapped(unsigned long start, unsigned long end, unsigned type)
+{
+        int i;
+        for (i = 0; i < e820.nr_map; i++) {
+                struct e820entry *ei = &e820.map[i];
+                if (type && ei->type != type)
+                        continue;
+                /* is the region (part) in overlap with the current region ?*/
+                if (ei->addr >= end || ei->addr + ei->size <= start)
+                        continue;
+                /* if the region is at the beginning of <start,end> we move
+                 * start to the end of the region since it's ok until there
+                 */
+                if (ei->addr <= start)
+                        start = ei->addr + ei->size;
+                /* if start is now at or beyond end, we're done, full
+                 * coverage */
+                if (start >= end)
+                        return 1; /* we're done */
+        }
+        return 0;
+}
+
 /*
  * Find the highest page frame number we have available
  */
@@ -1317,8 +1347,8 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat
 /*
  * Request address space for all standard resources
  *
- * This is called just before pcibios_assign_resources(), which is also
- * an fs_initcall, but is linked in later (in arch/i386/pci/i386.c).
+ * This is called just before pcibios_init(), which is also a
+ * subsys_initcall, but is linked in later (in arch/i386/pci/common.c).
  */
 static int __init request_standard_resources(void)
 {
@@ -1339,7 +1369,7 @@ static int __init request_standard_resources(void)
         return 0;
 }
 
-fs_initcall(request_standard_resources);
+subsys_initcall(request_standard_resources);
 
 static void __init register_memory(void)
 {
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index e38527994590..2d22f5761b1d 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -365,6 +365,9 @@ void die(const char * str, struct pt_regs * regs, long err)
 
         if (++die.lock_owner_depth < 3) {
                 int nl = 0;
+                unsigned long esp;
+                unsigned short ss;
+
                 handle_BUG(regs);
                 printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
 #ifdef CONFIG_PREEMPT
@@ -387,8 +390,19 @@ void die(const char * str, struct pt_regs * regs, long err)
                         printk("\n");
                 if (notify_die(DIE_OOPS, str, regs, err,
                                         current->thread.trap_no, SIGSEGV) !=
-                                NOTIFY_STOP)
+                                NOTIFY_STOP) {
                         show_registers(regs);
+                        /* Executive summary in case the oops scrolled away */
+                        esp = (unsigned long) (&regs->esp);
+                        savesegment(ss, ss);
+                        if (user_mode(regs)) {
+                                esp = regs->esp;
+                                ss = regs->xss & 0xffff;
+                        }
+                        printk(KERN_EMERG "EIP: [<%08lx>] ", regs->eip);
+                        print_symbol("%s", regs->eip);
+                        printk(" SS:ESP %04x:%08lx\n", ss, esp);
+                }
                 else
                         regs = NULL;
         } else
diff --git a/arch/i386/mach-voyager/voyager_cat.c b/arch/i386/mach-voyager/voyager_cat.c
index 23967fe658d3..3039539de51e 100644
--- a/arch/i386/mach-voyager/voyager_cat.c
+++ b/arch/i386/mach-voyager/voyager_cat.c
@@ -106,9 +106,15 @@ voyager_module_t *voyager_cat_list;
 
 /* the I/O port assignments for the VIC and QIC */
 static struct resource vic_res = {
-        "Voyager Interrupt Controller", 0xFC00, 0xFC6F };
+        .name   = "Voyager Interrupt Controller",
+        .start  = 0xFC00,
+        .end    = 0xFC6F
+};
 static struct resource qic_res = {
-        "Quad Interrupt Controller", 0xFC70, 0xFCFF };
+        .name   = "Quad Interrupt Controller",
+        .start  = 0xFC70,
+        .end    = 0xFCFF
+};
 
 /* This function is used to pack a data bit stream inside a message.
  * It writes num_bits of the data buffer in msg starting at start_bit.
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 9f66ac582a8b..ae6534ad8161 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -651,6 +651,7 @@ void __init mem_init(void)
  * Specifically, in the case of x86, we will always add
  * memory to the highmem for now.
  */
+#ifdef CONFIG_HOTPLUG_MEMORY
 #ifndef CONFIG_NEED_MULTIPLE_NODES
 int add_memory(u64 start, u64 size)
 {
@@ -667,6 +668,7 @@ int remove_memory(u64 start, u64 size)
         return -EINVAL;
 }
 #endif
+#endif
 
 kmem_cache_t *pgd_cache;
 kmem_cache_t *pmd_cache;
diff --git a/arch/i386/pci/direct.c b/arch/i386/pci/direct.c
index 99012b93bd12..5d81fb510375 100644
--- a/arch/i386/pci/direct.c
+++ b/arch/i386/pci/direct.c
@@ -4,6 +4,7 @@
 
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/dmi.h>
 #include "pci.h"
 
 /*
@@ -18,8 +19,10 @@ int pci_conf1_read(unsigned int seg, unsigned int bus,
 {
         unsigned long flags;
 
-        if (!value || (bus > 255) || (devfn > 255) || (reg > 255))
+        if ((bus > 255) || (devfn > 255) || (reg > 255)) {
+                *value = -1;
                 return -EINVAL;
+        }
 
         spin_lock_irqsave(&pci_config_lock, flags);
 
@@ -91,8 +94,10 @@ static int pci_conf2_read(unsigned int seg, unsigned int bus,
         unsigned long flags;
         int dev, fn;
 
-        if (!value || (bus > 255) || (devfn > 255) || (reg > 255))
+        if ((bus > 255) || (devfn > 255) || (reg > 255)) {
+                *value = -1;
                 return -EINVAL;
+        }
 
         dev = PCI_SLOT(devfn);
         fn = PCI_FUNC(devfn);
@@ -188,6 +193,10 @@ static int __init pci_sanity_check(struct pci_raw_ops *o)
 
         if (pci_probe & PCI_NO_CHECKS)
                 return 1;
+        /* Assume Type 1 works for newer systems.
+           This handles machines that don't have anything on PCI Bus 0. */
+        if (dmi_get_year(DMI_BIOS_DATE) >= 2001)
+                return 1;
 
         for (devfn = 0; devfn < 0x100; devfn++) {
                 if (o->read(0, 0, devfn, PCI_CLASS_DEVICE, 2, &x))
diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index 613789071f30..6b1ea0c9a570 100644
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
@@ -12,14 +12,20 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
+#include <asm/e820.h>
 #include "pci.h"
 
+#define MMCONFIG_APER_SIZE (256*1024*1024)
+
+/* Assume systems with more busses have correct MCFG */
+#define MAX_CHECK_BUS 16
+
 #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))
 
 /* The base address of the last MMCONFIG device accessed */
 static u32 mmcfg_last_accessed_device;
 
-static DECLARE_BITMAP(fallback_slots, 32);
+static DECLARE_BITMAP(fallback_slots, MAX_CHECK_BUS*32);
 
 /*
  * Functions for accessing PCI configuration space with MMCONFIG accesses
@@ -29,8 +35,8 @@ static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn)
         int cfg_num = -1;
         struct acpi_table_mcfg_config *cfg;
 
-        if (seg == 0 && bus == 0 &&
-            test_bit(PCI_SLOT(devfn), fallback_slots))
+        if (seg == 0 && bus < MAX_CHECK_BUS &&
+            test_bit(PCI_SLOT(devfn) + 32*bus, fallback_slots))
                 return 0;
 
         while (1) {
@@ -74,8 +80,10 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
         unsigned long flags;
         u32 base;
 
-        if (!value || (bus > 255) || (devfn > 255) || (reg > 4095))
+        if ((bus > 255) || (devfn > 255) || (reg > 4095)) {
+                *value = -1;
                 return -EINVAL;
+        }
 
         base = get_base_addr(seg, bus, devfn);
         if (!base)
@@ -146,29 +154,34 @@ static struct pci_raw_ops pci_mmcfg = {
    Normally this can be expressed in the MCFG by not listing them
    and assigning suitable _SEGs, but this isn't implemented in some BIOS.
    Instead try to discover all devices on bus 0 that are unreachable using MM
-   and fallback for them.
-   We only do this for bus 0/seg 0 */
+   and fallback for them. */
 static __init void unreachable_devices(void)
 {
-        int i;
+        int i, k;
         unsigned long flags;
 
-        for (i = 0; i < 32; i++) {
-                u32 val1;
-                u32 addr;
-
-                pci_conf1_read(0, 0, PCI_DEVFN(i, 0), 0, 4, &val1);
-                if (val1 == 0xffffffff)
-                        continue;
-
-                /* Locking probably not needed, but safer */
-                spin_lock_irqsave(&pci_config_lock, flags);
-                addr = get_base_addr(0, 0, PCI_DEVFN(i, 0));
-                if (addr != 0)
-                        pci_exp_set_dev_base(addr, 0, PCI_DEVFN(i, 0));
-                if (addr == 0 || readl((u32 __iomem *)mmcfg_virt_addr) != val1)
-                        set_bit(i, fallback_slots);
-                spin_unlock_irqrestore(&pci_config_lock, flags);
+        for (k = 0; k < MAX_CHECK_BUS; k++) {
+                for (i = 0; i < 32; i++) {
+                        u32 val1;
+                        u32 addr;
+
+                        pci_conf1_read(0, k, PCI_DEVFN(i, 0), 0, 4, &val1);
+                        if (val1 == 0xffffffff)
+                                continue;
+
+                        /* Locking probably not needed, but safer */
+                        spin_lock_irqsave(&pci_config_lock, flags);
+                        addr = get_base_addr(0, k, PCI_DEVFN(i, 0));
+                        if (addr != 0)
+                                pci_exp_set_dev_base(addr, k, PCI_DEVFN(i, 0));
+                        if (addr == 0 ||
+                            readl((u32 __iomem *)mmcfg_virt_addr) != val1) {
+                                set_bit(i, fallback_slots);
+                                printk(KERN_NOTICE
+                        "PCI: No mmconfig possible on %x:%x\n", k, i);
+                        }
+                        spin_unlock_irqrestore(&pci_config_lock, flags);
+                }
         }
 }
 
@@ -183,6 +196,14 @@ void __init pci_mmcfg_init(void)
             (pci_mmcfg_config[0].base_address == 0))
                 return;
 
+        if (!e820_all_mapped(pci_mmcfg_config[0].base_address,
+                        pci_mmcfg_config[0].base_address + MMCONFIG_APER_SIZE,
+                        E820_RESERVED)) {
+                printk(KERN_ERR "PCI: BIOS Bug: MCFG area is not E820-reserved\n");
+                printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
+                return;
+        }
+
         printk(KERN_INFO "PCI: Using MMCONFIG\n");
         raw_pci_ops = &pci_mmcfg;
         pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index edffe25a477a..9f40eeff0b5c 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -260,15 +260,6 @@ config NR_CPUS
           than 64 will cause the use of a CPU mask array, causing a small
           performance hit.
 
-config IA64_NR_NODES
-        int "Maximum number of NODEs (256-1024)" if (IA64_SGI_SN2 || IA64_GENERIC)
-        range 256 1024
-        depends on IA64_SGI_SN2 || IA64_GENERIC
-        default "256"
-        help
-          This option specifies the maximum number of nodes in your SSI system.
-          If in doubt, use the default.
-
 config HOTPLUG_CPU
         bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
         depends on SMP && EXPERIMENTAL
@@ -352,6 +343,16 @@ config NUMA
           Access).  This option is for configuring high-end multiprocessor
           server systems.  If in doubt, say N.
 
+config NODES_SHIFT
+        int "Max num nodes shift(3-10)"
+        range 3 10
+        default "8"
+        depends on NEED_MULTIPLE_NODES
+        help
+          This option specifies the maximum number of nodes in your SSI system.
+          MAX_NUMNODES will be 2^(This value).
+          If in doubt, use the default.
+
 # VIRTUAL_MEM_MAP and FLAT_NODE_MEM_MAP are functionally equivalent.
 # VIRTUAL_MEM_MAP has been retained for historical reasons.
 config VIRTUAL_MEM_MAP
diff --git a/arch/ia64/kernel/acpi-ext.c b/arch/ia64/kernel/acpi-ext.c
index 4a5574ff007b..fff82929d225 100644
--- a/arch/ia64/kernel/acpi-ext.c
+++ b/arch/ia64/kernel/acpi-ext.c
@@ -1,105 +1,104 @@
 /*
- * arch/ia64/kernel/acpi-ext.c
+ * (c) Copyright 2003, 2006 Hewlett-Packard Development Company, L.P.
+ *      Alex Williamson <alex.williamson@hp.com>
+ *      Bjorn Helgaas <bjorn.helgaas@hp.com>
  *
- * Copyright (C) 2003 Hewlett-Packard
- * Copyright (C) Alex Williamson
- * Copyright (C) Bjorn Helgaas
- *
- * Vendor specific extensions to ACPI.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  */
 
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/acpi.h>
-#include <linux/efi.h>
 
 #include <asm/acpi-ext.h>
 
-struct acpi_vendor_descriptor {
-        u8 guid_id;
-        efi_guid_t guid;
-};
+/*
+ * Device CSRs that do not appear in PCI config space should be described
+ * via ACPI.  This would normally be done with Address Space Descriptors
+ * marked as "consumer-only," but old versions of Windows and Linux ignore
+ * the producer/consumer flag, so HP invented a vendor-defined resource to
+ * describe the location and size of CSR space.
+ */
 
-struct acpi_vendor_info {
-        struct acpi_vendor_descriptor *descriptor;
-        u8 *data;
-        u32 length;
+struct acpi_vendor_uuid hp_ccsr_uuid = {
+        .subtype = 2,
+        .data = { 0xf9, 0xad, 0xe9, 0x69, 0x4f, 0x92, 0x5f, 0xab, 0xf6, 0x4a,
+            0x24, 0xd2, 0x01, 0x37, 0x0e, 0xad },
 };
 
-acpi_status
-acpi_vendor_resource_match(struct acpi_resource *resource, void *context)
+static acpi_status hp_ccsr_locate(acpi_handle obj, u64 *base, u64 *length)
 {
-        struct acpi_vendor_info *info = (struct acpi_vendor_info *)context;
-        struct acpi_resource_vendor *vendor;
-        struct acpi_vendor_descriptor *descriptor;
-        u32 byte_length;
-
-        if (resource->type != ACPI_RESOURCE_TYPE_VENDOR)
-                return AE_OK;
-
-        vendor = (struct acpi_resource_vendor *)&resource->data;
-        descriptor = (struct acpi_vendor_descriptor *)vendor->byte_data;
-        if (vendor->byte_length <= sizeof(*info->descriptor) ||
-            descriptor->guid_id != info->descriptor->guid_id ||
-            efi_guidcmp(descriptor->guid, info->descriptor->guid))
-                return AE_OK;
-
-        byte_length = vendor->byte_length - sizeof(struct acpi_vendor_descriptor);
-        info->data = acpi_os_allocate(byte_length);
-        if (!info->data)
-                return AE_NO_MEMORY;
-
-        memcpy(info->data,
-               vendor->byte_data + sizeof(struct acpi_vendor_descriptor),
-               byte_length);
-        info->length = byte_length;
-        return AE_CTRL_TERMINATE;
-}
+        acpi_status status;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        struct acpi_resource *resource;
+        struct acpi_resource_vendor_typed *vendor;
 
-acpi_status
-acpi_find_vendor_resource(acpi_handle obj, struct acpi_vendor_descriptor * id,
-                          u8 ** data, u32 * byte_length)
-{
-        struct acpi_vendor_info info;
+        status = acpi_get_vendor_resource(obj, METHOD_NAME__CRS, &hp_ccsr_uuid,
+                &buffer);
 
-        info.descriptor = id;
-        info.data = NULL;
+        resource = buffer.pointer;
+        vendor = &resource->data.vendor_typed;
 
-        acpi_walk_resources(obj, METHOD_NAME__CRS, acpi_vendor_resource_match,
-                            &info);
-        if (!info.data)
-                return AE_NOT_FOUND;
+        if (ACPI_FAILURE(status) || vendor->byte_length < 16) {
+                status = AE_NOT_FOUND;
+                goto exit;
+        }
 
-        *data = info.data;
-        *byte_length = info.length;
-        return AE_OK;
+        memcpy(base, vendor->byte_data, sizeof(*base));
+        memcpy(length, vendor->byte_data + 8, sizeof(*length));
+
+  exit:
+        acpi_os_free(buffer.pointer);
+        return status;
 }
 
-struct acpi_vendor_descriptor hp_ccsr_descriptor = {
-        .guid_id = 2,
-        .guid =
-            EFI_GUID(0x69e9adf9, 0x924f, 0xab5f, 0xf6, 0x4a, 0x24, 0xd2, 0x01,
-                     0x37, 0x0e, 0xad)
+struct csr_space {
+        u64     base;
+        u64     length;
 };
 
-acpi_status hp_acpi_csr_space(acpi_handle obj, u64 * csr_base, u64 * csr_length)
+static acpi_status find_csr_space(struct acpi_resource *resource, void *data)
 {
+        struct csr_space *space = data;
+        struct acpi_resource_address64 addr;
         acpi_status status;
-        u8 *data;
-        u32 length;
 
-        status =
-            acpi_find_vendor_resource(obj, &hp_ccsr_descriptor, &data, &length);
+        status = acpi_resource_to_address64(resource, &addr);
+        if (ACPI_SUCCESS(status) &&
+            addr.resource_type == ACPI_MEMORY_RANGE &&
+            addr.address_length &&
+            addr.producer_consumer == ACPI_CONSUMER) {
+                space->base = addr.minimum;
+                space->length = addr.address_length;
+                return AE_CTRL_TERMINATE;
+        }
+        return AE_OK;           /* keep looking */
+}
 
-        if (ACPI_FAILURE(status) || length != 16)
-                return AE_NOT_FOUND;
+static acpi_status hp_crs_locate(acpi_handle obj, u64 *base, u64 *length)
+{
+        struct csr_space space = { 0, 0 };
 
-        memcpy(csr_base, data, sizeof(*csr_base));
-        memcpy(csr_length, data + 8, sizeof(*csr_length));
-        acpi_os_free(data);
+        acpi_walk_resources(obj, METHOD_NAME__CRS, find_csr_space, &space);
+        if (!space.length)
+                return AE_NOT_FOUND;
 
+        *base = space.base;
+        *length = space.length;
         return AE_OK;
 }
 
+acpi_status hp_acpi_csr_space(acpi_handle obj, u64 *csr_base, u64 *csr_length)
+{
+        acpi_status status;
+
+        status = hp_ccsr_locate(obj, csr_base, csr_length);
+        if (ACPI_SUCCESS(status))
+                return status;
+
+        return hp_crs_locate(obj, csr_base, csr_length);
+}
 EXPORT_SYMBOL(hp_acpi_csr_space);
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 750e8e7fbdc3..6e16f6b35bd3 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1606,5 +1606,8 @@ sys_call_table:
         data8 sys_ni_syscall                    // 1295 reserved for ppoll
         data8 sys_unshare
         data8 sys_splice
+        data8 sys_set_robust_list
+        data8 sys_get_robust_list
+        data8 sys_sync_file_range               // 1300
 
         .org sys_call_table + 8*NR_syscalls     // guard against failures to increase NR_syscalls
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 8963171788d5..5e6fdbe78bcd 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -581,10 +581,12 @@ ia64_mca_rendez_int_handler(int rendez_irq, void *arg, struct pt_regs *regs)
 {
         unsigned long flags;
         int cpu = smp_processor_id();
+        struct ia64_mca_notify_die nd =
+                { .sos = NULL, .monarch_cpu = &monarch_cpu };
 
         /* Mask all interrupts */
         local_irq_save(flags);
-        if (notify_die(DIE_MCA_RENDZVOUS_ENTER, "MCA", regs, 0, 0, 0)
+        if (notify_die(DIE_MCA_RENDZVOUS_ENTER, "MCA", regs, (long)&nd, 0, 0)
                         == NOTIFY_STOP)
                 ia64_mca_spin(__FUNCTION__);
 
@@ -594,7 +596,7 @@ ia64_mca_rendez_int_handler(int rendez_irq, void *arg, struct pt_regs *regs)
          */
         ia64_sal_mc_rendez();
 
-        if (notify_die(DIE_MCA_RENDZVOUS_PROCESS, "MCA", regs, 0, 0, 0)
+        if (notify_die(DIE_MCA_RENDZVOUS_PROCESS, "MCA", regs, (long)&nd, 0, 0)
                         == NOTIFY_STOP)
                 ia64_mca_spin(__FUNCTION__);
 
@@ -602,7 +604,7 @@ ia64_mca_rendez_int_handler(int rendez_irq, void *arg, struct pt_regs *regs)
         while (monarch_cpu != -1)
                cpu_relax();     /* spin until monarch leaves */
 
-        if (notify_die(DIE_MCA_RENDZVOUS_LEAVE, "MCA", regs, 0, 0, 0)
+        if (notify_die(DIE_MCA_RENDZVOUS_LEAVE, "MCA", regs, (long)&nd, 0, 0)
                         == NOTIFY_STOP)
                 ia64_mca_spin(__FUNCTION__);
 
@@ -1023,6 +1025,8 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
                 &sos->proc_state_param;
         int recover, cpu = smp_processor_id();
         task_t *previous_current;
+        struct ia64_mca_notify_die nd =
+                { .sos = sos, .monarch_cpu = &monarch_cpu };
 
         oops_in_progress = 1;   /* FIXME: make printk NMI/MCA/INIT safe */
         console_loglevel = 15;  /* make sure printks make it to console */
@@ -1031,7 +1035,7 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
 
         previous_current = ia64_mca_modify_original_stack(regs, sw, sos, "MCA");
         monarch_cpu = cpu;
-        if (notify_die(DIE_MCA_MONARCH_ENTER, "MCA", regs, 0, 0, 0)
+        if (notify_die(DIE_MCA_MONARCH_ENTER, "MCA", regs, (long)&nd, 0, 0)
                         == NOTIFY_STOP)
                 ia64_mca_spin(__FUNCTION__);
         ia64_wait_for_slaves(cpu);
@@ -1043,7 +1047,7 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
          * spinning in SAL does not work.
          */
         ia64_mca_wakeup_all();
-        if (notify_die(DIE_MCA_MONARCH_PROCESS, "MCA", regs, 0, 0, 0)
+        if (notify_die(DIE_MCA_MONARCH_PROCESS, "MCA", regs, (long)&nd, 0, 0)
                         == NOTIFY_STOP)
                 ia64_mca_spin(__FUNCTION__);
 
@@ -1064,7 +1068,7 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
                 ia64_sal_clear_state_info(SAL_INFO_TYPE_MCA);
                 sos->os_status = IA64_MCA_CORRECTED;
         }
-        if (notify_die(DIE_MCA_MONARCH_LEAVE, "MCA", regs, 0, 0, recover)
+        if (notify_die(DIE_MCA_MONARCH_LEAVE, "MCA", regs, (long)&nd, 0, recover)
                         == NOTIFY_STOP)
                 ia64_mca_spin(__FUNCTION__);
 
@@ -1351,10 +1355,14 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw,
         static atomic_t monarchs;
         task_t *previous_current;
         int cpu = smp_processor_id();
+        struct ia64_mca_notify_die nd =
+                { .sos = sos, .monarch_cpu = &monarch_cpu };
 
         oops_in_progress = 1;   /* FIXME: make printk NMI/MCA/INIT safe */
         console_loglevel = 15;  /* make sure printks make it to console */
 
+        (void) notify_die(DIE_INIT_ENTER, "INIT", regs, (long)&nd, 0, 0);
+
         printk(KERN_INFO "Entered OS INIT handler. PSP=%lx cpu=%d monarch=%ld\n",
                 sos->proc_state_param, cpu, sos->monarch);
         salinfo_log_wakeup(SAL_INFO_TYPE_INIT, NULL, 0, 0);
@@ -1390,15 +1398,15 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw,
                 ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_INIT;
                 while (monarch_cpu == -1)
                        cpu_relax();     /* spin until monarch enters */
-                if (notify_die(DIE_INIT_SLAVE_ENTER, "INIT", regs, 0, 0, 0)
+                if (notify_die(DIE_INIT_SLAVE_ENTER, "INIT", regs, (long)&nd, 0, 0)
                                 == NOTIFY_STOP)
                         ia64_mca_spin(__FUNCTION__);
-                if (notify_die(DIE_INIT_SLAVE_PROCESS, "INIT", regs, 0, 0, 0)
+                if (notify_die(DIE_INIT_SLAVE_PROCESS, "INIT", regs, (long)&nd, 0, 0)
                                 == NOTIFY_STOP)
                         ia64_mca_spin(__FUNCTION__);
                 while (monarch_cpu != -1)
                        cpu_relax();     /* spin until monarch leaves */
-                if (notify_die(DIE_INIT_SLAVE_LEAVE, "INIT", regs, 0, 0, 0)
+                if (notify_die(DIE_INIT_SLAVE_LEAVE, "INIT", regs, (long)&nd, 0, 0)
                                 == NOTIFY_STOP)
                         ia64_mca_spin(__FUNCTION__);
                 printk("Slave on cpu %d returning to normal service.\n", cpu);
@@ -1409,7 +1417,7 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw,
         }
 
         monarch_cpu = cpu;
-        if (notify_die(DIE_INIT_MONARCH_ENTER, "INIT", regs, 0, 0, 0)
+        if (notify_die(DIE_INIT_MONARCH_ENTER, "INIT", regs, (long)&nd, 0, 0)
                         == NOTIFY_STOP)
                 ia64_mca_spin(__FUNCTION__);
 
@@ -1426,10 +1434,10 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw,
          * to default_monarch_init_process() above and just print all the
          * tasks.
          */
-        if (notify_die(DIE_INIT_MONARCH_PROCESS, "INIT", regs, 0, 0, 0)
+        if (notify_die(DIE_INIT_MONARCH_PROCESS, "INIT", regs, (long)&nd, 0, 0)
                         == NOTIFY_STOP)
                 ia64_mca_spin(__FUNCTION__);
-        if (notify_die(DIE_INIT_MONARCH_LEAVE, "INIT", regs, 0, 0, 0)
+        if (notify_die(DIE_INIT_MONARCH_LEAVE, "INIT", regs, (long)&nd, 0, 0)
                         == NOTIFY_STOP)
                 ia64_mca_spin(__FUNCTION__);
         printk("\nINIT dump complete.  Monarch on cpu %d returning to normal service.\n", cpu);
@@ -1631,6 +1639,7 @@ ia64_mca_init(void)
                         printk(KERN_INFO "Increasing MCA rendezvous timeout from "
                                 "%ld to %ld milliseconds\n", timeout, isrv.v0);
                         timeout = isrv.v0;
+                        (void) notify_die(DIE_MCA_NEW_TIMEOUT, "MCA", NULL, timeout, 0, 0);
                         continue;
                 }
                 printk(KERN_ERR "Failed to register rendezvous interrupt "
diff --git a/arch/ia64/kernel/mca_asm.S b/arch/ia64/kernel/mca_asm.S
index 60a464bfd9e2..6dff024cd62b 100644
--- a/arch/ia64/kernel/mca_asm.S
+++ b/arch/ia64/kernel/mca_asm.S
@@ -827,7 +827,7 @@ ia64_state_restore:
         ld8 r9=[temp2],16       // sal_gp
         ;;
         ld8 r22=[temp1],16      // pal_min_state, virtual
-        ld8 r21=[temp2],16      // prev_IA64_KR_CURRENT
+        ld8 r13=[temp2],16      // prev_IA64_KR_CURRENT
         ;;
         ld8 r16=[temp1],16      // prev_IA64_KR_CURRENT_STACK
         ld8 r20=[temp2],16      // prev_task
@@ -848,7 +848,7 @@ ia64_state_restore:
         mov cr.iim=temp3
         mov cr.iha=temp4
         dep r22=0,r22,62,1      // pal_min_state, physical, uncached
-        mov IA64_KR(CURRENT)=r21
+        mov IA64_KR(CURRENT)=r13
         ld8 r8=[temp1]          // os_status
         ld8 r10=[temp2]         // context
 
@@ -856,7 +856,7 @@ ia64_state_restore:
          * avoid any dependencies on the algorithm in ia64_switch_to(), just
          * purge any existing CURRENT_STACK mapping and insert the new one.
          *
-         * r16 contains prev_IA64_KR_CURRENT_STACK, r21 contains
+         * r16 contains prev_IA64_KR_CURRENT_STACK, r13 contains
          * prev_IA64_KR_CURRENT, these values may have been changed by the C
          * code.  Do not use r8, r9, r10, r22, they contain values ready for
          * the return to SAL.
@@ -873,7 +873,7 @@ ia64_state_restore:
         ;;
         srlz.d
 
-        extr.u r19=r21,61,3                     // r21 = prev_IA64_KR_CURRENT
+        extr.u r19=r13,61,3                     // r13 = prev_IA64_KR_CURRENT
         shl r20=r16,IA64_GRANULE_SHIFT          // r16 = prev_IA64_KR_CURRENT_STACK
         movl r21=PAGE_KERNEL                    // page properties
         ;;
@@ -883,7 +883,7 @@ ia64_state_restore:
 (p6)    br.spnt 1f                              // the dreaded cpu 0 idle task in region 5:(
         ;;
         mov cr.itir=r18
-        mov cr.ifa=r21
+        mov cr.ifa=r13
         mov r20=IA64_TR_CURRENT_STACK
         ;;
         itr.d dtr[r20]=r21
diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
index 7a2f0a798d12..3a30cfc9574f 100644
--- a/arch/ia64/kernel/module.c
+++ b/arch/ia64/kernel/module.c
@@ -947,7 +947,7 @@ void
 percpu_modcopy (void *pcpudst, const void *src, unsigned long size)
 {
         unsigned int i;
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 memcpy(pcpudst + __per_cpu_offset[i], src, size);
         }
 }
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index af7eb087dca7..d98ec49570b8 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -60,6 +60,9 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
         struct siginfo si;
         unsigned long mask;
 
+        /* mmap_sem is performance critical.... */
+        prefetchw(&mm->mmap_sem);
+
         /*
          * If we're in an interrupt or have no user context, we must not take the fault..
          */
diff --git a/arch/ia64/sn/kernel/xpc_channel.c b/arch/ia64/sn/kernel/xpc_channel.c
index d0abddd9ffe6..8255a9be4632 100644
--- a/arch/ia64/sn/kernel/xpc_channel.c
+++ b/arch/ia64/sn/kernel/xpc_channel.c
@@ -1831,7 +1831,7 @@ xpc_initiate_allocate(partid_t partid, int ch_number, u32 flags, void **payload)
 {
         struct xpc_partition *part = &xpc_partitions[partid];
         enum xpc_retval ret = xpcUnknownReason;
-        struct xpc_msg *msg;
+        struct xpc_msg *msg = NULL;
 
 
         DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 05c864c6c2d9..41fd490af3b4 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -285,6 +285,11 @@ config NUMA
         depends on SMP && BROKEN
         default n
 
+config NODES_SHIFT
+        int
+        default "1"
+        depends on NEED_MULTIPLE_NODES
+
 # turning this on wastes a bunch of space.
 # Summit needs it only when NUMA is on
 config BOOT_IOREMAP
diff --git a/arch/m32r/kernel/m32r_ksyms.c b/arch/m32r/kernel/m32r_ksyms.c
index be8b711367ec..c50330fa83b9 100644
--- a/arch/m32r/kernel/m32r_ksyms.c
+++ b/arch/m32r/kernel/m32r_ksyms.c
@@ -23,9 +23,6 @@ EXPORT_SYMBOL(boot_cpu_data);
 EXPORT_SYMBOL(dump_fpu);
 EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(iounmap);
-EXPORT_SYMBOL(enable_irq);
-EXPORT_SYMBOL(disable_irq);
-EXPORT_SYMBOL(disable_irq_nosync);
 EXPORT_SYMBOL(kernel_thread);
 EXPORT_SYMBOL(__down);
 EXPORT_SYMBOL(__down_interruptible);
@@ -38,13 +35,6 @@ EXPORT_SYMBOL(__udelay);
 EXPORT_SYMBOL(__delay);
 EXPORT_SYMBOL(__const_udelay);
 
-EXPORT_SYMBOL(__get_user_1);
-EXPORT_SYMBOL(__get_user_2);
-EXPORT_SYMBOL(__get_user_4);
-
-EXPORT_SYMBOL(strpbrk);
-EXPORT_SYMBOL(strstr);
-
 EXPORT_SYMBOL(strncpy_from_user);
 EXPORT_SYMBOL(__strncpy_from_user);
 EXPORT_SYMBOL(clear_user);
@@ -59,11 +49,8 @@ extern void *dcache_dummy;
 EXPORT_SYMBOL(dcache_dummy);
 #endif
 EXPORT_SYMBOL(cpu_data);
-EXPORT_SYMBOL(cpu_online_map);
-EXPORT_SYMBOL(cpu_callout_map);
 
 /* Global SMP stuff */
-EXPORT_SYMBOL(synchronize_irq);
 EXPORT_SYMBOL(smp_call_function);
 
 /* TLB flushing */
@@ -83,27 +70,11 @@ EXPORT_SYMBOL(__lshrdi3);
 EXPORT_SYMBOL(__muldi3);
 
 /* memory and string operations */
-EXPORT_SYMBOL(memchr);
 EXPORT_SYMBOL(memcpy);
-/* EXPORT_SYMBOL(memcpy_fromio); // not implement yet */
-/* EXPORT_SYMBOL(memcpy_toio); // not implement yet */
 EXPORT_SYMBOL(memset);
-/* EXPORT_SYMBOL(memset_io); // not implement yet */
-EXPORT_SYMBOL(memmove);
-EXPORT_SYMBOL(memcmp);
-EXPORT_SYMBOL(memscan);
 EXPORT_SYMBOL(copy_page);
 EXPORT_SYMBOL(clear_page);
-
-EXPORT_SYMBOL(strcat);
-EXPORT_SYMBOL(strchr);
-EXPORT_SYMBOL(strcmp);
-EXPORT_SYMBOL(strcpy);
 EXPORT_SYMBOL(strlen);
-EXPORT_SYMBOL(strncat);
-EXPORT_SYMBOL(strncmp);
-EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strncpy);
 
 EXPORT_SYMBOL(_inb);
 EXPORT_SYMBOL(_inw);
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c
index 0d78942b4c76..3cd3c2988a48 100644
--- a/arch/m32r/kernel/setup.c
+++ b/arch/m32r/kernel/setup.c
@@ -9,6 +9,7 @@
 
 #include <linux/config.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <linux/fs.h>
 #include <linux/sched.h>
@@ -219,8 +220,6 @@ static unsigned long __init setup_memory(void)
 extern unsigned long setup_memory(void);
 #endif  /* CONFIG_DISCONTIGMEM */
 
-#define M32R_PCC_PCATCR 0x00ef7014      /* will move to m32r.h */
-
 void __init setup_arch(char **cmdline_p)
 {
         ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
@@ -269,15 +268,14 @@ void __init setup_arch(char **cmdline_p)
         paging_init();
 }
 
-static struct cpu cpu[NR_CPUS];
+static struct cpu cpu_devices[NR_CPUS];
 
 static int __init topology_init(void)
 {
-        int cpu_id;
+        int i;
 
-        for (cpu_id = 0; cpu_id < NR_CPUS; cpu_id++)
-                if (cpu_possible(cpu_id))
-                        register_cpu(&cpu[cpu_id], cpu_id, NULL);
+        for_each_present_cpu(i)
+                register_cpu(&cpu_devices[i], i, NULL);
 
         return 0;
 }
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c
index d7ec16e7fb25..840b4348bf0c 100644
--- a/arch/m32r/kernel/smpboot.c
+++ b/arch/m32r/kernel/smpboot.c
@@ -39,8 +39,10 @@
  *              Martin J. Bligh :       Added support for multi-quad systems
  */
 
+#include <linux/module.h>
 #include <linux/config.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/smp_lock.h>
 #include <linux/irq.h>
@@ -72,11 +74,15 @@ physid_mask_t phys_cpu_present_map;
 
 /* Bitmask of currently online CPUs */
 cpumask_t cpu_online_map;
+EXPORT_SYMBOL(cpu_online_map);
 
 cpumask_t cpu_bootout_map;
 cpumask_t cpu_bootin_map;
-cpumask_t cpu_callout_map;
 static cpumask_t cpu_callin_map;
+cpumask_t cpu_callout_map;
+EXPORT_SYMBOL(cpu_callout_map);
+cpumask_t cpu_possible_map = CPU_MASK_ALL;
+EXPORT_SYMBOL(cpu_possible_map);
 
 /* Per CPU bogomips and other parameters */
 struct cpuinfo_m32r cpu_data[NR_CPUS] __cacheline_aligned;
@@ -110,7 +116,6 @@ static unsigned int calibration_result;
 
 void smp_prepare_boot_cpu(void);
 void smp_prepare_cpus(unsigned int);
-static void smp_tune_scheduling(void);
 static void init_ipi_lock(void);
 static void do_boot_cpu(int);
 int __cpu_up(unsigned int);
@@ -177,6 +182,9 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         }
         for (phys_id = 0 ; phys_id < nr_cpu ; phys_id++)
                 physid_set(phys_id, phys_cpu_present_map);
+#ifndef CONFIG_HOTPLUG_CPU
+        cpu_present_map = cpu_possible_map;
+#endif
 
         show_mp_info(nr_cpu);
 
@@ -186,7 +194,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
          * Setup boot CPU information
          */
         smp_store_cpu_info(0); /* Final full version of the data */
-        smp_tune_scheduling();
 
         /*
          * If SMP should be disabled, then really disable it!
@@ -230,11 +237,6 @@ smp_done:
         Dprintk("Boot done.\n");
 }
 
-static void __init smp_tune_scheduling(void)
-{
-        /* Nothing to do. */
-}
-
 /*
  * init_ipi_lock : Initialize IPI locks.
  */
@@ -629,4 +631,3 @@ static void __init unmap_cpu_to_physid(int cpu_id, int phys_id)
         physid_2_cpu[phys_id] = -1;
         cpu_2_physid[cpu_id] = -1;
 }
-
diff --git a/arch/m32r/lib/Makefile b/arch/m32r/lib/Makefile
index e632d10c7d78..d16b4e40d1ae 100644
--- a/arch/m32r/lib/Makefile
+++ b/arch/m32r/lib/Makefile
@@ -2,6 +2,6 @@
 # Makefile for M32R-specific library files..
 #
 
-lib-y  := checksum.o ashxdi3.o memset.o memcpy.o getuser.o \
-          putuser.o delay.o strlen.o usercopy.o csum_partial_copy.o
+lib-y  := checksum.o ashxdi3.o memset.o memcpy.o \
+          delay.o strlen.o usercopy.o csum_partial_copy.o
 
diff --git a/arch/m32r/lib/getuser.S b/arch/m32r/lib/getuser.S
deleted file mode 100644
index 58a0db055c5c..000000000000
--- a/arch/m32r/lib/getuser.S
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * __get_user functions.
- *
- * (C) Copyright 2001 Hirokazu Takata
- *
- * These functions have a non-standard call interface
- * to make them more efficient, especially as they
- * return an error value in addition to the "real"
- * return value.
- */
-
-#include <linux/config.h>
-
-/*
- * __get_user_X
- *
- * Inputs:      r0 contains the address
- *
- * Outputs:     r0 is error code (0 or -EFAULT)
- *              r1 contains zero-extended value
- *
- * These functions should not modify any other registers,
- * as they get called from within inline assembly.
- */
-
-#ifdef CONFIG_ISA_DUAL_ISSUE
-
-        .text
-        .balign 4
-        .globl __get_user_1
-__get_user_1:
-1:      ldub    r1, @r0             ||  ldi     r0, #0
-        jmp     r14
-
-        .balign 4
-        .globl __get_user_2
-__get_user_2:
-2:      lduh    r1, @r0             ||  ldi     r0, #0
-        jmp     r14
-
-        .balign 4
-        .globl __get_user_4
-__get_user_4:
-3:      ld      r1, @r0             ||  ldi     r0, #0
-        jmp     r14
-
-bad_get_user:
-        ldi     r1, #0              ||  ldi     r0, #-14
-        jmp     r14
-
-#else /* not CONFIG_ISA_DUAL_ISSUE */
-
-        .text
-        .balign 4
-        .globl __get_user_1
-__get_user_1:
-1:      ldub    r1, @r0
-        ldi     r0, #0
-        jmp     r14
-
-        .balign 4
-        .globl __get_user_2
-__get_user_2:
-2:      lduh    r1, @r0
-        ldi     r0, #0
-        jmp     r14
-
-        .balign 4
-        .globl __get_user_4
-__get_user_4:
-3:      ld      r1, @r0
-        ldi     r0, #0
-        jmp     r14
-
-bad_get_user:
-        ldi     r1, #0
-        ldi     r0, #-14
-        jmp     r14
-
-#endif /* not CONFIG_ISA_DUAL_ISSUE */
-
-.section __ex_table,"a"
-        .long 1b,bad_get_user
-        .long 2b,bad_get_user
-        .long 3b,bad_get_user
-.previous
-
-        .end
diff --git a/arch/m32r/lib/putuser.S b/arch/m32r/lib/putuser.S
deleted file mode 100644
index 218154cc3890..000000000000
--- a/arch/m32r/lib/putuser.S
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * __put_user functions.
- *
- * (C) Copyright 1998 Linus Torvalds
- * (C) Copyright 2001 Hirokazu Takata
- *
- * These functions have a non-standard call interface
- * to make them more efficient.
- */
-
-#include <linux/config.h>
-
-/*
- * __put_user_X
- *
- * Inputs:      r0 contains the address
- *              r1 contains the value
- *
- * Outputs:     r0 is error code (0 or -EFAULT)
- *              r1 is corrupted (will contain "current_task").
- *
- * These functions should not modify any other registers,
- * as they get called from within inline assembly.
- */
-
-#ifdef CONFIG_ISA_DUAL_ISSUE
-
-        .text
-        .balign 4
-        .globl __put_user_1
-__put_user_1:
-1:      stb     r1, @r0             ||  ldi     r0, #0
-        jmp     r14
-
-        .balign 4
-        .globl __put_user_2
-__put_user_2:
-2:      sth     r1, @r0             ||  ldi     r0, #0
-        jmp     r14
-
-        .balign 4
-        .globl __put_user_4
-__put_user_4:
-3:      st      r1, @r0             ||  ldi     r0, #0
-        jmp     r14
-
-bad_put_user:
-        ldi     r0, #-14            ||  jmp     r14
-
-#else /* not CONFIG_ISA_DUAL_ISSUE */
-
-        .text
-        .balign 4
-        .globl __put_user_1
-__put_user_1:
-1:      stb     r1, @r0
-        ldi     r0, #0
-        jmp     r14
-
-        .balign 4
-        .globl __put_user_2
-__put_user_2:
-2:      sth     r1, @r0
-        ldi     r0, #0
-        jmp     r14
-
-        .balign 4
-        .globl __put_user_4
-__put_user_4:
-3:      st      r1, @r0
-        ldi     r0, #0
-        jmp     r14
-
-bad_put_user:
-        ldi     r0, #-14
-        jmp     r14
-
-#endif /* not CONFIG_ISA_DUAL_ISSUE */
-
-.section __ex_table,"a"
-        .long 1b,bad_put_user
-        .long 2b,bad_put_user
-        .long 3b,bad_put_user
-.previous
diff --git a/arch/m68k/kernel/m68k_ksyms.c b/arch/m68k/kernel/m68k_ksyms.c
index c3319514a85e..5b7952ea2bae 100644
--- a/arch/m68k/kernel/m68k_ksyms.c
+++ b/arch/m68k/kernel/m68k_ksyms.c
@@ -57,7 +57,6 @@ EXPORT_SYMBOL(dump_thread);
 EXPORT_SYMBOL(strnlen);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(enable_irq);
 EXPORT_SYMBOL(disable_irq);
 EXPORT_SYMBOL(kernel_thread);
diff --git a/arch/m68knommu/kernel/m68k_ksyms.c b/arch/m68knommu/kernel/m68k_ksyms.c
index f9b4ea16c099..4320d5dcc9cb 100644
--- a/arch/m68knommu/kernel/m68k_ksyms.c
+++ b/arch/m68knommu/kernel/m68k_ksyms.c
@@ -26,7 +26,6 @@ EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(iounmap);
 EXPORT_SYMBOL(dump_fpu);
 EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(strchr);
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e15709ce8866..7aec60d40420 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1590,6 +1590,11 @@ config ARCH_FLATMEM_ENABLE
         def_bool y
         depends on !NUMA
 
+config NODES_SHIFT
+        int
+        default "6"
+        depends on NEED_MULTIPLE_NODES
+
 source "mm/Kconfig"
 
 config SMP
diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c
index 86e42c633f73..e042f9d2ba31 100644
--- a/arch/mips/kernel/mips_ksyms.c
+++ b/arch/mips/kernel/mips_ksyms.c
@@ -39,7 +39,6 @@ EXPORT_SYMBOL(strchr);
 EXPORT_SYMBOL(strncmp);
 #endif
 EXPORT_SYMBOL(strlen);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strncat);
 EXPORT_SYMBOL(strnlen);
 EXPORT_SYMBOL(strrchr);
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 2fdf21989dc2..19f911c5dd58 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -177,6 +177,11 @@ config ARCH_DISCONTIGMEM_DEFAULT
         def_bool y
         depends on ARCH_DISCONTIGMEM_ENABLE
 
+config NODES_SHIFT
+        int
+        default "3"
+        depends on NEED_MULTIPLE_NODES
+
 source "kernel/Kconfig.preempt"
 source "kernel/Kconfig.hz"
 source "mm/Kconfig"
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c
index 47ca5c0a323b..fc107add627c 100644
--- a/arch/parisc/kernel/parisc_ksyms.c
+++ b/arch/parisc/kernel/parisc_ksyms.c
@@ -31,7 +31,6 @@
 
 #include <linux/string.h>
 EXPORT_SYMBOL(memset);
-EXPORT_SYMBOL(strpbrk);
 
 #include <asm/atomic.h>
 EXPORT_SYMBOL(__xchg8);
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 2cdc35ce8045..167e70e95556 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -649,6 +649,11 @@ config NUMA
         depends on PPC64
         default y if SMP && PPC_PSERIES
 
+config NODES_SHIFT
+        int
+        default "4"
+        depends on NEED_MULTIPLE_NODES
+
 config ARCH_SELECT_MEMORY_MODEL
         def_bool y
         depends on PPC64
diff --git a/arch/ppc/boot/lib/Makefile b/arch/ppc/boot/lib/Makefile
index d4077e69086f..80c84d562fa4 100644
--- a/arch/ppc/boot/lib/Makefile
+++ b/arch/ppc/boot/lib/Makefile
@@ -3,7 +3,7 @@
 #
 
 CFLAGS_kbd.o    := -Idrivers/char
-CFLAGS_vreset.o := -I$(srctree)/arch/ppc/boot/include
+CFLAGS_vreset.o := -Iarch/ppc/boot/include
 
 zlib  := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c
          
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 6c6b197898d0..7bb16fb97d4f 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -67,7 +67,6 @@ cflags-$(CONFIG_WARN_STACK) += -mwarn-framesize=$(CONFIG_WARN_STACK_SIZE)
 endif
 
 CFLAGS          += -mbackchain -msoft-float $(cflags-y)
-CFLAGS          += $(call cc-option,-finline-limit=10000)
 CFLAGS          += -pipe -fno-strength-reduce -Wno-sign-compare 
 AFLAGS          += $(aflags-y)
 
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index f8d0cd540a06..f4dfc10026d2 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -1,10 +1,11 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-rc2
-# Wed Feb  8 10:44:39 2006
+# Linux kernel version: 2.6.17-rc1
+# Mon Apr  3 14:34:15 2006
 #
 CONFIG_MMU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_S390=y
 
@@ -30,8 +31,8 @@ CONFIG_AUDIT=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_CPUSETS is not set
+# CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
@@ -45,10 +46,6 @@ CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
 CONFIG_SLAB=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -60,7 +57,6 @@ CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
 CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
@@ -69,7 +65,7 @@ CONFIG_STOP_MACHINE=y
 #
 # Block layer
 #
-# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
 
 #
 # IO Schedulers
@@ -91,17 +87,20 @@ CONFIG_DEFAULT_IOSCHED="deadline"
 #
 # Processor type and features
 #
-# CONFIG_64BIT is not set
+CONFIG_64BIT=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=32
 CONFIG_HOTPLUG_CPU=y
-CONFIG_MATHEMU=y
+CONFIG_DEFAULT_MIGRATION_COST=1000000
+CONFIG_COMPAT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_BINFMT_ELF32=y
 
 #
 # Code generation options
 #
-CONFIG_MARCH_G5=y
-# CONFIG_MARCH_Z900 is not set
+# CONFIG_MARCH_G5 is not set
+CONFIG_MARCH_Z900=y
 # CONFIG_MARCH_Z990 is not set
 CONFIG_PACK_STACK=y
 # CONFIG_SMALL_STACK is not set
@@ -143,7 +142,7 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
 # CONFIG_APPLDATA_BASE is not set
 CONFIG_NO_IDLE_HZ=y
 CONFIG_NO_IDLE_HZ_INIT=y
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC=y
 
 #
 # Networking
@@ -173,6 +172,7 @@ CONFIG_IP_FIB_HASH=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_DIAG=y
 CONFIG_INET_TCP_DIAG=y
@@ -180,9 +180,11 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_BIC=y
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
 # CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_IPV6_TUNNEL is not set
 # CONFIG_NETFILTER is not set
@@ -276,6 +278,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_DEBUG_DRIVER is not set
 
 #
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
@@ -340,8 +347,7 @@ CONFIG_DASD_PROFILE=y
 CONFIG_DASD_ECKD=y
 CONFIG_DASD_FBA=y
 CONFIG_DASD_DIAG=y
-CONFIG_DASD_EER=m
-# CONFIG_DASD_CMB is not set
+CONFIG_DASD_EER=y
 # CONFIG_ATA_OVER_ETH is not set
 
 #
@@ -354,6 +360,7 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 # CONFIG_MD_RAID10 is not set
 CONFIG_MD_RAID5=m
+# CONFIG_MD_RAID5_RESHAPE is not set
 # CONFIG_MD_RAID6 is not set
 CONFIG_MD_MULTIPATH=m
 # CONFIG_MD_FAULTY is not set
@@ -404,6 +411,7 @@ CONFIG_S390_TAPE_BLOCK=y
 # S/390 tape hardware support
 #
 CONFIG_S390_TAPE_34XX=m
+# CONFIG_S390_TAPE_3590 is not set
 # CONFIG_VMLOGRDR is not set
 # CONFIG_VMCP is not set
 # CONFIG_MONREADER is not set
@@ -529,7 +537,6 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_RELAYFS_FS is not set
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -619,14 +626,15 @@ CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_DETECT_SOFTLOCKUP is not set
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_PREEMPT is not set
+CONFIG_DEBUG_PREEMPT=y
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_INFO is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_VM is not set
+# CONFIG_UNWIND_INFO is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 58583f459471..2bcecf422573 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -527,6 +527,11 @@ config CPU_HAS_SR_RB
           See <file:Documentation/sh/register-banks.txt> for further
           information on SR.RB and register banking in the kernel in general.
 
+config NODES_SHIFT
+        int
+        default "1"
+        depends on NEED_MULTIPLE_NODES
+
 endmenu
 
 menu "Boot options"
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c
index 1cf94a618be3..d5d032533a8b 100644
--- a/arch/sh/kernel/sh_ksyms.c
+++ b/arch/sh/kernel/sh_ksyms.c
@@ -37,7 +37,6 @@ EXPORT_SYMBOL(disable_irq_nosync);
 EXPORT_SYMBOL(irq_desc);
 EXPORT_SYMBOL(no_irq_type);
 
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(strlen);
 EXPORT_SYMBOL(strnlen);
diff --git a/arch/sh64/kernel/sh_ksyms.c b/arch/sh64/kernel/sh_ksyms.c
index de29c45f23a7..6f3a1c946339 100644
--- a/arch/sh64/kernel/sh_ksyms.c
+++ b/arch/sh64/kernel/sh_ksyms.c
@@ -41,7 +41,6 @@ EXPORT_SYMBOL(kernel_thread);
 /* Networking helper routines. */
 EXPORT_SYMBOL(csum_partial_copy);
 
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strstr);
 
 #ifdef CONFIG_VT
diff --git a/arch/sparc/kernel/smp.c b/arch/sparc/kernel/smp.c
index 2be812115197..a93f5da6855d 100644
--- a/arch/sparc/kernel/smp.c
+++ b/arch/sparc/kernel/smp.c
@@ -244,7 +244,7 @@ int setup_profiling_timer(unsigned int multiplier)
                 return -EINVAL;
 
         spin_lock_irqsave(&prof_setup_lock, flags);
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 load_profile_irq(i, lvl14_resolution / multiplier);
                 prof_multiplier(i) = multiplier;
         }
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c
index 2c21d7907635..ec1c9687d679 100644
--- a/arch/sparc/kernel/sparc_ksyms.c
+++ b/arch/sparc/kernel/sparc_ksyms.c
@@ -263,7 +263,6 @@ EXPORT_SYMBOL(strcmp);
 EXPORT_SYMBOL(strncmp);
 EXPORT_SYMBOL(strchr);
 EXPORT_SYMBOL(strrchr);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(page_kernel);
 
diff --git a/arch/sparc/math-emu/Makefile b/arch/sparc/math-emu/Makefile
index f84a9a6162be..8136987977f4 100644
--- a/arch/sparc/math-emu/Makefile
+++ b/arch/sparc/math-emu/Makefile
@@ -5,4 +5,4 @@
 obj-y    := math.o
 
 EXTRA_AFLAGS := -ansi
-EXTRA_CFLAGS = -I. -I$(TOPDIR)/include/math-emu -w
+EXTRA_CFLAGS = -I. -Iinclude/math-emu -w
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index d1e2fc566486..648047a0bce3 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -194,6 +194,9 @@ endchoice
 
 endmenu
 
+config ARCH_SELECT_MEMORY_MODEL
+        def_bool y
+
 config ARCH_SPARSEMEM_ENABLE
         def_bool y
 
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 30389085a359..1317380fa937 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16
-# Fri Mar 31 01:40:57 2006
+# Sun Apr  2 19:31:04 2006
 #
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
@@ -838,7 +838,6 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set
 # CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON_OLD is not set
 CONFIG_FB_RADEON=y
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
@@ -924,6 +923,7 @@ CONFIG_SND_MTPAV=m
 # PCI devices
 #
 # CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
 CONFIG_SND_ALI5451=m
 # CONFIG_SND_ATIIXP is not set
 # CONFIG_SND_ATIIXP_MODEM is not set
@@ -955,6 +955,7 @@ CONFIG_SND_ALI5451=m
 # CONFIG_SND_MIXART is not set
 # CONFIG_SND_NM256 is not set
 # CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
 # CONFIG_SND_RME32 is not set
 # CONFIG_SND_RME96 is not set
 # CONFIG_SND_RME9652 is not set
@@ -1109,6 +1110,11 @@ CONFIG_USB_HIDDEV=y
 # CONFIG_MMC is not set
 
 #
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
 # InfiniBand support
 #
 # CONFIG_INFINIBAND is not set
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index 9372d4f376d5..9e94db2573a2 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -1092,7 +1092,7 @@ void sun4v_pci_init(int node, char *model_name)
                 }
         }
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 unsigned long page = get_zeroed_page(GFP_ATOMIC);
 
                 if (!page)
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index eb93e9c52846..49e6dedd027d 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -244,6 +244,13 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
         }
 
         switch(request) {
+        case PTRACE_PEEKUSR:
+                if (addr != 0)
+                        pt_error_return(regs, EIO);
+                else
+                        pt_succ_return(regs, 0);
+                goto out_tsk;
+
         case PTRACE_PEEKTEXT: /* read word at location addr. */ 
         case PTRACE_PEEKDATA: {
                 unsigned long tmp64;
@@ -602,6 +609,22 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
 
         /* PTRACE_DUMPCORE unsupported... */
 
+        case PTRACE_GETEVENTMSG: {
+                int err;
+
+                if (test_thread_flag(TIF_32BIT))
+                        err = put_user(child->ptrace_message,
+                                       (unsigned int __user *) data);
+                else
+                        err = put_user(child->ptrace_message,
+                                       (unsigned long __user *) data);
+                if (err)
+                        pt_error_return(regs, -err);
+                else
+                        pt_succ_return(regs, 0);
+                break;
+        }
+
         default: {
                 int err = ptrace_request(child, request, addr, data);
                 if (err)
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 7d0e67c1ce50..005167f82419 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -535,7 +535,7 @@ static int __init topology_init(void)
         while (!cpu_find_by_instance(ncpus_probed, NULL, NULL))
                 ncpus_probed++;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);
                 if (p) {
                         register_cpu(p, i, NULL);
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 8175a6968c6b..90eaca3ec9a6 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -745,12 +745,21 @@ struct call_data_struct {
         int wait;
 };
 
-static DEFINE_SPINLOCK(call_lock);
+static __cacheline_aligned_in_smp DEFINE_SPINLOCK(call_lock);
 static struct call_data_struct *call_data;
 
 extern unsigned long xcall_call_function;
 
-/*
+/**
+ * smp_call_function(): Run a function on all other CPUs.
+ * @func: The function to run. This must be fast and non-blocking.
+ * @info: An arbitrary pointer to pass to the function.
+ * @nonatomic: currently unused.
+ * @wait: If true, wait (atomically) until function has completed on other CPUs.
+ *
+ * Returns 0 on success, else a negative status code. Does not return until
+ * remote CPUs are nearly ready to execute <<func>> or are or have executed.
+ *
  * You must not call this function with disabled interrupts or from a
  * hardware interrupt handler or from a bottom half handler.
  */
@@ -759,7 +768,6 @@ static int smp_call_function_mask(void (*func)(void *info), void *info,
 {
         struct call_data_struct data;
         int cpus;
-        long timeout;
 
         /* Can deadlock when called with interrupts disabled */
         WARN_ON(irqs_disabled());
@@ -777,31 +785,18 @@ static int smp_call_function_mask(void (*func)(void *info), void *info,
                 goto out_unlock;
 
         call_data = &data;
+        mb();
 
         smp_cross_call_masked(&xcall_call_function, 0, 0, 0, mask);
 
-        /* 
-         * Wait for other cpus to complete function or at
-         * least snap the call data.
-         */
-        timeout = 1000000;
-        while (atomic_read(&data.finished) != cpus) {
-                if (--timeout <= 0)
-                        goto out_timeout;
-                barrier();
-                udelay(1);
-        }
+        /* Wait for response */
+        while (atomic_read(&data.finished) != cpus)
+                cpu_relax();
 
 out_unlock:
         spin_unlock(&call_lock);
 
         return 0;
-
-out_timeout:
-        spin_unlock(&call_lock);
-        printk("XCALL: Remote cpus not responding, ncpus=%d finished=%d\n",
-               cpus, atomic_read(&data.finished));
-        return 0;
 }
 
 int smp_call_function(void (*func)(void *info), void *info,
@@ -1285,7 +1280,7 @@ int setup_profiling_timer(unsigned int multiplier)
                 return -EINVAL;
 
         spin_lock_irqsave(&prof_setup_lock, flags);
-        for_each_cpu(i)
+        for_each_possible_cpu(i)
                 prof_multiplier(i) = multiplier;
         current_tick_offset = (timer_tick_offset / multiplier);
         spin_unlock_irqrestore(&prof_setup_lock, flags);
@@ -1313,12 +1308,12 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
                 }
         }
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 if (tlb_type == hypervisor) {
                         int j;
 
                         /* XXX get this mapping from machine description */
-                        for_each_cpu(j) {
+                        for_each_possible_cpu(j) {
                                 if ((j >> 2) == (i >> 2))
                                         cpu_set(j, cpu_sibling_map[i]);
                         }
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c
index f5e8db1de76b..62d8a99271ea 100644
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
@@ -276,7 +276,6 @@ EXPORT_SYMBOL(__prom_getsibling);
 EXPORT_SYMBOL(strlen);
 EXPORT_SYMBOL(__strlen_user);
 EXPORT_SYMBOL(__strnlen_user);
-EXPORT_SYMBOL(strpbrk);
 
 #ifdef CONFIG_SOLARIS_EMUL_MODULE
 EXPORT_SYMBOL(linux_sparc_syscall);
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c
index ff090bb9734b..2793a5d82380 100644
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
@@ -1130,9 +1130,9 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
                (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
                afsr, afar,
                (afsr & CHAFSR_TL1) ? 1 : 0);
-        printk("%s" "ERROR(%d): TPC[%016lx] TNPC[%016lx] TSTATE[%016lx]\n",
+        printk("%s" "ERROR(%d): TPC[%lx] TNPC[%lx] O7[%lx] TSTATE[%lx]\n",
                (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
-               regs->tpc, regs->tnpc, regs->tstate);
+               regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
         printk("%s" "ERROR(%d): M_SYND(%lx),  E_SYND(%lx)%s%s\n",
                (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
                (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 24790bed2054..a508e7a02891 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -159,6 +159,7 @@ archclean:
 $(SYMLINK_HEADERS):
         @echo '  SYMLINK $@'
 ifneq ($(KBUILD_SRC),)
+        $(Q)mkdir -p $(objtree)/include/asm-um
         $(Q)ln -fsn $(srctree)/include/asm-um/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
 else
         $(Q)cd $(TOPDIR)/$(dir $@) ; \
@@ -168,7 +169,7 @@ endif
 include/asm-um/arch:
         @echo '  SYMLINK $@'
 ifneq ($(KBUILD_SRC),)
-        $(Q)mkdir -p include/asm-um
+        $(Q)mkdir -p $(objtree)/include/asm-um
         $(Q)ln -fsn $(srctree)/include/asm-$(SUBARCH) include/asm-um/arch
 else
         $(Q)cd $(TOPDIR)/include/asm-um && ln -sf ../asm-$(SUBARCH) arch
diff --git a/arch/um/drivers/cow.h b/arch/um/drivers/cow.h
index 04e3958266e0..dc36b222100b 100644
--- a/arch/um/drivers/cow.h
+++ b/arch/um/drivers/cow.h
@@ -46,7 +46,7 @@ extern int file_reader(__u64 offset, char *buf, int len, void *arg);
 extern int read_cow_header(int (*reader)(__u64, char *, int, void *),
                            void *arg, __u32 *version_out,
                            char **backing_file_out, time_t *mtime_out,
-                           __u64 *size_out, int *sectorsize_out,
+                           unsigned long long *size_out, int *sectorsize_out,
                            __u32 *align_out, int *bitmap_offset_out);
 
 extern int write_cow_header(char *cow_file, int fd, char *backing_file,
diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h
index 94de4ead4f7a..7a5b4afde692 100644
--- a/arch/um/drivers/cow_sys.h
+++ b/arch/um/drivers/cow_sys.h
@@ -28,7 +28,7 @@ static inline int cow_seek_file(int fd, __u64 offset)
         return(os_seek_file(fd, offset));
 }
 
-static inline int cow_file_size(char *file, __u64 *size_out)
+static inline int cow_file_size(char *file, unsigned long long *size_out)
 {
         return(os_file_size(file, size_out));
 }
diff --git a/arch/um/drivers/cow_user.c b/arch/um/drivers/cow_user.c
index 61951b721268..0ec4052db9c5 100644
--- a/arch/um/drivers/cow_user.c
+++ b/arch/um/drivers/cow_user.c
@@ -17,30 +17,34 @@
 
 #define PATH_LEN_V1 256
 
+typedef __u32 time32_t;
+
 struct cow_header_v1 {
-        int magic;
-        int version;
+        __s32 magic;
+        __s32 version;
         char backing_file[PATH_LEN_V1];
-        time_t mtime;
+        time32_t mtime;
         __u64 size;
-        int sectorsize;
-};
+        __s32 sectorsize;
+} __attribute__((packed));
 
-#define PATH_LEN_V2 MAXPATHLEN
+/* Define PATH_LEN_V3 as the usual value of MAXPATHLEN, just hard-code it in
+ * case other systems have different values for MAXPATHLEN.
+ *
+ * The same must hold for V2 - we want file format compatibility, not anything
+ * else.
+ */
+#define PATH_LEN_V3 4096
+#define PATH_LEN_V2 PATH_LEN_V3
 
 struct cow_header_v2 {
         __u32 magic;
         __u32 version;
         char backing_file[PATH_LEN_V2];
-        time_t mtime;
+        time32_t mtime;
         __u64 size;
-        int sectorsize;
-};
-
-/* Define PATH_LEN_V3 as the usual value of MAXPATHLEN, just hard-code it in
- * case other systems have different values for MAXPATHLEN
- */
-#define PATH_LEN_V3 4096
+        __s32 sectorsize;
+} __attribute__((packed));
 
 /* Changes from V2 -
  *      PATH_LEN_V3 as described above
@@ -66,6 +70,15 @@ struct cow_header_v2 {
  *      Fixed (finally!) the rounding bug
  */
 
+/* Until Dec2005, __attribute__((packed)) was left out from the below
+ * definition, leading on 64-bit systems to 4 bytes of padding after mtime, to
+ * align size to 8-byte alignment.  This shifted all fields above (no padding
+ * was present on 32-bit, no other padding was added).
+ *
+ * However, this _can be detected_: it means that cow_format (always 0 until
+ * now) is shifted onto the first 4 bytes of backing_file, where it is otherwise
+ * impossible to find 4 zeros. -bb */
+
 struct cow_header_v3 {
         __u32 magic;
         __u32 version;
@@ -75,6 +88,18 @@ struct cow_header_v3 {
         __u32 alignment;
         __u32 cow_format;
         char backing_file[PATH_LEN_V3];
+} __attribute__((packed));
+
+/* This is the broken layout used by some 64-bit binaries. */
+struct cow_header_v3_broken {
+        __u32 magic;
+        __u32 version;
+        __s64 mtime;
+        __u64 size;
+        __u32 sectorsize;
+        __u32 alignment;
+        __u32 cow_format;
+        char backing_file[PATH_LEN_V3];
 };
 
 /* COW format definitions - for now, we have only the usual COW bitmap */
@@ -84,6 +109,7 @@ union cow_header {
         struct cow_header_v1 v1;
         struct cow_header_v2 v2;
         struct cow_header_v3 v3;
+        struct cow_header_v3_broken v3_b;
 };
 
 #define COW_MAGIC 0x4f4f4f4d  /* MOOO */
@@ -184,8 +210,9 @@ int write_cow_header(char *cow_file, int fd, char *backing_file,
 
         err = -EINVAL;
         if(strlen(backing_file) > sizeof(header->backing_file) - 1){
+                /* Below, %zd is for a size_t value */
                 cow_printf("Backing file name \"%s\" is too long - names are "
-                           "limited to %d characters\n", backing_file,
+                           "limited to %zd characters\n", backing_file,
                            sizeof(header->backing_file) - 1);
                 goto out_free;
         }
@@ -300,7 +327,8 @@ int read_cow_header(int (*reader)(__u64, char *, int, void *), void *arg,
                 *align_out = *sectorsize_out;
                 file = header->v2.backing_file;
         }
-        else if(version == 3){
+        /* This is very subtle - see above at union cow_header definition */
+        else if(version == 3 && (*((int*)header->v3.backing_file) != 0)){
                 if(n < sizeof(header->v3)){
                         cow_printf("read_cow_header - failed to read V3 "
                                    "header\n");
@@ -310,9 +338,43 @@ int read_cow_header(int (*reader)(__u64, char *, int, void *), void *arg,
                 *size_out = ntohll(header->v3.size);
                 *sectorsize_out = ntohl(header->v3.sectorsize);
                 *align_out = ntohl(header->v3.alignment);
+                if (*align_out == 0) {
+                        cow_printf("read_cow_header - invalid COW header, "
+                                   "align == 0\n");
+                }
                 *bitmap_offset_out = ROUND_UP(sizeof(header->v3), *align_out);
                 file = header->v3.backing_file;
         }
+        else if(version == 3){
+                cow_printf("read_cow_header - broken V3 file with"
+                           " 64-bit layout - recovering content.\n");
+
+                if(n < sizeof(header->v3_b)){
+                        cow_printf("read_cow_header - failed to read V3 "
+                                   "header\n");
+                        goto out;
+                }
+
+                /* this was used until Dec2005 - 64bits are needed to represent
+                 * 2038+. I.e. we can safely do this truncating cast.
+                 *
+                 * Additionally, we must use ntohl() instead of ntohll(), since
+                 * the program used to use the former (tested - I got mtime
+                 * mismatch "0 vs whatever").
+                 *
+                 * Ever heard about bug-to-bug-compatibility ? ;-) */
+                *mtime_out = (time32_t) ntohl(header->v3_b.mtime);
+
+                *size_out = ntohll(header->v3_b.size);
+                *sectorsize_out = ntohl(header->v3_b.sectorsize);
+                *align_out = ntohl(header->v3_b.alignment);
+                if (*align_out == 0) {
+                        cow_printf("read_cow_header - invalid COW header, "
+                                   "align == 0\n");
+                }
+                *bitmap_offset_out = ROUND_UP(sizeof(header->v3_b), *align_out);
+                file = header->v3_b.backing_file;
+        }
         else {
                 cow_printf("read_cow_header - invalid COW version\n");
                 goto out;
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 28e3760e8b98..6d7173fc55a3 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -62,7 +62,7 @@ static void mc_work_proc(void *unused)
         unsigned long flags;
 
         while(!list_empty(&mc_requests)){
-                local_save_flags(flags);
+                local_irq_save(flags);
                 req = list_entry(mc_requests.next, struct mconsole_entry,
                                  list);
                 list_del(&req->list);
@@ -87,7 +87,7 @@ static irqreturn_t mconsole_interrupt(int irq, void *dev_id,
                 if(req.cmd->context == MCONSOLE_INTR)
                         (*req.cmd->handler)(&req);
                 else {
-                        new = kmalloc(sizeof(*new), GFP_ATOMIC);
+                        new = kmalloc(sizeof(*new), GFP_NOWAIT);
                         if(new == NULL)
                                 mconsole_reply(&req, "Out of memory", 1, 0);
                         else {
@@ -415,7 +415,6 @@ static int mem_config(char *str)
 
                         unplugged = page_address(page);
                         if(unplug_index == UNPLUGGED_PER_PAGE){
-                                INIT_LIST_HEAD(&unplugged->list);
                                 list_add(&unplugged->list, &unplugged_pages);
                                 unplug_index = 0;
                         }
@@ -616,7 +615,7 @@ static void console_write(struct console *console, const char *string,
                 return;
 
         while(1){
-                n = min((size_t)len, ARRAY_SIZE(console_buf) - console_index);
+                n = min((size_t) len, ARRAY_SIZE(console_buf) - console_index);
                 strncpy(&console_buf[console_index], string, n);
                 console_index += n;
                 string += n;
@@ -655,7 +654,6 @@ static void with_console(struct mc_request *req, void (*proc)(void *),
         struct mconsole_entry entry;
         unsigned long flags;
 
-        INIT_LIST_HEAD(&entry.list);
         entry.request = *req;
         list_add(&entry.list, &clients);
         spin_lock_irqsave(&console_lock, flags);
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 0e2f06187ea7..0a7786e00cfb 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -182,7 +182,9 @@ static int change_tramp(char **argv, char *output, int output_len)
         pe_data.stdout = fds[1];
         pid = run_helper(change_pre_exec, &pe_data, argv, NULL);
 
-        read_output(fds[0], output, output_len);
+        if (pid > 0)    /* Avoid hang as we won't get data in failure case. */
+                read_output(fds[0], output, output_len);
+
         os_close_file(fds[0]);
         os_close_file(fds[1]);
 
diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
index b94c66114bc8..33c5f6e625e8 100644
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
@@ -104,7 +104,7 @@ static void slirp_close(int fd, void *data)
         }
 
         if(err == 0) {
-                printk("slirp_close: process %d has not exited\n");
+                printk("slirp_close: process %d has not exited\n", pri->pid);
                 return;
         }
 
diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h
index 42557130a408..efa3d33c0be6 100644
--- a/arch/um/include/kern_util.h
+++ b/arch/um/include/kern_util.h
@@ -117,10 +117,6 @@ extern struct task_struct *get_task(int pid, int require);
 extern void machine_halt(void);
 extern int is_syscall(unsigned long addr);
 
-extern void arch_switch_to_tt(struct task_struct *from, struct task_struct *to);
-
-extern void arch_switch_to_skas(struct task_struct *from, struct task_struct *to);
-
 extern void free_irq(unsigned int, void *);
 extern int cpu(void);
 
diff --git a/arch/um/include/tt/tt.h b/arch/um/include/tt/tt.h
index 808521980186..acb8356e1f98 100644
--- a/arch/um/include/tt/tt.h
+++ b/arch/um/include/tt/tt.h
@@ -19,7 +19,8 @@ extern int fork_tramp(void *sig_stack);
 extern int do_proc_op(void *t, int proc_id);
 extern int tracer(int (*init_proc)(void *), void *sp);
 extern void attach_process(int pid);
-extern void tracer_panic(char *format, ...);
+extern void tracer_panic(char *format, ...)
+        __attribute__ ((format (printf, 1, 2)));
 extern void set_init_pid(int pid);
 extern int set_user_mode(void *task);
 extern void set_tracing(void *t, int tracing);
diff --git a/arch/um/include/user.h b/arch/um/include/user.h
index 91b0ac4ad88c..39f8c8801076 100644
--- a/arch/um/include/user.h
+++ b/arch/um/include/user.h
@@ -6,8 +6,10 @@
 #ifndef __USER_H__
 #define __USER_H__
 
-extern void panic(const char *fmt, ...);
-extern int printk(const char *fmt, ...);
+extern void panic(const char *fmt, ...)
+        __attribute__ ((format (printf, 1, 2)));
+extern int printk(const char *fmt, ...)
+        __attribute__ ((format (printf, 1, 2)));
 extern void schedule(void);
 extern void *um_kmalloc(int size);
 extern void *um_kmalloc_atomic(int size);
diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h
index fe0c29b5144d..802d7842514d 100644
--- a/arch/um/include/user_util.h
+++ b/arch/um/include/user_util.h
@@ -55,7 +55,8 @@ extern int get_pty(void);
 extern void *um_kmalloc(int size);
 extern int switcheroo(int fd, int prot, void *from, void *to, int size);
 extern void do_exec(int old_pid, int new_pid);
-extern void tracer_panic(char *msg, ...);
+extern void tracer_panic(char *msg, ...)
+        __attribute__ ((format (printf, 1, 2)));
 extern int detach(int pid, int sig);
 extern int attach(int pid);
 extern void kill_child_dead(int pid);
diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c
index 7713e7a6f476..432cf0b97a13 100644
--- a/arch/um/kernel/ksyms.c
+++ b/arch/um/kernel/ksyms.c
@@ -39,7 +39,6 @@ EXPORT_SYMBOL(um_virt_to_phys);
 EXPORT_SYMBOL(mode_tt);
 EXPORT_SYMBOL(handle_page_fault);
 EXPORT_SYMBOL(find_iomem);
-EXPORT_SYMBOL(end_iomem);
 
 #ifdef CONFIG_MODE_TT
 EXPORT_SYMBOL(strncpy_from_user_tt);
@@ -89,12 +88,10 @@ EXPORT_SYMBOL(dump_thread);
 EXPORT_SYMBOL(do_gettimeofday);
 EXPORT_SYMBOL(do_settimeofday);
 
-/* This is here because UML expands open to sys_open, not to a system
+/* This is here because UML expands lseek to sys_lseek, not to a system
  * call instruction.
  */
-EXPORT_SYMBOL(sys_open);
 EXPORT_SYMBOL(sys_lseek);
-EXPORT_SYMBOL(sys_read);
 EXPORT_SYMBOL(sys_wait4);
 
 #ifdef CONFIG_SMP
diff --git a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c
index 901b85e8a1c6..8f49507e64ef 100644
--- a/arch/um/os-Linux/drivers/ethertap_user.c
+++ b/arch/um/os-Linux/drivers/ethertap_user.c
@@ -40,7 +40,7 @@ static void etap_change(int op, unsigned char *addr, unsigned char *netmask,
                         int fd)
 {
         struct addr_change change;
-        void *output;
+        char *output;
         int n;
 
         change.what = op;
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c
index 6490a4ff40ac..6987d1d247a2 100644
--- a/arch/um/os-Linux/helper.c
+++ b/arch/um/os-Linux/helper.c
@@ -43,7 +43,7 @@ static int helper_child(void *arg)
                 (*data->pre_exec)(data->pre_data);
         execvp(argv[0], argv);
         errval = errno;
-        printk("execvp of '%s' failed - errno = %d\n", argv[0], errno);
+        printk("helper_child - execve of '%s' failed - errno = %d\n", argv[0], errno);
         os_write_file(data->fd, &errval, sizeof(errval));
         kill(os_getpid(), SIGKILL);
         return(0);
@@ -92,15 +92,15 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
         close(fds[1]);
         fds[1] = -1;
 
-        /*Read the errno value from the child.*/
+        /* Read the errno value from the child, if the exec failed, or get 0 if
+         * the exec succeeded because the pipe fd was set as close-on-exec. */
         n = os_read_file(fds[0], &ret, sizeof(ret));
-        if(n < 0){
+        if (n < 0) {
                 printk("run_helper : read on pipe failed, ret = %d\n", -n);
                 ret = n;
                 kill(pid, SIGKILL);
                 CATCH_EINTR(waitpid(pid, NULL, 0));
-        }
-        else if(n != 0){
+        } else if(n != 0){
                 CATCH_EINTR(n = waitpid(pid, NULL, 0));
                 ret = -errno;
         } else {
diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index 6ab372da9657..71bb90a7606d 100644
--- a/arch/um/os-Linux/mem.c
+++ b/arch/um/os-Linux/mem.c
@@ -53,33 +53,36 @@ static void __init find_tempdir(void)
  */
 int make_tempfile(const char *template, char **out_tempname, int do_unlink)
 {
-        char tempname[MAXPATHLEN];
+        char *tempname;
         int fd;
 
+        tempname = malloc(MAXPATHLEN);
+
         find_tempdir();
-        if (*template != '/')
+        if (template[0] != '/')
                 strcpy(tempname, tempdir);
         else
-                *tempname = 0;
+                tempname[0] = '\0';
         strcat(tempname, template);
         fd = mkstemp(tempname);
         if(fd < 0){
                 fprintf(stderr, "open - cannot create %s: %s\n", tempname,
                         strerror(errno));
-                return -1;
+                goto out;
         }
         if(do_unlink && (unlink(tempname) < 0)){
                 perror("unlink");
-                return -1;
+                goto out;
         }
         if(out_tempname){
-                *out_tempname = strdup(tempname);
-                if(*out_tempname == NULL){
-                        perror("strdup");
-                        return -1;
-                }
+                *out_tempname = tempname;
+        } else {
+                free(tempname);
         }
         return(fd);
+out:
+        free(tempname);
+        return -1;
 }
 
 #define TEMPNAME_TEMPLATE "vm_file-XXXXXX"
diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c
index 9ba942947146..00e9388e947a 100644
--- a/arch/um/os-Linux/sigio.c
+++ b/arch/um/os-Linux/sigio.c
@@ -304,8 +304,8 @@ out_clear_poll:
                                            .size        = 0,
                                            .used        = 0 });
 out_free:
-        kfree(p);
         sigio_unlock();
+        kfree(p);
 out_close2:
         close(l_sigio_private[0]);
         close(l_sigio_private[1]);
diff --git a/arch/um/os-Linux/skas/mem.c b/arch/um/os-Linux/skas/mem.c
index fbb080c2fc26..b3c11cfa995a 100644
--- a/arch/um/os-Linux/skas/mem.c
+++ b/arch/um/os-Linux/skas/mem.c
@@ -82,8 +82,8 @@ static inline long do_syscall_stub(struct mm_id * mm_idp, void **addr)
         if (offset) {
                 data = (unsigned long *)(mm_idp->stack +
                                          offset - UML_CONFIG_STUB_DATA);
-                printk("do_syscall_stub : ret = %d, offset = %d, "
-                       "data = 0x%x\n", ret, offset, data);
+                printk("do_syscall_stub : ret = %ld, offset = %ld, "
+                       "data = %p\n", ret, offset, data);
                 syscall = (unsigned long *)((unsigned long)data + data[0]);
                 printk("do_syscall_stub: syscall %ld failed, return value = "
                        "0x%lx, expected return value = 0x%lx\n",
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index bbf34cb91ce1..045ae0037456 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -265,7 +265,7 @@ void userspace(union uml_pt_regs *regs)
                 if(err)
                         panic("userspace - could not resume userspace process, "
                               "pid=%d, ptrace operation = %d, errno = %d\n",
-                              op, errno);
+                              pid, op, errno);
 
                 CATCH_EINTR(err = waitpid(pid, &status, WUNTRACED));
                 if(err < 0)
@@ -369,7 +369,7 @@ int copy_context_skas0(unsigned long new_stack, int pid)
          */
         wait_stub_done(pid, -1, "copy_context_skas0");
         if (child_data->err != UML_CONFIG_STUB_DATA)
-                panic("copy_context_skas0 - stub-child reports error %d\n",
+                panic("copy_context_skas0 - stub-child reports error %ld\n",
                       child_data->err);
 
         if (ptrace(PTRACE_OLDSETOPTIONS, pid, NULL,
diff --git a/arch/um/os-Linux/sys-i386/tls.c b/arch/um/os-Linux/sys-i386/tls.c
index ba21f0e04a2f..120abbe4e3ce 100644
--- a/arch/um/os-Linux/sys-i386/tls.c
+++ b/arch/um/os-Linux/sys-i386/tls.c
@@ -1,3 +1,4 @@
+#include <errno.h>
 #include <linux/unistd.h>
 #include "sysdep/tls.h"
 #include "user_util.h"
diff --git a/arch/um/os-Linux/umid.c b/arch/um/os-Linux/umid.c
index 198e59163288..34bfc1bb9e38 100644
--- a/arch/um/os-Linux/umid.c
+++ b/arch/um/os-Linux/umid.c
@@ -120,7 +120,8 @@ static int not_dead_yet(char *dir)
 
         dead = 0;
         fd = open(file, O_RDONLY);
-        if(fd < 0){
+        if(fd < 0) {
+                fd = -errno;
                 if(fd != -ENOENT){
                         printk("not_dead_yet : couldn't open pid file '%s', "
                                "err = %d\n", file, -fd);
@@ -130,9 +131,13 @@ static int not_dead_yet(char *dir)
 
         err = 0;
         n = read(fd, pid, sizeof(pid));
-        if(n <= 0){
+        if(n < 0){
+                printk("not_dead_yet : couldn't read pid file '%s', "
+                       "err = %d\n", file, errno);
+                goto out_close;
+        } else if(n == 0){
                 printk("not_dead_yet : couldn't read pid file '%s', "
-                       "err = %d\n", file, -n);
+                       "0-byte read\n", file);
                 goto out_close;
         }
 
@@ -155,9 +160,9 @@ static int not_dead_yet(char *dir)
 
         return err;
 
- out_close:
+out_close:
         close(fd);
- out:
+out:
         return 0;
 }
 
diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
index 8da6ab31152a..2598158e1f53 100644
--- a/arch/um/os-Linux/user_syms.c
+++ b/arch/um/os-Linux/user_syms.c
@@ -18,14 +18,19 @@ extern void *memmove(void *, const void *, size_t);
 extern void *memset(void *, int, size_t);
 extern int printf(const char *, ...);
 
+/* If they're not defined, the export is included in lib/string.c.*/
+#ifdef __HAVE_ARCH_STRLEN
 EXPORT_SYMBOL(strlen);
+#endif
+#ifdef __HAVE_ARCH_STRSTR
+EXPORT_SYMBOL(strstr);
+#endif
+
 EXPORT_SYMBOL(memcpy);
 EXPORT_SYMBOL(memmove);
 EXPORT_SYMBOL(memset);
 EXPORT_SYMBOL(printf);
 
-EXPORT_SYMBOL(strstr);
-
 /* Here, instead, I can provide a fake prototype. Yes, someone cares: genksyms.
  * However, the modules will use the CRC defined *here*, no matter if it is
  * good; so the versions of these symbols will always match
diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules
index b696b451774c..5e7a9c310aa5 100644
--- a/arch/um/scripts/Makefile.rules
+++ b/arch/um/scripts/Makefile.rules
@@ -9,10 +9,8 @@ USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
 
 $(USER_OBJS) $(USER_OBJS:.o=.i) $(USER_OBJS:.o=.s) $(USER_OBJS:.o=.lst): \
         c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) $(CFLAGS_$(notdir $@))
-$(USER_OBJS): cmd_checksrc =
-$(USER_OBJS): quiet_cmd_checksrc =
-$(USER_OBJS): cmd_force_checksrc =
-$(USER_OBJS): quiet_cmd_force_checksrc =
+$(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \
+        -Dunix -D__unix__ -D__$(SUBARCH)__
 
 
 # The stubs and unmap.o can't try to call mcount or update basic block data
diff --git a/arch/um/sys-i386/ksyms.c b/arch/um/sys-i386/ksyms.c
index db524ab3f743..2a1eac1859ce 100644
--- a/arch/um/sys-i386/ksyms.c
+++ b/arch/um/sys-i386/ksyms.c
@@ -15,7 +15,3 @@ EXPORT_SYMBOL(__up_wakeup);
 
 /* Networking helper routines. */
 EXPORT_SYMBOL(csum_partial);
-
-/* delay core functions */
-EXPORT_SYMBOL(__const_udelay);
-EXPORT_SYMBOL(__udelay);
diff --git a/arch/um/sys-i386/ptrace_user.c b/arch/um/sys-i386/ptrace_user.c
index 9f3bd8ed78f5..40aa88531446 100644
--- a/arch/um/sys-i386/ptrace_user.c
+++ b/arch/um/sys-i386/ptrace_user.c
@@ -57,7 +57,7 @@ static void write_debugregs(int pid, unsigned long *regs)
                 if(ptrace(PTRACE_POKEUSR, pid, &dummy->u_debugreg[i],
                           regs[i]) < 0)
                         printk("write_debugregs - ptrace failed on "
-                               "register %d, value = 0x%x, errno = %d\n", i,
+                               "register %d, value = 0x%lx, errno = %d\n", i,
                                regs[i], errno);
         }
 }
diff --git a/arch/um/sys-i386/signal.c b/arch/um/sys-i386/signal.c
index f5d0e1c37ea2..618fd8594643 100644
--- a/arch/um/sys-i386/signal.c
+++ b/arch/um/sys-i386/signal.c
@@ -147,7 +147,7 @@ int copy_sc_to_user_tt(struct sigcontext *to, struct _fpstate __user *fp,
          * delivery.  The sp passed in is the original, and this needs
          * to be restored, so we stick it in separately.
          */
-        err |= copy_to_user(&SC_SP(to), sp, sizeof(sp));
+        err |= copy_to_user(&SC_SP(to), &sp, sizeof(sp));
 
         if(from_fp != NULL){
                 err |= copy_to_user(&to->fpstate, &to_fp, sizeof(to->fpstate));
diff --git a/arch/um/sys-i386/tls.c b/arch/um/sys-i386/tls.c
index a3188e861cc7..71b9796258ef 100644
--- a/arch/um/sys-i386/tls.c
+++ b/arch/um/sys-i386/tls.c
@@ -378,7 +378,7 @@ static int __init __setup_host_supports_tls(void) {
         } else
                 printk(KERN_ERR "  Host TLS support NOT detected! "
                                 "TLS support inside UML will not work\n");
-        return 1;
+        return 0;
 }
 
 __initcall(__setup_host_supports_tls);
diff --git a/arch/um/sys-x86_64/signal.c b/arch/um/sys-x86_64/signal.c
index e75c4e1838b0..a4c46a8af008 100644
--- a/arch/um/sys-x86_64/signal.c
+++ b/arch/um/sys-x86_64/signal.c
@@ -137,7 +137,7 @@ int copy_sc_to_user_tt(struct sigcontext *to, struct _fpstate *fp,
          * delivery.  The sp passed in is the original, and this needs
          * to be restored, so we stick it in separately.
          */
-        err |= copy_to_user(&SC_SP(to), sp, sizeof(sp));
+        err |= copy_to_user(&SC_SP(to), &sp, sizeof(sp));
 
         if(from_fp != NULL){
                 err |= copy_to_user(&to->fpstate, &to_fp, sizeof(to->fpstate));
diff --git a/arch/v850/kernel/v850_ksyms.c b/arch/v850/kernel/v850_ksyms.c
index 8ffc29c1c89d..6bcfcfe88384 100644
--- a/arch/v850/kernel/v850_ksyms.c
+++ b/arch/v850/kernel/v850_ksyms.c
@@ -43,7 +43,6 @@ EXPORT_SYMBOL (strncmp);
 EXPORT_SYMBOL (strchr);
 EXPORT_SYMBOL (strlen);
 EXPORT_SYMBOL (strnlen);
-EXPORT_SYMBOL (strpbrk);
 EXPORT_SYMBOL (strrchr);
 EXPORT_SYMBOL (strstr);
 EXPORT_SYMBOL (memset);
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 4310b4a311a5..408d44a59756 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -136,6 +136,11 @@ config X86_L1_CACHE_SHIFT
         default "7" if GENERIC_CPU || MPSC
         default "6" if MK8
 
+config X86_INTERNODE_CACHE_BYTES
+        int
+        default "4096" if X86_VSMP
+        default X86_L1_CACHE_BYTES if !X86_VSMP
+
 config X86_TSC
         bool
         default y
@@ -283,6 +288,11 @@ config K8_NUMA
          Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA
          instead, which also takes priority if both are compiled in.   
 
+config NODES_SHIFT
+        int
+        default "6"
+        depends on NEED_MULTIPLE_NODES
+
 # Dummy CONFIG option to select ACPI_NUMA from drivers/acpi/Kconfig.
 
 config X86_64_ACPI_NUMA
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index 585fd4a559c8..e573e2ab5510 100644
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -24,37 +24,37 @@
 LDFLAGS         := -m elf_x86_64
 OBJCOPYFLAGS    := -O binary -R .note -R .comment -S
 LDFLAGS_vmlinux :=
-
 CHECKFLAGS      += -D__x86_64__ -m64
 
+cflags-y        :=
 cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
 cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
 cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
-CFLAGS += $(cflags-y)
 
-CFLAGS += -m64
-CFLAGS += -mno-red-zone
-CFLAGS += -mcmodel=kernel
-CFLAGS += -pipe
+cflags-y += -m64
+cflags-y += -mno-red-zone
+cflags-y += -mcmodel=kernel
+cflags-y += -pipe
 cflags-$(CONFIG_REORDER) += -ffunction-sections
 # this makes reading assembly source easier, but produces worse code
 # actually it makes the kernel smaller too.
-CFLAGS += -fno-reorder-blocks   
-CFLAGS += -Wno-sign-compare
+cflags-y += -fno-reorder-blocks
+cflags-y += -Wno-sign-compare
 ifneq ($(CONFIG_UNWIND_INFO),y)
-CFLAGS += -fno-asynchronous-unwind-tables
+cflags-y += -fno-asynchronous-unwind-tables
 endif
 ifneq ($(CONFIG_DEBUG_INFO),y)
 # -fweb shrinks the kernel a bit, but the difference is very small
 # it also messes up debugging, so don't use it for now.
-#CFLAGS += $(call cc-option,-fweb)
+#cflags-y += $(call cc-option,-fweb)
 endif
 # -funit-at-a-time shrinks the kernel .text considerably
 # unfortunately it makes reading oopses harder.
-CFLAGS += $(call cc-option,-funit-at-a-time)
+cflags-y += $(call cc-option,-funit-at-a-time)
 # prevent gcc from generating any FP code by mistake
-CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
+cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
 
+CFLAGS += $(cflags-y)
 AFLAGS += -m64
 
 head-y := arch/x86_64/kernel/head.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task.o
diff --git a/arch/x86_64/boot/video.S b/arch/x86_64/boot/video.S
index 0587477c99f2..32327bb37aff 100644
--- a/arch/x86_64/boot/video.S
+++ b/arch/x86_64/boot/video.S
@@ -97,6 +97,7 @@
 #define PARAM_VESAPM_OFF        0x30
 #define PARAM_LFB_PAGES         0x32
 #define PARAM_VESA_ATTRIB       0x34
+#define PARAM_CAPABILITIES      0x36
 
 /* Define DO_STORE according to CONFIG_VIDEO_RETAIN */
 #ifdef CONFIG_VIDEO_RETAIN
@@ -233,6 +234,10 @@ mopar_gr:
         movw    18(%di), %ax
         movl    %eax, %fs:(PARAM_LFB_SIZE)
 
+# store mode capabilities
+        movl 10(%di), %eax
+        movl %eax, %fs:(PARAM_CAPABILITIES)
+
 # switching the DAC to 8-bit is for <= 8 bpp only
         movw    %fs:(PARAM_LFB_DEPTH), %ax
         cmpw    $8, %ax
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index 566ecc97ee5a..3c45ec22b3fe 100644
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-git9
-# Sat Mar 25 15:18:40 2006
+# Linux kernel version: 2.6.17-rc1
+# Mon Apr  3 16:11:14 2006
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -9,6 +9,7 @@ CONFIG_X86=y
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_MMU=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_X86_CMPXCHG=y
 CONFIG_EARLY_PRINTK=y
@@ -55,10 +56,6 @@ CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
 CONFIG_SLAB=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -70,7 +67,6 @@ CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_OBSOLETE_MODPARM=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
@@ -81,6 +77,7 @@ CONFIG_STOP_MACHINE=y
 #
 CONFIG_LBD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
 
 #
 # IO Schedulers
@@ -105,6 +102,7 @@ CONFIG_X86_PC=y
 CONFIG_GENERIC_CPU=y
 CONFIG_X86_L1_CACHE_BYTES=128
 CONFIG_X86_L1_CACHE_SHIFT=7
+CONFIG_X86_INTERNODE_CACHE_BYTES=128
 CONFIG_X86_TSC=y
 CONFIG_X86_GOOD_APIC=y
 # CONFIG_MICROCODE is not set
@@ -116,6 +114,7 @@ CONFIG_X86_LOCAL_APIC=y
 CONFIG_MTRR=y
 CONFIG_SMP=y
 CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -138,6 +137,7 @@ CONFIG_NEED_MULTIPLE_NODES=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MIGRATION=y
 CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
+CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y
 CONFIG_NR_CPUS=32
 CONFIG_HOTPLUG_CPU=y
 CONFIG_HPET_TIMER=y
@@ -289,6 +289,7 @@ CONFIG_IP_PNP_DHCP=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_DIAG=y
 CONFIG_INET_TCP_DIAG=y
@@ -300,6 +301,7 @@ CONFIG_IPV6=y
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
 # CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_IPV6_TUNNEL is not set
 # CONFIG_NETFILTER is not set
@@ -704,7 +706,6 @@ CONFIG_S2IO=m
 # Wireless LAN (non-hamradio)
 #
 # CONFIG_NET_RADIO is not set
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
 
 #
 # Wan interfaces
@@ -791,7 +792,7 @@ CONFIG_HW_CONSOLE=y
 #
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -921,6 +922,7 @@ CONFIG_HWMON=y
 # Digital Video Broadcasting Devices
 #
 # CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
 
 #
 # Graphics support
@@ -932,6 +934,8 @@ CONFIG_VIDEO_SELECT=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256
 CONFIG_DUMMY_CONSOLE=y
 
 #
@@ -1058,15 +1062,6 @@ CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_MICROTEK is not set
 
 #
-# USB Multimedia devices
-#
-# CONFIG_USB_DABUSB is not set
-
-#
-# Video4Linux support is needed for USB Multimedia device support
-#
-
-#
 # USB Network Adapters
 #
 # CONFIG_USB_CATC is not set
@@ -1118,9 +1113,15 @@ CONFIG_USB_MON=y
 # CONFIG_MMC is not set
 
 #
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
 # InfiniBand support
 #
 # CONFIG_INFINIBAND is not set
+# CONFIG_IPATH_CORE is not set
 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
@@ -1128,6 +1129,11 @@ CONFIG_USB_MON=y
 # CONFIG_EDAC is not set
 
 #
+# Real Time Clock
+#
+# CONFIG_RTC_CLASS is not set
+
+#
 # Firmware Drivers
 #
 # CONFIG_EDD is not set
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index 35b2faccdc6c..5a9802676689 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -15,6 +15,8 @@
 #include <asm/vsyscall32.h>
 #include <linux/linkage.h>
 
+#define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)
+
         .macro IA32_ARG_FIXUP noebp=0
         movl    %edi,%r8d
         .if \noebp
@@ -109,8 +111,8 @@ ENTRY(ia32_sysenter_target)
         CFI_REMEMBER_STATE
         jnz  sysenter_tracesys
 sysenter_do_call:       
-        cmpl    $(IA32_NR_syscalls),%eax
-        jae     ia32_badsys
+        cmpl    $(IA32_NR_syscalls-1),%eax
+        ja      ia32_badsys
         IA32_ARG_FIXUP 1
         call    *ia32_sys_call_table(,%rax,8)
         movq    %rax,RAX-ARGOFFSET(%rsp)
@@ -210,8 +212,8 @@ ENTRY(ia32_cstar_target)
         CFI_REMEMBER_STATE
         jnz   cstar_tracesys
 cstar_do_call:  
-        cmpl $IA32_NR_syscalls,%eax
-        jae  ia32_badsys
+        cmpl $IA32_NR_syscalls-1,%eax
+        ja  ia32_badsys
         IA32_ARG_FIXUP 1
         call *ia32_sys_call_table(,%rax,8)
         movq %rax,RAX-ARGOFFSET(%rsp)
@@ -296,8 +298,8 @@ ENTRY(ia32_syscall)
         testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%r10)
         jnz ia32_tracesys
 ia32_do_syscall:        
-        cmpl $(IA32_NR_syscalls),%eax
-        jae  ia32_badsys
+        cmpl $(IA32_NR_syscalls-1),%eax
+        ja  ia32_badsys
         IA32_ARG_FIXUP
         call *ia32_sys_call_table(,%rax,8) # xxx: rip relative
 ia32_sysret:
@@ -685,12 +687,11 @@ ia32_sys_call_table:
         .quad sys_readlinkat            /* 305 */
         .quad sys_fchmodat
         .quad sys_faccessat
-        .quad sys_ni_syscall            /* pselect6 for now */
-        .quad sys_ni_syscall            /* ppoll for now */
+        .quad quiet_ni_syscall          /* pselect6 for now */
+        .quad quiet_ni_syscall          /* ppoll for now */
         .quad sys_unshare               /* 310 */
         .quad compat_sys_set_robust_list
         .quad compat_sys_get_robust_list
+        .quad sys_splice
+        .quad sys_sync_file_range
 ia32_syscall_end:               
-        .rept IA32_NR_syscalls-(ia32_syscall_end-ia32_sys_call_table)/8
-                .quad ni_syscall
-        .endr
diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c
index fffd6b0a2fab..70b9d21ed675 100644
--- a/arch/x86_64/kernel/aperture.c
+++ b/arch/x86_64/kernel/aperture.c
@@ -80,7 +80,7 @@ static int __init aperture_valid(char *name, u64 aper_base, u32 aper_size)
                 printk("Aperture from %s beyond 4GB. Ignoring.\n",name);
                 return 0; 
         }
-        if (e820_mapped(aper_base, aper_base + aper_size, E820_RAM)) {  
+        if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) {
                 printk("Aperture from %s pointing to e820 RAM. Ignoring.\n",name);
                 return 0; 
         } 
diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c
index 293cd71a266a..62776c07cff1 100644
--- a/arch/x86_64/kernel/e820.c
+++ b/arch/x86_64/kernel/e820.c
@@ -80,7 +80,12 @@ static inline int bad_addr(unsigned long *addrp, unsigned long size)
         return 0;
 } 
 
-int __init e820_mapped(unsigned long start, unsigned long end, unsigned type) 
+/*
+ * This function checks if any part of the range <start,end> is mapped
+ * with type.
+ */
+int __meminit
+e820_any_mapped(unsigned long start, unsigned long end, unsigned type)
 { 
         int i;
         for (i = 0; i < e820.nr_map; i++) { 
@@ -94,6 +99,35 @@ int __init e820_mapped(unsigned long start, unsigned long end, unsigned type)
         return 0;
 }
 
+/*
+ * This function checks if the entire range <start,end> is mapped with type.
+ *
+ * Note: this function only works correct if the e820 table is sorted and
+ * not-overlapping, which is the case
+ */
+int __init e820_all_mapped(unsigned long start, unsigned long end, unsigned type)
+{
+        int i;
+        for (i = 0; i < e820.nr_map; i++) {
+                struct e820entry *ei = &e820.map[i];
+                if (type && ei->type != type)
+                        continue;
+                /* is the region (part) in overlap with the current region ?*/
+                if (ei->addr >= end || ei->addr + ei->size <= start)
+                        continue;
+
+                /* if the region is at the beginning of <start,end> we move
+                 * start to the end of the region since it's ok until there
+                 */
+                if (ei->addr <= start)
+                        start = ei->addr + ei->size;
+                /* if start is now at or beyond end, we're done, full coverage */
+                if (start >= end)
+                        return 1; /* we're done */
+        }
+        return 0;
+}
+
 /* 
  * Find a free area in a specific range. 
  */ 
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index 8538bfea30e6..c946e4fe67a7 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -180,6 +180,10 @@ rff_trace:
  *
  * XXX  if we had a free scratch register we could save the RSP into the stack frame
  *      and report it properly in ps. Unfortunately we haven't.
+ *
+ * When user can change the frames always force IRET. That is because
+ * it deals with uncanonical addresses better. SYSRET has trouble
+ * with them due to bugs in both AMD and Intel CPUs.
  */                                     
 
 ENTRY(system_call)
@@ -254,7 +258,10 @@ sysret_signal:
         xorl %esi,%esi # oldset -> arg2
         call ptregscall_common
 1:      movl $_TIF_NEED_RESCHED,%edi
-        jmp sysret_check
+        /* Use IRET because user could have changed frame. This
+           works because ptregscall_common has called FIXUP_TOP_OF_STACK. */
+        cli
+        jmp int_with_check
         
 badsys:
         movq $-ENOSYS,RAX-ARGOFFSET(%rsp)
@@ -280,7 +287,8 @@ tracesys:
         call syscall_trace_leave
         RESTORE_TOP_OF_STACK %rbx
         RESTORE_REST
-        jmp ret_from_sys_call
+        /* Use IRET because user could have changed frame */
+        jmp int_ret_from_sys_call
         CFI_ENDPROC
                 
 /* 
@@ -408,25 +416,9 @@ ENTRY(stub_execve)
         CFI_ADJUST_CFA_OFFSET -8
         CFI_REGISTER rip, r11
         SAVE_REST
-        movq %r11, %r15
-        CFI_REGISTER rip, r15
         FIXUP_TOP_OF_STACK %r11
         call sys_execve
-        GET_THREAD_INFO(%rcx)
-        bt $TIF_IA32,threadinfo_flags(%rcx)
-        CFI_REMEMBER_STATE
-        jc exec_32bit
         RESTORE_TOP_OF_STACK %r11
-        movq %r15, %r11
-        CFI_REGISTER rip, r11
-        RESTORE_REST
-        pushq %r11
-        CFI_ADJUST_CFA_OFFSET 8
-        CFI_REL_OFFSET rip, 0
-        ret
-
-exec_32bit:
-        CFI_RESTORE_STATE
         movq %rax,RAX(%rsp)
         RESTORE_REST
         jmp int_ret_from_sys_call
diff --git a/arch/x86_64/kernel/mce.c b/arch/x86_64/kernel/mce.c
index 10b3e348fc99..6f0790e8b6d3 100644
--- a/arch/x86_64/kernel/mce.c
+++ b/arch/x86_64/kernel/mce.c
@@ -29,6 +29,8 @@
 #define MISC_MCELOG_MINOR 227
 #define NR_BANKS 6
 
+atomic_t mce_entry;
+
 static int mce_dont_init;
 
 /* 0: always panic, 1: panic if deadlock possible, 2: try to avoid panic,
@@ -172,10 +174,12 @@ void do_machine_check(struct pt_regs * regs, long error_code)
         int i;
         int panicm_found = 0;
 
+        atomic_inc(&mce_entry);
+
         if (regs)
                 notify_die(DIE_NMI, "machine check", regs, error_code, 18, SIGKILL);
         if (!banks)
-                return;
+                goto out2;
 
         memset(&m, 0, sizeof(struct mce));
         m.cpu = safe_smp_processor_id();
@@ -266,6 +270,8 @@ void do_machine_check(struct pt_regs * regs, long error_code)
  out:
         /* Last thing done in the machine check exception to clear state. */
         wrmsrl(MSR_IA32_MCG_STATUS, 0);
+ out2:
+        atomic_dec(&mce_entry);
 }
 
 /*
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index d9e4067faf05..4e6357fe0ec3 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -34,6 +34,7 @@
 #include <asm/proto.h>
 #include <asm/kdebug.h>
 #include <asm/local.h>
+#include <asm/mce.h>
 
 /*
  * lapic_nmi_owner tracks the ownership of the lapic NMI hardware:
@@ -480,6 +481,12 @@ void __kprobes nmi_watchdog_tick(struct pt_regs * regs, unsigned reason)
                 __get_cpu_var(nmi_touch) = 0;
                 touched = 1;
         }
+#ifdef CONFIG_X86_MCE
+        /* Could check oops_in_progress here too, but it's safer
+           not too */
+        if (atomic_read(&mce_entry) > 0)
+                touched = 1;
+#endif
         if (!touched && __get_cpu_var(last_irq_sum) == sum) {
                 /*
                  * Ayiee, looks like this CPU is stuck ...
diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c
index 03c9eeedb0f3..af035ede70cd 100644
--- a/arch/x86_64/kernel/pci-dma.c
+++ b/arch/x86_64/kernel/pci-dma.c
@@ -48,9 +48,11 @@ dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order)
 {
         struct page *page;
         int node;
+#ifdef CONFIG_PCI
         if (dev->bus == &pci_bus_type)
                 node = pcibus_to_node(to_pci_dev(dev)->bus);
         else
+#endif
                 node = numa_node_id();
         page = alloc_pages_node(node, gfp, order);
         return page ? page_address(page) : NULL;
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index 70dd8e5c6889..1c44b53cb15b 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -781,10 +781,16 @@ long do_arch_prctl(struct task_struct *task, int code, unsigned long addr)
         }
         case ARCH_GET_GS: { 
                 unsigned long base;
+                unsigned gsindex;
                 if (task->thread.gsindex == GS_TLS_SEL)
                         base = read_32bit_tls(task, GS_TLS);
-                else if (doit)
-                        rdmsrl(MSR_KERNEL_GS_BASE, base);
+                else if (doit) {
+                        asm("movl %%gs,%0" : "=r" (gsindex));
+                        if (gsindex)
+                                rdmsrl(MSR_KERNEL_GS_BASE, base);
+                        else
+                                base = task->thread.gs;
+                }
                 else
                         base = task->thread.gs;
                 ret = put_user(base, (unsigned long __user *)addr); 
diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c
index d44b2c1e63a6..da8e7903d817 100644
--- a/arch/x86_64/kernel/ptrace.c
+++ b/arch/x86_64/kernel/ptrace.c
@@ -274,11 +274,6 @@ static int putreg(struct task_struct *child,
                                 return -EIO;
                         value &= 0xffff;
                         break;
-                case offsetof(struct user_regs_struct, rip):
-                        /* Check if the new RIP address is canonical */
-                        if (value >= TASK_SIZE_OF(child))
-                                return -EIO;
-                        break;
         }
         put_stack_long(child, regno - sizeof(struct pt_regs), value);
         return 0;
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 0856ad444f90..c50b06765a80 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -353,8 +353,10 @@ static __init void parse_cmdline_early (char ** cmdline_p)
                 if (fullarg(from, "enable_timer_pin_1"))
                         disable_timer_pin_1 = -1;
 
-                if (fullarg(from, "nolapic") || fullarg(from, "disableapic"))
+                if (fullarg(from, "nolapic") || fullarg(from, "disableapic")) {
+                        clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);
                         disable_apic = 1;
+                }
 
                 if (fullarg(from, "noapic"))
                         skip_ioapic_setup = 1;
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index ef8bc46dc140..7392570f975d 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -726,7 +726,7 @@ static __init int late_hpet_init(void)
         unsigned int            ntimer;
 
         if (!vxtime.hpet_address)
-                return -1;
+                return 0;
 
         memset(&hd, 0, sizeof (hd));
 
@@ -917,6 +917,8 @@ void __init time_init(void)
                 vxtime.hpet_address = 0;
 
         if (hpet_use_timer) {
+                /* set tick_nsec to use the proper rate for HPET */
+                tick_nsec = TICK_NSEC_HPET;
                 cpu_khz = hpet_calibrate_tsc();
                 timename = "HPET";
 #ifdef CONFIG_X86_PM_TIMER
diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S
index 39ff0708f803..b81f473c4a19 100644
--- a/arch/x86_64/kernel/vmlinux.lds.S
+++ b/arch/x86_64/kernel/vmlinux.lds.S
@@ -65,7 +65,7 @@ SECTIONS
   .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
         *(.data.cacheline_aligned)
   }
-  . = ALIGN(CONFIG_X86_L1_CACHE_BYTES);
+  . = ALIGN(CONFIG_X86_INTERNODE_CACHE_BYTES);
   .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) {
         *(.data.read_mostly)
   }
diff --git a/arch/x86_64/kernel/x8664_ksyms.c b/arch/x86_64/kernel/x8664_ksyms.c
index d78f46056bda..1def21c9f7cd 100644
--- a/arch/x86_64/kernel/x8664_ksyms.c
+++ b/arch/x86_64/kernel/x8664_ksyms.c
@@ -112,7 +112,6 @@ EXPORT_SYMBOL_GPL(unset_nmi_callback);
 #undef memcpy
 #undef memset
 #undef memmove
-#undef strlen
 
 extern void * memset(void *,int,__kernel_size_t);
 extern size_t strlen(const char *);
@@ -121,8 +120,6 @@ extern void * memcpy(void *,const void *,__kernel_size_t);
 extern void * __memcpy(void *,const void *,__kernel_size_t);
 
 EXPORT_SYMBOL(memset);
-EXPORT_SYMBOL(strlen);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(memmove);
 EXPORT_SYMBOL(memcpy);
 EXPORT_SYMBOL(__memcpy);
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index e5f7f1c34462..4ba34e95d835 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -305,7 +305,7 @@ static void __meminit phys_pud_init(pud_t *pud, unsigned long address, unsigned
                 if (paddr >= end)
                         break;
 
-                if (!after_bootmem && !e820_mapped(paddr, paddr+PUD_SIZE, 0)) {
+                if (!after_bootmem && !e820_any_mapped(paddr, paddr+PUD_SIZE, 0)) {
                         set_pud(pud, __pud(0)); 
                         continue;
                 } 
@@ -507,9 +507,8 @@ void __init clear_kernel_mapping(unsigned long address, unsigned long size)
 
 /*
  * Memory hotplug specific functions
- * These are only for non-NUMA machines right now.
  */
-#ifdef CONFIG_MEMORY_HOTPLUG
+#if defined(CONFIG_ACPI_HOTPLUG_MEMORY) || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
 
 void online_page(struct page *page)
 {
@@ -520,6 +519,38 @@ void online_page(struct page *page)
         num_physpages++;
 }
 
+#ifndef CONFIG_MEMORY_HOTPLUG
+/*
+ * Memory Hotadd without sparsemem. The mem_maps have been allocated in advance,
+ * just online the pages.
+ */
+int __add_pages(struct zone *z, unsigned long start_pfn, unsigned long nr_pages)
+{
+        int err = -EIO;
+        unsigned long pfn;
+        unsigned long total = 0, mem = 0;
+        for (pfn = start_pfn; pfn < start_pfn + nr_pages; pfn++) {
+                if (pfn_valid(pfn)) {
+                        online_page(pfn_to_page(pfn));
+                        err = 0;
+                        mem++;
+                }
+                total++;
+        }
+        if (!err) {
+                z->spanned_pages += total;
+                z->present_pages += mem;
+                z->zone_pgdat->node_spanned_pages += total;
+                z->zone_pgdat->node_present_pages += mem;
+        }
+        return err;
+}
+#endif
+
+/*
+ * Memory is added always to NORMAL zone. This means you will never get
+ * additional DMA/DMA32 memory.
+ */
 int add_memory(u64 start, u64 size)
 {
         struct pglist_data *pgdat = NODE_DATA(0);
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c
index 4be82d6e2b48..cc02573a3271 100644
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86_64/mm/numa.c
@@ -100,11 +100,30 @@ int early_pfn_to_nid(unsigned long pfn)
 }
 #endif
 
+static void * __init
+early_node_mem(int nodeid, unsigned long start, unsigned long end,
+              unsigned long size)
+{
+        unsigned long mem = find_e820_area(start, end, size);
+        void *ptr;
+        if (mem != -1L)
+                return __va(mem);
+        ptr = __alloc_bootmem_nopanic(size,
+                                SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS));
+        if (ptr == 0) {
+                printk(KERN_ERR "Cannot find %lu bytes in node %d\n",
+                        size, nodeid);
+                return NULL;
+        }
+        return ptr;
+}
+
 /* Initialize bootmem allocator for a node */
 void __init setup_node_bootmem(int nodeid, unsigned long start, unsigned long end)
 { 
         unsigned long start_pfn, end_pfn, bootmap_pages, bootmap_size, bootmap_start; 
         unsigned long nodedata_phys;
+        void *bootmap;
         const int pgdat_size = round_up(sizeof(pg_data_t), PAGE_SIZE);
 
         start = round_up(start, ZONE_ALIGN); 
@@ -114,13 +133,11 @@ void __init setup_node_bootmem(int nodeid, unsigned long start, unsigned long en
         start_pfn = start >> PAGE_SHIFT;
         end_pfn = end >> PAGE_SHIFT;
 
-        nodedata_phys = find_e820_area(start, end, pgdat_size); 
-        if (nodedata_phys == -1L) 
-                panic("Cannot find memory pgdat in node %d\n", nodeid);
-
-        Dprintk("nodedata_phys %lx\n", nodedata_phys); 
+        node_data[nodeid] = early_node_mem(nodeid, start, end, pgdat_size);
+        if (node_data[nodeid] == NULL)
+                return;
+        nodedata_phys = __pa(node_data[nodeid]);
 
-        node_data[nodeid] = phys_to_virt(nodedata_phys);
         memset(NODE_DATA(nodeid), 0, sizeof(pg_data_t));
         NODE_DATA(nodeid)->bdata = &plat_node_bdata[nodeid];
         NODE_DATA(nodeid)->node_start_pfn = start_pfn;
@@ -129,9 +146,15 @@ void __init setup_node_bootmem(int nodeid, unsigned long start, unsigned long en
         /* Find a place for the bootmem map */
         bootmap_pages = bootmem_bootmap_pages(end_pfn - start_pfn); 
         bootmap_start = round_up(nodedata_phys + pgdat_size, PAGE_SIZE);
-        bootmap_start = find_e820_area(bootmap_start, end, bootmap_pages<<PAGE_SHIFT);
-        if (bootmap_start == -1L) 
-                panic("Not enough continuous space for bootmap on node %d", nodeid); 
+        bootmap = early_node_mem(nodeid, bootmap_start, end,
+                                        bootmap_pages<<PAGE_SHIFT);
+        if (bootmap == NULL)  {
+                if (nodedata_phys < start || nodedata_phys >= end)
+                        free_bootmem((unsigned long)node_data[nodeid],pgdat_size);
+                node_data[nodeid] = NULL;
+                return;
+        }
+        bootmap_start = __pa(bootmap);
         Dprintk("bootmap start %lu pages %lu\n", bootmap_start, bootmap_pages); 
         
         bootmap_size = init_bootmem_node(NODE_DATA(nodeid),
@@ -142,6 +165,9 @@ void __init setup_node_bootmem(int nodeid, unsigned long start, unsigned long en
 
         reserve_bootmem_node(NODE_DATA(nodeid), nodedata_phys, pgdat_size); 
         reserve_bootmem_node(NODE_DATA(nodeid), bootmap_start, bootmap_pages<<PAGE_SHIFT);
+#ifdef CONFIG_ACPI_NUMA
+        srat_reserve_add_area(nodeid);
+#endif
         node_set_online(nodeid);
 } 
 
@@ -335,6 +361,8 @@ __init int numa_setup(char *opt)
 #ifdef CONFIG_ACPI_NUMA
         if (!strncmp(opt,"noacpi",6))
                 acpi_numa = -1;
+        if (!strncmp(opt,"hotadd=", 7))
+                hotadd_percent = simple_strtoul(opt+7, NULL, 10);
 #endif
         return 1;
 } 
diff --git a/arch/x86_64/mm/srat.c b/arch/x86_64/mm/srat.c
index 2eb879590dc4..15ae9fcd65a7 100644
--- a/arch/x86_64/mm/srat.c
+++ b/arch/x86_64/mm/srat.c
@@ -15,15 +15,26 @@
 #include <linux/bitmap.h>
 #include <linux/module.h>
 #include <linux/topology.h>
+#include <linux/bootmem.h>
+#include <linux/mm.h>
 #include <asm/proto.h>
 #include <asm/numa.h>
 #include <asm/e820.h>
 
+#if (defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \
+        defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) \
+                && !defined(CONFIG_MEMORY_HOTPLUG)
+#define RESERVE_HOTADD 1
+#endif
+
 static struct acpi_table_slit *acpi_slit;
 
 static nodemask_t nodes_parsed __initdata;
 static nodemask_t nodes_found __initdata;
 static struct bootnode nodes[MAX_NUMNODES] __initdata;
+static struct bootnode nodes_add[MAX_NUMNODES] __initdata;
+static int found_add_area __initdata;
+int hotadd_percent __initdata = 10;
 static u8 pxm2node[256] = { [0 ... 255] = 0xff };
 
 /* Too small nodes confuse the VM badly. Usually they result
@@ -71,6 +82,10 @@ static __init int conflicting_nodes(unsigned long start, unsigned long end)
 static __init void cutoff_node(int i, unsigned long start, unsigned long end)
 {
         struct bootnode *nd = &nodes[i];
+
+        if (found_add_area)
+                return;
+
         if (nd->start < start) {
                 nd->start = start;
                 if (nd->end < nd->start)
@@ -90,6 +105,8 @@ static __init void bad_srat(void)
         acpi_numa = -1;
         for (i = 0; i < MAX_LOCAL_APIC; i++)
                 apicid_to_node[i] = NUMA_NO_NODE;
+        for (i = 0; i < MAX_NUMNODES; i++)
+                nodes_add[i].start = nodes[i].end = 0;
 }
 
 static __init inline int srat_disabled(void)
@@ -155,11 +172,114 @@ acpi_numa_processor_affinity_init(struct acpi_table_processor_affinity *pa)
                pxm, pa->apic_id, node);
 }
 
+#ifdef RESERVE_HOTADD
+/*
+ * Protect against too large hotadd areas that would fill up memory.
+ */
+static int hotadd_enough_memory(struct bootnode *nd)
+{
+        static unsigned long allocated;
+        static unsigned long last_area_end;
+        unsigned long pages = (nd->end - nd->start) >> PAGE_SHIFT;
+        long mem = pages * sizeof(struct page);
+        unsigned long addr;
+        unsigned long allowed;
+        unsigned long oldpages = pages;
+
+        if (mem < 0)
+                return 0;
+        allowed = (end_pfn - e820_hole_size(0, end_pfn)) * PAGE_SIZE;
+        allowed = (allowed / 100) * hotadd_percent;
+        if (allocated + mem > allowed) {
+                /* Give them at least part of their hotadd memory upto hotadd_percent
+                   It would be better to spread the limit out
+                   over multiple hotplug areas, but that is too complicated
+                   right now */
+                if (allocated >= allowed)
+                        return 0;
+                pages = (allowed - allocated + mem) / sizeof(struct page);
+                mem = pages * sizeof(struct page);
+                nd->end = nd->start + pages*PAGE_SIZE;
+        }
+        /* Not completely fool proof, but a good sanity check */
+        addr = find_e820_area(last_area_end, end_pfn<<PAGE_SHIFT, mem);
+        if (addr == -1UL)
+                return 0;
+        if (pages != oldpages)
+                printk(KERN_NOTICE "SRAT: Hotadd area limited to %lu bytes\n",
+                        pages << PAGE_SHIFT);
+        last_area_end = addr + mem;
+        allocated += mem;
+        return 1;
+}
+
+/*
+ * It is fine to add this area to the nodes data it will be used later
+ * This code supports one contigious hot add area per node.
+ */
+static int reserve_hotadd(int node, unsigned long start, unsigned long end)
+{
+        unsigned long s_pfn = start >> PAGE_SHIFT;
+        unsigned long e_pfn = end >> PAGE_SHIFT;
+        int changed = 0;
+        struct bootnode *nd = &nodes_add[node];
+
+        /* I had some trouble with strange memory hotadd regions breaking
+           the boot. Be very strict here and reject anything unexpected.
+           If you want working memory hotadd write correct SRATs.
+
+           The node size check is a basic sanity check to guard against
+           mistakes */
+        if ((signed long)(end - start) < NODE_MIN_SIZE) {
+                printk(KERN_ERR "SRAT: Hotplug area too small\n");
+                return -1;
+        }
+
+        /* This check might be a bit too strict, but I'm keeping it for now. */
+        if (e820_hole_size(s_pfn, e_pfn) != e_pfn - s_pfn) {
+                printk(KERN_ERR "SRAT: Hotplug area has existing memory\n");
+                return -1;
+        }
+
+        if (!hotadd_enough_memory(&nodes_add[node]))  {
+                printk(KERN_ERR "SRAT: Hotplug area too large\n");
+                return -1;
+        }
+
+        /* Looks good */
+
+        found_add_area = 1;
+        if (nd->start == nd->end) {
+                nd->start = start;
+                nd->end = end;
+                changed = 1;
+        } else {
+                if (nd->start == end) {
+                        nd->start = start;
+                        changed = 1;
+                }
+                if (nd->end == start) {
+                        nd->end = end;
+                        changed = 1;
+                }
+                if (!changed)
+                        printk(KERN_ERR "SRAT: Hotplug zone not continuous. Partly ignored\n");
+        }
+
+        if ((nd->end >> PAGE_SHIFT) > end_pfn)
+                end_pfn = nd->end >> PAGE_SHIFT;
+
+        if (changed)
+                printk(KERN_INFO "SRAT: hot plug zone found %Lx - %Lx\n", nd->start, nd->end);
+        return 0;
+}
+#endif
+
 /* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
 void __init
 acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
 {
-        struct bootnode *nd;
+        struct bootnode *nd, oldnode;
         unsigned long start, end;
         int node, pxm;
         int i;
@@ -172,6 +292,8 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
         }
         if (ma->flags.enabled == 0)
                 return;
+        if (ma->flags.hot_pluggable && hotadd_percent == 0)
+                return;
         start = ma->base_addr_lo | ((u64)ma->base_addr_hi << 32);
         end = start + (ma->length_lo | ((u64)ma->length_hi << 32));
         pxm = ma->proximity_domain;
@@ -181,10 +303,6 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
                 bad_srat();
                 return;
         }
-        /* It is fine to add this area to the nodes data it will be used later*/
-        if (ma->flags.hot_pluggable == 1)
-                printk(KERN_INFO "SRAT: hot plug zone found %lx - %lx \n",
-                                start, end);
         i = conflicting_nodes(start, end);
         if (i == node) {
                 printk(KERN_WARNING
@@ -199,6 +317,7 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
                 return;
         }
         nd = &nodes[node];
+        oldnode = *nd;
         if (!node_test_and_set(node, nodes_parsed)) {
                 nd->start = start;
                 nd->end = end;
@@ -208,8 +327,19 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
                 if (nd->end < end)
                         nd->end = end;
         }
+
         printk(KERN_INFO "SRAT: Node %u PXM %u %Lx-%Lx\n", node, pxm,
                nd->start, nd->end);
+
+#ifdef RESERVE_HOTADD
+        if (ma->flags.hot_pluggable && reserve_hotadd(node, start, end) < 0) {
+                /* Ignore hotadd region. Undo damage */
+                printk(KERN_NOTICE "SRAT: Hotplug region ignored\n");
+                *nd = oldnode;
+                if ((nd->start | nd->end) == 0)
+                        node_clear(node, nodes_parsed);
+        }
+#endif
 }
 
 /* Sanity check to catch more bad SRATs (they are amazingly common).
@@ -225,6 +355,9 @@ static int nodes_cover_memory(void)
                 unsigned long e = nodes[i].end >> PAGE_SHIFT;
                 pxmram += e - s;
                 pxmram -= e820_hole_size(s, e);
+                pxmram -= nodes_add[i].end - nodes_add[i].start;
+                if ((long)pxmram < 0)
+                        pxmram = 0;
         }
 
         e820ram = end_pfn - e820_hole_size(0, end_pfn);
@@ -258,7 +391,7 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end)
 
         /* First clean up the node list */
         for (i = 0; i < MAX_NUMNODES; i++) {
-                cutoff_node(i, start, end);
+                cutoff_node(i, start, end);
                 if ((nodes[i].end - nodes[i].start) < NODE_MIN_SIZE)
                         unparse_node(i);
         }
@@ -282,6 +415,12 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end)
         /* Finally register nodes */
         for_each_node_mask(i, nodes_parsed)
                 setup_node_bootmem(i, nodes[i].start, nodes[i].end);
+        /* Try again in case setup_node_bootmem missed one due
+           to missing bootmem */
+        for_each_node_mask(i, nodes_parsed)
+                if (!node_online(i))
+                        setup_node_bootmem(i, nodes[i].start, nodes[i].end);
+
         for (i = 0; i < NR_CPUS; i++) { 
                 if (cpu_to_node[i] == NUMA_NO_NODE)
                         continue;
@@ -303,6 +442,25 @@ static int node_to_pxm(int n)
        return 0;
 }
 
+void __init srat_reserve_add_area(int nodeid)
+{
+        if (found_add_area && nodes_add[nodeid].end) {
+                u64 total_mb;
+
+                printk(KERN_INFO "SRAT: Reserving hot-add memory space "
+                                "for node %d at %Lx-%Lx\n",
+                        nodeid, nodes_add[nodeid].start, nodes_add[nodeid].end);
+                total_mb = (nodes_add[nodeid].end - nodes_add[nodeid].start)
+                                        >> PAGE_SHIFT;
+                total_mb *= sizeof(struct page);
+                total_mb >>= 20;
+                printk(KERN_INFO "SRAT: This will cost you %Lu MB of "
+                                "pre-allocated memory.\n", (unsigned long long)total_mb);
+                reserve_bootmem_node(NODE_DATA(nodeid), nodes_add[nodeid].start,
+                               nodes_add[nodeid].end - nodes_add[nodeid].start);
+        }
+}
+
 int __node_distance(int a, int b)
 {
         int index;
diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c
index e616500207e4..a2060e4d5de6 100644
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86_64/pci/mmconfig.c
@@ -9,11 +9,16 @@
 #include <linux/init.h>
 #include <linux/acpi.h>
 #include <linux/bitmap.h>
+#include <asm/e820.h>
+
 #include "pci.h"
 
 #define MMCONFIG_APER_SIZE (256*1024*1024)
+/* Verify the first 16 busses. We assume that systems with more busses
+   get MCFG right. */
+#define MAX_CHECK_BUS 16
 
-static DECLARE_BITMAP(fallback_slots, 32);
+static DECLARE_BITMAP(fallback_slots, 32*MAX_CHECK_BUS);
 
 /* Static virtual mapping of the MMCONFIG aperture */
 struct mmcfg_virt {
@@ -55,7 +60,8 @@ static char __iomem *get_virt(unsigned int seg, unsigned bus)
 static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn)
 {
         char __iomem *addr;
-        if (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), fallback_slots))
+        if (seg == 0 && bus < MAX_CHECK_BUS &&
+                test_bit(32*bus + PCI_SLOT(devfn), fallback_slots))
                 return NULL;
         addr = get_virt(seg, bus);
         if (!addr)
@@ -69,8 +75,10 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
         char __iomem *addr;
 
         /* Why do we have this when nobody checks it. How about a BUG()!? -AK */
-        if (unlikely(!value || (bus > 255) || (devfn > 255) || (reg > 4095)))
+        if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095))) {
+                *value = -1;
                 return -EINVAL;
+        }
 
         addr = pci_dev_base(seg, bus, devfn);
         if (!addr)
@@ -129,21 +137,26 @@ static struct pci_raw_ops pci_mmcfg = {
    Normally this can be expressed in the MCFG by not listing them
    and assigning suitable _SEGs, but this isn't implemented in some BIOS.
    Instead try to discover all devices on bus 0 that are unreachable using MM
-   and fallback for them.
-   We only do this for bus 0/seg 0 */
+   and fallback for them. */
 static __init void unreachable_devices(void)
 {
-        int i;
-        for (i = 0; i < 32; i++) {
-                u32 val1;
-                char __iomem *addr;
-
-                pci_conf1_read(0, 0, PCI_DEVFN(i,0), 0, 4, &val1);
-                if (val1 == 0xffffffff)
-                        continue;
-                addr = pci_dev_base(0, 0, PCI_DEVFN(i, 0));
-                if (addr == NULL|| readl(addr) != val1) {
-                        set_bit(i, fallback_slots);
+        int i, k;
+        /* Use the max bus number from ACPI here? */
+        for (k = 0; k < MAX_CHECK_BUS; k++) {
+                for (i = 0; i < 32; i++) {
+                        u32 val1;
+                        char __iomem *addr;
+
+                        pci_conf1_read(0, k, PCI_DEVFN(i,0), 0, 4, &val1);
+                        if (val1 == 0xffffffff)
+                                continue;
+                        addr = pci_dev_base(0, k, PCI_DEVFN(i, 0));
+                        if (addr == NULL|| readl(addr) != val1) {
+                                set_bit(i + 32*k, fallback_slots);
+                                printk(KERN_NOTICE
+                                "PCI: No mmconfig possible on device %x:%x\n",
+                                        k, i);
+                        }
                 }
         }
 }
@@ -161,6 +174,14 @@ void __init pci_mmcfg_init(void)
             (pci_mmcfg_config[0].base_address == 0))
                 return;
 
+        if (!e820_all_mapped(pci_mmcfg_config[0].base_address,
+                        pci_mmcfg_config[0].base_address + MMCONFIG_APER_SIZE,
+                        E820_RESERVED)) {
+                printk(KERN_ERR "PCI: BIOS Bug: MCFG area is not E820-reserved\n");
+                printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
+                return;
+        }
+
         /* RED-PEN i386 doesn't do _nocache right now */
         pci_mmcfg_virt = kmalloc(sizeof(*pci_mmcfg_virt) * pci_mmcfg_config_num, GFP_KERNEL);
         if (pci_mmcfg_virt == NULL) {
diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c
index 152b9370789b..a15b6e3e72c8 100644
--- a/arch/xtensa/kernel/xtensa_ksyms.c
+++ b/arch/xtensa/kernel/xtensa_ksyms.c
@@ -48,7 +48,6 @@ EXPORT_SYMBOL(memchr);
 EXPORT_SYMBOL(strcat);
 EXPORT_SYMBOL(strchr);
 EXPORT_SYMBOL(strlen);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strncat);
 EXPORT_SYMBOL(strnlen);
 EXPORT_SYMBOL(strrchr);
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 5cb96300eb0f..c24652d31bf9 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -329,7 +329,7 @@ config ACPI_CONTAINER
 config ACPI_HOTPLUG_MEMORY
         tristate "Memory Hotplug"
         depends on ACPI
-        depends on MEMORY_HOTPLUG
+        depends on MEMORY_HOTPLUG || X86_64
         default n
         help
           This driver adds supports for ACPI Memory Hotplug.  This driver
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 16c513aa4d48..c80c3aeed004 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -106,7 +106,7 @@ static ssize_t node_read_numastat(struct sys_device * dev, char * buf)
         other_node = 0;
         for (i = 0; i < MAX_NR_ZONES; i++) {
                 struct zone *z = &pg->node_zones[i];
-                for (cpu = 0; cpu < NR_CPUS; cpu++) {
+                for_each_online_cpu(cpu) {
                         struct per_cpu_pageset *ps = zone_pcp(z,cpu);
                         numa_hit += ps->numa_hit;
                         numa_miss += ps->numa_miss;
diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c
index ce4a1ce59d6a..ec004897b634 100644
--- a/drivers/cdrom/aztcd.c
+++ b/drivers/cdrom/aztcd.c
@@ -1763,7 +1763,7 @@ static int __init aztcd_init(void)
                                 release_region(azt_port, 4);
                         }
                 }
-                if ((azt_port_auto[i] == 0) || (i == 16)) {
+                if ((i == 16) || (azt_port_auto[i] == 0)) {
                         printk(KERN_INFO "aztcd: no AZTECH CD-ROM drive found\n");
                         return -EIO;
                 }
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 889cad07774e..402296670d3a 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -805,10 +805,6 @@ config S3C2410_RTC
           Samsung S3C2410. This can provide periodic interrupt rates
           from 1Hz to 64Hz for user programs, and wakeup from Alarm.
 
-config RTC_VR41XX
-        tristate "NEC VR4100 series Real Time Clock Support"
-        depends on CPU_VR41XX
-
 config COBALT_LCD
         bool "Support for Cobalt LCD"
         depends on MIPS_COBALT
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index a73cb4956928..f5b01c6d498e 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -67,7 +67,6 @@ obj-$(CONFIG_SGI_DS1286)	+= ds1286.o
 obj-$(CONFIG_SGI_IP27_RTC)      += ip27-rtc.o
 obj-$(CONFIG_DS1302)            += ds1302.o
 obj-$(CONFIG_S3C2410_RTC)       += s3c2410-rtc.o
-obj-$(CONFIG_RTC_VR41XX)        += vr41xx_rtc.o
 ifeq ($(CONFIG_GENERIC_NVRAM),y)
   obj-$(CONFIG_NVRAM)   += generic_nvram.o
 else
diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
index 927a5bbe112c..a370e7a0bad5 100644
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
@@ -142,7 +142,7 @@ static int ac_register_board(unsigned long physloc, void __iomem *loc,
         if (!boardno)
                 boardno = readb(loc + NUMCARD_OWNER_TO_PC);
 
-        if (!boardno && boardno > MAX_BOARD) {
+        if (!boardno || boardno > MAX_BOARD) {
                 printk(KERN_WARNING "Board #%d (at 0x%lx) is out of range (1 <= x <= %d).\n",
                        boardno, physloc, MAX_BOARD);
                 return 0;
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index a229915ce1b2..87dcaa237f07 100644
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -490,7 +490,7 @@ for (i = 0; i < 10; i++)			\
                 release_region(dtlk_portlist[i], DTLK_IO_EXTENT);
         }
 
-        printk(KERN_INFO "\nDoubleTalk PC - not found\n");
+        printk(KERN_INFO "DoubleTalk PC - not found\n");
         return -ENODEV;
 }
 
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 0ded046d5aa8..9f2f8fdec69a 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -941,6 +941,7 @@ int ipmi_set_gets_events(ipmi_user_t user, int val)
                         list_del(&msg->link);
                         list_add_tail(&msg->link, &msgs);
                 }
+                intf->waiting_events_count = 0;
         }
 
         /* Hold the events lock while doing this to preserve order. */
@@ -2916,6 +2917,7 @@ static int handle_read_event_rsp(ipmi_smi_t          intf,
 
                 copy_event_into_recv_msg(recv_msg, msg);
                 list_add_tail(&(recv_msg->link), &(intf->waiting_events));
+                intf->waiting_events_count++;
         } else {
                 /* There's too many things in the queue, discard this
                    message. */
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 86be04b241e1..58f3512c52e1 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1584,7 +1584,6 @@ u32 secure_ipv6_port_ephemeral(const __u32 *saddr, const __u32 *daddr, __u16 dpo
 
         return twothirdsMD4Transform(daddr, hash);
 }
-EXPORT_SYMBOL(secure_ipv6_port_ephemeral);
 #endif
 
 #if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE)
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
index 2546637a55c0..f58ad7f68267 100644
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
@@ -327,7 +327,7 @@ static ssize_t store_received_ref_clk3a(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(received_ref_clk3a, S_IWUGO, NULL,
+static DEVICE_ATTR(received_ref_clk3a, (S_IWUSR|S_IWGRP), NULL,
                 store_received_ref_clk3a);
 
 
@@ -349,7 +349,7 @@ static ssize_t store_received_ref_clk3b(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(received_ref_clk3b, S_IWUGO, NULL,
+static DEVICE_ATTR(received_ref_clk3b, (S_IWUSR|S_IWGRP), NULL,
                 store_received_ref_clk3b);
 
 
@@ -371,7 +371,7 @@ static ssize_t store_enable_clk3b_output(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(enable_clk3b_output, S_IWUGO, NULL,
+static DEVICE_ATTR(enable_clk3b_output, (S_IWUSR|S_IWGRP), NULL,
                 store_enable_clk3b_output);
 
 static ssize_t store_enable_clk3a_output(struct device *d,
@@ -392,7 +392,7 @@ static ssize_t store_enable_clk3a_output(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(enable_clk3a_output, S_IWUGO, NULL,
+static DEVICE_ATTR(enable_clk3a_output, (S_IWUSR|S_IWGRP), NULL,
                 store_enable_clk3a_output);
 
 static ssize_t store_enable_clkb1_output(struct device *d,
@@ -413,7 +413,7 @@ static ssize_t store_enable_clkb1_output(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(enable_clkb1_output, S_IWUGO, NULL,
+static DEVICE_ATTR(enable_clkb1_output, (S_IWUSR|S_IWGRP), NULL,
                 store_enable_clkb1_output);
 
 
@@ -435,7 +435,7 @@ static ssize_t store_enable_clka1_output(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(enable_clka1_output, S_IWUGO, NULL,
+static DEVICE_ATTR(enable_clka1_output, (S_IWUSR|S_IWGRP), NULL,
                 store_enable_clka1_output);
 
 static ssize_t store_enable_clkb0_output(struct device *d,
@@ -456,7 +456,7 @@ static ssize_t store_enable_clkb0_output(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(enable_clkb0_output, S_IWUGO, NULL,
+static DEVICE_ATTR(enable_clkb0_output, (S_IWUSR|S_IWGRP), NULL,
                 store_enable_clkb0_output);
 
 static ssize_t store_enable_clka0_output(struct device *d,
@@ -477,7 +477,7 @@ static ssize_t store_enable_clka0_output(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(enable_clka0_output, S_IWUGO, NULL,
+static DEVICE_ATTR(enable_clka0_output, (S_IWUSR|S_IWGRP), NULL,
                 store_enable_clka0_output);
 
 static ssize_t store_select_amcb2_transmit_clock(struct device *d,
@@ -519,7 +519,7 @@ static ssize_t store_select_amcb2_transmit_clock(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(select_amcb2_transmit_clock, S_IWUGO, NULL,
+static DEVICE_ATTR(select_amcb2_transmit_clock, (S_IWUSR|S_IWGRP), NULL,
         store_select_amcb2_transmit_clock);
 
 static ssize_t store_select_amcb1_transmit_clock(struct device *d,
@@ -560,7 +560,7 @@ static ssize_t store_select_amcb1_transmit_clock(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(select_amcb1_transmit_clock, S_IWUGO, NULL,
+static DEVICE_ATTR(select_amcb1_transmit_clock, (S_IWUSR|S_IWGRP), NULL,
                 store_select_amcb1_transmit_clock);
 
 static ssize_t store_select_redundant_clock(struct device *d,
@@ -581,7 +581,7 @@ static ssize_t store_select_redundant_clock(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(select_redundant_clock, S_IWUGO, NULL,
+static DEVICE_ATTR(select_redundant_clock, (S_IWUSR|S_IWGRP), NULL,
                 store_select_redundant_clock);
 
 static ssize_t store_select_ref_frequency(struct device *d,
@@ -602,7 +602,7 @@ static ssize_t store_select_ref_frequency(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(select_ref_frequency, S_IWUGO, NULL,
+static DEVICE_ATTR(select_ref_frequency, (S_IWUSR|S_IWGRP), NULL,
                 store_select_ref_frequency);
 
 static ssize_t store_filter_select(struct device *d,
@@ -623,7 +623,7 @@ static ssize_t store_filter_select(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(filter_select, S_IWUGO, NULL, store_filter_select);
+static DEVICE_ATTR(filter_select, (S_IWUSR|S_IWGRP), NULL, store_filter_select);
 
 static ssize_t store_hardware_switching_mode(struct device *d,
                  struct device_attribute *attr, const char *buf, size_t count)
@@ -643,7 +643,7 @@ static ssize_t store_hardware_switching_mode(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(hardware_switching_mode, S_IWUGO, NULL,
+static DEVICE_ATTR(hardware_switching_mode, (S_IWUSR|S_IWGRP), NULL,
                 store_hardware_switching_mode);
 
 static ssize_t store_hardware_switching(struct device *d,
@@ -664,7 +664,7 @@ static ssize_t store_hardware_switching(struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(hardware_switching, S_IWUGO, NULL,
+static DEVICE_ATTR(hardware_switching, (S_IWUSR|S_IWGRP), NULL,
                 store_hardware_switching);
 
 static ssize_t store_refalign (struct device *d,
@@ -684,7 +684,7 @@ static ssize_t store_refalign (struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(refalign, S_IWUGO, NULL, store_refalign);
+static DEVICE_ATTR(refalign, (S_IWUSR|S_IWGRP), NULL, store_refalign);
 
 static ssize_t store_mode_select (struct device *d,
                  struct device_attribute *attr, const char *buf, size_t count)
@@ -704,7 +704,7 @@ static ssize_t store_mode_select (struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(mode_select, S_IWUGO, NULL, store_mode_select);
+static DEVICE_ATTR(mode_select, (S_IWUSR|S_IWGRP), NULL, store_mode_select);
 
 static ssize_t store_reset (struct device *d,
                  struct device_attribute *attr, const char *buf, size_t count)
@@ -724,7 +724,7 @@ static ssize_t store_reset (struct device *d,
         return strnlen(buf, count);
 }
 
-static DEVICE_ATTR(reset, S_IWUGO, NULL, store_reset);
+static DEVICE_ATTR(reset, (S_IWUSR|S_IWGRP), NULL, store_reset);
 
 static struct attribute *tlclk_sysfs_entries[] = {
         &dev_attr_current_ref.attr,
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 98b126c2ded8..f70a47eadb52 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -351,10 +351,10 @@ int tty_buffer_request_room(struct tty_struct *tty, size_t size)
         spin_unlock_irqrestore(&tty->buf.lock, flags);
         return size;
 }
-
 EXPORT_SYMBOL_GPL(tty_buffer_request_room);
 
-int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars, size_t size)
+int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars,
+                                size_t size)
 {
         int copied = 0;
         do {
@@ -368,17 +368,16 @@ int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars, s
                 tb->used += space;
                 copied += space;
                 chars += space;
-/*              printk("Flip insert %d.\n", space); */
         }
         /* There is a small chance that we need to split the data over
            several buffers. If this is the case we must loop */
         while (unlikely(size > copied));
         return copied;
 }
-
 EXPORT_SYMBOL(tty_insert_flip_string);
 
-int tty_insert_flip_string_flags(struct tty_struct *tty, const unsigned char *chars, const char *flags, size_t size)
+int tty_insert_flip_string_flags(struct tty_struct *tty,
+                const unsigned char *chars, const char *flags, size_t size)
 {
         int copied = 0;
         do {
@@ -399,9 +398,20 @@ int tty_insert_flip_string_flags(struct tty_struct *tty, const unsigned char *ch
         while (unlikely(size > copied));
         return copied;
 }
-
 EXPORT_SYMBOL_GPL(tty_insert_flip_string_flags);
 
+void tty_schedule_flip(struct tty_struct *tty)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&tty->buf.lock, flags);
+        if (tty->buf.tail != NULL) {
+                tty->buf.tail->active = 0;
+                tty->buf.tail->commit = tty->buf.tail->used;
+        }
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
+        schedule_delayed_work(&tty->buf.work, 1);
+}
+EXPORT_SYMBOL(tty_schedule_flip);
 
 /*
  *      Prepare a block of space in the buffer for data. Returns the length
@@ -1730,7 +1740,7 @@ static void release_dev(struct file * filp)
 {
         struct tty_struct *tty, *o_tty;
         int     pty_master, tty_closing, o_tty_closing, do_sleep;
-        int     devpts_master, devpts;
+        int     devpts;
         int     idx;
         char    buf[64];
         unsigned long flags;
@@ -1747,7 +1757,6 @@ static void release_dev(struct file * filp)
         pty_master = (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
                       tty->driver->subtype == PTY_TYPE_MASTER);
         devpts = (tty->driver->flags & TTY_DRIVER_DEVPTS_MEM) != 0;
-        devpts_master = pty_master && devpts;
         o_tty = tty->link;
 
 #ifdef TTY_PARANOIA_CHECK
@@ -2185,6 +2194,7 @@ static int ptmx_open(struct inode * inode, struct file * filp)
                 return 0;
 out1:
         release_dev(filp);
+        return retval;
 out:
         down(&allocated_ptys_lock);
         idr_remove(&allocated_ptys, index);
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index 23a9e1ea8e32..1659f6c41458 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -509,12 +509,22 @@ static int hdaps_dmi_match_invert(struct dmi_system_id *id)
         }                                               \
 }
 
+#define HDAPS_DMI_MATCH_LENOVO(model)   {               \
+        .ident = "Lenovo " model,                       \
+        .callback = hdaps_dmi_match_invert,             \
+        .matches = {                                    \
+                DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),  \
+                DMI_MATCH(DMI_PRODUCT_VERSION, model)   \
+        }                                               \
+}
+
 static int __init hdaps_init(void)
 {
         int ret;
 
         /* Note that DMI_MATCH(...,"ThinkPad T42") will match "ThinkPad T42p" */
         struct dmi_system_id hdaps_whitelist[] = {
+                HDAPS_DMI_MATCH_NORMAL("ThinkPad H"),
                 HDAPS_DMI_MATCH_INVERT("ThinkPad R50p"),
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad R50"),
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad R51"),
@@ -524,15 +534,17 @@ static int __init hdaps_init(void)
                 HDAPS_DMI_MATCH_INVERT("ThinkPad T42p"),
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad T42"),
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad T43"),
+                HDAPS_DMI_MATCH_LENOVO("ThinkPad T60p"),
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad X40"),
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad X41 Tablet"),
                 HDAPS_DMI_MATCH_NORMAL("ThinkPad X41"),
+                HDAPS_DMI_MATCH_LENOVO("ThinkPad X60"),
                 { .ident = NULL }
         };
 
         if (!dmi_check_system(hdaps_whitelist)) {
                 printk(KERN_WARNING "hdaps: supported laptop not found!\n");
-                ret = -ENXIO;
+                ret = -ENODEV;
                 goto out;
         }
 
diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
index 53c4fb62ed85..5b203fe21dcd 100644
--- a/drivers/isdn/gigaset/Kconfig
+++ b/drivers/isdn/gigaset/Kconfig
@@ -3,8 +3,8 @@ menu "Siemens Gigaset"
 
 config ISDN_DRV_GIGASET
         tristate "Siemens Gigaset support (isdn)"
-        depends on ISDN_I4L && m
-#       depends on ISDN_I4L && MODULES
+        depends on ISDN_I4L
+        select CRC_CCITT
         help
           Say m here if you have a Gigaset or Sinus isdn device.
 
diff --git a/drivers/isdn/gigaset/asyncdata.c b/drivers/isdn/gigaset/asyncdata.c
index 171f8b703d61..ce3cd77094b3 100644
--- a/drivers/isdn/gigaset/asyncdata.c
+++ b/drivers/isdn/gigaset/asyncdata.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2005 by Tilman Schmidt <tilman@imap.cc>,
  *                       Hansjoerg Lipp <hjlipp@web.de>,
- *                       Stefan Eilers <Eilers.Stefan@epost.de>.
+ *                       Stefan Eilers.
  *
  * =====================================================================
  *      This program is free software; you can redistribute it and/or
@@ -11,10 +11,6 @@
  *      published by the Free Software Foundation; either version 2 of
  *      the License, or (at your option) any later version.
  * =====================================================================
- * ToDo: ...
- * =====================================================================
- * Version: $Id: asyncdata.c,v 1.2.2.7 2005/11/13 23:05:18 hjlipp Exp $
- * =====================================================================
  */
 
 #include "gigaset.h"
@@ -45,7 +41,7 @@ static inline int muststuff(unsigned char c)
  *      number of processed bytes
  */
 static inline int cmd_loop(unsigned char c, unsigned char *src, int numbytes,
-                           struct inbuf_t *inbuf)
+                           struct inbuf_t *inbuf)
 {
         struct cardstate *cs = inbuf->cs;
         unsigned cbytes      = cs->cbytes;
@@ -55,10 +51,11 @@ static inline int cmd_loop(unsigned char c, unsigned char *src, int numbytes,
         for (;;) {
                 cs->respdata[cbytes] = c;
                 if (c == 10 || c == 13) {
-                        dbg(DEBUG_TRANSCMD, "%s: End of Command (%d Bytes)",
-                            __func__, cbytes);
+                        gig_dbg(DEBUG_TRANSCMD, "%s: End of Command (%d Bytes)",
+                                __func__, cbytes);
                         cs->cbytes = cbytes;
-                        gigaset_handle_modem_response(cs); /* can change cs->dle */
+                        gigaset_handle_modem_response(cs); /* can change
+                                                              cs->dle */
                         cbytes = 0;
 
                         if (cs->dle &&
@@ -71,7 +68,7 @@ static inline int cmd_loop(unsigned char c, unsigned char *src, int numbytes,
                         if (cbytes < MAX_RESP_SIZE - 1)
                                 cbytes++;
                         else
-                                warn("response too large");
+                                dev_warn(cs->dev, "response too large\n");
                 }
 
                 if (!numbytes)
@@ -96,11 +93,12 @@ static inline int cmd_loop(unsigned char c, unsigned char *src, int numbytes,
  *      number of processed bytes
  */
 static inline int lock_loop(unsigned char *src, int numbytes,
-                            struct inbuf_t *inbuf)
+                            struct inbuf_t *inbuf)
 {
         struct cardstate *cs = inbuf->cs;
 
-        gigaset_dbg_buffer(DEBUG_LOCKCMD, "received response", numbytes, src, 0);
+        gigaset_dbg_buffer(DEBUG_LOCKCMD, "received response",
+                           numbytes, src);
         gigaset_if_receive(cs, src, numbytes);
 
         return numbytes;
@@ -115,24 +113,18 @@ static inline int lock_loop(unsigned char *src, int numbytes,
  *      numbytes (all bytes processed) on error --FIXME
  */
 static inline int hdlc_loop(unsigned char c, unsigned char *src, int numbytes,
-                            struct inbuf_t *inbuf)
+                            struct inbuf_t *inbuf)
 {
         struct cardstate *cs = inbuf->cs;
         struct bc_state *bcs = inbuf->bcs;
-        int inputstate;
-        __u16 fcs;
-        struct sk_buff *skb;
+        int inputstate = bcs->inputstate;
+        __u16 fcs = bcs->fcs;
+        struct sk_buff *skb = bcs->skb;
         unsigned char error;
         struct sk_buff *compskb;
         int startbytes = numbytes;
         int l;
 
-        IFNULLRETVAL(bcs, numbytes);
-        inputstate = bcs->inputstate;
-        fcs = bcs->fcs;
-        skb = bcs->skb;
-        IFNULLRETVAL(skb, numbytes);
-
         if (unlikely(inputstate & INS_byte_stuff)) {
                 inputstate &= ~INS_byte_stuff;
                 goto byte_stuff;
@@ -156,39 +148,37 @@ byte_stuff:
                         c ^= PPP_TRANS;
 #ifdef CONFIG_GIGASET_DEBUG
                         if (unlikely(!muststuff(c)))
-                                dbg(DEBUG_HDLC,
-                                    "byte stuffed: 0x%02x", c);
+                                gig_dbg(DEBUG_HDLC, "byte stuffed: 0x%02x", c);
 #endif
                 } else if (unlikely(c == PPP_FLAG)) {
                         if (unlikely(inputstate & INS_skip_frame)) {
                                 if (!(inputstate & INS_have_data)) { /* 7E 7E */
-                                        //dbg(DEBUG_HDLC, "(7e)7e------------------------");
 #ifdef CONFIG_GIGASET_DEBUG
                                         ++bcs->emptycount;
 #endif
                                 } else
-                                        dbg(DEBUG_HDLC,
+                                        gig_dbg(DEBUG_HDLC,
                                             "7e----------------------------");
 
                                 /* end of frame */
                                 error = 1;
                                 gigaset_rcv_error(NULL, cs, bcs);
                         } else if (!(inputstate & INS_have_data)) { /* 7E 7E */
-                                //dbg(DEBUG_HDLC, "(7e)7e------------------------");
 #ifdef CONFIG_GIGASET_DEBUG
                                 ++bcs->emptycount;
 #endif
                                 break;
                         } else {
-                                dbg(DEBUG_HDLC,
-                                    "7e----------------------------");
+                                gig_dbg(DEBUG_HDLC,
+                                        "7e----------------------------");
 
                                 /* end of frame */
                                 error = 0;
 
                                 if (unlikely(fcs != PPP_GOODFCS)) {
-                                        err("Packet checksum at %lu failed, "
-                                            "packet is corrupted (%u bytes)!",
+                                        dev_err(cs->dev,
+                                            "Packet checksum at %lu failed, "
+                                            "packet is corrupted (%u bytes)!\n",
                                             bcs->rcvbytes, skb->len);
                                         compskb = NULL;
                                         gigaset_rcv_error(compskb, cs, bcs);
@@ -202,9 +192,11 @@ byte_stuff:
                                                 skb = NULL;
                                                 inputstate |= INS_skip_frame;
                                                 if (l == 1) {
-                                                        err("invalid packet size (1)!");
+                                                        dev_err(cs->dev,
+                                                  "invalid packet size (1)!\n");
                                                         error = 1;
-                                                        gigaset_rcv_error(NULL, cs, bcs);
+                                                        gigaset_rcv_error(NULL,
+                                                                cs, bcs);
                                                 }
                                         }
                                         if (likely(!(error ||
@@ -227,7 +219,8 @@ byte_stuff:
                         } else if (likely((skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)) {
                                 skb_reserve(skb, HW_HDR_LEN);
                         } else {
-                                warn("could not allocate new skb");
+                                dev_warn(cs->dev,
+                                         "could not allocate new skb\n");
                                 inputstate |= INS_skip_frame;
                         }
 
@@ -235,7 +228,7 @@ byte_stuff:
 #ifdef CONFIG_GIGASET_DEBUG
                 } else if (unlikely(muststuff(c))) {
                         /* Should not happen. Possible after ZDLE=1<CR><LF>. */
-                        dbg(DEBUG_HDLC, "not byte stuffed: 0x%02x", c);
+                        gig_dbg(DEBUG_HDLC, "not byte stuffed: 0x%02x", c);
 #endif
                 }
 
@@ -243,8 +236,8 @@ byte_stuff:
 
 #ifdef CONFIG_GIGASET_DEBUG
                 if (unlikely(!(inputstate & INS_have_data))) {
-                        dbg(DEBUG_HDLC,
-                            "7e (%d x) ================", bcs->emptycount);
+                        gig_dbg(DEBUG_HDLC, "7e (%d x) ================",
+                                bcs->emptycount);
                         bcs->emptycount = 0;
                 }
 #endif
@@ -253,14 +246,13 @@ byte_stuff:
 
                 if (likely(!(inputstate & INS_skip_frame))) {
                         if (unlikely(skb->len == SBUFSIZE)) {
-                                warn("received packet too long");
+                                dev_warn(cs->dev, "received packet too long\n");
                                 dev_kfree_skb_any(skb);
                                 skb = NULL;
                                 inputstate |= INS_skip_frame;
                                 break;
                         }
-                        *gigaset_skb_put_quick(skb, 1) = c;
-                        /* *__skb_put (skb, 1) = c; */
+                        *__skb_put(skb, 1) = c;
                         fcs = crc_ccitt_byte(fcs, c);
                 }
 
@@ -289,19 +281,14 @@ byte_stuff:
  *      numbytes (all bytes processed) on error --FIXME
  */
 static inline int iraw_loop(unsigned char c, unsigned char *src, int numbytes,
-                            struct inbuf_t *inbuf)
+                            struct inbuf_t *inbuf)
 {
         struct cardstate *cs = inbuf->cs;
         struct bc_state *bcs = inbuf->bcs;
-        int inputstate;
-        struct sk_buff *skb;
+        int inputstate = bcs->inputstate;
+        struct sk_buff *skb = bcs->skb;
         int startbytes = numbytes;
 
-        IFNULLRETVAL(bcs, numbytes);
-        inputstate = bcs->inputstate;
-        skb = bcs->skb;
-        IFNULLRETVAL(skb, numbytes);
-
         for (;;) {
                 /* add character */
                 inputstate |= INS_have_data;
@@ -309,13 +296,13 @@ static inline int iraw_loop(unsigned char c, unsigned char *src, int numbytes,
                 if (likely(!(inputstate & INS_skip_frame))) {
                         if (unlikely(skb->len == SBUFSIZE)) {
                                 //FIXME just pass skb up and allocate a new one
-                                warn("received packet too long");
+                                dev_warn(cs->dev, "received packet too long\n");
                                 dev_kfree_skb_any(skb);
                                 skb = NULL;
                                 inputstate |= INS_skip_frame;
                                 break;
                         }
-                        *gigaset_skb_put_quick(skb, 1) = gigaset_invtab[c];
+                        *__skb_put(skb, 1) = gigaset_invtab[c];
                 }
 
                 if (unlikely(!numbytes))
@@ -343,7 +330,7 @@ static inline int iraw_loop(unsigned char c, unsigned char *src, int numbytes,
                                   != NULL)) {
                         skb_reserve(skb, HW_HDR_LEN);
                 } else {
-                        warn("could not allocate new skb");
+                        dev_warn(cs->dev, "could not allocate new skb\n");
                         inputstate |= INS_skip_frame;
                 }
         }
@@ -364,13 +351,13 @@ void gigaset_m10x_input(struct inbuf_t *inbuf)
 
         head = atomic_read(&inbuf->head);
         tail = atomic_read(&inbuf->tail);
-        dbg(DEBUG_INTR, "buffer state: %u -> %u", head, tail);
+        gig_dbg(DEBUG_INTR, "buffer state: %u -> %u", head, tail);
 
         if (head != tail) {
                 cs = inbuf->cs;
                 src = inbuf->data + head;
                 numbytes = (head > tail ? RBUFSIZE : tail) - head;
-                dbg(DEBUG_INTR, "processing %u bytes", numbytes);
+                gig_dbg(DEBUG_INTR, "processing %u bytes", numbytes);
 
                 while (numbytes) {
                         if (atomic_read(&cs->mstate) == MS_LOCKED) {
@@ -392,8 +379,7 @@ void gigaset_m10x_input(struct inbuf_t *inbuf)
 
                                 if (!(inbuf->inputstate & INS_DLE_char)) {
 
-                                        /* FIXME Einfach je nach Modus Funktionszeiger in cs setzen [hier+hdlc_loop]?  */
-                                        /* FIXME Spart folgendes "if" und ermoeglicht andere Protokolle */
+                                        /* FIXME use function pointers?  */
                                         if (inbuf->inputstate & INS_command)
                                                 procbytes = cmd_loop(c, src, numbytes, inbuf);
                                         else if (inbuf->bcs->proto2 == ISDN_PROTO_L2_HDLC)
@@ -403,13 +389,14 @@ void gigaset_m10x_input(struct inbuf_t *inbuf)
 
                                         src += procbytes;
                                         numbytes -= procbytes;
-                                } else {  /* DLE-char */
+                                } else {  /* DLE char */
                                         inbuf->inputstate &= ~INS_DLE_char;
                                         switch (c) {
                                         case 'X': /*begin of command*/
 #ifdef CONFIG_GIGASET_DEBUG
                                                 if (inbuf->inputstate & INS_command)
-                                                        err("received <DLE> 'X' in command mode");
+                                                        dev_err(cs->dev,
+                                        "received <DLE> 'X' in command mode\n");
 #endif
                                                 inbuf->inputstate |=
                                                         INS_command | INS_DLE_command;
@@ -417,7 +404,8 @@ void gigaset_m10x_input(struct inbuf_t *inbuf)
                                         case '.': /*end of command*/
 #ifdef CONFIG_GIGASET_DEBUG
                                                 if (!(inbuf->inputstate & INS_command))
-                                                        err("received <DLE> '.' in hdlc mode");
+                                                        dev_err(cs->dev,
+                                        "received <DLE> '.' in hdlc mode\n");
 #endif
                                                 inbuf->inputstate &= cs->dle ?
                                                         ~(INS_DLE_command|INS_command)
@@ -425,7 +413,9 @@ void gigaset_m10x_input(struct inbuf_t *inbuf)
                                                 break;
                                         //case DLE_FLAG: /*DLE_FLAG in data stream*/ /* schon oben behandelt! */
                                         default:
-                                                err("received 0x10 0x%02x!", (int) c);
+                                                dev_err(cs->dev,
+                                                      "received 0x10 0x%02x!\n",
+                                                        (int) c);
                                                 /* FIXME: reset driver?? */
                                         }
                                 }
@@ -444,7 +434,7 @@ nextbyte:
                         }
                 }
 
-                dbg(DEBUG_INTR, "setting head to %u", head);
+                gig_dbg(DEBUG_INTR, "setting head to %u", head);
                 atomic_set(&inbuf->head, head);
         }
 }
@@ -479,14 +469,13 @@ static struct sk_buff *HDLC_Encode(struct sk_buff *skb, int head, int tail)
                         stuf_cnt++;
                 fcs = crc_ccitt_byte(fcs, *cp++);
         }
-        fcs ^= 0xffff;                 /* complement */
+        fcs ^= 0xffff;                  /* complement */
 
         /* size of new buffer: original size + number of stuffing bytes
          * + 2 bytes FCS + 2 stuffing bytes for FCS (if needed) + 2 flag bytes
          */
         hdlc_skb = dev_alloc_skb(skb->len + stuf_cnt + 6 + tail + head);
         if (!hdlc_skb) {
-                err("unable to allocate memory for HDLC encoding!");
                 dev_kfree_skb(skb);
                 return NULL;
         }
@@ -508,7 +497,7 @@ static struct sk_buff *HDLC_Encode(struct sk_buff *skb, int head, int tail)
         }
 
         /* Finally add FCS (byte stuffed) and flag sequence */
-        c = (fcs & 0x00ff);      /* least significant byte first */
+        c = (fcs & 0x00ff);     /* least significant byte first */
         if (muststuff(c)) {
                 *(skb_put(hdlc_skb, 1)) = PPP_ESCAPE;
                 c ^= PPP_TRANS;
@@ -546,7 +535,6 @@ static struct sk_buff *iraw_encode(struct sk_buff *skb, int head, int tail)
         /* worst case: every byte must be stuffed */
         iraw_skb = dev_alloc_skb(2*skb->len + tail + head);
         if (!iraw_skb) {
-                err("unable to allocate memory for HDLC encoding!");
                 dev_kfree_skb(skb);
                 return NULL;
         }
@@ -577,21 +565,23 @@ static struct sk_buff *iraw_encode(struct sk_buff *skb, int head, int tail)
  */
 int gigaset_m10x_send_skb(struct bc_state *bcs, struct sk_buff *skb)
 {
-        unsigned len;
-
-        IFNULLRETVAL(bcs, -EFAULT);
-        IFNULLRETVAL(skb, -EFAULT);
-        len = skb->len;
+        unsigned len = skb->len;
+        unsigned long flags;
 
         if (bcs->proto2 == ISDN_PROTO_L2_HDLC)
                 skb = HDLC_Encode(skb, HW_HDR_LEN, 0);
         else
                 skb = iraw_encode(skb, HW_HDR_LEN, 0);
-        if (!skb)
+        if (!skb) {
+                err("unable to allocate memory for encoding!\n");
                 return -ENOMEM;
+        }
 
         skb_queue_tail(&bcs->squeue, skb);
-        tasklet_schedule(&bcs->cs->write_tasklet);
+        spin_lock_irqsave(&bcs->cs->lock, flags);
+        if (bcs->cs->connected)
+                tasklet_schedule(&bcs->cs->write_tasklet);
+        spin_unlock_irqrestore(&bcs->cs->lock, flags);
 
         return len;     /* ok so far */
 }
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 31f0f07832bc..f86ed6af3aa2 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2001 by Hansjoerg Lipp <hjlipp@web.de>,
  *                       Tilman Schmidt <tilman@imap.cc>,
- *                       Stefan Eilers <Eilers.Stefan@epost.de>.
+ *                       Stefan Eilers.
  *
  * Based on usb-gigaset.c.
  *
@@ -13,10 +13,6 @@
  *      published by the Free Software Foundation; either version 2 of
  *      the License, or (at your option) any later version.
  * =====================================================================
- * ToDo: ...
- * =====================================================================
- * Version: $Id: bas-gigaset.c,v 1.52.4.19 2006/02/04 18:28:16 hjlipp Exp $
- * =====================================================================
  */
 
 #include "gigaset.h"
@@ -30,7 +26,7 @@
 #include <linux/moduleparam.h>
 
 /* Version Information */
-#define DRIVER_AUTHOR "Tilman Schmidt <tilman@imap.cc>, Hansjoerg Lipp <hjlipp@web.de>, Stefan Eilers <Eilers.Stefan@epost.de>"
+#define DRIVER_AUTHOR "Tilman Schmidt <tilman@imap.cc>, Hansjoerg Lipp <hjlipp@web.de>, Stefan Eilers"
 #define DRIVER_DESC "USB Driver for Gigaset 307x"
 
 
@@ -70,9 +66,6 @@ static struct usb_device_id gigaset_table [] = {
 
 MODULE_DEVICE_TABLE(usb, gigaset_table);
 
-/* Get a minor range for your devices from the usb maintainer */
-#define USB_SKEL_MINOR_BASE     200
-
 /*======================= local function prototypes =============================*/
 
 /* This function is called if a new device is connected to the USB port. It
@@ -88,25 +81,25 @@ static void gigaset_disconnect(struct usb_interface *interface);
 /*==============================================================================*/
 
 struct bas_cardstate {
-        struct usb_device       *udev;          /* USB device pointer */
-        struct usb_interface    *interface;     /* interface for this device */
+        struct usb_device       *udev;          /* USB device pointer */
+        struct usb_interface    *interface;     /* interface for this device */
         unsigned char           minor;          /* starting minor number */
 
-        struct urb              *urb_ctrl;      /* control pipe default URB */
+        struct urb              *urb_ctrl;      /* control pipe default URB */
         struct usb_ctrlrequest  dr_ctrl;
         struct timer_list       timer_ctrl;     /* control request timeout */
 
         struct timer_list       timer_atrdy;    /* AT command ready timeout */
-        struct urb              *urb_cmd_out;   /* for sending AT commands */
+        struct urb              *urb_cmd_out;   /* for sending AT commands */
         struct usb_ctrlrequest  dr_cmd_out;
         int                     retry_cmd_out;
 
-        struct urb              *urb_cmd_in;    /* for receiving AT replies */
+        struct urb              *urb_cmd_in;    /* for receiving AT replies */
         struct usb_ctrlrequest  dr_cmd_in;
         struct timer_list       timer_cmd_in;   /* receive request timeout */
-        unsigned char           *rcvbuf;        /* AT reply receive buffer */
+        unsigned char           *rcvbuf;        /* AT reply receive buffer */
 
-        struct urb              *urb_int_in;    /* URB for interrupt pipe */
+        struct urb              *urb_int_in;    /* URB for interrupt pipe */
         unsigned char           int_in_buf[3];
 
         spinlock_t              lock;           /* locks all following */
@@ -208,53 +201,54 @@ static inline char *usb_pipetype_str(int pipe)
  * write content of URB to syslog for debugging
  */
 static inline void dump_urb(enum debuglevel level, const char *tag,
-                            struct urb *urb)
+                            struct urb *urb)
 {
 #ifdef CONFIG_GIGASET_DEBUG
         int i;
-        IFNULLRET(tag);
-        dbg(level, "%s urb(0x%08lx)->{", tag, (unsigned long) urb);
+        gig_dbg(level, "%s urb(0x%08lx)->{", tag, (unsigned long) urb);
         if (urb) {
-                dbg(level,
-                    "  dev=0x%08lx, pipe=%s:EP%d/DV%d:%s, "
-                    "status=%d, hcpriv=0x%08lx, transfer_flags=0x%x,",
-                    (unsigned long) urb->dev,
-                    usb_pipetype_str(urb->pipe),
-                    usb_pipeendpoint(urb->pipe), usb_pipedevice(urb->pipe),
-                    usb_pipein(urb->pipe) ? "in" : "out",
-                    urb->status, (unsigned long) urb->hcpriv,
-                    urb->transfer_flags);
-                dbg(level,
-                    "  transfer_buffer=0x%08lx[%d], actual_length=%d, "
-                    "bandwidth=%d, setup_packet=0x%08lx,",
-                    (unsigned long) urb->transfer_buffer,
-                    urb->transfer_buffer_length, urb->actual_length,
-                    urb->bandwidth, (unsigned long) urb->setup_packet);
-                dbg(level,
-                    "  start_frame=%d, number_of_packets=%d, interval=%d, "
-                    "error_count=%d,",
-                    urb->start_frame, urb->number_of_packets, urb->interval,
-                    urb->error_count);
-                dbg(level,
-                    "  context=0x%08lx, complete=0x%08lx, iso_frame_desc[]={",
-                    (unsigned long) urb->context,
-                    (unsigned long) urb->complete);
+                gig_dbg(level,
+                        "  dev=0x%08lx, pipe=%s:EP%d/DV%d:%s, "
+                        "status=%d, hcpriv=0x%08lx, transfer_flags=0x%x,",
+                        (unsigned long) urb->dev,
+                        usb_pipetype_str(urb->pipe),
+                        usb_pipeendpoint(urb->pipe), usb_pipedevice(urb->pipe),
+                        usb_pipein(urb->pipe) ? "in" : "out",
+                        urb->status, (unsigned long) urb->hcpriv,
+                        urb->transfer_flags);
+                gig_dbg(level,
+                        "  transfer_buffer=0x%08lx[%d], actual_length=%d, "
+                        "bandwidth=%d, setup_packet=0x%08lx,",
+                        (unsigned long) urb->transfer_buffer,
+                        urb->transfer_buffer_length, urb->actual_length,
+                        urb->bandwidth, (unsigned long) urb->setup_packet);
+                gig_dbg(level,
+                        "  start_frame=%d, number_of_packets=%d, interval=%d, "
+                        "error_count=%d,",
+                        urb->start_frame, urb->number_of_packets, urb->interval,
+                        urb->error_count);
+                gig_dbg(level,
+                        "  context=0x%08lx, complete=0x%08lx, "
+                        "iso_frame_desc[]={",
+                        (unsigned long) urb->context,
+                        (unsigned long) urb->complete);
                 for (i = 0; i < urb->number_of_packets; i++) {
-                        struct usb_iso_packet_descriptor *pifd = &urb->iso_frame_desc[i];
-                        dbg(level,
-                            "    {offset=%u, length=%u, actual_length=%u, "
-                            "status=%u}",
-                            pifd->offset, pifd->length, pifd->actual_length,
-                            pifd->status);
+                        struct usb_iso_packet_descriptor *pifd
+                                = &urb->iso_frame_desc[i];
+                        gig_dbg(level,
+                                "    {offset=%u, length=%u, actual_length=%u, "
+                                "status=%u}",
+                                pifd->offset, pifd->length, pifd->actual_length,
+                                pifd->status);
                 }
         }
-        dbg(level, "}}");
+        gig_dbg(level, "}}");
 #endif
 }
 
 /* read/set modem control bits etc. (m10x only) */
 static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
-                                  unsigned new_state)
+                                  unsigned new_state)
 {
         return -EINVAL;
 }
@@ -280,8 +274,8 @@ static inline void error_hangup(struct bc_state *bcs)
 {
         struct cardstate *cs = bcs->cs;
 
-        dbg(DEBUG_ANY,
-            "%s: scheduling HUP for channel %d", __func__, bcs->channel);
+        gig_dbg(DEBUG_ANY, "%s: scheduling HUP for channel %d",
+                __func__, bcs->channel);
 
         if (!gigaset_add_event(cs, &bcs->at_state, EV_HUP, NULL, 0, NULL)) {
                 //FIXME what should we do?
@@ -301,22 +295,19 @@ static inline void error_hangup(struct bc_state *bcs)
 static inline void error_reset(struct cardstate *cs)
 {
         //FIXME try to recover without bothering the user
-        err("unrecoverable error - please disconnect the Gigaset base to reset");
+        dev_err(cs->dev,
+            "unrecoverable error - please disconnect Gigaset base to reset\n");
 }
 
 /* check_pending
  * check for completion of pending control request
  * parameter:
- *      urb     USB request block of completed request
- *              urb->context = hardware specific controller state structure
+ *      ucs     hardware specific controller state structure
  */
 static void check_pending(struct bas_cardstate *ucs)
 {
         unsigned long flags;
 
-        IFNULLRET(ucs);
-        IFNULLRET(cardstate);
-
         spin_lock_irqsave(&ucs->lock, flags);
         switch (ucs->pending) {
         case 0:
@@ -336,8 +327,6 @@ static void check_pending(struct bas_cardstate *ucs)
         case HD_CLOSE_ATCHANNEL:
                 if (!(atomic_read(&ucs->basstate) & BS_ATOPEN))
                         ucs->pending = 0;
-                //wake_up_interruptible(cs->initwait);
-                //FIXME need own wait queue?
                 break;
         case HD_CLOSE_B1CHANNEL:
                 if (!(atomic_read(&ucs->basstate) & BS_B1OPEN))
@@ -354,7 +343,9 @@ static void check_pending(struct bas_cardstate *ucs)
          * are handled separately and should never end up here
          */
         default:
-                warn("unknown pending request 0x%02x cleared", ucs->pending);
+                dev_warn(&ucs->interface->dev,
+                         "unknown pending request 0x%02x cleared\n",
+                         ucs->pending);
                 ucs->pending = 0;
         }
 
@@ -372,27 +363,23 @@ static void check_pending(struct bas_cardstate *ucs)
 static void cmd_in_timeout(unsigned long data)
 {
         struct cardstate *cs = (struct cardstate *) data;
-        struct bas_cardstate *ucs;
+        struct bas_cardstate *ucs = cs->hw.bas;
         unsigned long flags;
 
-        IFNULLRET(cs);
-        ucs = cs->hw.bas;
-        IFNULLRET(ucs);
-
         spin_lock_irqsave(&cs->lock, flags);
-        if (!atomic_read(&cs->connected)) {
-                dbg(DEBUG_USBREQ, "%s: disconnected", __func__);
+        if (unlikely(!cs->connected)) {
+                gig_dbg(DEBUG_USBREQ, "%s: disconnected", __func__);
                 spin_unlock_irqrestore(&cs->lock, flags);
                 return;
         }
         if (!ucs->rcvbuf_size) {
-                dbg(DEBUG_USBREQ, "%s: no receive in progress", __func__);
+                gig_dbg(DEBUG_USBREQ, "%s: no receive in progress", __func__);
                 spin_unlock_irqrestore(&cs->lock, flags);
                 return;
         }
         spin_unlock_irqrestore(&cs->lock, flags);
 
-        err("timeout reading AT response");
+        dev_err(cs->dev, "timeout reading AT response\n");
         error_reset(cs);        //FIXME retry?
 }
 
@@ -412,18 +399,15 @@ static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs);
  */
 static int atread_submit(struct cardstate *cs, int timeout)
 {
-        struct bas_cardstate *ucs;
+        struct bas_cardstate *ucs = cs->hw.bas;
         int ret;
 
-        IFNULLRETVAL(cs, -EINVAL);
-        ucs = cs->hw.bas;
-        IFNULLRETVAL(ucs, -EINVAL);
-        IFNULLRETVAL(ucs->urb_cmd_in, -EINVAL);
-
-        dbg(DEBUG_USBREQ, "-------> HD_READ_ATMESSAGE (%d)", ucs->rcvbuf_size);
+        gig_dbg(DEBUG_USBREQ, "-------> HD_READ_ATMESSAGE (%d)",
+                ucs->rcvbuf_size);
 
         if (ucs->urb_cmd_in->status == -EINPROGRESS) {
-                err("could not submit HD_READ_ATMESSAGE: URB busy");
+                dev_err(cs->dev,
+                        "could not submit HD_READ_ATMESSAGE: URB busy\n");
                 return -EBUSY;
         }
 
@@ -433,19 +417,19 @@ static int atread_submit(struct cardstate *cs, int timeout)
         ucs->dr_cmd_in.wIndex = 0;
         ucs->dr_cmd_in.wLength = cpu_to_le16(ucs->rcvbuf_size);
         usb_fill_control_urb(ucs->urb_cmd_in, ucs->udev,
-                             usb_rcvctrlpipe(ucs->udev, 0),
-                             (unsigned char*) & ucs->dr_cmd_in,
-                             ucs->rcvbuf, ucs->rcvbuf_size,
-                             read_ctrl_callback, cs->inbuf);
+                             usb_rcvctrlpipe(ucs->udev, 0),
+                             (unsigned char*) & ucs->dr_cmd_in,
+                             ucs->rcvbuf, ucs->rcvbuf_size,
+                             read_ctrl_callback, cs->inbuf);
 
         if ((ret = usb_submit_urb(ucs->urb_cmd_in, SLAB_ATOMIC)) != 0) {
-                err("could not submit HD_READ_ATMESSAGE: %s",
-                    get_usb_statmsg(ret));
+                dev_err(cs->dev, "could not submit HD_READ_ATMESSAGE: %s\n",
+                        get_usb_statmsg(ret));
                 return ret;
         }
 
         if (timeout > 0) {
-                dbg(DEBUG_USBREQ, "setting timeout of %d/10 secs", timeout);
+                gig_dbg(DEBUG_USBREQ, "setting timeout of %d/10 secs", timeout);
                 ucs->timer_cmd_in.expires = jiffies + timeout * HZ / 10;
                 ucs->timer_cmd_in.data = (unsigned long) cs;
                 ucs->timer_cmd_in.function = cmd_in_timeout;
@@ -483,25 +467,14 @@ inline static void update_basstate(struct bas_cardstate *ucs,
  */
 static void read_int_callback(struct urb *urb, struct pt_regs *regs)
 {
-        struct cardstate *cs;
-        struct bas_cardstate *ucs;
+        struct cardstate *cs = urb->context;
+        struct bas_cardstate *ucs = cs->hw.bas;
         struct bc_state *bcs;
         unsigned long flags;
         int status;
         unsigned l;
         int channel;
 
-        IFNULLRET(urb);
-        cs = (struct cardstate *) urb->context;
-        IFNULLRET(cs);
-        ucs = cs->hw.bas;
-        IFNULLRET(ucs);
-
-        if (unlikely(!atomic_read(&cs->connected))) {
-                warn("%s: disconnected", __func__);
-                return;
-        }
-
         switch (urb->status) {
         case 0:                 /* success */
                 break;
@@ -509,11 +482,12 @@ static void read_int_callback(struct urb *urb, struct pt_regs *regs)
         case -ECONNRESET:               /* canceled (async) */
         case -EINPROGRESS:              /* pending */
                 /* ignore silently */
-                dbg(DEBUG_USBREQ,
-                    "%s: %s", __func__, get_usb_statmsg(urb->status));
+                gig_dbg(DEBUG_USBREQ, "%s: %s",
+                        __func__, get_usb_statmsg(urb->status));
                 return;
         default:                /* severe trouble */
-                warn("interrupt read: %s", get_usb_statmsg(urb->status));
+                dev_warn(cs->dev, "interrupt read: %s\n",
+                         get_usb_statmsg(urb->status));
                 //FIXME corrective action? resubmission always ok?
                 goto resubmit;
         }
@@ -521,10 +495,9 @@ static void read_int_callback(struct urb *urb, struct pt_regs *regs)
         l = (unsigned) ucs->int_in_buf[1] +
             (((unsigned) ucs->int_in_buf[2]) << 8);
 
-        dbg(DEBUG_USBREQ,
-            "<-------%d: 0x%02x (%u [0x%02x 0x%02x])", urb->actual_length,
-            (int)ucs->int_in_buf[0], l,
-            (int)ucs->int_in_buf[1], (int)ucs->int_in_buf[2]);
+        gig_dbg(DEBUG_USBREQ, "<-------%d: 0x%02x (%u [0x%02x 0x%02x])",
+                urb->actual_length, (int)ucs->int_in_buf[0], l,
+                (int)ucs->int_in_buf[1], (int)ucs->int_in_buf[2]);
 
         channel = 0;
 
@@ -570,28 +543,30 @@ static void read_int_callback(struct urb *urb, struct pt_regs *regs)
         case HD_B1_FLOW_CONTROL:
                 bcs = cs->bcs + channel;
                 atomic_add((l - BAS_NORMFRAME) * BAS_CORRFRAMES,
-                           &bcs->hw.bas->corrbytes);
-                dbg(DEBUG_ISO,
-                    "Flow control (channel %d, sub %d): 0x%02x => %d",
-                    channel, bcs->hw.bas->numsub, l,
-                    atomic_read(&bcs->hw.bas->corrbytes));
+                           &bcs->hw.bas->corrbytes);
+                gig_dbg(DEBUG_ISO,
+                        "Flow control (channel %d, sub %d): 0x%02x => %d",
+                        channel, bcs->hw.bas->numsub, l,
+                        atomic_read(&bcs->hw.bas->corrbytes));
                 break;
 
         case HD_RECEIVEATDATA_ACK:      /* AT response ready to be received */
                 if (!l) {
-                        warn("HD_RECEIVEATDATA_ACK with length 0 ignored");
+                        dev_warn(cs->dev,
+                                "HD_RECEIVEATDATA_ACK with length 0 ignored\n");
                         break;
                 }
                 spin_lock_irqsave(&cs->lock, flags);
                 if (ucs->rcvbuf_size) {
                         spin_unlock_irqrestore(&cs->lock, flags);
-                        err("receive AT data overrun, %d bytes lost", l);
+                        dev_err(cs->dev,
+                                "receive AT data overrun, %d bytes lost\n", l);
                         error_reset(cs);        //FIXME reschedule
                         break;
                 }
                 if ((ucs->rcvbuf = kmalloc(l, GFP_ATOMIC)) == NULL) {
                         spin_unlock_irqrestore(&cs->lock, flags);
-                        err("%s: out of memory, %d bytes lost", __func__, l);
+                        dev_err(cs->dev, "out of memory, %d bytes lost\n", l);
                         error_reset(cs);        //FIXME reschedule
                         break;
                 }
@@ -607,25 +582,28 @@ static void read_int_callback(struct urb *urb, struct pt_regs *regs)
                 break;
 
         case HD_RESET_INTERRUPT_PIPE_ACK:
-                dbg(DEBUG_USBREQ, "HD_RESET_INTERRUPT_PIPE_ACK");
+                gig_dbg(DEBUG_USBREQ, "HD_RESET_INTERRUPT_PIPE_ACK");
                 break;
 
         case HD_SUSPEND_END:
-                dbg(DEBUG_USBREQ, "HD_SUSPEND_END");
+                gig_dbg(DEBUG_USBREQ, "HD_SUSPEND_END");
                 break;
 
         default:
-                warn("unknown Gigaset signal 0x%02x (%u) ignored",
-                     (int) ucs->int_in_buf[0], l);
+                dev_warn(cs->dev,
+                         "unknown Gigaset signal 0x%02x (%u) ignored\n",
+                         (int) ucs->int_in_buf[0], l);
         }
 
         check_pending(ucs);
 
 resubmit:
-        status = usb_submit_urb(urb, SLAB_ATOMIC);
+        spin_lock_irqsave(&cs->lock, flags);
+        status = cs->connected ? usb_submit_urb(urb, SLAB_ATOMIC) : -ENODEV;
+        spin_unlock_irqrestore(&cs->lock, flags);
         if (unlikely(status)) {
-                err("could not resubmit interrupt URB: %s",
-                    get_usb_statmsg(status));
+                dev_err(cs->dev, "could not resubmit interrupt URB: %s\n",
+                        get_usb_statmsg(status));
                 error_reset(cs);
         }
 }
@@ -639,30 +617,22 @@ resubmit:
  */
 static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs)
 {
-        struct cardstate *cs;
-        struct bas_cardstate *ucs;
+        struct inbuf_t *inbuf = urb->context;
+        struct cardstate *cs = inbuf->cs;
+        struct bas_cardstate *ucs = cs->hw.bas;
+        int have_data = 0;
         unsigned numbytes;
         unsigned long flags;
-        struct inbuf_t *inbuf;
-        int have_data = 0;
-
-        IFNULLRET(urb);
-        inbuf = (struct inbuf_t *) urb->context;
-        IFNULLRET(inbuf);
-        cs = inbuf->cs;
-        IFNULLRET(cs);
-        ucs = cs->hw.bas;
-        IFNULLRET(ucs);
 
         spin_lock_irqsave(&cs->lock, flags);
-        if (!atomic_read(&cs->connected)) {
+        if (unlikely(!cs->connected)) {
                 warn("%s: disconnected", __func__);
                 spin_unlock_irqrestore(&cs->lock, flags);
                 return;
         }
 
         if (!ucs->rcvbuf_size) {
-                warn("%s: no receive in progress", __func__);
+                dev_warn(cs->dev, "%s: no receive in progress\n", __func__);
                 spin_unlock_irqrestore(&cs->lock, flags);
                 return;
         }
@@ -673,12 +643,14 @@ static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs)
         case 0:                         /* normal completion */
                 numbytes = urb->actual_length;
                 if (unlikely(numbytes == 0)) {
-                        warn("control read: empty block received");
+                        dev_warn(cs->dev,
+                                 "control read: empty block received\n");
                         goto retry;
                 }
                 if (unlikely(numbytes != ucs->rcvbuf_size)) {
-                        warn("control read: received %d chars, expected %d",
-                             numbytes, ucs->rcvbuf_size);
+                        dev_warn(cs->dev,
+                               "control read: received %d chars, expected %d\n",
+                                 numbytes, ucs->rcvbuf_size);
                         if (numbytes > ucs->rcvbuf_size)
                                 numbytes = ucs->rcvbuf_size;
                 }
@@ -698,23 +670,26 @@ static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs)
         case -ECONNRESET:               /* canceled (async) */
         case -EINPROGRESS:              /* pending */
                 /* no action necessary */
-                dbg(DEBUG_USBREQ,
-                    "%s: %s", __func__, get_usb_statmsg(urb->status));
+                gig_dbg(DEBUG_USBREQ, "%s: %s",
+                        __func__, get_usb_statmsg(urb->status));
                 break;
 
         default:                        /* severe trouble */
-                warn("control read: %s", get_usb_statmsg(urb->status));
+                dev_warn(cs->dev, "control read: %s\n",
+                         get_usb_statmsg(urb->status));
         retry:
                 if (ucs->retry_cmd_in++ < BAS_RETRY) {
-                        notice("control read: retry %d", ucs->retry_cmd_in);
+                        dev_notice(cs->dev, "control read: retry %d\n",
+                                   ucs->retry_cmd_in);
                         if (atread_submit(cs, BAS_TIMEOUT) >= 0) {
                                 /* resubmitted - bypass regular exit block */
                                 spin_unlock_irqrestore(&cs->lock, flags);
                                 return;
                         }
                 } else {
-                        err("control read: giving up after %d tries",
-                            ucs->retry_cmd_in);
+                        dev_err(cs->dev,
+                                "control read: giving up after %d tries\n",
+                                ucs->retry_cmd_in);
                 }
                 error_reset(cs);
         }
@@ -724,7 +699,7 @@ static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs)
         ucs->rcvbuf_size = 0;
         spin_unlock_irqrestore(&cs->lock, flags);
         if (have_data) {
-                dbg(DEBUG_INTR, "%s-->BH", __func__);
+                gig_dbg(DEBUG_INTR, "%s-->BH", __func__);
                 gigaset_schedule_event(cs);
         }
 }
@@ -743,21 +718,16 @@ static void read_iso_callback(struct urb *urb, struct pt_regs *regs)
         unsigned long flags;
         int i, rc;
 
-        IFNULLRET(urb);
-        IFNULLRET(urb->context);
-        IFNULLRET(cardstate);
-
         /* status codes not worth bothering the tasklet with */
         if (unlikely(urb->status == -ENOENT || urb->status == -ECONNRESET ||
-                     urb->status == -EINPROGRESS)) {
-                dbg(DEBUG_ISO,
-                    "%s: %s", __func__, get_usb_statmsg(urb->status));
+                     urb->status == -EINPROGRESS)) {
+                gig_dbg(DEBUG_ISO, "%s: %s",
+                        __func__, get_usb_statmsg(urb->status));
                 return;
         }
 
-        bcs = (struct bc_state *) urb->context;
+        bcs = urb->context;
         ubc = bcs->hw.bas;
-        IFNULLRET(ubc);
 
         spin_lock_irqsave(&ubc->isoinlock, flags);
         if (likely(ubc->isoindone == NULL)) {
@@ -777,14 +747,17 @@ static void read_iso_callback(struct urb *urb, struct pt_regs *regs)
                         urb->iso_frame_desc[i].actual_length = 0;
                 }
                 if (likely(atomic_read(&ubc->running))) {
-                        urb->dev = bcs->cs->hw.bas->udev;       /* clobbered by USB subsystem */
+                        /* urb->dev is clobbered by USB subsystem */
+                        urb->dev = bcs->cs->hw.bas->udev;
                         urb->transfer_flags = URB_ISO_ASAP;
                         urb->number_of_packets = BAS_NUMFRAMES;
-                        dbg(DEBUG_ISO, "%s: isoc read overrun/resubmit", __func__);
+                        gig_dbg(DEBUG_ISO, "%s: isoc read overrun/resubmit",
+                                __func__);
                         rc = usb_submit_urb(urb, SLAB_ATOMIC);
                         if (unlikely(rc != 0)) {
-                                err("could not resubmit isochronous read URB: %s",
-                                    get_usb_statmsg(rc));
+                                dev_err(bcs->cs->dev,
+                                        "could not resubmit isochronous read "
+                                        "URB: %s\n", get_usb_statmsg(rc));
                                 dump_urb(DEBUG_ISO, "isoc read", urb);
                                 error_hangup(bcs);
                         }
@@ -806,23 +779,17 @@ static void write_iso_callback(struct urb *urb, struct pt_regs *regs)
         struct bas_bc_state *ubc;
         unsigned long flags;
 
-        IFNULLRET(urb);
-        IFNULLRET(urb->context);
-        IFNULLRET(cardstate);
-
         /* status codes not worth bothering the tasklet with */
         if (unlikely(urb->status == -ENOENT || urb->status == -ECONNRESET ||
-                     urb->status == -EINPROGRESS)) {
-                dbg(DEBUG_ISO,
-                    "%s: %s", __func__, get_usb_statmsg(urb->status));
+                     urb->status == -EINPROGRESS)) {
+                gig_dbg(DEBUG_ISO, "%s: %s",
+                        __func__, get_usb_statmsg(urb->status));
                 return;
         }
 
         /* pass URB context to tasklet */
-        ucx = (struct isow_urbctx_t *) urb->context;
-        IFNULLRET(ucx->bcs);
+        ucx = urb->context;
         ubc = ucx->bcs->hw.bas;
-        IFNULLRET(ubc);
 
         spin_lock_irqsave(&ubc->isooutlock, flags);
         ubc->isooutovfl = ubc->isooutdone;
@@ -841,15 +808,11 @@ static void write_iso_callback(struct urb *urb, struct pt_regs *regs)
  */
 static int starturbs(struct bc_state *bcs)
 {
+        struct bas_bc_state *ubc = bcs->hw.bas;
         struct urb *urb;
-        struct bas_bc_state *ubc;
         int j, k;
         int rc;
 
-        IFNULLRETVAL(bcs, -EFAULT);
-        ubc = bcs->hw.bas;
-        IFNULLRETVAL(ubc, -EFAULT);
-
         /* initialize L2 reception */
         if (bcs->proto2 == ISDN_PROTO_L2_HDLC)
                 bcs->inputstate |= INS_flag_hunt;
@@ -859,7 +822,7 @@ static int starturbs(struct bc_state *bcs)
         for (k = 0; k < BAS_INURBS; k++) {
                 urb = ubc->isoinurbs[k];
                 if (!urb) {
-                        err("isoinurbs[%d]==NULL", k);
+                        dev_err(bcs->cs->dev, "isoinurbs[%d]==NULL\n", k);
                         rc = -EFAULT;
                         goto error;
                 }
@@ -882,8 +845,9 @@ static int starturbs(struct bc_state *bcs)
 
                 dump_urb(DEBUG_ISO, "Initial isoc read", urb);
                 if ((rc = usb_submit_urb(urb, SLAB_ATOMIC)) != 0) {
-                        err("could not submit isochronous read URB %d: %s",
-                            k, get_usb_statmsg(rc));
+                        dev_err(bcs->cs->dev,
+                               "could not submit isochronous read URB %d: %s\n",
+                                k, get_usb_statmsg(rc));
                         goto error;
                 }
         }
@@ -895,7 +859,7 @@ static int starturbs(struct bc_state *bcs)
         for (k = 0; k < BAS_OUTURBS; ++k) {
                 urb = ubc->isoouturbs[k].urb;
                 if (!urb) {
-                        err("isoouturbs[%d].urb==NULL", k);
+                        dev_err(bcs->cs->dev, "isoouturbs[%d].urb==NULL\n", k);
                         rc = -EFAULT;
                         goto error;
                 }
@@ -922,8 +886,9 @@ static int starturbs(struct bc_state *bcs)
                 dump_urb(DEBUG_ISO, "Initial isoc write", urb);
                 rc = usb_submit_urb(ubc->isoouturbs[k].urb, SLAB_ATOMIC);
                 if (rc != 0) {
-                        err("could not submit isochronous write URB %d: %s",
-                            k, get_usb_statmsg(rc));
+                        dev_err(bcs->cs->dev,
+                              "could not submit isochronous write URB %d: %s\n",
+                                k, get_usb_statmsg(rc));
                         goto error;
                 }
         }
@@ -946,20 +911,20 @@ static void stopurbs(struct bas_bc_state *ubc)
 {
         int k, rc;
 
-        IFNULLRET(ubc);
-
         atomic_set(&ubc->running, 0);
 
         for (k = 0; k < BAS_INURBS; ++k) {
                 rc = usb_unlink_urb(ubc->isoinurbs[k]);
-                dbg(DEBUG_ISO, "%s: isoc input URB %d unlinked, result = %d",
-                    __func__, k, rc);
+                gig_dbg(DEBUG_ISO,
+                        "%s: isoc input URB %d unlinked, result = %d",
+                        __func__, k, rc);
         }
 
         for (k = 0; k < BAS_OUTURBS; ++k) {
                 rc = usb_unlink_urb(ubc->isoouturbs[k].urb);
-                dbg(DEBUG_ISO, "%s: isoc output URB %d unlinked, result = %d",
-                    __func__, k, rc);
+                gig_dbg(DEBUG_ISO,
+                        "%s: isoc output URB %d unlinked, result = %d",
+                        __func__, k, rc);
         }
 }
 
@@ -977,19 +942,14 @@ static void stopurbs(struct bas_bc_state *ubc)
  */
 static int submit_iso_write_urb(struct isow_urbctx_t *ucx)
 {
-        struct urb *urb;
-        struct bas_bc_state *ubc;
+        struct urb *urb = ucx->urb;
+        struct bas_bc_state *ubc = ucx->bcs->hw.bas;
         struct usb_iso_packet_descriptor *ifd;
         int corrbytes, nframe, rc;
+        unsigned long flags;
 
-        IFNULLRETVAL(ucx, -EFAULT);
-        urb = ucx->urb;
-        IFNULLRETVAL(urb, -EFAULT);
-        IFNULLRETVAL(ucx->bcs, -EFAULT);
-        ubc = ucx->bcs->hw.bas;
-        IFNULLRETVAL(ubc, -EFAULT);
-
-        urb->dev = ucx->bcs->cs->hw.bas->udev;  /* clobbered by USB subsystem */
+        /* urb->dev is clobbered by USB subsystem */
+        urb->dev = ucx->bcs->cs->hw.bas->udev;
         urb->transfer_flags = URB_ISO_ASAP;
         urb->transfer_buffer = ubc->isooutbuf->data;
         urb->transfer_buffer_length = sizeof(ubc->isooutbuf->data);
@@ -1000,7 +960,8 @@ static int submit_iso_write_urb(struct isow_urbctx_t *ucx)
                 /* compute frame length according to flow control */
                 ifd->length = BAS_NORMFRAME;
                 if ((corrbytes = atomic_read(&ubc->corrbytes)) != 0) {
-                        dbg(DEBUG_ISO, "%s: corrbytes=%d", __func__, corrbytes);
+                        gig_dbg(DEBUG_ISO, "%s: corrbytes=%d",
+                                __func__, corrbytes);
                         if (corrbytes > BAS_HIGHFRAME - BAS_NORMFRAME)
                                 corrbytes = BAS_HIGHFRAME - BAS_NORMFRAME;
                         else if (corrbytes < BAS_LOWFRAME - BAS_NORMFRAME)
@@ -1008,18 +969,21 @@ static int submit_iso_write_urb(struct isow_urbctx_t *ucx)
                         ifd->length += corrbytes;
                         atomic_add(-corrbytes, &ubc->corrbytes);
                 }
-                //dbg(DEBUG_ISO, "%s: frame %d length=%d", __func__, nframe, ifd->length);
 
                 /* retrieve block of data to send */
-                ifd->offset = gigaset_isowbuf_getbytes(ubc->isooutbuf, ifd->length);
+                ifd->offset = gigaset_isowbuf_getbytes(ubc->isooutbuf,
+                                                       ifd->length);
                 if (ifd->offset < 0) {
                         if (ifd->offset == -EBUSY) {
-                                dbg(DEBUG_ISO, "%s: buffer busy at frame %d",
-                                    __func__, nframe);
-                                /* tasklet will be restarted from gigaset_send_skb() */
+                                gig_dbg(DEBUG_ISO,
+                                        "%s: buffer busy at frame %d",
+                                        __func__, nframe);
+                                /* tasklet will be restarted from
+                                   gigaset_send_skb() */
                         } else {
-                                err("%s: buffer error %d at frame %d",
-                                    __func__, ifd->offset, nframe);
+                                dev_err(ucx->bcs->cs->dev,
+                                        "%s: buffer error %d at frame %d\n",
+                                        __func__, ifd->offset, nframe);
                                 return ifd->offset;
                         }
                         break;
@@ -1029,9 +993,14 @@ static int submit_iso_write_urb(struct isow_urbctx_t *ucx)
                 ifd->actual_length = 0;
         }
         if ((urb->number_of_packets = nframe) > 0) {
-                if ((rc = usb_submit_urb(urb, SLAB_ATOMIC)) != 0) {
-                        err("could not submit isochronous write URB: %s",
-                            get_usb_statmsg(rc));
+                spin_lock_irqsave(&ucx->bcs->cs->lock, flags);
+                rc = ucx->bcs->cs->connected ? usb_submit_urb(urb, SLAB_ATOMIC) : -ENODEV;
+                spin_unlock_irqrestore(&ucx->bcs->cs->lock, flags);
+
+                if (rc) {
+                        dev_err(ucx->bcs->cs->dev,
+                                "could not submit isochronous write URB: %s\n",
+                                get_usb_statmsg(rc));
                         dump_urb(DEBUG_ISO, "isoc write", urb);
                         return rc;
                 }
@@ -1048,9 +1017,9 @@ static int submit_iso_write_urb(struct isow_urbctx_t *ucx)
  */
 static void write_iso_tasklet(unsigned long data)
 {
-        struct bc_state *bcs;
-        struct bas_bc_state *ubc;
-        struct cardstate *cs;
+        struct bc_state *bcs = (struct bc_state *) data;
+        struct bas_bc_state *ubc = bcs->hw.bas;
+        struct cardstate *cs = bcs->cs;
         struct isow_urbctx_t *done, *next, *ovfl;
         struct urb *urb;
         struct usb_iso_packet_descriptor *ifd;
@@ -1060,22 +1029,10 @@ static void write_iso_tasklet(unsigned long data)
         struct sk_buff *skb;
         int len;
 
-        bcs = (struct bc_state *) data;
-        IFNULLRET(bcs);
-        ubc = bcs->hw.bas;
-        IFNULLRET(ubc);
-        cs = bcs->cs;
-        IFNULLRET(cs);
-
         /* loop while completed URBs arrive in time */
         for (;;) {
-                if (unlikely(!atomic_read(&cs->connected))) {
-                        warn("%s: disconnected", __func__);
-                        return;
-                }
-
                 if (unlikely(!(atomic_read(&ubc->running)))) {
-                        dbg(DEBUG_ISO, "%s: not running", __func__);
+                        gig_dbg(DEBUG_ISO, "%s: not running", __func__);
                         return;
                 }
 
@@ -1087,7 +1044,7 @@ static void write_iso_tasklet(unsigned long data)
                 ubc->isooutovfl = NULL;
                 spin_unlock_irqrestore(&ubc->isooutlock, flags);
                 if (ovfl) {
-                        err("isochronous write buffer underrun - buy a faster machine :-)");
+                        dev_err(cs->dev, "isochronous write buffer underrun\n");
                         error_hangup(bcs);
                         break;
                 }
@@ -1110,7 +1067,8 @@ static void write_iso_tasklet(unsigned long data)
                                 spin_unlock_irqrestore(&ubc->isooutlock, flags);
                                 if (next) {
                                         /* couldn't put it back */
-                                        err("losing isochronous write URB");
+                                        dev_err(cs->dev,
+                                              "losing isochronous write URB\n");
                                         error_hangup(bcs);
                                 }
                         }
@@ -1123,22 +1081,25 @@ static void write_iso_tasklet(unsigned long data)
                         break;
                 case -EXDEV:                    /* inspect individual frames */
                         /* assumptions (for lack of documentation):
-                         * - actual_length bytes of the frame in error are successfully sent
+                         * - actual_length bytes of the frame in error are
+                         *   successfully sent
                          * - all following frames are not sent at all
                          */
-                        dbg(DEBUG_ISO, "%s: URB partially completed", __func__);
+                        gig_dbg(DEBUG_ISO, "%s: URB partially completed",
+                                __func__);
                         offset = done->limit;   /* just in case */
                         for (i = 0; i < BAS_NUMFRAMES; i++) {
                                 ifd = &urb->iso_frame_desc[i];
                                 if (ifd->status ||
                                     ifd->actual_length != ifd->length) {
-                                        warn("isochronous write: frame %d: %s, "
-                                             "only %d of %d bytes sent",
+                                        dev_warn(cs->dev,
+                                             "isochronous write: frame %d: %s, "
+                                             "only %d of %d bytes sent\n",
                                              i, get_usb_statmsg(ifd->status),
                                              ifd->actual_length, ifd->length);
                                         offset = (ifd->offset +
-                                                  ifd->actual_length)
-                                                 % BAS_OUTBUFSIZE;
+                                                  ifd->actual_length)
+                                                 % BAS_OUTBUFSIZE;
                                         break;
                                 }
                         }
@@ -1148,25 +1109,26 @@ static void write_iso_tasklet(unsigned long data)
                                 ifd = &urb->iso_frame_desc[i];
                                 if (ifd->status != -EINPROGRESS
                                     || ifd->actual_length != 0) {
-                                        warn("isochronous write: frame %d: %s, "
-                                             "%d of %d bytes sent",
+                                        dev_warn(cs->dev,
+                                             "isochronous write: frame %d: %s, "
+                                             "%d of %d bytes sent\n",
                                              i, get_usb_statmsg(ifd->status),
                                              ifd->actual_length, ifd->length);
                                         offset = (ifd->offset +
-                                                  ifd->actual_length)
-                                                 % BAS_OUTBUFSIZE;
+                                                  ifd->actual_length)
+                                                 % BAS_OUTBUFSIZE;
                                         break;
                                 }
                         }
 #endif
                         break;
-                case -EPIPE:                    //FIXME is this the code for "underrun"?
-                        err("isochronous write stalled");
+                case -EPIPE:            //FIXME is this the code for "underrun"?
+                        dev_err(cs->dev, "isochronous write stalled\n");
                         error_hangup(bcs);
                         break;
                 default:                        /* severe trouble */
-                        warn("isochronous write: %s",
-                             get_usb_statmsg(urb->status));
+                        dev_warn(cs->dev, "isochronous write: %s\n",
+                                 get_usb_statmsg(urb->status));
                 }
 
                 /* mark the write buffer area covered by this URB as free */
@@ -1194,8 +1156,8 @@ static void write_iso_tasklet(unsigned long data)
                 if (gigaset_isoc_buildframe(bcs, skb->data, len) == -EAGAIN) {
                         /* insufficient buffer space, push back onto queue */
                         skb_queue_head(&bcs->squeue, skb);
-                        dbg(DEBUG_ISO, "%s: skb requeued, qlen=%d",
-                            __func__, skb_queue_len(&bcs->squeue));
+                        gig_dbg(DEBUG_ISO, "%s: skb requeued, qlen=%d",
+                                __func__, skb_queue_len(&bcs->squeue));
                         break;
                 }
                 skb_pull(skb, len);
@@ -1215,28 +1177,16 @@ static void write_iso_tasklet(unsigned long data)
  */
 static void read_iso_tasklet(unsigned long data)
 {
-        struct bc_state *bcs;
-        struct bas_bc_state *ubc;
-        struct cardstate *cs;
+        struct bc_state *bcs = (struct bc_state *) data;
+        struct bas_bc_state *ubc = bcs->hw.bas;
+        struct cardstate *cs = bcs->cs;
         struct urb *urb;
         char *rcvbuf;
         unsigned long flags;
         int totleft, numbytes, offset, frame, rc;
 
-        bcs = (struct bc_state *) data;
-        IFNULLRET(bcs);
-        ubc = bcs->hw.bas;
-        IFNULLRET(ubc);
-        cs = bcs->cs;
-        IFNULLRET(cs);
-
         /* loop while more completed URBs arrive in the meantime */
         for (;;) {
-                if (!atomic_read(&cs->connected)) {
-                        warn("%s: disconnected", __func__);
-                        return;
-                }
-
                 /* retrieve URB */
                 spin_lock_irqsave(&ubc->isoinlock, flags);
                 if (!(urb = ubc->isoindone)) {
@@ -1245,38 +1195,45 @@ static void read_iso_tasklet(unsigned long data)
                 }
                 ubc->isoindone = NULL;
                 if (unlikely(ubc->loststatus != -EINPROGRESS)) {
-                        warn("isochronous read overrun, dropped URB with status: %s, %d bytes lost",
-                             get_usb_statmsg(ubc->loststatus), ubc->isoinlost);
+                        dev_warn(cs->dev,
+                                 "isochronous read overrun, "
+                                 "dropped URB with status: %s, %d bytes lost\n",
+                                 get_usb_statmsg(ubc->loststatus),
+                                 ubc->isoinlost);
                         ubc->loststatus = -EINPROGRESS;
                 }
                 spin_unlock_irqrestore(&ubc->isoinlock, flags);
 
                 if (unlikely(!(atomic_read(&ubc->running)))) {
-                        dbg(DEBUG_ISO, "%s: channel not running, dropped URB with status: %s",
-                            __func__, get_usb_statmsg(urb->status));
+                        gig_dbg(DEBUG_ISO,
+                                "%s: channel not running, "
+                                "dropped URB with status: %s",
+                                __func__, get_usb_statmsg(urb->status));
                         return;
                 }
 
                 switch (urb->status) {
                 case 0:                         /* normal completion */
                         break;
-                case -EXDEV:                    /* inspect individual frames (we do that anyway) */
-                        dbg(DEBUG_ISO, "%s: URB partially completed", __func__);
+                case -EXDEV:                    /* inspect individual frames
+                                                   (we do that anyway) */
+                        gig_dbg(DEBUG_ISO, "%s: URB partially completed",
+                                __func__);
                         break;
                 case -ENOENT:
                 case -ECONNRESET:
-                        dbg(DEBUG_ISO, "%s: URB canceled", __func__);
+                        gig_dbg(DEBUG_ISO, "%s: URB canceled", __func__);
                         continue;               /* -> skip */
                 case -EINPROGRESS:              /* huh? */
-                        dbg(DEBUG_ISO, "%s: URB still pending", __func__);
+                        gig_dbg(DEBUG_ISO, "%s: URB still pending", __func__);
                         continue;               /* -> skip */
                 case -EPIPE:
-                        err("isochronous read stalled");
+                        dev_err(cs->dev, "isochronous read stalled\n");
                         error_hangup(bcs);
                         continue;               /* -> skip */
                 default:                        /* severe trouble */
-                        warn("isochronous read: %s",
-                             get_usb_statmsg(urb->status));
+                        dev_warn(cs->dev, "isochronous read: %s\n",
+                                 get_usb_statmsg(urb->status));
                         goto error;
                 }
 
@@ -1284,33 +1241,44 @@ static void read_iso_tasklet(unsigned long data)
                 totleft = urb->actual_length;
                 for (frame = 0; totleft > 0 && frame < BAS_NUMFRAMES; frame++) {
                         if (unlikely(urb->iso_frame_desc[frame].status)) {
-                                warn("isochronous read: frame %d: %s",
-                                     frame, get_usb_statmsg(urb->iso_frame_desc[frame].status));
+                                dev_warn(cs->dev,
+                                         "isochronous read: frame %d: %s\n",
+                                         frame,
+                                         get_usb_statmsg(
+                                            urb->iso_frame_desc[frame].status));
                                 break;
                         }
                         numbytes = urb->iso_frame_desc[frame].actual_length;
                         if (unlikely(numbytes > BAS_MAXFRAME)) {
-                                warn("isochronous read: frame %d: numbytes (%d) > BAS_MAXFRAME",
-                                     frame, numbytes);
+                                dev_warn(cs->dev,
+                                         "isochronous read: frame %d: "
+                                         "numbytes (%d) > BAS_MAXFRAME\n",
+                                         frame, numbytes);
                                 break;
                         }
                         if (unlikely(numbytes > totleft)) {
-                                warn("isochronous read: frame %d: numbytes (%d) > totleft (%d)",
-                                     frame, numbytes, totleft);
+                                dev_warn(cs->dev,
+                                         "isochronous read: frame %d: "
+                                         "numbytes (%d) > totleft (%d)\n",
+                                         frame, numbytes, totleft);
                                 break;
                         }
                         offset = urb->iso_frame_desc[frame].offset;
                         if (unlikely(offset + numbytes > BAS_INBUFSIZE)) {
-                                warn("isochronous read: frame %d: offset (%d) + numbytes (%d) > BAS_INBUFSIZE",
-                                     frame, offset, numbytes);
+                                dev_warn(cs->dev,
+                                         "isochronous read: frame %d: "
+                                         "offset (%d) + numbytes (%d) "
+                                         "> BAS_INBUFSIZE\n",
+                                         frame, offset, numbytes);
                                 break;
                         }
                         gigaset_isoc_receive(rcvbuf + offset, numbytes, bcs);
                         totleft -= numbytes;
                 }
                 if (unlikely(totleft > 0))
-                        warn("isochronous read: %d data bytes missing",
-                             totleft);
+                        dev_warn(cs->dev,
+                                 "isochronous read: %d data bytes missing\n",
+                                 totleft);
 
         error:
                 /* URB processed, resubmit */
@@ -1318,12 +1286,17 @@ static void read_iso_tasklet(unsigned long data)
                         urb->iso_frame_desc[frame].status = 0;
                         urb->iso_frame_desc[frame].actual_length = 0;
                 }
-                urb->dev = bcs->cs->hw.bas->udev;       /* clobbered by USB subsystem */
+                /* urb->dev is clobbered by USB subsystem */
+                urb->dev = bcs->cs->hw.bas->udev;
                 urb->transfer_flags = URB_ISO_ASAP;
                 urb->number_of_packets = BAS_NUMFRAMES;
-                if ((rc = usb_submit_urb(urb, SLAB_ATOMIC)) != 0) {
-                        err("could not resubmit isochronous read URB: %s",
-                            get_usb_statmsg(rc));
+                spin_lock_irqsave(&cs->lock, flags);
+                rc = cs->connected ? usb_submit_urb(urb, SLAB_ATOMIC) : -ENODEV;
+                spin_unlock_irqrestore(&cs->lock, flags);
+                if (rc) {
+                        dev_err(cs->dev,
+                                "could not resubmit isochronous read URB: %s\n",
+                                get_usb_statmsg(rc));
                         dump_urb(DEBUG_ISO, "resubmit iso read", urb);
                         error_hangup(bcs);
                 }
@@ -1341,15 +1314,10 @@ static void read_iso_tasklet(unsigned long data)
 static void req_timeout(unsigned long data)
 {
         struct bc_state *bcs = (struct bc_state *) data;
-        struct bas_cardstate *ucs;
+        struct bas_cardstate *ucs = bcs->cs->hw.bas;
         int pending;
         unsigned long flags;
 
-        IFNULLRET(bcs);
-        IFNULLRET(bcs->cs);
-        ucs = bcs->cs->hw.bas;
-        IFNULLRET(ucs);
-
         check_pending(ucs);
 
         spin_lock_irqsave(&ucs->lock, flags);
@@ -1359,33 +1327,34 @@ static void req_timeout(unsigned long data)
 
         switch (pending) {
         case 0:                                 /* no pending request */
-                dbg(DEBUG_USBREQ, "%s: no request pending", __func__);
+                gig_dbg(DEBUG_USBREQ, "%s: no request pending", __func__);
                 break;
 
         case HD_OPEN_ATCHANNEL:
-                err("timeout opening AT channel");
+                dev_err(bcs->cs->dev, "timeout opening AT channel\n");
                 error_reset(bcs->cs);
                 break;
 
         case HD_OPEN_B2CHANNEL:
         case HD_OPEN_B1CHANNEL:
-                err("timeout opening channel %d", bcs->channel + 1);
+                dev_err(bcs->cs->dev, "timeout opening channel %d\n",
+                        bcs->channel + 1);
                 error_hangup(bcs);
                 break;
 
         case HD_CLOSE_ATCHANNEL:
-                err("timeout closing AT channel");
-                //wake_up_interruptible(cs->initwait);
-                //FIXME need own wait queue?
+                dev_err(bcs->cs->dev, "timeout closing AT channel\n");
                 break;
 
         case HD_CLOSE_B2CHANNEL:
         case HD_CLOSE_B1CHANNEL:
-                err("timeout closing channel %d", bcs->channel + 1);
+                dev_err(bcs->cs->dev, "timeout closing channel %d\n",
+                        bcs->channel + 1);
                 break;
 
         default:
-                warn("request 0x%02x timed out, clearing", pending);
+                dev_warn(bcs->cs->dev, "request 0x%02x timed out, clearing\n",
+                         pending);
         }
 }
 
@@ -1398,18 +1367,14 @@ static void req_timeout(unsigned long data)
  */
 static void write_ctrl_callback(struct urb *urb, struct pt_regs *regs)
 {
-        struct bas_cardstate *ucs;
+        struct bas_cardstate *ucs = urb->context;
         unsigned long flags;
 
-        IFNULLRET(urb);
-        IFNULLRET(urb->context);
-        IFNULLRET(cardstate);
-
-        ucs = (struct bas_cardstate *) urb->context;
         spin_lock_irqsave(&ucs->lock, flags);
         if (urb->status && ucs->pending) {
-                err("control request 0x%02x failed: %s",
-                    ucs->pending, get_usb_statmsg(urb->status));
+                dev_err(&ucs->interface->dev,
+                        "control request 0x%02x failed: %s\n",
+                        ucs->pending, get_usb_statmsg(urb->status));
                 del_timer(&ucs->timer_ctrl);
                 ucs->pending = 0;
         }
@@ -1438,28 +1403,25 @@ static void write_ctrl_callback(struct urb *urb, struct pt_regs *regs)
  */
 static int req_submit(struct bc_state *bcs, int req, int val, int timeout)
 {
-        struct bas_cardstate *ucs;
+        struct bas_cardstate *ucs = bcs->cs->hw.bas;
         int ret;
         unsigned long flags;
 
-        IFNULLRETVAL(bcs, -EINVAL);
-        IFNULLRETVAL(bcs->cs, -EINVAL);
-        ucs = bcs->cs->hw.bas;
-        IFNULLRETVAL(ucs, -EINVAL);
-        IFNULLRETVAL(ucs->urb_ctrl, -EINVAL);
-
-        dbg(DEBUG_USBREQ, "-------> 0x%02x (%d)", req, val);
+        gig_dbg(DEBUG_USBREQ, "-------> 0x%02x (%d)", req, val);
 
         spin_lock_irqsave(&ucs->lock, flags);
         if (ucs->pending) {
                 spin_unlock_irqrestore(&ucs->lock, flags);
-                err("submission of request 0x%02x failed: request 0x%02x still pending",
-                    req, ucs->pending);
+                dev_err(bcs->cs->dev,
+                        "submission of request 0x%02x failed: "
+                        "request 0x%02x still pending\n",
+                        req, ucs->pending);
                 return -EBUSY;
         }
         if (ucs->urb_ctrl->status == -EINPROGRESS) {
                 spin_unlock_irqrestore(&ucs->lock, flags);
-                err("could not submit request 0x%02x: URB busy", req);
+                dev_err(bcs->cs->dev,
+                        "could not submit request 0x%02x: URB busy\n", req);
                 return -EBUSY;
         }
 
@@ -1469,19 +1431,19 @@ static int req_submit(struct bc_state *bcs, int req, int val, int timeout)
         ucs->dr_ctrl.wIndex = 0;
         ucs->dr_ctrl.wLength = 0;
         usb_fill_control_urb(ucs->urb_ctrl, ucs->udev,
-                             usb_sndctrlpipe(ucs->udev, 0),
-                             (unsigned char*) &ucs->dr_ctrl, NULL, 0,
-                             write_ctrl_callback, ucs);
+                             usb_sndctrlpipe(ucs->udev, 0),
+                             (unsigned char*) &ucs->dr_ctrl, NULL, 0,
+                             write_ctrl_callback, ucs);
         if ((ret = usb_submit_urb(ucs->urb_ctrl, SLAB_ATOMIC)) != 0) {
-                err("could not submit request 0x%02x: %s",
-                    req, get_usb_statmsg(ret));
+                dev_err(bcs->cs->dev, "could not submit request 0x%02x: %s\n",
+                        req, get_usb_statmsg(ret));
                 spin_unlock_irqrestore(&ucs->lock, flags);
                 return ret;
         }
         ucs->pending = req;
 
         if (timeout > 0) {
-                dbg(DEBUG_USBREQ, "setting timeout of %d/10 secs", timeout);
+                gig_dbg(DEBUG_USBREQ, "setting timeout of %d/10 secs", timeout);
                 ucs->timer_ctrl.expires = jiffies + timeout * HZ / 10;
                 ucs->timer_ctrl.data = (unsigned long) bcs;
                 ucs->timer_ctrl.function = req_timeout;
@@ -1504,19 +1466,18 @@ static int gigaset_init_bchannel(struct bc_state *bcs)
 {
         int req, ret;
 
-        IFNULLRETVAL(bcs, -EINVAL);
-
         if ((ret = starturbs(bcs)) < 0) {
-                err("could not start isochronous I/O for channel %d",
-                    bcs->channel + 1);
+                dev_err(bcs->cs->dev,
+                        "could not start isochronous I/O for channel %d\n",
+                        bcs->channel + 1);
                 error_hangup(bcs);
                 return ret;
         }
 
         req = bcs->channel ? HD_OPEN_B2CHANNEL : HD_OPEN_B1CHANNEL;
         if ((ret = req_submit(bcs, req, 0, BAS_TIMEOUT)) < 0) {
-                err("could not open channel %d: %s",
-                    bcs->channel + 1, get_usb_statmsg(ret));
+                dev_err(bcs->cs->dev, "could not open channel %d: %s\n",
+                        bcs->channel + 1, get_usb_statmsg(ret));
                 stopurbs(bcs->hw.bas);
                 error_hangup(bcs);
         }
@@ -1537,8 +1498,6 @@ static int gigaset_close_bchannel(struct bc_state *bcs)
 {
         int req, ret;
 
-        IFNULLRETVAL(bcs, -EINVAL);
-
         if (!(atomic_read(&bcs->cs->hw.bas->basstate) &
               (bcs->channel ? BS_B2OPEN : BS_B1OPEN))) {
                 /* channel not running: just signal common.c */
@@ -1548,8 +1507,9 @@ static int gigaset_close_bchannel(struct bc_state *bcs)
 
         req = bcs->channel ? HD_CLOSE_B2CHANNEL : HD_CLOSE_B1CHANNEL;
         if ((ret = req_submit(bcs, req, 0, BAS_TIMEOUT)) < 0)
-                err("could not submit HD_CLOSE_BxCHANNEL request: %s",
-                    get_usb_statmsg(ret));
+                dev_err(bcs->cs->dev,
+                        "could not submit HD_CLOSE_BxCHANNEL request: %s\n",
+                        get_usb_statmsg(ret));
         return ret;
 }
 
@@ -1564,17 +1524,13 @@ static int gigaset_close_bchannel(struct bc_state *bcs)
  */
 static void complete_cb(struct cardstate *cs)
 {
-        struct cmdbuf_t *cb;
-
-        IFNULLRET(cs);
-        cb = cs->cmdbuf;
-        IFNULLRET(cb);
+        struct cmdbuf_t *cb = cs->cmdbuf;
 
         /* unqueue completed buffer */
         cs->cmdbytes -= cs->curlen;
-        dbg(DEBUG_TRANSCMD | DEBUG_LOCKCMD,
-            "write_command: sent %u bytes, %u left",
-            cs->curlen, cs->cmdbytes);
+        gig_dbg(DEBUG_TRANSCMD|DEBUG_LOCKCMD,
+                "write_command: sent %u bytes, %u left",
+                cs->curlen, cs->cmdbytes);
         if ((cs->cmdbuf = cb->next) != NULL) {
                 cs->cmdbuf->prev = NULL;
                 cs->curlen = cs->cmdbuf->len;
@@ -1600,15 +1556,9 @@ static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len);
  */
 static void write_command_callback(struct urb *urb, struct pt_regs *regs)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = urb->context;
+        struct bas_cardstate *ucs = cs->hw.bas;
         unsigned long flags;
-        struct bas_cardstate *ucs;
-
-        IFNULLRET(urb);
-        cs = (struct cardstate *) urb->context;
-        IFNULLRET(cs);
-        ucs = cs->hw.bas;
-        IFNULLRET(ucs);
 
         /* check status */
         switch (urb->status) {
@@ -1618,22 +1568,27 @@ static void write_command_callback(struct urb *urb, struct pt_regs *regs)
         case -ECONNRESET:               /* canceled (async) */
         case -EINPROGRESS:              /* pending */
                 /* ignore silently */
-                dbg(DEBUG_USBREQ,
-                    "%s: %s", __func__, get_usb_statmsg(urb->status));
+                gig_dbg(DEBUG_USBREQ, "%s: %s",
+                        __func__, get_usb_statmsg(urb->status));
                 return;
         default:                                /* any failure */
                 if (++ucs->retry_cmd_out > BAS_RETRY) {
-                        warn("command write: %s, giving up after %d retries",
-                             get_usb_statmsg(urb->status), ucs->retry_cmd_out);
+                        dev_warn(cs->dev,
+                                 "command write: %s, "
+                                 "giving up after %d retries\n",
+                                 get_usb_statmsg(urb->status),
+                                 ucs->retry_cmd_out);
                         break;
                 }
                 if (cs->cmdbuf == NULL) {
-                        warn("command write: %s, cannot retry - cmdbuf gone",
-                             get_usb_statmsg(urb->status));
+                        dev_warn(cs->dev,
+                                 "command write: %s, "
+                                 "cannot retry - cmdbuf gone\n",
+                                 get_usb_statmsg(urb->status));
                         break;
                 }
-                notice("command write: %s, retry %d",
-                       get_usb_statmsg(urb->status), ucs->retry_cmd_out);
+                dev_notice(cs->dev, "command write: %s, retry %d\n",
+                           get_usb_statmsg(urb->status), ucs->retry_cmd_out);
                 if (atwrite_submit(cs, cs->cmdbuf->buf, cs->cmdbuf->len) >= 0)
                         /* resubmitted - bypass regular exit block */
                         return;
@@ -1655,13 +1610,9 @@ static void write_command_callback(struct urb *urb, struct pt_regs *regs)
 static void atrdy_timeout(unsigned long data)
 {
         struct cardstate *cs = (struct cardstate *) data;
-        struct bas_cardstate *ucs;
-
-        IFNULLRET(cs);
-        ucs = cs->hw.bas;
-        IFNULLRET(ucs);
+        struct bas_cardstate *ucs = cs->hw.bas;
 
-        warn("timeout waiting for HD_READY_SEND_ATDATA");
+        dev_warn(cs->dev, "timeout waiting for HD_READY_SEND_ATDATA\n");
 
         /* fake the missing signal - what else can I do? */
         update_basstate(ucs, BS_ATREADY, BS_ATTIMER);
@@ -1682,18 +1633,15 @@ static void atrdy_timeout(unsigned long data)
  */
 static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len)
 {
-        struct bas_cardstate *ucs;
+        struct bas_cardstate *ucs = cs->hw.bas;
+        unsigned long flags;
         int ret;
 
-        IFNULLRETVAL(cs, -EFAULT);
-        ucs = cs->hw.bas;
-        IFNULLRETVAL(ucs, -EFAULT);
-        IFNULLRETVAL(ucs->urb_cmd_out, -EFAULT);
-
-        dbg(DEBUG_USBREQ, "-------> HD_WRITE_ATMESSAGE (%d)", len);
+        gig_dbg(DEBUG_USBREQ, "-------> HD_WRITE_ATMESSAGE (%d)", len);
 
         if (ucs->urb_cmd_out->status == -EINPROGRESS) {
-                err("could not submit HD_WRITE_ATMESSAGE: URB busy");
+                dev_err(cs->dev,
+                        "could not submit HD_WRITE_ATMESSAGE: URB busy\n");
                 return -EBUSY;
         }
 
@@ -1707,9 +1655,13 @@ static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len)
                              (unsigned char*) &ucs->dr_cmd_out, buf, len,
                              write_command_callback, cs);
 
-        if ((ret = usb_submit_urb(ucs->urb_cmd_out, SLAB_ATOMIC)) != 0) {
-                err("could not submit HD_WRITE_ATMESSAGE: %s",
-                    get_usb_statmsg(ret));
+        spin_lock_irqsave(&cs->lock, flags);
+        ret = cs->connected ? usb_submit_urb(ucs->urb_cmd_out, SLAB_ATOMIC) : -ENODEV;
+        spin_unlock_irqrestore(&cs->lock, flags);
+
+        if (ret) {
+                dev_err(cs->dev, "could not submit HD_WRITE_ATMESSAGE: %s\n",
+                        get_usb_statmsg(ret));
                 return ret;
         }
 
@@ -1718,8 +1670,8 @@ static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len)
 
         /* start timeout if necessary */
         if (!(atomic_read(&ucs->basstate) & BS_ATTIMER)) {
-                dbg(DEBUG_OUTPUT,
-                    "setting ATREADY timeout of %d/10 secs", ATRDY_TIMEOUT);
+                gig_dbg(DEBUG_OUTPUT, "setting ATREADY timeout of %d/10 secs",
+                        ATRDY_TIMEOUT);
                 ucs->timer_atrdy.expires = jiffies + ATRDY_TIMEOUT * HZ / 10;
                 ucs->timer_atrdy.data = (unsigned long) cs;
                 ucs->timer_atrdy.function = atrdy_timeout;
@@ -1740,21 +1692,17 @@ static int atwrite_submit(struct cardstate *cs, unsigned char *buf, int len)
 static int start_cbsend(struct cardstate *cs)
 {
         struct cmdbuf_t *cb;
-        struct bas_cardstate *ucs;
+        struct bas_cardstate *ucs = cs->hw.bas;
         unsigned long flags;
         int rc;
         int retval = 0;
 
-        IFNULLRETVAL(cs, -EFAULT);
-        ucs = cs->hw.bas;
-        IFNULLRETVAL(ucs, -EFAULT);
-
         /* check if AT channel is open */
         if (!(atomic_read(&ucs->basstate) & BS_ATOPEN)) {
-                dbg(DEBUG_TRANSCMD | DEBUG_LOCKCMD, "AT channel not open");
+                gig_dbg(DEBUG_TRANSCMD|DEBUG_LOCKCMD, "AT channel not open");
                 rc = req_submit(cs->bcs, HD_OPEN_ATCHANNEL, 0, BAS_TIMEOUT);
                 if (rc < 0) {
-                        err("could not open AT channel");
+                        dev_err(cs->dev, "could not open AT channel\n");
                         /* flush command queue */
                         spin_lock_irqsave(&cs->cmdlock, flags);
                         while (cs->cmdbuf != NULL)
@@ -1792,27 +1740,23 @@ static int start_cbsend(struct cardstate *cs)
  *      cs              controller state structure
  *      buf             command string to send
  *      len             number of bytes to send (max. IF_WRITEBUF)
- *      wake_tasklet    tasklet to run when transmission is completed (NULL if none)
+ *      wake_tasklet    tasklet to run when transmission is completed
+ *                      (NULL if none)
  * return value:
  *      number of bytes queued on success
  *      error code < 0 on error
  */
 static int gigaset_write_cmd(struct cardstate *cs,
-                             const unsigned char *buf, int len,
-                             struct tasklet_struct *wake_tasklet)
+                             const unsigned char *buf, int len,
+                             struct tasklet_struct *wake_tasklet)
 {
         struct cmdbuf_t *cb;
         unsigned long flags;
         int status;
 
         gigaset_dbg_buffer(atomic_read(&cs->mstate) != MS_LOCKED ?
-                             DEBUG_TRANSCMD : DEBUG_LOCKCMD,
-                           "CMD Transmit", len, buf, 0);
-
-        if (!atomic_read(&cs->connected)) {
-                err("%s: not connected", __func__);
-                return -ENODEV;
-        }
+                             DEBUG_TRANSCMD : DEBUG_LOCKCMD,
+                           "CMD Transmit", len, buf);
 
         if (len <= 0)
                 return 0;                       /* nothing to do */
@@ -1820,7 +1764,7 @@ static int gigaset_write_cmd(struct cardstate *cs,
         if (len > IF_WRITEBUF)
                 len = IF_WRITEBUF;
         if (!(cb = kmalloc(sizeof(struct cmdbuf_t) + len, GFP_ATOMIC))) {
-                err("%s: out of memory", __func__);
+                dev_err(cs->dev, "%s: out of memory\n", __func__);
                 return -ENOMEM;
         }
 
@@ -1849,7 +1793,8 @@ static int gigaset_write_cmd(struct cardstate *cs,
 
 /* gigaset_write_room
  * tty_driver.write_room interface routine
- * return number of characters the driver will accept to be written via gigaset_write_cmd
+ * return number of characters the driver will accept to be written via
+ * gigaset_write_cmd
  * parameter:
  *      controller state structure
  * return value:
@@ -1947,7 +1892,7 @@ static int gigaset_initbcshw(struct bc_state *bcs)
                 return 0;
         }
         tasklet_init(&ubc->sent_tasklet,
-                     &write_iso_tasklet, (unsigned long) bcs);
+                     &write_iso_tasklet, (unsigned long) bcs);
 
         spin_lock_init(&ubc->isoinlock);
         for (i = 0; i < BAS_INURBS; ++i)
@@ -1968,7 +1913,7 @@ static int gigaset_initbcshw(struct bc_state *bcs)
         ubc->shared0s = 0;
         ubc->stolen0s = 0;
         tasklet_init(&ubc->rcvd_tasklet,
-                     &read_iso_tasklet, (unsigned long) bcs);
+                     &read_iso_tasklet, (unsigned long) bcs);
         return 1;
 }
 
@@ -2027,57 +1972,56 @@ static int gigaset_initcshw(struct cardstate *cs)
  */
 static void freeurbs(struct cardstate *cs)
 {
-        struct bas_cardstate *ucs;
+        struct bas_cardstate *ucs = cs->hw.bas;
         struct bas_bc_state *ubc;
         int i, j;
 
-        IFNULLRET(cs);
-        ucs = cs->hw.bas;
-        IFNULLRET(ucs);
-
         for (j = 0; j < 2; ++j) {
                 ubc = cs->bcs[j].hw.bas;
-                IFNULLCONT(ubc);
                 for (i = 0; i < BAS_OUTURBS; ++i)
                         if (ubc->isoouturbs[i].urb) {
                                 usb_kill_urb(ubc->isoouturbs[i].urb);
-                                dbg(DEBUG_INIT,
-                                    "%s: isoc output URB %d/%d unlinked",
-                                    __func__, j, i);
+                                gig_dbg(DEBUG_INIT,
+                                        "%s: isoc output URB %d/%d unlinked",
+                                        __func__, j, i);
                                 usb_free_urb(ubc->isoouturbs[i].urb);
                                 ubc->isoouturbs[i].urb = NULL;
                         }
                 for (i = 0; i < BAS_INURBS; ++i)
                         if (ubc->isoinurbs[i]) {
                                 usb_kill_urb(ubc->isoinurbs[i]);
-                                dbg(DEBUG_INIT,
-                                    "%s: isoc input URB %d/%d unlinked",
-                                    __func__, j, i);
+                                gig_dbg(DEBUG_INIT,
+                                        "%s: isoc input URB %d/%d unlinked",
+                                        __func__, j, i);
                                 usb_free_urb(ubc->isoinurbs[i]);
                                 ubc->isoinurbs[i] = NULL;
                         }
         }
         if (ucs->urb_int_in) {
                 usb_kill_urb(ucs->urb_int_in);
-                dbg(DEBUG_INIT, "%s: interrupt input URB unlinked", __func__);
+                gig_dbg(DEBUG_INIT, "%s: interrupt input URB unlinked",
+                        __func__);
                 usb_free_urb(ucs->urb_int_in);
                 ucs->urb_int_in = NULL;
         }
         if (ucs->urb_cmd_out) {
                 usb_kill_urb(ucs->urb_cmd_out);
-                dbg(DEBUG_INIT, "%s: command output URB unlinked", __func__);
+                gig_dbg(DEBUG_INIT, "%s: command output URB unlinked",
+                        __func__);
                 usb_free_urb(ucs->urb_cmd_out);
                 ucs->urb_cmd_out = NULL;
         }
         if (ucs->urb_cmd_in) {
                 usb_kill_urb(ucs->urb_cmd_in);
-                dbg(DEBUG_INIT, "%s: command input URB unlinked", __func__);
+                gig_dbg(DEBUG_INIT, "%s: command input URB unlinked",
+                        __func__);
                 usb_free_urb(ucs->urb_cmd_in);
                 ucs->urb_cmd_in = NULL;
         }
         if (ucs->urb_ctrl) {
                 usb_kill_urb(ucs->urb_ctrl);
-                dbg(DEBUG_INIT, "%s: control output URB unlinked", __func__);
+                gig_dbg(DEBUG_INIT, "%s: control output URB unlinked",
+                        __func__);
                 usb_free_urb(ucs->urb_ctrl);
                 ucs->urb_ctrl = NULL;
         }
@@ -2099,12 +2043,10 @@ static int gigaset_probe(struct usb_interface *interface,
         int i, j;
         int ret;
 
-        IFNULLRETVAL(udev, -ENODEV);
-
-        dbg(DEBUG_ANY,
-            "%s: Check if device matches .. (Vendor: 0x%x, Product: 0x%x)",
-            __func__, le16_to_cpu(udev->descriptor.idVendor),
-            le16_to_cpu(udev->descriptor.idProduct));
+        gig_dbg(DEBUG_ANY,
+                "%s: Check if device matches .. (Vendor: 0x%x, Product: 0x%x)",
+                __func__, le16_to_cpu(udev->descriptor.idVendor),
+                le16_to_cpu(udev->descriptor.idProduct));
 
         /* See if the device offered us matches what we can accept */
         if ((le16_to_cpu(udev->descriptor.idVendor)  != USB_GIGA_VENDOR_ID) ||
@@ -2112,20 +2054,21 @@ static int gigaset_probe(struct usb_interface *interface,
              le16_to_cpu(udev->descriptor.idProduct) != USB_4175_PRODUCT_ID &&
              le16_to_cpu(udev->descriptor.idProduct) != USB_SX303_PRODUCT_ID &&
              le16_to_cpu(udev->descriptor.idProduct) != USB_SX353_PRODUCT_ID)) {
-                dbg(DEBUG_ANY, "%s: unmatched ID - exiting", __func__);
+                gig_dbg(DEBUG_ANY, "%s: unmatched ID - exiting", __func__);
                 return -ENODEV;
         }
 
         /* set required alternate setting */
         hostif = interface->cur_altsetting;
         if (hostif->desc.bAlternateSetting != 3) {
-                dbg(DEBUG_ANY,
-                    "%s: wrong alternate setting %d - trying to switch",
-                    __func__, hostif->desc.bAlternateSetting);
+                gig_dbg(DEBUG_ANY,
+                        "%s: wrong alternate setting %d - trying to switch",
+                        __func__, hostif->desc.bAlternateSetting);
                 if (usb_set_interface(udev, hostif->desc.bInterfaceNumber, 3) < 0) {
-                        warn("usb_set_interface failed, device %d interface %d altsetting %d",
-                             udev->devnum, hostif->desc.bInterfaceNumber,
-                             hostif->desc.bAlternateSetting);
+                        dev_warn(&udev->dev, "usb_set_interface failed, "
+                                 "device %d interface %d altsetting %d\n",
+                                 udev->devnum, hostif->desc.bInterfaceNumber,
+                                 hostif->desc.bAlternateSetting);
                         return -ENODEV;
                 }
                 hostif = interface->cur_altsetting;
@@ -2134,23 +2077,28 @@ static int gigaset_probe(struct usb_interface *interface,
         /* Reject application specific interfaces
          */
         if (hostif->desc.bInterfaceClass != 255) {
-                warn("%s: bInterfaceClass == %d",
-                     __func__, hostif->desc.bInterfaceClass);
+                dev_warn(&udev->dev, "%s: bInterfaceClass == %d\n",
+                         __func__, hostif->desc.bInterfaceClass);
                 return -ENODEV;
         }
 
-        info("%s: Device matched (Vendor: 0x%x, Product: 0x%x)",
-             __func__, le16_to_cpu(udev->descriptor.idVendor),
-             le16_to_cpu(udev->descriptor.idProduct));
+        dev_info(&udev->dev,
+                 "%s: Device matched (Vendor: 0x%x, Product: 0x%x)\n",
+                 __func__, le16_to_cpu(udev->descriptor.idVendor),
+                 le16_to_cpu(udev->descriptor.idProduct));
 
         cs = gigaset_getunassignedcs(driver);
         if (!cs) {
-                err("%s: no free cardstate", __func__);
+                dev_err(&udev->dev, "no free cardstate\n");
                 return -ENODEV;
         }
         ucs = cs->hw.bas;
+
+        /* save off device structure ptrs for later use */
+        usb_get_dev(udev);
         ucs->udev = udev;
         ucs->interface = interface;
+        cs->dev = &interface->dev;
 
         /* allocate URBs:
          * - one for the interrupt pipe
@@ -2159,22 +2107,22 @@ static int gigaset_probe(struct usb_interface *interface,
          */
         ucs->urb_int_in = usb_alloc_urb(0, SLAB_KERNEL);
         if (!ucs->urb_int_in) {
-                err("No free urbs available");
+                dev_err(cs->dev, "no free urbs available\n");
                 goto error;
         }
         ucs->urb_cmd_in = usb_alloc_urb(0, SLAB_KERNEL);
         if (!ucs->urb_cmd_in) {
-                err("No free urbs available");
+                dev_err(cs->dev, "no free urbs available\n");
                 goto error;
         }
         ucs->urb_cmd_out = usb_alloc_urb(0, SLAB_KERNEL);
         if (!ucs->urb_cmd_out) {
-                err("No free urbs available");
+                dev_err(cs->dev, "no free urbs available\n");
                 goto error;
         }
         ucs->urb_ctrl = usb_alloc_urb(0, SLAB_KERNEL);
         if (!ucs->urb_ctrl) {
-                err("No free urbs available");
+                dev_err(cs->dev, "no free urbs available\n");
                 goto error;
         }
 
@@ -2184,7 +2132,7 @@ static int gigaset_probe(struct usb_interface *interface,
                         ubc->isoouturbs[i].urb =
                                 usb_alloc_urb(BAS_NUMFRAMES, SLAB_KERNEL);
                         if (!ubc->isoouturbs[i].urb) {
-                                err("No free urbs available");
+                                dev_err(cs->dev, "no free urbs available\n");
                                 goto error;
                         }
                 }
@@ -2192,7 +2140,7 @@ static int gigaset_probe(struct usb_interface *interface,
                         ubc->isoinurbs[i] =
                                 usb_alloc_urb(BAS_NUMFRAMES, SLAB_KERNEL);
                         if (!ubc->isoinurbs[i]) {
-                                err("No free urbs available");
+                                dev_err(cs->dev, "no free urbs available\n");
                                 goto error;
                         }
                 }
@@ -2204,13 +2152,14 @@ static int gigaset_probe(struct usb_interface *interface,
         /* Fill the interrupt urb and send it to the core */
         endpoint = &hostif->endpoint[0].desc;
         usb_fill_int_urb(ucs->urb_int_in, udev,
-                         usb_rcvintpipe(udev,
-                                        (endpoint->bEndpointAddress) & 0x0f),
-                         ucs->int_in_buf, 3, read_int_callback, cs,
-                         endpoint->bInterval);
+                         usb_rcvintpipe(udev,
+                                        (endpoint->bEndpointAddress) & 0x0f),
+                         ucs->int_in_buf, 3, read_int_callback, cs,
+                         endpoint->bInterval);
         ret = usb_submit_urb(ucs->urb_int_in, SLAB_KERNEL);
         if (ret) {
-                err("could not submit interrupt URB: %s", get_usb_statmsg(ret));
+                dev_err(cs->dev, "could not submit interrupt URB: %s\n",
+                        get_usb_statmsg(ret));
                 goto error;
         }
 
@@ -2221,18 +2170,18 @@ static int gigaset_probe(struct usb_interface *interface,
         /* tell common part that the device is ready */
         if (startmode == SM_LOCKED)
                 atomic_set(&cs->mstate, MS_LOCKED);
-        if (!gigaset_start(cs))
-                goto error;
 
         /* save address of controller structure */
         usb_set_intfdata(interface, cs);
 
-        /* set up device sysfs */
-        gigaset_init_dev_sysfs(interface);
+        if (!gigaset_start(cs))
+                goto error;
+
         return 0;
 
 error:
         freeurbs(cs);
+        usb_set_intfdata(interface, NULL);
         gigaset_unassign(cs);
         return -ENODEV;
 }
@@ -2245,23 +2194,22 @@ static void gigaset_disconnect(struct usb_interface *interface)
         struct cardstate *cs;
         struct bas_cardstate *ucs;
 
-        /* clear device sysfs */
-        gigaset_free_dev_sysfs(interface);
-
         cs = usb_get_intfdata(interface);
-        usb_set_intfdata(interface, NULL);
 
-        IFNULLRET(cs);
         ucs = cs->hw.bas;
-        IFNULLRET(ucs);
 
-        info("disconnecting GigaSet base");
+        dev_info(cs->dev, "disconnecting Gigaset base\n");
         gigaset_stop(cs);
         freeurbs(cs);
+        usb_set_intfdata(interface, NULL);
         kfree(ucs->rcvbuf);
         ucs->rcvbuf = NULL;
         ucs->rcvbuf_size = 0;
         atomic_set(&ucs->basstate, 0);
+        usb_put_dev(ucs->udev);
+        ucs->interface = NULL;
+        ucs->udev = NULL;
+        cs->dev = NULL;
         gigaset_unassign(cs);
 }
 
@@ -2293,13 +2241,14 @@ static int __init bas_gigaset_init(void)
 
         /* allocate memory for our driver state and intialize it */
         if ((driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
-                                       GIGASET_MODULENAME, GIGASET_DEVNAME,
-                                       GIGASET_DEVFSNAME, &gigops,
-                                       THIS_MODULE)) == NULL)
+                                       GIGASET_MODULENAME, GIGASET_DEVNAME,
+                                       GIGASET_DEVFSNAME, &gigops,
+                                       THIS_MODULE)) == NULL)
                 goto error;
 
         /* allocate memory for our device state and intialize it */
-        cardstate = gigaset_initcs(driver, 2, 0, 0, cidmode, GIGASET_MODULENAME);
+        cardstate = gigaset_initcs(driver, 2, 0, 0, cidmode,
+                                   GIGASET_MODULENAME);
         if (!cardstate)
                 goto error;
 
@@ -2329,19 +2278,18 @@ error:	if (cardstate)
 static void __exit bas_gigaset_exit(void)
 {
         gigaset_blockdriver(driver); /* => probe will fail
-                                      * => no gigaset_start any more
-                                      */
+                                      * => no gigaset_start any more
+                                      */
 
         gigaset_shutdown(cardstate);
         /* from now on, no isdn callback should be possible */
 
         if (atomic_read(&cardstate->hw.bas->basstate) & BS_ATOPEN) {
-                dbg(DEBUG_ANY, "closing AT channel");
+                gig_dbg(DEBUG_ANY, "closing AT channel");
                 if (req_submit(cardstate->bcs,
-                               HD_CLOSE_ATCHANNEL, 0, BAS_TIMEOUT) >= 0) {
-                        /* successfully submitted - wait for completion */
-                        //wait_event_interruptible(cs->initwait, !cs->hw.bas->pending);
-                        //FIXME need own wait queue? wakeup?
+                               HD_CLOSE_ATCHANNEL, 0, BAS_TIMEOUT) >= 0) {
+                        /* successfully submitted */
+                        //FIXME wait for completion?
                 }
         }
 
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 64371995c1a9..749b3da1236e 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -1,7 +1,7 @@
 /*
  * Stuff used by all variants of the driver
  *
- * Copyright (c) 2001 by Stefan Eilers <Eilers.Stefan@epost.de>,
+ * Copyright (c) 2001 by Stefan Eilers,
  *                       Hansjoerg Lipp <hjlipp@web.de>,
  *                       Tilman Schmidt <tilman@imap.cc>.
  *
@@ -11,10 +11,6 @@
  *      published by the Free Software Foundation; either version 2 of
  *      the License, or (at your option) any later version.
  * =====================================================================
- * ToDo: ...
- * =====================================================================
- * Version: $Id: common.c,v 1.104.4.22 2006/02/04 18:28:16 hjlipp Exp $
- * =====================================================================
  */
 
 #include "gigaset.h"
@@ -23,7 +19,7 @@
 #include <linux/moduleparam.h>
 
 /* Version Information */
-#define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Tilman Schmidt <tilman@imap.cc>, Stefan Eilers <Eilers.Stefan@epost.de>"
+#define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Tilman Schmidt <tilman@imap.cc>, Stefan Eilers"
 #define DRIVER_DESC "Driver for Gigaset 307x"
 
 /* Module parameters */
@@ -32,21 +28,10 @@ EXPORT_SYMBOL_GPL(gigaset_debuglevel);
 module_param_named(debug, gigaset_debuglevel, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(debug, "debug level");
 
-/*======================================================================
-  Prototypes of internal functions
- */
-
-//static void gigaset_process_response(int resp_code, int parameter,
-//                                     struct at_state_t *at_state,
-//                                     unsigned char ** pstring);
-static struct cardstate *alloc_cs(struct gigaset_driver *drv);
-static void free_cs(struct cardstate *cs);
-static void make_valid(struct cardstate *cs, unsigned mask);
-static void make_invalid(struct cardstate *cs, unsigned mask);
-
-#define VALID_MINOR       0x01
-#define VALID_ID          0x02
-#define ASSIGNED          0x04
+/* driver state flags */
+#define VALID_MINOR     0x01
+#define VALID_ID        0x02
+#define ASSIGNED        0x04
 
 /* bitwise byte inversion table */
 __u8 gigaset_invtab[256] = {
@@ -86,42 +71,40 @@ __u8 gigaset_invtab[256] = {
 EXPORT_SYMBOL_GPL(gigaset_invtab);
 
 void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
-                        size_t len, const unsigned char *buf, int from_user)
+                        size_t len, const unsigned char *buf)
 {
         unsigned char outbuf[80];
-        unsigned char inbuf[80 - 1];
-        size_t numin;
-        const unsigned char *in;
+        unsigned char c;
         size_t space = sizeof outbuf - 1;
         unsigned char *out = outbuf;
+        size_t numin = len;
 
-        if (!from_user) {
-                in = buf;
-                numin = len;
-        } else {
-                numin = len < sizeof inbuf ? len : sizeof inbuf;
-                in = inbuf;
-                if (copy_from_user(inbuf, (const unsigned char __user *) buf, numin)) {
-                        strncpy(inbuf, "<FAULT>", sizeof inbuf);
-                        numin = sizeof "<FAULT>" - 1;
+        while (numin--) {
+                c = *buf++;
+                if (c == '~' || c == '^' || c == '\\') {
+                        if (!space--)
+                                break;
+                        *out++ = '\\';
                 }
-        }
-
-        for (; numin && space; --numin, ++in) {
-                --space;
-                if (*in >= 32)
-                        *out++ = *in;
-                else {
+                if (c & 0x80) {
+                        if (!space--)
+                                break;
+                        *out++ = '~';
+                        c ^= 0x80;
+                }
+                if (c < 0x20 || c == 0x7f) {
+                        if (!space--)
+                                break;
                         *out++ = '^';
-                        if (space) {
-                                *out++ = '@' + *in;
-                                --space;
-                        }
+                        c ^= 0x40;
                 }
+                if (!space--)
+                        break;
+                *out++ = c;
         }
         *out = 0;
 
-        dbg(level, "%s (%u bytes): %s", msg, (unsigned) len, outbuf);
+        gig_dbg(level, "%s (%u bytes): %s", msg, (unsigned) len, outbuf);
 }
 EXPORT_SYMBOL_GPL(gigaset_dbg_buffer);
 
@@ -146,11 +129,6 @@ int gigaset_enterconfigmode(struct cardstate *cs)
 {
         int i, r;
 
-        if (!atomic_read(&cs->connected)) {
-                err("not connected!");
-                return -1;
-        }
-
         cs->control_state = TIOCM_RTS; //FIXME
 
         r = setflags(cs, TIOCM_DTR, 200);
@@ -174,7 +152,7 @@ int gigaset_enterconfigmode(struct cardstate *cs)
         return 0;
 
 error:
-        err("error %d on setuartbits!\n", -r);
+        dev_err(cs->dev, "error %d on setuartbits\n", -r);
         cs->control_state = TIOCM_RTS|TIOCM_DTR; // FIXME is this a good value?
         cs->ops->set_modem_ctrl(cs, 0, TIOCM_RTS|TIOCM_DTR);
 
@@ -187,13 +165,13 @@ static int test_timeout(struct at_state_t *at_state)
                 return 0;
 
         if (--at_state->timer_expires) {
-                dbg(DEBUG_MCMD, "decreased timer of %p to %lu",
-                    at_state, at_state->timer_expires);
+                gig_dbg(DEBUG_MCMD, "decreased timer of %p to %lu",
+                        at_state, at_state->timer_expires);
                 return 0;
         }
 
         if (!gigaset_add_event(at_state->cs, at_state, EV_TIMEOUT, NULL,
-                               atomic_read(&at_state->timer_index), NULL)) {
+                               at_state->timer_index, NULL)) {
                 //FIXME what should we do?
         }
 
@@ -221,10 +199,10 @@ static void timer_tick(unsigned long data)
                 if (test_timeout(at_state))
                         timeout = 1;
 
-        if (atomic_read(&cs->running)) {
-                mod_timer(&cs->timer, jiffies + GIG_TICK);
+        if (cs->running) {
+                mod_timer(&cs->timer, jiffies + msecs_to_jiffies(GIG_TICK));
                 if (timeout) {
-                        dbg(DEBUG_CMD, "scheduling timeout");
+                        gig_dbg(DEBUG_CMD, "scheduling timeout");
                         tasklet_schedule(&cs->event_tasklet);
                 }
         }
@@ -238,13 +216,14 @@ int gigaset_get_channel(struct bc_state *bcs)
 
         spin_lock_irqsave(&bcs->cs->lock, flags);
         if (bcs->use_count) {
-                dbg(DEBUG_ANY, "could not allocate channel %d", bcs->channel);
+                gig_dbg(DEBUG_ANY, "could not allocate channel %d",
+                        bcs->channel);
                 spin_unlock_irqrestore(&bcs->cs->lock, flags);
                 return 0;
         }
         ++bcs->use_count;
         bcs->busy = 1;
-        dbg(DEBUG_ANY, "allocated channel %d", bcs->channel);
+        gig_dbg(DEBUG_ANY, "allocated channel %d", bcs->channel);
         spin_unlock_irqrestore(&bcs->cs->lock, flags);
         return 1;
 }
@@ -255,13 +234,13 @@ void gigaset_free_channel(struct bc_state *bcs)
 
         spin_lock_irqsave(&bcs->cs->lock, flags);
         if (!bcs->busy) {
-                dbg(DEBUG_ANY, "could not free channel %d", bcs->channel);
+                gig_dbg(DEBUG_ANY, "could not free channel %d", bcs->channel);
                 spin_unlock_irqrestore(&bcs->cs->lock, flags);
                 return;
         }
         --bcs->use_count;
         bcs->busy = 0;
-        dbg(DEBUG_ANY, "freed channel %d", bcs->channel);
+        gig_dbg(DEBUG_ANY, "freed channel %d", bcs->channel);
         spin_unlock_irqrestore(&bcs->cs->lock, flags);
 }
 
@@ -274,14 +253,14 @@ int gigaset_get_channels(struct cardstate *cs)
         for (i = 0; i < cs->channels; ++i)
                 if (cs->bcs[i].use_count) {
                         spin_unlock_irqrestore(&cs->lock, flags);
-                        dbg(DEBUG_ANY, "could not allocated all channels");
+                        gig_dbg(DEBUG_ANY, "could not allocate all channels");
                         return 0;
                 }
         for (i = 0; i < cs->channels; ++i)
                 ++cs->bcs[i].use_count;
         spin_unlock_irqrestore(&cs->lock, flags);
 
-        dbg(DEBUG_ANY, "allocated all channels");
+        gig_dbg(DEBUG_ANY, "allocated all channels");
 
         return 1;
 }
@@ -291,7 +270,7 @@ void gigaset_free_channels(struct cardstate *cs)
         unsigned long flags;
         int i;
 
-        dbg(DEBUG_ANY, "unblocking all channels");
+        gig_dbg(DEBUG_ANY, "unblocking all channels");
         spin_lock_irqsave(&cs->lock, flags);
         for (i = 0; i < cs->channels; ++i)
                 --cs->bcs[i].use_count;
@@ -303,7 +282,7 @@ void gigaset_block_channels(struct cardstate *cs)
         unsigned long flags;
         int i;
 
-        dbg(DEBUG_ANY, "blocking all channels");
+        gig_dbg(DEBUG_ANY, "blocking all channels");
         spin_lock_irqsave(&cs->lock, flags);
         for (i = 0; i < cs->channels; ++i)
                 ++cs->bcs[i].use_count;
@@ -314,25 +293,27 @@ static void clear_events(struct cardstate *cs)
 {
         struct event_t *ev;
         unsigned head, tail;
+        unsigned long flags;
 
-        /* no locking needed (no reader/writer allowed) */
+        spin_lock_irqsave(&cs->ev_lock, flags);
 
-        head = atomic_read(&cs->ev_head);
-        tail = atomic_read(&cs->ev_tail);
+        head = cs->ev_head;
+        tail = cs->ev_tail;
 
         while (tail != head) {
                 ev = cs->events + head;
                 kfree(ev->ptr);
-
                 head = (head + 1) % MAX_EVENTS;
         }
 
-        atomic_set(&cs->ev_head, tail);
+        cs->ev_head = tail;
+
+        spin_unlock_irqrestore(&cs->ev_lock, flags);
 }
 
 struct event_t *gigaset_add_event(struct cardstate *cs,
-                                  struct at_state_t *at_state, int type,
-                                  void *ptr, int parameter, void *arg)
+                                  struct at_state_t *at_state, int type,
+                                  void *ptr, int parameter, void *arg)
 {
         unsigned long flags;
         unsigned next, tail;
@@ -340,9 +321,9 @@ struct event_t *gigaset_add_event(struct cardstate *cs,
 
         spin_lock_irqsave(&cs->ev_lock, flags);
 
-        tail = atomic_read(&cs->ev_tail);
+        tail = cs->ev_tail;
         next = (tail + 1) % MAX_EVENTS;
-        if (unlikely(next == atomic_read(&cs->ev_head)))
+        if (unlikely(next == cs->ev_head))
                 err("event queue full");
         else {
                 event = cs->events + tail;
@@ -352,7 +333,7 @@ struct event_t *gigaset_add_event(struct cardstate *cs,
                 event->ptr = ptr;
                 event->arg = arg;
                 event->parameter = parameter;
-                atomic_set(&cs->ev_tail, next);
+                cs->ev_tail = next;
         }
 
         spin_unlock_irqrestore(&cs->ev_lock, flags);
@@ -391,14 +372,14 @@ static void gigaset_freebcs(struct bc_state *bcs)
 {
         int i;
 
-        dbg(DEBUG_INIT, "freeing bcs[%d]->hw", bcs->channel);
+        gig_dbg(DEBUG_INIT, "freeing bcs[%d]->hw", bcs->channel);
         if (!bcs->cs->ops->freebcshw(bcs)) {
-                dbg(DEBUG_INIT, "failed");
+                gig_dbg(DEBUG_INIT, "failed");
         }
 
-        dbg(DEBUG_INIT, "clearing bcs[%d]->at_state", bcs->channel);
+        gig_dbg(DEBUG_INIT, "clearing bcs[%d]->at_state", bcs->channel);
         clear_at_state(&bcs->at_state);
-        dbg(DEBUG_INIT, "freeing bcs[%d]->skb", bcs->channel);
+        gig_dbg(DEBUG_INIT, "freeing bcs[%d]->skb", bcs->channel);
 
         if (bcs->skb)
                 dev_kfree_skb(bcs->skb);
@@ -408,6 +389,52 @@ static void gigaset_freebcs(struct bc_state *bcs)
         }
 }
 
+static struct cardstate *alloc_cs(struct gigaset_driver *drv)
+{
+        unsigned long flags;
+        unsigned i;
+        static struct cardstate *ret = NULL;
+
+        spin_lock_irqsave(&drv->lock, flags);
+        for (i = 0; i < drv->minors; ++i) {
+                if (!(drv->flags[i] & VALID_MINOR)) {
+                        drv->flags[i] = VALID_MINOR;
+                        ret = drv->cs + i;
+                }
+                if (ret)
+                        break;
+        }
+        spin_unlock_irqrestore(&drv->lock, flags);
+        return ret;
+}
+
+static void free_cs(struct cardstate *cs)
+{
+        unsigned long flags;
+        struct gigaset_driver *drv = cs->driver;
+        spin_lock_irqsave(&drv->lock, flags);
+        drv->flags[cs->minor_index] = 0;
+        spin_unlock_irqrestore(&drv->lock, flags);
+}
+
+static void make_valid(struct cardstate *cs, unsigned mask)
+{
+        unsigned long flags;
+        struct gigaset_driver *drv = cs->driver;
+        spin_lock_irqsave(&drv->lock, flags);
+        drv->flags[cs->minor_index] |= mask;
+        spin_unlock_irqrestore(&drv->lock, flags);
+}
+
+static void make_invalid(struct cardstate *cs, unsigned mask)
+{
+        unsigned long flags;
+        struct gigaset_driver *drv = cs->driver;
+        spin_lock_irqsave(&drv->lock, flags);
+        drv->flags[cs->minor_index] &= ~mask;
+        spin_unlock_irqrestore(&drv->lock, flags);
+}
+
 void gigaset_freecs(struct cardstate *cs)
 {
         int i;
@@ -416,7 +443,7 @@ void gigaset_freecs(struct cardstate *cs)
         if (!cs)
                 return;
 
-        down(&cs->sem);
+        mutex_lock(&cs->mutex);
 
         if (!cs->bcs)
                 goto f_cs;
@@ -424,8 +451,9 @@ void gigaset_freecs(struct cardstate *cs)
                 goto f_bcs;
 
         spin_lock_irqsave(&cs->lock, flags);
-        atomic_set(&cs->running, 0);
-        spin_unlock_irqrestore(&cs->lock, flags); /* event handler and timer are not rescheduled below */
+        cs->running = 0;
+        spin_unlock_irqrestore(&cs->lock, flags); /* event handler and timer are
+                                                     not rescheduled below */
 
         tasklet_kill(&cs->event_tasklet);
         del_timer_sync(&cs->timer);
@@ -434,7 +462,7 @@ void gigaset_freecs(struct cardstate *cs)
         default:
                 gigaset_if_free(cs);
 
-                dbg(DEBUG_INIT, "clearing hw");
+                gig_dbg(DEBUG_INIT, "clearing hw");
                 cs->ops->freecshw(cs);
 
                 //FIXME cmdbuf
@@ -443,36 +471,36 @@ void gigaset_freecs(struct cardstate *cs)
         case 2: /* error in initcshw */
                 /* Deregister from LL */
                 make_invalid(cs, VALID_ID);
-                dbg(DEBUG_INIT, "clearing iif");
+                gig_dbg(DEBUG_INIT, "clearing iif");
                 gigaset_i4l_cmd(cs, ISDN_STAT_UNLOAD);
 
                 /* fall through */
         case 1: /* error when regestering to LL */
-                dbg(DEBUG_INIT, "clearing at_state");
+                gig_dbg(DEBUG_INIT, "clearing at_state");
                 clear_at_state(&cs->at_state);
                 dealloc_at_states(cs);
 
                 /* fall through */
         case 0: /* error in one call to initbcs */
                 for (i = 0; i < cs->channels; ++i) {
-                        dbg(DEBUG_INIT, "clearing bcs[%d]", i);
+                        gig_dbg(DEBUG_INIT, "clearing bcs[%d]", i);
                         gigaset_freebcs(cs->bcs + i);
                 }
 
                 clear_events(cs);
-                dbg(DEBUG_INIT, "freeing inbuf");
+                gig_dbg(DEBUG_INIT, "freeing inbuf");
                 kfree(cs->inbuf);
         }
-f_bcs:  dbg(DEBUG_INIT, "freeing bcs[]");
+f_bcs:  gig_dbg(DEBUG_INIT, "freeing bcs[]");
         kfree(cs->bcs);
-f_cs:   dbg(DEBUG_INIT, "freeing cs");
-        up(&cs->sem);
+f_cs:   gig_dbg(DEBUG_INIT, "freeing cs");
+        mutex_unlock(&cs->mutex);
         free_cs(cs);
 }
 EXPORT_SYMBOL_GPL(gigaset_freecs);
 
 void gigaset_at_init(struct at_state_t *at_state, struct bc_state *bcs,
-                     struct cardstate *cs, int cid)
+                     struct cardstate *cs, int cid)
 {
         int i;
 
@@ -482,8 +510,8 @@ void gigaset_at_init(struct at_state_t *at_state, struct bc_state *bcs,
         at_state->pending_commands = 0;
         at_state->timer_expires = 0;
         at_state->timer_active = 0;
-        atomic_set(&at_state->timer_index, 0);
-        atomic_set(&at_state->seq_index, 0);
+        at_state->timer_index = 0;
+        at_state->seq_index = 0;
         at_state->ConState = 0;
         for (i = 0; i < STR_NUM; ++i)
                 at_state->str_var[i] = NULL;
@@ -501,7 +529,7 @@ void gigaset_at_init(struct at_state_t *at_state, struct bc_state *bcs,
 
 
 static void gigaset_inbuf_init(struct inbuf_t *inbuf, struct bc_state *bcs,
-                               struct cardstate *cs, int inputstate)
+                               struct cardstate *cs, int inputstate)
 /* inbuf->read must be allocated before! */
 {
         atomic_set(&inbuf->head, 0);
@@ -512,9 +540,50 @@ static void gigaset_inbuf_init(struct inbuf_t *inbuf, struct bc_state *bcs,
         inbuf->inputstate = inputstate;
 }
 
+/* append received bytes to inbuf */
+int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src,
+                       unsigned numbytes)
+{
+        unsigned n, head, tail, bytesleft;
+
+        gig_dbg(DEBUG_INTR, "received %u bytes", numbytes);
+
+        if (!numbytes)
+                return 0;
+
+        bytesleft = numbytes;
+        tail = atomic_read(&inbuf->tail);
+        head = atomic_read(&inbuf->head);
+        gig_dbg(DEBUG_INTR, "buffer state: %u -> %u", head, tail);
+
+        while (bytesleft) {
+                if (head > tail)
+                        n = head - 1 - tail;
+                else if (head == 0)
+                        n = (RBUFSIZE-1) - tail;
+                else
+                        n = RBUFSIZE - tail;
+                if (!n) {
+                        dev_err(inbuf->cs->dev,
+                                "buffer overflow (%u bytes lost)", bytesleft);
+                        break;
+                }
+                if (n > bytesleft)
+                        n = bytesleft;
+                memcpy(inbuf->data + tail, src, n);
+                bytesleft -= n;
+                tail = (tail + n) % RBUFSIZE;
+                src += n;
+        }
+        gig_dbg(DEBUG_INTR, "setting tail to %u", tail);
+        atomic_set(&inbuf->tail, tail);
+        return numbytes != bytesleft;
+}
+EXPORT_SYMBOL_GPL(gigaset_fill_inbuf);
+
 /* Initialize the b-channel structure */
 static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
-                                        struct cardstate *cs, int channel)
+                                        struct cardstate *cs, int channel)
 {
         int i;
 
@@ -526,7 +595,7 @@ static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
         bcs->trans_down = 0;
         bcs->trans_up = 0;
 
-        dbg(DEBUG_INIT, "setting up bcs[%d]->at_state", channel);
+        gig_dbg(DEBUG_INIT, "setting up bcs[%d]->at_state", channel);
         gigaset_at_init(&bcs->at_state, bcs, cs, -1);
 
         bcs->rcvbytes = 0;
@@ -535,7 +604,7 @@ static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
         bcs->emptycount = 0;
 #endif
 
-        dbg(DEBUG_INIT, "allocating bcs[%d]->skb", channel);
+        gig_dbg(DEBUG_INIT, "allocating bcs[%d]->skb", channel);
         bcs->fcs = PPP_INITFCS;
         bcs->inputstate = 0;
         if (cs->ignoreframes) {
@@ -544,7 +613,7 @@ static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
         } else if ((bcs->skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)
                 skb_reserve(bcs->skb, HW_HDR_LEN);
         else {
-                warn("could not allocate skb");
+                dev_warn(cs->dev, "could not allocate skb\n");
                 bcs->inputstate |= INS_skip_frame;
         }
 
@@ -559,14 +628,13 @@ static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
         for (i = 0; i < AT_NUM; ++i)
                 bcs->commands[i] = NULL;
 
-        dbg(DEBUG_INIT, "  setting up bcs[%d]->hw", channel);
+        gig_dbg(DEBUG_INIT, "  setting up bcs[%d]->hw", channel);
         if (cs->ops->initbcshw(bcs))
                 return bcs;
 
-//error:
-        dbg(DEBUG_INIT, "  failed");
+        gig_dbg(DEBUG_INIT, "  failed");
 
-        dbg(DEBUG_INIT, "  freeing bcs[%d]->skb", channel);
+        gig_dbg(DEBUG_INIT, "  freeing bcs[%d]->skb", channel);
         if (bcs->skb)
                 dev_kfree_skb(bcs->skb);
 
@@ -578,9 +646,10 @@ static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
  * Calls hardware dependent gigaset_initcshw() function
  * Calls B channel initialization function gigaset_initbcs() for each B channel
  * parameters:
- *      drv             hardware driver the device belongs to
+ *      drv             hardware driver the device belongs to
  *      channels        number of B channels supported by device
- *      onechannel      !=0: B channel data and AT commands share one communication channel
+ *      onechannel      !=0: B channel data and AT commands share one
+ *                           communication channel
  *                      ==0: B channels have separate communication channels
  *      ignoreframes    number of frames to ignore after setting up B channel
  *      cidmode         !=0: start in CallID mode
@@ -593,17 +662,18 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
                                  int cidmode, const char *modulename)
 {
         struct cardstate *cs = NULL;
+        unsigned long flags;
         int i;
 
-        dbg(DEBUG_INIT, "allocating cs");
+        gig_dbg(DEBUG_INIT, "allocating cs");
         cs = alloc_cs(drv);
         if (!cs)
                 goto error;
-        dbg(DEBUG_INIT, "allocating bcs[0..%d]", channels - 1);
+        gig_dbg(DEBUG_INIT, "allocating bcs[0..%d]", channels - 1);
         cs->bcs = kmalloc(channels * sizeof(struct bc_state), GFP_KERNEL);
         if (!cs->bcs)
                 goto error;
-        dbg(DEBUG_INIT, "allocating inbuf");
+        gig_dbg(DEBUG_INIT, "allocating inbuf");
         cs->inbuf = kmalloc(sizeof(struct inbuf_t), GFP_KERNEL);
         if (!cs->inbuf)
                 goto error;
@@ -613,19 +683,23 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
         cs->onechannel = onechannel;
         cs->ignoreframes = ignoreframes;
         INIT_LIST_HEAD(&cs->temp_at_states);
-        atomic_set(&cs->running, 0);
+        cs->running = 0;
         init_timer(&cs->timer); /* clear next & prev */
         spin_lock_init(&cs->ev_lock);
-        atomic_set(&cs->ev_tail, 0);
-        atomic_set(&cs->ev_head, 0);
-        init_MUTEX_LOCKED(&cs->sem);
-        tasklet_init(&cs->event_tasklet, &gigaset_handle_event, (unsigned long) cs);
+        cs->ev_tail = 0;
+        cs->ev_head = 0;
+        mutex_init(&cs->mutex);
+        mutex_lock(&cs->mutex);
+
+        tasklet_init(&cs->event_tasklet, &gigaset_handle_event,
+                     (unsigned long) cs);
         atomic_set(&cs->commands_pending, 0);
         cs->cur_at_seq = 0;
         cs->gotfwver = -1;
         cs->open_count = 0;
+        cs->dev = NULL;
         cs->tty = NULL;
-        atomic_set(&cs->cidmode, cidmode != 0);
+        cs->cidmode = cidmode != 0;
 
         //if(onechannel) { //FIXME
                 cs->tabnocid = gigaset_tab_nocid_m10x;
@@ -642,50 +716,43 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
         atomic_set(&cs->mstate, MS_UNINITIALIZED);
 
         for (i = 0; i < channels; ++i) {
-                dbg(DEBUG_INIT, "setting up bcs[%d].read", i);
+                gig_dbg(DEBUG_INIT, "setting up bcs[%d].read", i);
                 if (!gigaset_initbcs(cs->bcs + i, cs, i))
                         goto error;
         }
 
         ++cs->cs_init;
 
-        dbg(DEBUG_INIT, "setting up at_state");
+        gig_dbg(DEBUG_INIT, "setting up at_state");
         spin_lock_init(&cs->lock);
         gigaset_at_init(&cs->at_state, NULL, cs, 0);
         cs->dle = 0;
         cs->cbytes = 0;
 
-        dbg(DEBUG_INIT, "setting up inbuf");
+        gig_dbg(DEBUG_INIT, "setting up inbuf");
         if (onechannel) {                       //FIXME distinction necessary?
                 gigaset_inbuf_init(cs->inbuf, cs->bcs, cs, INS_command);
         } else
                 gigaset_inbuf_init(cs->inbuf, NULL,    cs, INS_command);
 
-        atomic_set(&cs->connected, 0);
+        cs->connected = 0;
+        cs->isdn_up = 0;
 
-        dbg(DEBUG_INIT, "setting up cmdbuf");
+        gig_dbg(DEBUG_INIT, "setting up cmdbuf");
         cs->cmdbuf = cs->lastcmdbuf = NULL;
         spin_lock_init(&cs->cmdlock);
         cs->curlen = 0;
         cs->cmdbytes = 0;
 
-        /*
-         * Tell the ISDN4Linux subsystem (the LL) that
-         * a driver for a USB-Device is available !
-         * If this is done, "isdnctrl" is able to bind a device for this driver even
-         * if no physical usb-device is currently connected.
-         * But this device will just be accessable if a physical USB device is connected
-         * (via "gigaset_probe") .
-         */
-        dbg(DEBUG_INIT, "setting up iif");
+        gig_dbg(DEBUG_INIT, "setting up iif");
         if (!gigaset_register_to_LL(cs, modulename)) {
-                err("register_isdn=>error");
+                err("register_isdn failed");
                 goto error;
         }
 
         make_valid(cs, VALID_ID);
         ++cs->cs_init;
-        dbg(DEBUG_INIT, "setting up hw");
+        gig_dbg(DEBUG_INIT, "setting up hw");
         if (!cs->ops->initcshw(cs))
                 goto error;
 
@@ -693,27 +760,29 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
 
         gigaset_if_init(cs);
 
-        atomic_set(&cs->running, 1);
-        cs->timer.data = (unsigned long) cs;
-        cs->timer.function = timer_tick;
-        cs->timer.expires = jiffies + GIG_TICK;
+        spin_lock_irqsave(&cs->lock, flags);
+        cs->running = 1;
+        spin_unlock_irqrestore(&cs->lock, flags);
+        setup_timer(&cs->timer, timer_tick, (unsigned long) cs);
+        cs->timer.expires = jiffies + msecs_to_jiffies(GIG_TICK);
         /* FIXME: can jiffies increase too much until the timer is added?
          * Same problem(?) with mod_timer() in timer_tick(). */
         add_timer(&cs->timer);
 
-        dbg(DEBUG_INIT, "cs initialized!");
-        up(&cs->sem);
+        gig_dbg(DEBUG_INIT, "cs initialized");
+        mutex_unlock(&cs->mutex);
         return cs;
 
 error:  if (cs)
-                up(&cs->sem);
-        dbg(DEBUG_INIT, "failed");
+                mutex_unlock(&cs->mutex);
+        gig_dbg(DEBUG_INIT, "failed");
         gigaset_freecs(cs);
         return NULL;
 }
 EXPORT_SYMBOL_GPL(gigaset_initcs);
 
-/* ReInitialize the b-channel structure */ /* e.g. called on hangup, disconnect */
+/* ReInitialize the b-channel structure */
+/* e.g. called on hangup, disconnect */
 void gigaset_bcs_reinit(struct bc_state *bcs)
 {
         struct sk_buff *skb;
@@ -723,12 +792,12 @@ void gigaset_bcs_reinit(struct bc_state *bcs)
         while ((skb = skb_dequeue(&bcs->squeue)) != NULL)
                 dev_kfree_skb(skb);
 
-        spin_lock_irqsave(&cs->lock, flags); //FIXME
+        spin_lock_irqsave(&cs->lock, flags);
         clear_at_state(&bcs->at_state);
         bcs->at_state.ConState = 0;
         bcs->at_state.timer_active = 0;
         bcs->at_state.timer_expires = 0;
-        bcs->at_state.cid = -1;                     /* No CID defined */
+        bcs->at_state.cid = -1;                 /* No CID defined */
         spin_unlock_irqrestore(&cs->lock, flags);
 
         bcs->inputstate = 0;
@@ -803,11 +872,14 @@ static void cleanup_cs(struct cardstate *cs)
 
 int gigaset_start(struct cardstate *cs)
 {
-        if (down_interruptible(&cs->sem))
+        unsigned long flags;
+
+        if (mutex_lock_interruptible(&cs->mutex))
                 return 0;
-        //info("USB device for Gigaset 307x now attached to Dev %d", ucs->minor);
 
-        atomic_set(&cs->connected, 1);
+        spin_lock_irqsave(&cs->lock, flags);
+        cs->connected = 1;
+        spin_unlock_irqrestore(&cs->lock, flags);
 
         if (atomic_read(&cs->mstate) != MS_LOCKED) {
                 cs->ops->set_modem_ctrl(cs, 0, TIOCM_DTR|TIOCM_RTS);
@@ -826,23 +898,26 @@ int gigaset_start(struct cardstate *cs)
                 goto error;
         }
 
-        dbg(DEBUG_CMD, "scheduling START");
+        gig_dbg(DEBUG_CMD, "scheduling START");
         gigaset_schedule_event(cs);
 
         wait_event(cs->waitqueue, !cs->waiting);
 
-        up(&cs->sem);
+        /* set up device sysfs */
+        gigaset_init_dev_sysfs(cs);
+
+        mutex_unlock(&cs->mutex);
         return 1;
 
 error:
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
         return 0;
 }
 EXPORT_SYMBOL_GPL(gigaset_start);
 
 void gigaset_shutdown(struct cardstate *cs)
 {
-        down(&cs->sem);
+        mutex_lock(&cs->mutex);
 
         cs->waiting = 1;
 
@@ -851,11 +926,11 @@ void gigaset_shutdown(struct cardstate *cs)
                 goto exit;
         }
 
-        dbg(DEBUG_CMD, "scheduling SHUTDOWN");
+        gig_dbg(DEBUG_CMD, "scheduling SHUTDOWN");
         gigaset_schedule_event(cs);
 
         if (wait_event_interruptible(cs->waitqueue, !cs->waiting)) {
-                warn("aborted");
+                warn("%s: aborted", __func__);
                 //FIXME
         }
 
@@ -872,15 +947,13 @@ void gigaset_shutdown(struct cardstate *cs)
         cleanup_cs(cs);
 
 exit:
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
 }
 EXPORT_SYMBOL_GPL(gigaset_shutdown);
 
 void gigaset_stop(struct cardstate *cs)
 {
-        down(&cs->sem);
-
-        atomic_set(&cs->connected, 0);
+        mutex_lock(&cs->mutex);
 
         cs->waiting = 1;
 
@@ -889,21 +962,21 @@ void gigaset_stop(struct cardstate *cs)
                 goto exit;
         }
 
-        dbg(DEBUG_CMD, "scheduling STOP");
+        gig_dbg(DEBUG_CMD, "scheduling STOP");
         gigaset_schedule_event(cs);
 
         if (wait_event_interruptible(cs->waitqueue, !cs->waiting)) {
-                warn("aborted");
+                warn("%s: aborted", __func__);
                 //FIXME
         }
 
-        /* Tell the LL that the device is not available .. */
-        gigaset_i4l_cmd(cs, ISDN_STAT_STOP); // FIXME move to event layer?
+        /* clear device sysfs */
+        gigaset_free_dev_sysfs(cs);
 
         cleanup_cs(cs);
 
 exit:
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
 }
 EXPORT_SYMBOL_GPL(gigaset_stop);
 
@@ -947,31 +1020,25 @@ void gigaset_debugdrivers(void)
 
         spin_lock_irqsave(&driver_lock, flags);
         list_for_each_entry(drv, &drivers, list) {
-                dbg(DEBUG_DRIVER, "driver %p", drv);
+                gig_dbg(DEBUG_DRIVER, "driver %p", drv);
                 spin_lock(&drv->lock);
                 for (i = 0; i < drv->minors; ++i) {
-                        dbg(DEBUG_DRIVER, "  index %u", i);
-                        dbg(DEBUG_DRIVER, "    flags 0x%02x", drv->flags[i]);
+                        gig_dbg(DEBUG_DRIVER, "  index %u", i);
+                        gig_dbg(DEBUG_DRIVER, "    flags 0x%02x",
+                                drv->flags[i]);
                         cs = drv->cs + i;
-                        dbg(DEBUG_DRIVER, "    cardstate %p", cs);
-                        dbg(DEBUG_DRIVER, "    minor_index %u", cs->minor_index);
-                        dbg(DEBUG_DRIVER, "    driver %p", cs->driver);
-                        dbg(DEBUG_DRIVER, "    i4l id %d", cs->myid);
+                        gig_dbg(DEBUG_DRIVER, "    cardstate %p", cs);
+                        gig_dbg(DEBUG_DRIVER, "    minor_index %u",
+                                cs->minor_index);
+                        gig_dbg(DEBUG_DRIVER, "    driver %p", cs->driver);
+                        gig_dbg(DEBUG_DRIVER, "    i4l id %d", cs->myid);
                 }
                 spin_unlock(&drv->lock);
         }
         spin_unlock_irqrestore(&driver_lock, flags);
 }
-EXPORT_SYMBOL_GPL(gigaset_debugdrivers);
-
-struct cardstate *gigaset_get_cs_by_tty(struct tty_struct *tty)
-{
-        if (tty->index < 0 || tty->index >= tty->driver->num)
-                return NULL;
-        return gigaset_get_cs_by_minor(tty->index + tty->driver->minor_start);
-}
 
-struct cardstate *gigaset_get_cs_by_minor(unsigned minor)
+static struct cardstate *gigaset_get_cs_by_minor(unsigned minor)
 {
         unsigned long flags;
         static struct cardstate *ret = NULL;
@@ -994,6 +1061,13 @@ struct cardstate *gigaset_get_cs_by_minor(unsigned minor)
         return ret;
 }
 
+struct cardstate *gigaset_get_cs_by_tty(struct tty_struct *tty)
+{
+        if (tty->index < 0 || tty->index >= tty->driver->num)
+                return NULL;
+        return gigaset_get_cs_by_minor(tty->index + tty->driver->minor_start);
+}
+
 void gigaset_freedriver(struct gigaset_driver *drv)
 {
         unsigned long flags;
@@ -1014,20 +1088,20 @@ EXPORT_SYMBOL_GPL(gigaset_freedriver);
 /* gigaset_initdriver
  * Allocate and initialize gigaset_driver structure. Initialize interface.
  * parameters:
- *      minor           First minor number
- *      minors          Number of minors this driver can handle
- *      procname        Name of the driver (e.g. for /proc/tty/drivers, path in /proc/driver)
- *      devname         Name of the device files (prefix without minor number)
- *      devfsname       Devfs name of the device files without %d
+ *      minor           First minor number
+ *      minors          Number of minors this driver can handle
+ *      procname        Name of the driver
+ *      devname         Name of the device files (prefix without minor number)
+ *      devfsname       Devfs name of the device files without %d
  * return value:
- *      Pointer to the gigaset_driver structure on success, NULL on failure.
+ *      Pointer to the gigaset_driver structure on success, NULL on failure.
  */
 struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
-                                          const char *procname,
-                                          const char *devname,
-                                          const char *devfsname,
-                                          const struct gigaset_ops *ops,
-                                          struct module *owner)
+                                          const char *procname,
+                                          const char *devname,
+                                          const char *devfsname,
+                                          const struct gigaset_ops *ops,
+                                          struct module *owner)
 {
         struct gigaset_driver *drv;
         unsigned long flags;
@@ -1036,8 +1110,9 @@ struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
         drv = kmalloc(sizeof *drv, GFP_KERNEL);
         if (!drv)
                 return NULL;
+
         if (!try_module_get(owner))
-                return NULL;
+                goto out1;
 
         drv->cs = NULL;
         drv->have_tty = 0;
@@ -1051,10 +1126,11 @@ struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
 
         drv->cs = kmalloc(minors * sizeof *drv->cs, GFP_KERNEL);
         if (!drv->cs)
-                goto out1;
+                goto out2;
+
         drv->flags = kmalloc(minors * sizeof *drv->flags, GFP_KERNEL);
         if (!drv->flags)
-                goto out2;
+                goto out3;
 
         for (i = 0; i < minors; ++i) {
                 drv->flags[i] = 0;
@@ -1071,61 +1147,16 @@ struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
 
         return drv;
 
-out2:
+out3:
         kfree(drv->cs);
+out2:
+        module_put(owner);
 out1:
         kfree(drv);
-        module_put(owner);
         return NULL;
 }
 EXPORT_SYMBOL_GPL(gigaset_initdriver);
 
-static struct cardstate *alloc_cs(struct gigaset_driver *drv)
-{
-        unsigned long flags;
-        unsigned i;
-        static struct cardstate *ret = NULL;
-
-        spin_lock_irqsave(&drv->lock, flags);
-        for (i = 0; i < drv->minors; ++i) {
-                if (!(drv->flags[i] & VALID_MINOR)) {
-                        drv->flags[i] = VALID_MINOR;
-                        ret = drv->cs + i;
-                }
-                if (ret)
-                        break;
-        }
-        spin_unlock_irqrestore(&drv->lock, flags);
-        return ret;
-}
-
-static void free_cs(struct cardstate *cs)
-{
-        unsigned long flags;
-        struct gigaset_driver *drv = cs->driver;
-        spin_lock_irqsave(&drv->lock, flags);
-        drv->flags[cs->minor_index] = 0;
-        spin_unlock_irqrestore(&drv->lock, flags);
-}
-
-static void make_valid(struct cardstate *cs, unsigned mask)
-{
-        unsigned long flags;
-        struct gigaset_driver *drv = cs->driver;
-        spin_lock_irqsave(&drv->lock, flags);
-        drv->flags[cs->minor_index] |= mask;
-        spin_unlock_irqrestore(&drv->lock, flags);
-}
-
-static void make_invalid(struct cardstate *cs, unsigned mask)
-{
-        unsigned long flags;
-        struct gigaset_driver *drv = cs->driver;
-        spin_lock_irqsave(&drv->lock, flags);
-        drv->flags[cs->minor_index] &= ~mask;
-        spin_unlock_irqrestore(&drv->lock, flags);
-}
-
 /* For drivers without fixed assignment device<->cardstate (usb) */
 struct cardstate *gigaset_getunassignedcs(struct gigaset_driver *drv)
 {
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c
index fdcb80bb21c7..1ba3424a286b 100644
--- a/drivers/isdn/gigaset/ev-layer.c
+++ b/drivers/isdn/gigaset/ev-layer.c
@@ -1,7 +1,7 @@
 /*
  * Stuff used by all variants of the driver
  *
- * Copyright (c) 2001 by Stefan Eilers <Eilers.Stefan@epost.de>,
+ * Copyright (c) 2001 by Stefan Eilers,
  *                       Hansjoerg Lipp <hjlipp@web.de>,
  *                       Tilman Schmidt <tilman@imap.cc>.
  *
@@ -11,82 +11,78 @@
  *      published by the Free Software Foundation; either version 2 of
  *      the License, or (at your option) any later version.
  * =====================================================================
- * ToDo: ...
- * =====================================================================
- * Version: $Id: ev-layer.c,v 1.4.2.18 2006/02/04 18:28:16 hjlipp Exp $
- * =====================================================================
  */
 
 #include "gigaset.h"
 
 /* ========================================================== */
 /* bit masks for pending commands */
-#define PC_INIT       0x004
-#define PC_DLE0       0x008
-#define PC_DLE1       0x010
-#define PC_CID        0x080
-#define PC_NOCID      0x100
-#define PC_HUP        0x002
-#define PC_DIAL       0x001
-#define PC_ACCEPT     0x040
-#define PC_SHUTDOWN   0x020
-#define PC_CIDMODE    0x200
-#define PC_UMMODE     0x400
+#define PC_DIAL         0x001
+#define PC_HUP          0x002
+#define PC_INIT         0x004
+#define PC_DLE0         0x008
+#define PC_DLE1         0x010
+#define PC_SHUTDOWN     0x020
+#define PC_ACCEPT       0x040
+#define PC_CID          0x080
+#define PC_NOCID        0x100
+#define PC_CIDMODE      0x200
+#define PC_UMMODE       0x400
 
 /* types of modem responses */
-#define RT_NOTHING 0
-#define RT_ZSAU    1
-#define RT_RING    2
-#define RT_NUMBER  3
-#define RT_STRING  4
-#define RT_HEX     5
-#define RT_ZCAU    6
+#define RT_NOTHING      0
+#define RT_ZSAU         1
+#define RT_RING         2
+#define RT_NUMBER       3
+#define RT_STRING       4
+#define RT_HEX          5
+#define RT_ZCAU         6
 
 /* Possible ASCII responses */
-#define RSP_OK           0
-//#define RSP_BUSY       1
-//#define RSP_CONNECT    2
-#define RSP_ZGCI         3
-#define RSP_RING         4
-#define RSP_ZAOC         5
-#define RSP_ZCSTR        6
-#define RSP_ZCFGT        7
-#define RSP_ZCFG         8
-#define RSP_ZCCR         9
-#define RSP_EMPTY        10
-#define RSP_ZLOG         11
-#define RSP_ZCAU         12
-#define RSP_ZMWI         13
-#define RSP_ZABINFO      14
-#define RSP_ZSMLSTCHG    15
-#define RSP_VAR          100
-#define RSP_ZSAU         (RSP_VAR + VAR_ZSAU)
-#define RSP_ZDLE         (RSP_VAR + VAR_ZDLE)
-#define RSP_ZVLS         (RSP_VAR + VAR_ZVLS)
-#define RSP_ZCTP         (RSP_VAR + VAR_ZCTP)
-#define RSP_STR          (RSP_VAR + VAR_NUM)
-#define RSP_NMBR         (RSP_STR + STR_NMBR)
-#define RSP_ZCPN         (RSP_STR + STR_ZCPN)
-#define RSP_ZCON         (RSP_STR + STR_ZCON)
-#define RSP_ZBC          (RSP_STR + STR_ZBC)
-#define RSP_ZHLC         (RSP_STR + STR_ZHLC)
-#define RSP_ERROR       -1       /* ERROR              */
-#define RSP_WRONG_CID   -2       /* unknown cid in cmd */
-//#define RSP_EMPTY     -3
-#define RSP_UNKNOWN     -4       /* unknown response   */
-#define RSP_FAIL        -5       /* internal error     */
-#define RSP_INVAL       -6       /* invalid response   */
-
-#define RSP_NONE        -19
-#define RSP_STRING      -20
-#define RSP_NULL        -21
-//#define RSP_RETRYFAIL -22
-//#define RSP_RETRY     -23
-//#define RSP_SKIP      -24
-#define RSP_INIT        -27
-#define RSP_ANY         -26
-#define RSP_LAST        -28
-#define RSP_NODEV       -9
+#define RSP_OK          0
+//#define RSP_BUSY      1
+//#define RSP_CONNECT   2
+#define RSP_ZGCI        3
+#define RSP_RING        4
+#define RSP_ZAOC        5
+#define RSP_ZCSTR       6
+#define RSP_ZCFGT       7
+#define RSP_ZCFG        8
+#define RSP_ZCCR        9
+#define RSP_EMPTY       10
+#define RSP_ZLOG        11
+#define RSP_ZCAU        12
+#define RSP_ZMWI        13
+#define RSP_ZABINFO     14
+#define RSP_ZSMLSTCHG   15
+#define RSP_VAR         100
+#define RSP_ZSAU        (RSP_VAR + VAR_ZSAU)
+#define RSP_ZDLE        (RSP_VAR + VAR_ZDLE)
+#define RSP_ZVLS        (RSP_VAR + VAR_ZVLS)
+#define RSP_ZCTP        (RSP_VAR + VAR_ZCTP)
+#define RSP_STR         (RSP_VAR + VAR_NUM)
+#define RSP_NMBR        (RSP_STR + STR_NMBR)
+#define RSP_ZCPN        (RSP_STR + STR_ZCPN)
+#define RSP_ZCON        (RSP_STR + STR_ZCON)
+#define RSP_ZBC         (RSP_STR + STR_ZBC)
+#define RSP_ZHLC        (RSP_STR + STR_ZHLC)
+#define RSP_ERROR       -1      /* ERROR              */
+#define RSP_WRONG_CID   -2      /* unknown cid in cmd */
+//#define RSP_EMPTY     -3
+#define RSP_UNKNOWN     -4      /* unknown response   */
+#define RSP_FAIL        -5      /* internal error     */
+#define RSP_INVAL       -6      /* invalid response   */
+
+#define RSP_NONE        -19
+#define RSP_STRING      -20
+#define RSP_NULL        -21
+//#define RSP_RETRYFAIL -22
+//#define RSP_RETRY     -23
+//#define RSP_SKIP      -24
+#define RSP_INIT        -27
+#define RSP_ANY         -26
+#define RSP_LAST        -28
+#define RSP_NODEV       -9
 
 /* actions for process_response */
 #define ACT_NOTHING             0
@@ -112,7 +108,7 @@
 #define ACT_DISCONNECT          20
 #define ACT_CONNECT             21
 #define ACT_REMOTEREJECT        22
-#define ACT_CONNTIMEOUT         23
+#define ACT_CONNTIMEOUT         23
 #define ACT_REMOTEHUP           24
 #define ACT_ABORTHUP            25
 #define ACT_ICALL               26
@@ -127,40 +123,40 @@
 #define ACT_ERROR               35
 #define ACT_ABORTCID            36
 #define ACT_ZCAU                37
-#define ACT_NOTIFY_BC_DOWN      38
-#define ACT_NOTIFY_BC_UP        39
-#define ACT_DIAL                40
-#define ACT_ACCEPT              41
-#define ACT_PROTO_L2            42
-#define ACT_HUP                 43
-#define ACT_IF_LOCK             44
-#define ACT_START               45
-#define ACT_STOP                46
-#define ACT_FAKEDLE0            47
-#define ACT_FAKEHUP             48
-#define ACT_FAKESDOWN           49
-#define ACT_SHUTDOWN            50
-#define ACT_PROC_CIDMODE        51
-#define ACT_UMODESET            52
-#define ACT_FAILUMODE           53
-#define ACT_CMODESET            54
-#define ACT_FAILCMODE           55
-#define ACT_IF_VER              56
+#define ACT_NOTIFY_BC_DOWN      38
+#define ACT_NOTIFY_BC_UP        39
+#define ACT_DIAL                40
+#define ACT_ACCEPT              41
+#define ACT_PROTO_L2            42
+#define ACT_HUP                 43
+#define ACT_IF_LOCK             44
+#define ACT_START               45
+#define ACT_STOP                46
+#define ACT_FAKEDLE0            47
+#define ACT_FAKEHUP             48
+#define ACT_FAKESDOWN           49
+#define ACT_SHUTDOWN            50
+#define ACT_PROC_CIDMODE        51
+#define ACT_UMODESET            52
+#define ACT_FAILUMODE           53
+#define ACT_CMODESET            54
+#define ACT_FAILCMODE           55
+#define ACT_IF_VER              56
 #define ACT_CMD                 100
 
 /* at command sequences */
-#define SEQ_NONE      0
-#define SEQ_INIT      100
-#define SEQ_DLE0      200
-#define SEQ_DLE1      250
-#define SEQ_CID       300
-#define SEQ_NOCID     350
-#define SEQ_HUP       400
-#define SEQ_DIAL      600
-#define SEQ_ACCEPT    720
-#define SEQ_SHUTDOWN  500
-#define SEQ_CIDMODE   10
-#define SEQ_UMMODE    11
+#define SEQ_NONE        0
+#define SEQ_INIT        100
+#define SEQ_DLE0        200
+#define SEQ_DLE1        250
+#define SEQ_CID         300
+#define SEQ_NOCID       350
+#define SEQ_HUP         400
+#define SEQ_DIAL        600
+#define SEQ_ACCEPT      720
+#define SEQ_SHUTDOWN    500
+#define SEQ_CIDMODE     10
+#define SEQ_UMMODE      11
 
 
 // 100: init, 200: dle0, 250:dle1, 300: get cid (dial), 350: "hup" (no cid), 400: hup, 500: reset, 600: dial, 700: ring
@@ -175,7 +171,7 @@ struct reply_t gigaset_tab_nocid_m10x[]= /* with dle mode */
         //                                                  {ACT_TIMEOUT}},
 
         {RSP_INIT,     -1, -1,SEQ_INIT,           100, INIT_TIMEOUT,
-                                                          {ACT_TIMEOUT}},                /* wait until device is ready */
+                                                          {ACT_TIMEOUT}},                /* wait until device is ready */
 
         {EV_TIMEOUT,  100,100, -1,                101, 3, {0},             "Z\r"},       /* device in transparent mode? try to initialize it. */
         {RSP_OK,      101,103, -1,                120, 5, {ACT_GETSTRING}, "+GMR\r"},    /* get version */
@@ -190,8 +186,8 @@ struct reply_t gigaset_tab_nocid_m10x[]= /* with dle mode */
         {RSP_ERROR,   108,108, -1,                  0, 0, {ACT_FAILINIT}},
 
         {EV_TIMEOUT,  108,108, -1,                105, 2, {ACT_SETDLE0,
-                                                           ACT_HUPMODEM,
-                                                           ACT_TIMEOUT}},                /* still timeout => connection in unimodem mode? */
+                                                           ACT_HUPMODEM,
+                                                           ACT_TIMEOUT}},                /* still timeout => connection in unimodem mode? */
         {EV_TIMEOUT,  105,105, -1,                103, 5, {0},             "Z\r"},
 
         {RSP_ERROR,   102,102, -1,                107, 5, {0},             "^GETPRE\r"}, /* ERROR on ATZ => maybe in config mode? */
@@ -393,7 +389,7 @@ struct reply_t gigaset_tab_cid_m10x[] = /* for M10x */
 
 
 #if 0
-static struct reply_t tab_nocid[]= /* no dle mode */ //FIXME aenderungen uebernehmen
+static struct reply_t tab_nocid[]= /* no dle mode */ //FIXME
 {
         /* resp_code, min_ConState, max_ConState, parameter, new_ConState, timeout, action, command */
 
@@ -401,7 +397,7 @@ static struct reply_t tab_nocid[]= /* no dle mode */ //FIXME aenderungen ueberne
         {RSP_LAST,0,0,0,0,0,0}
 };
 
-static struct reply_t tab_cid[] = /* no dle mode */ //FIXME aenderungen uebernehmen
+static struct reply_t tab_cid[] = /* no dle mode */ //FIXME
 {
         /* resp_code, min_ConState, max_ConState, parameter, new_ConState, timeout, action, command */
 
@@ -412,30 +408,30 @@ static struct reply_t tab_cid[] = /* no dle mode */ //FIXME aenderungen ueberneh
 
 static struct resp_type_t resp_type[]=
 {
-        /*{"",          RSP_EMPTY,  RT_NOTHING},*/
-        {"OK",        RSP_OK,     RT_NOTHING},
-        {"ERROR",     RSP_ERROR,  RT_NOTHING},
-        {"ZSAU",      RSP_ZSAU,   RT_ZSAU},
-        {"ZCAU",      RSP_ZCAU,   RT_ZCAU},
-        {"RING",      RSP_RING,   RT_RING},
-        {"ZGCI",      RSP_ZGCI,   RT_NUMBER},
-        {"ZVLS",      RSP_ZVLS,   RT_NUMBER},
-        {"ZCTP",      RSP_ZCTP,   RT_NUMBER},
-        {"ZDLE",      RSP_ZDLE,   RT_NUMBER},
-        {"ZCFGT",     RSP_ZCFGT,  RT_NUMBER},
-        {"ZCCR",      RSP_ZCCR,   RT_NUMBER},
-        {"ZMWI",      RSP_ZMWI,   RT_NUMBER},
-        {"ZHLC",      RSP_ZHLC,   RT_STRING},
-        {"ZBC",       RSP_ZBC,    RT_STRING},
-        {"NMBR",      RSP_NMBR,   RT_STRING},
-        {"ZCPN",      RSP_ZCPN,   RT_STRING},
-        {"ZCON",      RSP_ZCON,   RT_STRING},
-        {"ZAOC",      RSP_ZAOC,   RT_STRING},
-        {"ZCSTR",     RSP_ZCSTR,  RT_STRING},
-        {"ZCFG",      RSP_ZCFG,   RT_HEX},
-        {"ZLOG",      RSP_ZLOG,   RT_NOTHING},
-        {"ZABINFO",   RSP_ZABINFO, RT_NOTHING},
-        {"ZSMLSTCHG", RSP_ZSMLSTCHG, RT_NOTHING},
+        /*{"",          RSP_EMPTY,      RT_NOTHING},*/
+        {"OK",          RSP_OK,         RT_NOTHING},
+        {"ERROR",       RSP_ERROR,      RT_NOTHING},
+        {"ZSAU",        RSP_ZSAU,       RT_ZSAU},
+        {"ZCAU",        RSP_ZCAU,       RT_ZCAU},
+        {"RING",        RSP_RING,       RT_RING},
+        {"ZGCI",        RSP_ZGCI,       RT_NUMBER},
+        {"ZVLS",        RSP_ZVLS,       RT_NUMBER},
+        {"ZCTP",        RSP_ZCTP,       RT_NUMBER},
+        {"ZDLE",        RSP_ZDLE,       RT_NUMBER},
+        {"ZCFGT",       RSP_ZCFGT,      RT_NUMBER},
+        {"ZCCR",        RSP_ZCCR,       RT_NUMBER},
+        {"ZMWI",        RSP_ZMWI,       RT_NUMBER},
+        {"ZHLC",        RSP_ZHLC,       RT_STRING},
+        {"ZBC",         RSP_ZBC,        RT_STRING},
+        {"NMBR",        RSP_NMBR,       RT_STRING},
+        {"ZCPN",        RSP_ZCPN,       RT_STRING},
+        {"ZCON",        RSP_ZCON,       RT_STRING},
+        {"ZAOC",        RSP_ZAOC,       RT_STRING},
+        {"ZCSTR",       RSP_ZCSTR,      RT_STRING},
+        {"ZCFG",        RSP_ZCFG,       RT_HEX},
+        {"ZLOG",        RSP_ZLOG,       RT_NOTHING},
+        {"ZABINFO",     RSP_ZABINFO,    RT_NOTHING},
+        {"ZSMLSTCHG",   RSP_ZSMLSTCHG,  RT_NOTHING},
         {NULL,0,0}
 };
 
@@ -446,9 +442,7 @@ static int isdn_getnum(char *p)
 {
         int v = -1;
 
-        IFNULLRETVAL(p, -1);
-
-        dbg(DEBUG_TRANSCMD, "string: %s", p);
+        gig_dbg(DEBUG_TRANSCMD, "string: %s", p);
 
         while (*p >= '0' && *p <= '9')
                 v = ((v < 0) ? 0 : (v * 10)) + (int) ((*p++) - '0');
@@ -465,9 +459,7 @@ static int isdn_gethex(char *p)
         int v = 0;
         int c;
 
-        IFNULLRETVAL(p, -1);
-
-        dbg(DEBUG_TRANSCMD, "string: %s", p);
+        gig_dbg(DEBUG_TRANSCMD, "string: %s", p);
 
         if (!*p)
                 return -1;
@@ -490,14 +482,6 @@ static int isdn_gethex(char *p)
         return v;
 }
 
-static inline void new_index(atomic_t *index, int max)
-{
-        if (atomic_read(index) == max)  //FIXME race?
-                atomic_set(index, 0);
-        else
-                atomic_inc(index);
-}
-
 /* retrieve CID from parsed response
  * returns 0 if no CID, -1 if invalid CID, or CID value 1..65535
  */
@@ -536,16 +520,14 @@ void gigaset_handle_modem_response(struct cardstate *cs)
         int cid;
         int rawstring;
 
-        IFNULLRET(cs);
-
         len = cs->cbytes;
         if (!len) {
                 /* ignore additional LFs/CRs (M10x config mode or cx100) */
-                dbg(DEBUG_MCMD, "skipped EOL [%02X]", cs->respdata[len]);
+                gig_dbg(DEBUG_MCMD, "skipped EOL [%02X]", cs->respdata[len]);
                 return;
         }
         cs->respdata[len] = 0;
-        dbg(DEBUG_TRANSCMD, "raw string: '%s'", cs->respdata);
+        gig_dbg(DEBUG_TRANSCMD, "raw string: '%s'", cs->respdata);
         argv[0] = cs->respdata;
         params = 1;
         if (cs->at_state.getstring) {
@@ -561,7 +543,8 @@ void gigaset_handle_modem_response(struct cardstate *cs)
                         case ',':
                         case '=':
                                 if (params > MAX_REC_PARAMS) {
-                                        warn("too many parameters in response");
+                                        dev_warn(cs->dev,
+                                           "too many parameters in response\n");
                                         /* need last parameter (might be CID) */
                                         params--;
                                 }
@@ -572,33 +555,33 @@ void gigaset_handle_modem_response(struct cardstate *cs)
                 cid = params > 1 ? cid_of_response(argv[params-1]) : 0;
                 if (cid < 0) {
                         gigaset_add_event(cs, &cs->at_state, RSP_INVAL,
-                                          NULL, 0, NULL);
+                                          NULL, 0, NULL);
                         return;
                 }
 
                 for (j = 1; j < params; ++j)
                         argv[j][-1] = 0;
 
-                dbg(DEBUG_TRANSCMD, "CMD received: %s", argv[0]);
+                gig_dbg(DEBUG_TRANSCMD, "CMD received: %s", argv[0]);
                 if (cid) {
                         --params;
-                        dbg(DEBUG_TRANSCMD, "CID: %s", argv[params]);
+                        gig_dbg(DEBUG_TRANSCMD, "CID: %s", argv[params]);
                 }
-                dbg(DEBUG_TRANSCMD, "available params: %d", params - 1);
+                gig_dbg(DEBUG_TRANSCMD, "available params: %d", params - 1);
                 for (j = 1; j < params; j++)
-                        dbg(DEBUG_TRANSCMD, "param %d: %s", j, argv[j]);
+                        gig_dbg(DEBUG_TRANSCMD, "param %d: %s", j, argv[j]);
         }
 
         spin_lock_irqsave(&cs->ev_lock, flags);
-        head = atomic_read(&cs->ev_head);
-        tail = atomic_read(&cs->ev_tail);
+        head = cs->ev_head;
+        tail = cs->ev_tail;
 
         abort = 1;
         curarg = 0;
         while (curarg < params) {
                 next = (tail + 1) % MAX_EVENTS;
                 if (unlikely(next == head)) {
-                        err("event queue full");
+                        dev_err(cs->dev, "event queue full\n");
                         break;
                 }
 
@@ -619,8 +602,9 @@ void gigaset_handle_modem_response(struct cardstate *cs)
 
                         if (!rt->response) {
                                 event->type = RSP_UNKNOWN;
-                                warn("unknown modem response: %s",
-                                     argv[curarg]);
+                                dev_warn(cs->dev,
+                                         "unknown modem response: %s\n",
+                                         argv[curarg]);
                                 break;
                         }
 
@@ -636,7 +620,8 @@ void gigaset_handle_modem_response(struct cardstate *cs)
                         break;
                 case RT_RING:
                         if (!cid) {
-                                err("received RING without CID!");
+                                dev_err(cs->dev,
+                                        "received RING without CID!\n");
                                 event->type = RSP_INVAL;
                                 abort = 1;
                         } else {
@@ -664,27 +649,25 @@ void gigaset_handle_modem_response(struct cardstate *cs)
                                 event->parameter = ZSAU_DISCONNECT_REQ;
                         else {
                                 event->parameter = ZSAU_UNKNOWN;
-                                warn("%s: unknown parameter %s after ZSAU",
-                                     __func__, argv[curarg]);
+                                dev_warn(cs->dev,
+                                        "%s: unknown parameter %s after ZSAU\n",
+                                         __func__, argv[curarg]);
                         }
                         ++curarg;
                         break;
                 case RT_STRING:
                         if (curarg < params) {
-                                len = strlen(argv[curarg]) + 1;
-                                event->ptr = kmalloc(len, GFP_ATOMIC);
-                                if (event->ptr)
-                                        memcpy(event->ptr, argv[curarg], len);
-                                else
-                                        err("no memory for string!");
+                                event->ptr = kstrdup(argv[curarg], GFP_ATOMIC);
+                                if (!event->ptr)
+                                        dev_err(cs->dev, "out of memory\n");
                                 ++curarg;
                         }
 #ifdef CONFIG_GIGASET_DEBUG
                         if (!event->ptr)
-                                dbg(DEBUG_CMD, "string==NULL");
+                                gig_dbg(DEBUG_CMD, "string==NULL");
                         else
-                                dbg(DEBUG_CMD,
-                                    "string==%s", (char *) event->ptr);
+                                gig_dbg(DEBUG_CMD, "string==%s",
+                                        (char *) event->ptr);
 #endif
                         break;
                 case RT_ZCAU:
@@ -694,7 +677,7 @@ void gigaset_handle_modem_response(struct cardstate *cs)
                                 j = isdn_gethex(argv[curarg + 1]);
                                 if (i >= 0 && i < 256 && j >= 0 && j < 256)
                                         event->parameter = (unsigned) i << 8
-                                                           | j;
+                                                           | j;
                                 curarg += 2;
                         } else
                                 curarg = params - 1;
@@ -712,7 +695,7 @@ void gigaset_handle_modem_response(struct cardstate *cs)
                         } else
                                 event->parameter = -1;
 #ifdef CONFIG_GIGASET_DEBUG
-                        dbg(DEBUG_CMD, "parameter==%d", event->parameter);
+                        gig_dbg(DEBUG_CMD, "parameter==%d", event->parameter);
 #endif
                         break;
                 }
@@ -724,12 +707,13 @@ void gigaset_handle_modem_response(struct cardstate *cs)
                         break;
         }
 
-        atomic_set(&cs->ev_tail, tail);
+        cs->ev_tail = tail;
         spin_unlock_irqrestore(&cs->ev_lock, flags);
 
         if (curarg != params)
-                dbg(DEBUG_ANY, "invalid number of processed parameters: %d/%d",
-                    curarg, params);
+                gig_dbg(DEBUG_ANY,
+                        "invalid number of processed parameters: %d/%d",
+                        curarg, params);
 }
 EXPORT_SYMBOL_GPL(gigaset_handle_modem_response);
 
@@ -739,23 +723,19 @@ EXPORT_SYMBOL_GPL(gigaset_handle_modem_response);
 static void disconnect(struct at_state_t **at_state_p)
 {
         unsigned long flags;
-        struct bc_state *bcs;
-        struct cardstate *cs;
+        struct bc_state *bcs = (*at_state_p)->bcs;
+        struct cardstate *cs = (*at_state_p)->cs;
 
-        IFNULLRET(at_state_p);
-        IFNULLRET(*at_state_p);
-        bcs = (*at_state_p)->bcs;
-        cs = (*at_state_p)->cs;
-        IFNULLRET(cs);
-
-        new_index(&(*at_state_p)->seq_index, MAX_SEQ_INDEX);
+        spin_lock_irqsave(&cs->lock, flags);
+        ++(*at_state_p)->seq_index;
 
         /* revert to selected idle mode */
-        if (!atomic_read(&cs->cidmode)) {
+        if (!cs->cidmode) {
                 cs->at_state.pending_commands |= PC_UMMODE;
                 atomic_set(&cs->commands_pending, 1); //FIXME
-                dbg(DEBUG_CMD, "Scheduling PC_UMMODE");
+                gig_dbg(DEBUG_CMD, "Scheduling PC_UMMODE");
         }
+        spin_unlock_irqrestore(&cs->lock, flags);
 
         if (bcs) {
                 /* B channel assigned: invoke hardware specific handler */
@@ -777,7 +757,7 @@ static void disconnect(struct at_state_t **at_state_p)
  * The structure should be freed by calling disconnect() after use.
  */
 static inline struct at_state_t *get_free_channel(struct cardstate *cs,
-                                                  int cid)
+                                                  int cid)
 /* cids: >0: siemens-cid
           0: without cid
          -1: no cid assigned yet
@@ -826,7 +806,7 @@ static void init_failed(struct cardstate *cs, int mode)
 static void schedule_init(struct cardstate *cs, int state)
 {
         if (cs->at_state.pending_commands & PC_INIT) {
-                dbg(DEBUG_CMD, "not scheduling PC_INIT again");
+                gig_dbg(DEBUG_CMD, "not scheduling PC_INIT again");
                 return;
         }
         atomic_set(&cs->mstate, state);
@@ -834,52 +814,56 @@ static void schedule_init(struct cardstate *cs, int state)
         gigaset_block_channels(cs);
         cs->at_state.pending_commands |= PC_INIT;
         atomic_set(&cs->commands_pending, 1);
-        dbg(DEBUG_CMD, "Scheduling PC_INIT");
+        gig_dbg(DEBUG_CMD, "Scheduling PC_INIT");
 }
 
-/* Add "AT" to a command, add the cid, dle encode it, send the result to the hardware. */
+/* Add "AT" to a command, add the cid, dle encode it, send the result to the
+   hardware. */
 static void send_command(struct cardstate *cs, const char *cmd, int cid,
-                         int dle, gfp_t kmallocflags)
+                         int dle, gfp_t kmallocflags)
 {
         size_t cmdlen, buflen;
         char *cmdpos, *cmdbuf, *cmdtail;
 
         cmdlen = strlen(cmd);
         buflen = 11 + cmdlen;
+        if (unlikely(buflen <= cmdlen)) {
+                dev_err(cs->dev, "integer overflow in buflen\n");
+                return;
+        }
 
-        if (likely(buflen > cmdlen)) {
-                cmdbuf = kmalloc(buflen, kmallocflags);
-                if (likely(cmdbuf != NULL)) {
-                        cmdpos = cmdbuf + 9;
-                        cmdtail = cmdpos + cmdlen;
-                        memcpy(cmdpos, cmd, cmdlen);
-
-                        if (cid > 0 && cid <= 65535) {
-                                do {
-                                        *--cmdpos = '0' + cid % 10;
-                                        cid /= 10;
-                                        ++cmdlen;
-                                } while (cid);
-                        }
+        cmdbuf = kmalloc(buflen, kmallocflags);
+        if (unlikely(!cmdbuf)) {
+                dev_err(cs->dev, "out of memory\n");
+                return;
+        }
 
-                        cmdlen += 2;
-                        *--cmdpos = 'T';
-                        *--cmdpos = 'A';
+        cmdpos = cmdbuf + 9;
+        cmdtail = cmdpos + cmdlen;
+        memcpy(cmdpos, cmd, cmdlen);
 
-                        if (dle) {
-                                cmdlen += 4;
-                                *--cmdpos = '(';
-                                *--cmdpos = 0x10;
-                                *cmdtail++ = 0x10;
-                                *cmdtail++ = ')';
-                        }
+        if (cid > 0 && cid <= 65535) {
+                do {
+                        *--cmdpos = '0' + cid % 10;
+                        cid /= 10;
+                        ++cmdlen;
+                } while (cid);
+        }
 
-                        cs->ops->write_cmd(cs, cmdpos, cmdlen, NULL);
-                        kfree(cmdbuf);
-                } else
-                        err("no memory for command buffer");
-        } else
-                err("overflow in buflen");
+        cmdlen += 2;
+        *--cmdpos = 'T';
+        *--cmdpos = 'A';
+
+        if (dle) {
+                cmdlen += 4;
+                *--cmdpos = '(';
+                *--cmdpos = 0x10;
+                *cmdtail++ = 0x10;
+                *cmdtail++ = ')';
+        }
+
+        cs->ops->write_cmd(cs, cmdpos, cmdlen, NULL);
+        kfree(cmdbuf);
 }
 
 static struct at_state_t *at_state_from_cid(struct cardstate *cs, int cid)
@@ -910,9 +894,6 @@ static struct at_state_t *at_state_from_cid(struct cardstate *cs, int cid)
 
 static void bchannel_down(struct bc_state *bcs)
 {
-        IFNULLRET(bcs);
-        IFNULLRET(bcs->cs);
-
         if (bcs->chstate & CHS_B_UP) {
                 bcs->chstate &= ~CHS_B_UP;
                 gigaset_i4l_channel_cmd(bcs, ISDN_STAT_BHUP);
@@ -930,16 +911,15 @@ static void bchannel_down(struct bc_state *bcs)
 
 static void bchannel_up(struct bc_state *bcs)
 {
-        IFNULLRET(bcs);
-
         if (!(bcs->chstate & CHS_D_UP)) {
-                notice("%s: D channel not up", __func__);
+                dev_notice(bcs->cs->dev, "%s: D channel not up\n", __func__);
                 bcs->chstate |= CHS_D_UP;
                 gigaset_i4l_channel_cmd(bcs, ISDN_STAT_DCONN);
         }
 
         if (bcs->chstate & CHS_B_UP) {
-                notice("%s: B channel already up", __func__);
+                dev_notice(bcs->cs->dev, "%s: B channel already up\n",
+                           __func__);
                 return;
         }
 
@@ -947,17 +927,21 @@ static void bchannel_up(struct bc_state *bcs)
         gigaset_i4l_channel_cmd(bcs, ISDN_STAT_BCONN);
 }
 
-static void start_dial(struct at_state_t *at_state, void *data, int seq_index)
+static void start_dial(struct at_state_t *at_state, void *data, unsigned seq_index)
 {
         struct bc_state *bcs = at_state->bcs;
         struct cardstate *cs = at_state->cs;
         int retval;
+        unsigned long flags;
 
         bcs->chstate |= CHS_NOTIFY_LL;
-        //atomic_set(&bcs->status, BCS_INIT);
 
-        if (atomic_read(&at_state->seq_index) != seq_index)
+        spin_lock_irqsave(&cs->lock, flags);
+        if (at_state->seq_index != seq_index) {
+                spin_unlock_irqrestore(&cs->lock, flags);
                 goto error;
+        }
+        spin_unlock_irqrestore(&cs->lock, flags);
 
         retval = gigaset_isdn_setup_dial(at_state, data);
         if (retval != 0)
@@ -965,20 +949,14 @@ static void start_dial(struct at_state_t *at_state, void *data, int seq_index)
 
 
         at_state->pending_commands |= PC_CID;
-        dbg(DEBUG_CMD, "Scheduling PC_CID");
-//#ifdef GIG_MAYINITONDIAL
-//      if (atomic_read(&cs->MState) == MS_UNKNOWN) {
-//              cs->at_state.pending_commands |= PC_INIT;
-//              dbg(DEBUG_CMD, "Scheduling PC_INIT");
-//      }
-//#endif
-        atomic_set(&cs->commands_pending, 1); //FIXME
+        gig_dbg(DEBUG_CMD, "Scheduling PC_CID");
+        atomic_set(&cs->commands_pending, 1);
         return;
 
 error:
         at_state->pending_commands |= PC_NOCID;
-        dbg(DEBUG_CMD, "Scheduling PC_NOCID");
-        atomic_set(&cs->commands_pending, 1); //FIXME
+        gig_dbg(DEBUG_CMD, "Scheduling PC_NOCID");
+        atomic_set(&cs->commands_pending, 1);
         return;
 }
 
@@ -991,13 +969,13 @@ static void start_accept(struct at_state_t *at_state)
 
         if (retval == 0) {
                 at_state->pending_commands |= PC_ACCEPT;
-                dbg(DEBUG_CMD, "Scheduling PC_ACCEPT");
-                atomic_set(&cs->commands_pending, 1); //FIXME
+                gig_dbg(DEBUG_CMD, "Scheduling PC_ACCEPT");
+                atomic_set(&cs->commands_pending, 1);
         } else {
                 //FIXME
                 at_state->pending_commands |= PC_HUP;
-                dbg(DEBUG_CMD, "Scheduling PC_HUP");
-                atomic_set(&cs->commands_pending, 1); //FIXME
+                gig_dbg(DEBUG_CMD, "Scheduling PC_HUP");
+                atomic_set(&cs->commands_pending, 1);
         }
 }
 
@@ -1008,9 +986,10 @@ static void do_start(struct cardstate *cs)
         if (atomic_read(&cs->mstate) != MS_LOCKED)
                 schedule_init(cs, MS_INIT);
 
+        cs->isdn_up = 1;
         gigaset_i4l_cmd(cs, ISDN_STAT_RUN);
-                                        // FIXME: not in locked mode
-                                        // FIXME 2: only after init sequence
+                                        // FIXME: not in locked mode
+                                        // FIXME 2: only after init sequence
 
         cs->waiting = 0;
         wake_up(&cs->waitqueue);
@@ -1023,6 +1002,12 @@ static void finish_shutdown(struct cardstate *cs)
                 atomic_set(&cs->mode, M_UNKNOWN);
         }
 
+        /* Tell the LL that the device is not available .. */
+        if (cs->isdn_up) {
+                cs->isdn_up = 0;
+                gigaset_i4l_cmd(cs, ISDN_STAT_STOP);
+        }
+
         /* The rest is done by cleanup_cs () in user mode. */
 
         cs->cmd_result = -ENODEV;
@@ -1037,15 +1022,20 @@ static void do_shutdown(struct cardstate *cs)
         if (atomic_read(&cs->mstate) == MS_READY) {
                 atomic_set(&cs->mstate, MS_SHUTDOWN);
                 cs->at_state.pending_commands |= PC_SHUTDOWN;
-                atomic_set(&cs->commands_pending, 1); //FIXME
-                dbg(DEBUG_CMD, "Scheduling PC_SHUTDOWN"); //FIXME
-                //gigaset_schedule_event(cs); //FIXME
+                atomic_set(&cs->commands_pending, 1);
+                gig_dbg(DEBUG_CMD, "Scheduling PC_SHUTDOWN");
         } else
                 finish_shutdown(cs);
 }
 
 static void do_stop(struct cardstate *cs)
 {
+        unsigned long flags;
+
+        spin_lock_irqsave(&cs->lock, flags);
+        cs->connected = 0;
+        spin_unlock_irqrestore(&cs->lock, flags);
+
         do_shutdown(cs);
 }
 
@@ -1069,9 +1059,11 @@ static int reinit_and_retry(struct cardstate *cs, int channel)
                         return 0;
 
         if (channel < 0)
-                warn("Could not enter cid mode. Reinit device and try again.");
+                dev_warn(cs->dev,
+                    "Could not enter cid mode. Reinit device and try again.\n");
         else {
-                warn("Could not get a call id. Reinit device and try again.");
+                dev_warn(cs->dev,
+                    "Could not get a call id. Reinit device and try again.\n");
                 cs->bcs[channel].at_state.pending_commands |= PC_CID;
         }
         schedule_init(cs, MS_INIT);
@@ -1079,7 +1071,7 @@ static int reinit_and_retry(struct cardstate *cs, int channel)
 }
 
 static int at_state_invalid(struct cardstate *cs,
-                            struct at_state_t *test_ptr)
+                            struct at_state_t *test_ptr)
 {
         unsigned long flags;
         unsigned channel;
@@ -1116,7 +1108,7 @@ static void handle_icall(struct cardstate *cs, struct bc_state *bcs,
         case ICALL_ACCEPT:
                 break;
         default:
-                err("internal error: disposition=%d", retval);
+                dev_err(cs->dev, "internal error: disposition=%d\n", retval);
                 /* --v-- fall through --v-- */
         case ICALL_IGNORE:
         case ICALL_REJECT:
@@ -1160,7 +1152,6 @@ static int do_lock(struct cardstate *cs)
         mode = atomic_read(&cs->mode);
         atomic_set(&cs->mstate, MS_LOCKED);
         atomic_set(&cs->mode, M_UNKNOWN);
-        //FIXME reset card state / at states / bcs states
 
         return mode;
 }
@@ -1173,8 +1164,7 @@ static int do_unlock(struct cardstate *cs)
         atomic_set(&cs->mstate, MS_UNINITIALIZED);
         atomic_set(&cs->mode, M_UNKNOWN);
         gigaset_free_channels(cs);
-        //FIXME reset card state / at states / bcs states
-        if (atomic_read(&cs->connected))
+        if (cs->connected)
                 schedule_init(cs, MS_INIT);
 
         return 0;
@@ -1203,21 +1193,23 @@ static void do_action(int action, struct cardstate *cs,
                 at_state->waiting = 1;
                 break;
         case ACT_INIT:
-                //FIXME setup everything
                 cs->at_state.pending_commands &= ~PC_INIT;
                 cs->cur_at_seq = SEQ_NONE;
                 atomic_set(&cs->mode, M_UNIMODEM);
-                if (!atomic_read(&cs->cidmode)) {
+                spin_lock_irqsave(&cs->lock, flags);
+                if (!cs->cidmode) {
+                        spin_unlock_irqrestore(&cs->lock, flags);
                         gigaset_free_channels(cs);
                         atomic_set(&cs->mstate, MS_READY);
                         break;
                 }
+                spin_unlock_irqrestore(&cs->lock, flags);
                 cs->at_state.pending_commands |= PC_CIDMODE;
-                atomic_set(&cs->commands_pending, 1); //FIXME
-                dbg(DEBUG_CMD, "Scheduling PC_CIDMODE");
+                atomic_set(&cs->commands_pending, 1);
+                gig_dbg(DEBUG_CMD, "Scheduling PC_CIDMODE");
                 break;
         case ACT_FAILINIT:
-                warn("Could not initialize the device.");
+                dev_warn(cs->dev, "Could not initialize the device.\n");
                 cs->dle = 0;
                 init_failed(cs, M_UNKNOWN);
                 cs->cur_at_seq = SEQ_NONE;
@@ -1273,8 +1265,8 @@ static void do_action(int action, struct cardstate *cs,
                 /* get fresh AT state structure for new CID */
                 at_state2 = get_free_channel(cs, ev->parameter);
                 if (!at_state2) {
-                        warn("RING ignored: "
-                             "could not allocate channel structure");
+                        dev_warn(cs->dev,
+                        "RING ignored: could not allocate channel structure\n");
                         break;
                 }
 
@@ -1302,7 +1294,7 @@ static void do_action(int action, struct cardstate *cs,
                 at_state = *p_at_state;
                 break;
         case ACT_FAILSDOWN:
-                warn("Could not shut down the device.");
+                dev_warn(cs->dev, "Could not shut down the device.\n");
                 /* fall through */
         case ACT_FAKESDOWN:
         case ACT_SDOWN:
@@ -1355,7 +1347,7 @@ static void do_action(int action, struct cardstate *cs,
                 break;
         case ACT_ABORTHUP:
                 cs->cur_at_seq = SEQ_NONE;
-                warn("Could not hang up.");
+                dev_warn(cs->dev, "Could not hang up.\n");
                 at_state->cid = -1;
                 if (bcs && cs->onechannel)
                         at_state->pending_commands |= PC_DLE0;
@@ -1367,14 +1359,15 @@ static void do_action(int action, struct cardstate *cs,
                 break;
         case ACT_FAILDLE0:
                 cs->cur_at_seq = SEQ_NONE;
-                warn("Could not leave DLE mode.");
+                dev_warn(cs->dev, "Could not leave DLE mode.\n");
                 at_state2 = &cs->bcs[cs->curchannel].at_state;
                 disconnect(&at_state2);
                 schedule_init(cs, MS_RECOVER);
                 break;
         case ACT_FAILDLE1:
                 cs->cur_at_seq = SEQ_NONE;
-                warn("Could not enter DLE mode. Try to hang up.");
+                dev_warn(cs->dev,
+                         "Could not enter DLE mode. Trying to hang up.\n");
                 channel = cs->curchannel;
                 cs->bcs[channel].at_state.pending_commands |= PC_HUP;
                 atomic_set(&cs->commands_pending, 1);
@@ -1395,7 +1388,8 @@ static void do_action(int action, struct cardstate *cs,
                 cs->cur_at_seq = SEQ_NONE;
                 channel = cs->curchannel;
                 if (!reinit_and_retry(cs, channel)) {
-                        warn("Could not get a call id. Dialing not possible");
+                        dev_warn(cs->dev,
+                                 "Could not get a call ID. Cannot dial.\n");
                         at_state2 = &cs->bcs[channel].at_state;
                         disconnect(&at_state2);
                 }
@@ -1428,7 +1422,8 @@ static void do_action(int action, struct cardstate *cs,
                 at_state->pending_commands |= PC_HUP;
                 atomic_set(&cs->commands_pending, 1);
                 break;
-        case ACT_GETSTRING: /* warning: RING, ZDLE, ... are not handled properly any more */
+        case ACT_GETSTRING: /* warning: RING, ZDLE, ...
+                               are not handled properly anymore */
                 at_state->getstring = 1;
                 break;
         case ACT_SETVER:
@@ -1469,16 +1464,16 @@ static void do_action(int action, struct cardstate *cs,
         case ACT_GOTVER:
                 if (cs->gotfwver == 0) {
                         cs->gotfwver = 1;
-                        dbg(DEBUG_ANY,
-                            "firmware version %02d.%03d.%02d.%02d",
-                            cs->fwver[0], cs->fwver[1],
-                            cs->fwver[2], cs->fwver[3]);
+                        gig_dbg(DEBUG_ANY,
+                                "firmware version %02d.%03d.%02d.%02d",
+                                cs->fwver[0], cs->fwver[1],
+                                cs->fwver[2], cs->fwver[3]);
                         break;
                 }
                 /* fall through */
         case ACT_FAILVER:
                 cs->gotfwver = -1;
-                err("could not read firmware version.");
+                dev_err(cs->dev, "could not read firmware version.\n");
                 break;
 #ifdef CONFIG_GIGASET_DEBUG
         case ACT_ERROR:
@@ -1496,16 +1491,16 @@ static void do_action(int action, struct cardstate *cs,
                 break;
 #endif
         case ACT_DEBUG:
-                dbg(DEBUG_ANY, "%s: resp_code %d in ConState %d",
+                gig_dbg(DEBUG_ANY, "%s: resp_code %d in ConState %d",
                         __func__, ev->type, at_state->ConState);
                 break;
         case ACT_WARN:
-                warn("%s: resp_code %d in ConState %d!",
-                        __func__, ev->type, at_state->ConState);
+                dev_warn(cs->dev, "%s: resp_code %d in ConState %d!\n",
+                         __func__, ev->type, at_state->ConState);
                 break;
         case ACT_ZCAU:
-                warn("cause code %04x in connection state %d.",
-                     ev->parameter, at_state->ConState);
+                dev_warn(cs->dev, "cause code %04x in connection state %d.\n",
+                         ev->parameter, at_state->ConState);
                 break;
 
         /* events from the LL */
@@ -1516,14 +1511,14 @@ static void do_action(int action, struct cardstate *cs,
                 start_accept(at_state);
                 break;
         case ACT_PROTO_L2:
-                dbg(DEBUG_CMD,
-                    "set protocol to %u", (unsigned) ev->parameter);
+                gig_dbg(DEBUG_CMD, "set protocol to %u",
+                        (unsigned) ev->parameter);
                 at_state->bcs->proto2 = ev->parameter;
                 break;
         case ACT_HUP:
                 at_state->pending_commands |= PC_HUP;
-                atomic_set(&cs->commands_pending, 1); //FIXME
-                dbg(DEBUG_CMD, "Scheduling PC_HUP");
+                atomic_set(&cs->commands_pending, 1);
+                gig_dbg(DEBUG_CMD, "Scheduling PC_HUP");
                 break;
 
         /* hotplug events */
@@ -1555,17 +1550,19 @@ static void do_action(int action, struct cardstate *cs,
 
         /* events from the proc file system */ // FIXME without ACT_xxxx?
         case ACT_PROC_CIDMODE:
-                if (ev->parameter != atomic_read(&cs->cidmode)) {
-                        atomic_set(&cs->cidmode, ev->parameter);
+                spin_lock_irqsave(&cs->lock, flags);
+                if (ev->parameter != cs->cidmode) {
+                        cs->cidmode = ev->parameter;
                         if (ev->parameter) {
                                 cs->at_state.pending_commands |= PC_CIDMODE;
-                                dbg(DEBUG_CMD, "Scheduling PC_CIDMODE");
+                                gig_dbg(DEBUG_CMD, "Scheduling PC_CIDMODE");
                         } else {
                                 cs->at_state.pending_commands |= PC_UMMODE;
-                                dbg(DEBUG_CMD, "Scheduling PC_UMMODE");
+                                gig_dbg(DEBUG_CMD, "Scheduling PC_UMMODE");
                         }
                         atomic_set(&cs->commands_pending, 1);
                 }
+                spin_unlock_irqrestore(&cs->lock, flags);
                 cs->waiting = 0;
                 wake_up(&cs->waitqueue);
                 break;
@@ -1590,7 +1587,7 @@ static void do_action(int action, struct cardstate *cs,
                                 *p_resp_code = RSP_NULL;
                         }
                 } else
-                        err("%s: action==%d!", __func__, action);
+                        dev_err(cs->dev, "%s: action==%d!\n", __func__, action);
         }
 }
 
@@ -1609,47 +1606,46 @@ static void process_event(struct cardstate *cs, struct event_t *ev)
         int curact;
         unsigned long flags;
 
-        IFNULLRET(cs);
-        IFNULLRET(ev);
-
         if (ev->cid >= 0) {
                 at_state = at_state_from_cid(cs, ev->cid);
                 if (!at_state) {
                         gigaset_add_event(cs, &cs->at_state, RSP_WRONG_CID,
-                                          NULL, 0, NULL);
+                                          NULL, 0, NULL);
                         return;
                 }
         } else {
                 at_state = ev->at_state;
                 if (at_state_invalid(cs, at_state)) {
-                        dbg(DEBUG_ANY,
-                            "event for invalid at_state %p", at_state);
+                        gig_dbg(DEBUG_ANY, "event for invalid at_state %p",
+                                at_state);
                         return;
                 }
         }
 
-        dbg(DEBUG_CMD,
-            "connection state %d, event %d", at_state->ConState, ev->type);
+        gig_dbg(DEBUG_CMD, "connection state %d, event %d",
+                at_state->ConState, ev->type);
 
         bcs = at_state->bcs;
         sendcid = at_state->cid;
 
         /* Setting the pointer to the dial array */
         rep = at_state->replystruct;
-        IFNULLRET(rep);
 
+        spin_lock_irqsave(&cs->lock, flags);
         if (ev->type == EV_TIMEOUT) {
-                if (ev->parameter != atomic_read(&at_state->timer_index)
+                if (ev->parameter != at_state->timer_index
                     || !at_state->timer_active) {
                         ev->type = RSP_NONE; /* old timeout */
-                        dbg(DEBUG_ANY, "old timeout");
+                        gig_dbg(DEBUG_ANY, "old timeout");
                 } else if (!at_state->waiting)
-                        dbg(DEBUG_ANY, "timeout occured");
+                        gig_dbg(DEBUG_ANY, "timeout occurred");
                 else
-                        dbg(DEBUG_ANY, "stopped waiting");
+                        gig_dbg(DEBUG_ANY, "stopped waiting");
         }
+        spin_unlock_irqrestore(&cs->lock, flags);
 
-        /* if the response belongs to a variable in at_state->int_var[VAR_XXXX] or at_state->str_var[STR_XXXX], set it */
+        /* if the response belongs to a variable in at_state->int_var[VAR_XXXX]
+           or at_state->str_var[STR_XXXX], set it */
         if (ev->type >= RSP_VAR && ev->type < RSP_VAR + VAR_NUM) {
                 index = ev->type - RSP_VAR;
                 at_state->int_var[index] = ev->parameter;
@@ -1657,20 +1653,22 @@ static void process_event(struct cardstate *cs, struct event_t *ev)
                 index = ev->type - RSP_STR;
                 kfree(at_state->str_var[index]);
                 at_state->str_var[index] = ev->ptr;
-                ev->ptr = NULL; /* prevent process_events() from deallocating ptr */
+                ev->ptr = NULL; /* prevent process_events() from
+                                   deallocating ptr */
         }
 
         if (ev->type == EV_TIMEOUT || ev->type == RSP_STRING)
                 at_state->getstring = 0;
 
-        /* Search row in dial array which matches modem response and current constate */
+        /* Search row in dial array which matches modem response and current
+           constate */
         for (;; rep++) {
                 rcode = rep->resp_code;
-                /* dbg (DEBUG_ANY, "rcode %d", rcode); */
                 if (rcode == RSP_LAST) {
                         /* found nothing...*/
-                        warn("%s: rcode=RSP_LAST: resp_code %d in ConState %d!",
-                                __func__, ev->type, at_state->ConState);
+                        dev_warn(cs->dev, "%s: rcode=RSP_LAST: "
+                                        "resp_code %d in ConState %d!\n",
+                                 __func__, ev->type, at_state->ConState);
                         return;
                 }
                 if ((rcode == RSP_ANY || rcode == ev->type)
@@ -1706,14 +1704,14 @@ static void process_event(struct cardstate *cs, struct event_t *ev)
                 } else {
                         /* Send command to modem if not NULL... */
                         if (p_command/*rep->command*/) {
-                                if (atomic_read(&cs->connected))
+                                if (cs->connected)
                                         send_command(cs, p_command,
-                                                     sendcid, cs->dle,
-                                                     GFP_ATOMIC);
+                                                     sendcid, cs->dle,
+                                                     GFP_ATOMIC);
                                 else
                                         gigaset_add_event(cs, at_state,
-                                                          RSP_NODEV,
-                                                          NULL, 0, NULL);
+                                                          RSP_NODEV,
+                                                          NULL, 0, NULL);
                         }
 
                         spin_lock_irqsave(&cs->lock, flags);
@@ -1723,8 +1721,7 @@ static void process_event(struct cardstate *cs, struct event_t *ev)
                         } else if (rep->timeout > 0) { /* new timeout */
                                 at_state->timer_expires = rep->timeout * 10;
                                 at_state->timer_active = 1;
-                                new_index(&at_state->timer_index,
-                                          MAX_TIMER_INDEX);
+                                ++at_state->timer_index;
                         }
                         spin_unlock_irqrestore(&cs->lock, flags);
                 }
@@ -1744,17 +1741,16 @@ static void process_command_flags(struct cardstate *cs)
         struct bc_state *bcs;
         int i;
         int sequence;
-
-        IFNULLRET(cs);
+        unsigned long flags;
 
         atomic_set(&cs->commands_pending, 0);
 
         if (cs->cur_at_seq) {
-                dbg(DEBUG_CMD, "not searching scheduled commands: busy");
+                gig_dbg(DEBUG_CMD, "not searching scheduled commands: busy");
                 return;
         }
 
-        dbg(DEBUG_CMD, "searching scheduled commands");
+        gig_dbg(DEBUG_CMD, "searching scheduled commands");
 
         sequence = SEQ_NONE;
 
@@ -1795,8 +1791,9 @@ static void process_command_flags(struct cardstate *cs)
         }
 
         /* only switch back to unimodem mode, if no commands are pending and no channels are up */
+        spin_lock_irqsave(&cs->lock, flags);
         if (cs->at_state.pending_commands == PC_UMMODE
-            && !atomic_read(&cs->cidmode)
+            && !cs->cidmode
             && list_empty(&cs->temp_at_states)
             && atomic_read(&cs->mode) == M_CID) {
                 sequence = SEQ_UMMODE;
@@ -1810,6 +1807,7 @@ static void process_command_flags(struct cardstate *cs)
                         }
                 }
         }
+        spin_unlock_irqrestore(&cs->lock, flags);
         cs->at_state.pending_commands &= ~PC_UMMODE;
         if (sequence != SEQ_NONE) {
                 schedule_sequence(cs, at_state, sequence);
@@ -1865,11 +1863,7 @@ static void process_command_flags(struct cardstate *cs)
         if (cs->at_state.pending_commands & PC_CIDMODE) {
                 cs->at_state.pending_commands &= ~PC_CIDMODE;
                 if (atomic_read(&cs->mode) == M_UNIMODEM) {
-#if 0
-                        cs->retry_count = 2;
-#else
                         cs->retry_count = 1;
-#endif
                         schedule_sequence(cs, &cs->at_state, SEQ_CIDMODE);
                         return;
                 }
@@ -1897,7 +1891,7 @@ static void process_command_flags(struct cardstate *cs)
                         switch (atomic_read(&cs->mode)) {
                         case M_UNIMODEM:
                                 cs->at_state.pending_commands |= PC_CIDMODE;
-                                dbg(DEBUG_CMD, "Scheduling PC_CIDMODE");
+                                gig_dbg(DEBUG_CMD, "Scheduling PC_CIDMODE");
                                 atomic_set(&cs->commands_pending, 1);
                                 return;
 #ifdef GIG_MAYINITONDIAL
@@ -1926,18 +1920,21 @@ static void process_events(struct cardstate *cs)
         int i;
         int check_flags = 0;
         int was_busy;
+        unsigned long flags;
 
-        /* no locking needed (only one reader) */
-        head = atomic_read(&cs->ev_head);
+        spin_lock_irqsave(&cs->ev_lock, flags);
+        head = cs->ev_head;
 
         for (i = 0; i < 2 * MAX_EVENTS; ++i) {
-                tail = atomic_read(&cs->ev_tail);
+                tail = cs->ev_tail;
                 if (tail == head) {
                         if (!check_flags && !atomic_read(&cs->commands_pending))
                                 break;
                         check_flags = 0;
+                        spin_unlock_irqrestore(&cs->ev_lock, flags);
                         process_command_flags(cs);
-                        tail = atomic_read(&cs->ev_tail);
+                        spin_lock_irqsave(&cs->ev_lock, flags);
+                        tail = cs->ev_tail;
                         if (tail == head) {
                                 if (!atomic_read(&cs->commands_pending))
                                         break;
@@ -1947,18 +1944,23 @@ static void process_events(struct cardstate *cs)
 
                 ev = cs->events + head;
                 was_busy = cs->cur_at_seq != SEQ_NONE;
+                spin_unlock_irqrestore(&cs->ev_lock, flags);
                 process_event(cs, ev);
+                spin_lock_irqsave(&cs->ev_lock, flags);
                 kfree(ev->ptr);
                 ev->ptr = NULL;
                 if (was_busy && cs->cur_at_seq == SEQ_NONE)
                         check_flags = 1;
 
                 head = (head + 1) % MAX_EVENTS;
-                atomic_set(&cs->ev_head, head);
+                cs->ev_head = head;
         }
 
+        spin_unlock_irqrestore(&cs->ev_lock, flags);
+
         if (i == 2 * MAX_EVENTS) {
-                err("infinite loop in process_events; aborting.");
+                dev_err(cs->dev,
+                        "infinite loop in process_events; aborting.\n");
         }
 }
 
@@ -1970,12 +1972,9 @@ void gigaset_handle_event(unsigned long data)
 {
         struct cardstate *cs = (struct cardstate *) data;
 
-        IFNULLRET(cs);
-        IFNULLRET(cs->inbuf);
-
         /* handle incoming data on control/common channel */
         if (atomic_read(&cs->inbuf->head) != atomic_read(&cs->inbuf->tail)) {
-                dbg(DEBUG_INTR, "processing new data");
+                gig_dbg(DEBUG_INTR, "processing new data");
                 cs->ops->handle_input(cs->inbuf);
         }
 
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 729edcdb6dac..9d21ba8757b0 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -1,11 +1,16 @@
-/* Siemens Gigaset 307x driver
+/*
+ * Siemens Gigaset 307x driver
  * Common header file for all connection variants
  *
- * Written by Stefan Eilers <Eilers.Stefan@epost.de>
+ * Written by Stefan Eilers
  *        and Hansjoerg Lipp <hjlipp@web.de>
  *
- * Version: $Id: gigaset.h,v 1.97.4.26 2006/02/04 18:28:16 hjlipp Exp $
- * ===========================================================================
+ * =====================================================================
+ *      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 GIGASET_H
@@ -15,7 +20,6 @@
 #include <linux/kernel.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
-#include <asm/atomic.h>
 #include <linux/spinlock.h>
 #include <linux/isdnif.h>
 #include <linux/usb.h>
@@ -27,21 +31,22 @@
 #include <linux/tty.h>
 #include <linux/tty_driver.h>
 #include <linux/list.h>
+#include <asm/atomic.h>
 
 #define GIG_VERSION {0,5,0,0}
 #define GIG_COMPAT  {0,4,0,0}
 
-#define MAX_REC_PARAMS 10                         /* Max. number of params in response string */
-#define MAX_RESP_SIZE 512                         /* Max. size of a response string */
-#define HW_HDR_LEN 2                              /* Header size used to store ack info */
+#define MAX_REC_PARAMS 10       /* Max. number of params in response string */
+#define MAX_RESP_SIZE 512       /* Max. size of a response string */
+#define HW_HDR_LEN 2            /* Header size used to store ack info */
 
-#define MAX_EVENTS 64                          /* size of event queue */
+#define MAX_EVENTS 64           /* size of event queue */
 
 #define RBUFSIZE 8192
-#define SBUFSIZE 4096                           /* sk_buff payload size */
+#define SBUFSIZE 4096           /* sk_buff payload size */
 
-#define MAX_BUF_SIZE (SBUFSIZE - 2)             /* Max. size of a data packet from LL */
-#define TRANSBUFSIZE 768                        /* bytes per skb for transparent receive */
+#define TRANSBUFSIZE 768        /* bytes per skb for transparent receive */
+#define MAX_BUF_SIZE (SBUFSIZE - 2)     /* Max. size of a data packet from LL */
 
 /* compile time options */
 #define GIG_MAJOR 0
@@ -50,10 +55,7 @@
 #define GIG_RETRYCID
 #define GIG_X75
 
-#define MAX_TIMER_INDEX 1000
-#define MAX_SEQ_INDEX   1000
-
-#define GIG_TICK (HZ / 10)
+#define GIG_TICK 100            /* in milliseconds */
 
 /* timeout values (unit: 1 sec) */
 #define INIT_TIMEOUT 1
@@ -67,74 +69,89 @@
 
 #define MAXACT 3
 
-#define IFNULL(a)         if (unlikely(!(a)))
-#define IFNULLRET(a)      if (unlikely(!(a))) {err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); return; }
-#define IFNULLRETVAL(a,b) if (unlikely(!(a))) {err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); return (b); }
-#define IFNULLCONT(a)     if (unlikely(!(a))) {err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); continue; }
-#define IFNULLGOTO(a,b)   if (unlikely(!(a))) {err("%s==NULL at %s:%d!", #a, __FILE__, __LINE__); goto b; }
-
 extern int gigaset_debuglevel;  /* "needs" cast to (enum debuglevel) */
 
-/* any combination of these can be given with the 'debug=' parameter to insmod, e.g.
- * 'insmod usb_gigaset.o debug=0x2c' will set DEBUG_OPEN, DEBUG_CMD and DEBUG_INTR. */
+/* any combination of these can be given with the 'debug=' parameter to insmod,
+ * e.g. 'insmod usb_gigaset.o debug=0x2c' will set DEBUG_OPEN, DEBUG_CMD and
+ * DEBUG_INTR.
+ */
 enum debuglevel { /* up to 24 bits (atomic_t) */
         DEBUG_REG         = 0x0002, /* serial port I/O register operations */
         DEBUG_OPEN        = 0x0004, /* open/close serial port */
         DEBUG_INTR        = 0x0008, /* interrupt processing */
-        DEBUG_INTR_DUMP   = 0x0010, /* Activating hexdump debug output on interrupt
-                                      requests, not available as run-time option */
+        DEBUG_INTR_DUMP   = 0x0010, /* Activating hexdump debug output on
+                                       interrupt requests, not available as
+                                       run-time option */
         DEBUG_CMD         = 0x00020, /* sent/received LL commands */
         DEBUG_STREAM      = 0x00040, /* application data stream I/O events */
         DEBUG_STREAM_DUMP = 0x00080, /* application data stream content */
         DEBUG_LLDATA      = 0x00100, /* sent/received LL data */
-        DEBUG_INTR_0      = 0x00200, /* serial port output interrupt processing */
+        DEBUG_INTR_0      = 0x00200, /* serial port interrupt processing */
         DEBUG_DRIVER      = 0x00400, /* driver structure */
         DEBUG_HDLC        = 0x00800, /* M10x HDLC processing */
         DEBUG_WRITE       = 0x01000, /* M105 data write */
-        DEBUG_TRANSCMD    = 0x02000, /*AT-COMMANDS+RESPONSES*/
-        DEBUG_MCMD        = 0x04000, /*COMMANDS THAT ARE SENT VERY OFTEN*/
-        DEBUG_INIT        = 0x08000, /* (de)allocation+initialization of data structures */
+        DEBUG_TRANSCMD    = 0x02000, /* AT-COMMANDS+RESPONSES */
+        DEBUG_MCMD        = 0x04000, /* COMMANDS THAT ARE SENT VERY OFTEN */
+        DEBUG_INIT        = 0x08000, /* (de)allocation+initialization of data
+                                        structures */
         DEBUG_LOCK        = 0x10000, /* semaphore operations */
         DEBUG_OUTPUT      = 0x20000, /* output to device */
-        DEBUG_ISO         = 0x40000, /* isochronous transfers */
+        DEBUG_ISO         = 0x40000, /* isochronous transfers */
         DEBUG_IF          = 0x80000, /* character device operations */
-        DEBUG_USBREQ      = 0x100000, /* USB communication (except payload data) */
-        DEBUG_LOCKCMD     = 0x200000, /* AT commands and responses when MS_LOCKED */
+        DEBUG_USBREQ      = 0x100000, /* USB communication (except payload
+                                         data) */
+        DEBUG_LOCKCMD     = 0x200000, /* AT commands and responses when
+                                         MS_LOCKED */
 
-        DEBUG_ANY         = 0x3fffff, /* print message if any of the others is activated */
+        DEBUG_ANY         = 0x3fffff, /* print message if any of the others is
+                                         activated */
 };
 
-#ifdef CONFIG_GIGASET_DEBUG
-#define DEBUG_DEFAULT (DEBUG_INIT | DEBUG_TRANSCMD | DEBUG_CMD | DEBUG_USBREQ)
-//#define DEBUG_DEFAULT (DEBUG_LOCK | DEBUG_INIT | DEBUG_TRANSCMD | DEBUG_CMD | DEBUF_IF | DEBUG_DRIVER | DEBUG_OUTPUT | DEBUG_INTR)
-#else
-#define DEBUG_DEFAULT 0
+/* missing from linux/device.h ... */
+#ifndef dev_notice
+#define dev_notice(dev, format, arg...)         \
+        dev_printk(KERN_NOTICE , dev , format , ## arg)
 #endif
 
-/* redefine syslog macros to prepend module name instead of entire source path */
-/* The space before the comma in ", ##" is needed by gcc 2.95 */
+/* Kernel message macros for situations where dev_printk and friends cannot be
+ * used for lack of reliable access to a device structure.
+ * linux/usb.h already contains these but in an obsolete form which clutters
+ * the log needlessly, and according to the USB maintainer those should be
+ * removed rather than fixed anyway.
+ */
+#undef err
 #undef info
-#define info(format, arg...) printk(KERN_INFO "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
-
-#undef notice
-#define notice(format, arg...) printk(KERN_NOTICE "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
-
 #undef warn
-#define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
+#undef notice
 
-#undef err
-#define err(format, arg...) printk(KERN_ERR "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg)
+#define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \
+        format "\n" , ## arg)
+#define info(format, arg...) printk(KERN_INFO KBUILD_MODNAME ": " \
+        format "\n" , ## arg)
+#define warn(format, arg...) printk(KERN_WARNING KBUILD_MODNAME ": " \
+        format "\n" , ## arg)
+#define notice(format, arg...) printk(KERN_NOTICE KBUILD_MODNAME ": " \
+        format "\n" , ## arg)
 
-#undef dbg
 #ifdef CONFIG_GIGASET_DEBUG
-#define dbg(level, format, arg...) do { if (unlikely(((enum debuglevel)gigaset_debuglevel) & (level))) \
-        printk(KERN_DEBUG "%s: " format "\n", THIS_MODULE ? THIS_MODULE->name : "gigaset_hw" , ## arg); } while (0)
+
+#define gig_dbg(level, format, arg...) \
+        do { \
+                if (unlikely(((enum debuglevel)gigaset_debuglevel) & (level))) \
+                        printk(KERN_DEBUG KBUILD_MODNAME ": " format "\n", \
+                               ## arg); \
+        } while (0)
+#define DEBUG_DEFAULT (DEBUG_INIT | DEBUG_TRANSCMD | DEBUG_CMD | DEBUG_USBREQ)
+
 #else
-#define dbg(level, format, arg...) do {} while (0)
+
+#define gig_dbg(level, format, arg...) do {} while (0)
+#define DEBUG_DEFAULT 0
+
 #endif
 
 void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
-                        size_t len, const unsigned char *buf, int from_user);
+                        size_t len, const unsigned char *buf);
 
 /* connection state */
 #define ZSAU_NONE                       0
@@ -148,13 +165,14 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
 #define ZSAU_UNKNOWN                    -1
 
 /* USB control transfer requests */
-#define OUT_VENDOR_REQ                  (USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT)
-#define IN_VENDOR_REQ                   (USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT)
+#define OUT_VENDOR_REQ  (USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT)
+#define IN_VENDOR_REQ   (USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT)
 
 /* int-in-events 3070 */
 #define HD_B1_FLOW_CONTROL              0x80
 #define HD_B2_FLOW_CONTROL              0x81
-#define HD_RECEIVEATDATA_ACK            (0x35)          // 3070         // att: HD_RECEIVE>>AT<<DATA_ACK
+#define HD_RECEIVEATDATA_ACK            (0x35)          // 3070
+                                                // att: HD_RECEIVE>>AT<<DATA_ACK
 #define HD_READY_SEND_ATDATA            (0x36)          // 3070
 #define HD_OPEN_ATCHANNEL_ACK           (0x37)          // 3070
 #define HD_CLOSE_ATCHANNEL_ACK          (0x38)          // 3070
@@ -181,17 +199,18 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
 #define HD_CLOSE_ATCHANNEL              (0x29)          // 3070
 
 /* USB frames for isochronous transfer */
-#define BAS_FRAMETIME   1               /* number of milliseconds between frames */
-#define BAS_NUMFRAMES   8               /* number of frames per URB */
-#define BAS_MAXFRAME    16              /* allocated bytes per frame */
-#define BAS_NORMFRAME   8               /* send size without flow control */
-#define BAS_HIGHFRAME   10              /* "    "    with positive flow control */
-#define BAS_LOWFRAME    5               /* "    "    with negative flow control */
-#define BAS_CORRFRAMES  4               /* flow control multiplicator */
-
-#define BAS_INBUFSIZE   (BAS_MAXFRAME * BAS_NUMFRAMES) /* size of isochronous input buffer per URB */
-#define BAS_OUTBUFSIZE  4096            /* size of common isochronous output buffer */
-#define BAS_OUTBUFPAD   BAS_MAXFRAME    /* size of pad area for isochronous output buffer */
+#define BAS_FRAMETIME   1       /* number of milliseconds between frames */
+#define BAS_NUMFRAMES   8       /* number of frames per URB */
+#define BAS_MAXFRAME    16      /* allocated bytes per frame */
+#define BAS_NORMFRAME   8       /* send size without flow control */
+#define BAS_HIGHFRAME   10      /* "    "    with positive flow control */
+#define BAS_LOWFRAME    5       /* "    "    with negative flow control */
+#define BAS_CORRFRAMES  4       /* flow control multiplicator */
+
+#define BAS_INBUFSIZE   (BAS_MAXFRAME * BAS_NUMFRAMES)
+                                        /* size of isoc in buf per URB */
+#define BAS_OUTBUFSIZE  4096            /* size of common isoc out buffer */
+#define BAS_OUTBUFPAD   BAS_MAXFRAME    /* size of pad area for isoc out buf */
 
 #define BAS_INURBS      3
 #define BAS_OUTURBS     3
@@ -207,40 +226,40 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
 #define AT_NUM          7
 
 /* variables in struct at_state_t */
-#define VAR_ZSAU   0
-#define VAR_ZDLE   1
-#define VAR_ZVLS   2
-#define VAR_ZCTP   3
-#define VAR_NUM    4
-
-#define STR_NMBR   0
-#define STR_ZCPN   1
-#define STR_ZCON   2
-#define STR_ZBC    3
-#define STR_ZHLC   4
-#define STR_NUM    5
-
-#define EV_TIMEOUT      -105
-#define EV_IF_VER       -106
-#define EV_PROC_CIDMODE -107
-#define EV_SHUTDOWN     -108
-#define EV_START        -110
-#define EV_STOP         -111
-#define EV_IF_LOCK      -112
-#define EV_PROTO_L2     -113
-#define EV_ACCEPT       -114
-#define EV_DIAL         -115
-#define EV_HUP          -116
-#define EV_BC_OPEN      -117
-#define EV_BC_CLOSED    -118
+#define VAR_ZSAU        0
+#define VAR_ZDLE        1
+#define VAR_ZVLS        2
+#define VAR_ZCTP        3
+#define VAR_NUM         4
+
+#define STR_NMBR        0
+#define STR_ZCPN        1
+#define STR_ZCON        2
+#define STR_ZBC         3
+#define STR_ZHLC        4
+#define STR_NUM         5
+
+#define EV_TIMEOUT      -105
+#define EV_IF_VER       -106
+#define EV_PROC_CIDMODE -107
+#define EV_SHUTDOWN     -108
+#define EV_START        -110
+#define EV_STOP         -111
+#define EV_IF_LOCK      -112
+#define EV_PROTO_L2     -113
+#define EV_ACCEPT       -114
+#define EV_DIAL         -115
+#define EV_HUP          -116
+#define EV_BC_OPEN      -117
+#define EV_BC_CLOSED    -118
 
 /* input state */
-#define INS_command     0x0001
-#define INS_DLE_char    0x0002
-#define INS_byte_stuff  0x0004
-#define INS_have_data   0x0008
-#define INS_skip_frame  0x0010
-#define INS_DLE_command 0x0020
+#define INS_command     0x0001
+#define INS_DLE_char    0x0002
+#define INS_byte_stuff  0x0004
+#define INS_have_data   0x0008
+#define INS_skip_frame  0x0010
+#define INS_DLE_command 0x0020
 #define INS_flag_hunt   0x0040
 
 /* channel state */
@@ -248,27 +267,27 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
 #define CHS_B_UP        0x02
 #define CHS_NOTIFY_LL   0x04
 
-#define ICALL_REJECT  0
-#define ICALL_ACCEPT  1
-#define ICALL_IGNORE  2
+#define ICALL_REJECT    0
+#define ICALL_ACCEPT    1
+#define ICALL_IGNORE    2
 
 /* device state */
-#define MS_UNINITIALIZED        0
-#define MS_INIT                 1
-#define MS_LOCKED               2
-#define MS_SHUTDOWN             3
-#define MS_RECOVER              4
-#define MS_READY                5
+#define MS_UNINITIALIZED        0
+#define MS_INIT                 1
+#define MS_LOCKED               2
+#define MS_SHUTDOWN             3
+#define MS_RECOVER              4
+#define MS_READY                5
 
 /* mode */
-#define M_UNKNOWN       0
-#define M_CONFIG        1
-#define M_UNIMODEM      2
-#define M_CID           3
+#define M_UNKNOWN       0
+#define M_CONFIG        1
+#define M_UNIMODEM      2
+#define M_CID           3
 
 /* start mode */
-#define SM_LOCKED       0
-#define SM_ISDN         1 /* default */
+#define SM_LOCKED       0
+#define SM_ISDN         1 /* default */
 
 struct gigaset_ops;
 struct gigaset_driver;
@@ -283,27 +302,26 @@ struct ser_bc_state;
 struct bas_bc_state;
 
 struct reply_t {
-        int     resp_code;      /* RSP_XXXX */
-        int     min_ConState;   /* <0 => ignore */
-        int     max_ConState;   /* <0 => ignore */
-        int     parameter;      /* e.g. ZSAU_XXXX <0: ignore*/
-        int     new_ConState;   /* <0 => ignore */
-        int     timeout;        /* >0 => *HZ; <=0 => TOUT_XXXX*/
-        int     action[MAXACT]; /* ACT_XXXX */
-        char *command;        /* NULL==none */
+        int     resp_code;      /* RSP_XXXX */
+        int     min_ConState;   /* <0 => ignore */
+        int     max_ConState;   /* <0 => ignore */
+        int     parameter;      /* e.g. ZSAU_XXXX <0: ignore*/
+        int     new_ConState;   /* <0 => ignore */
+        int     timeout;        /* >0 => *HZ; <=0 => TOUT_XXXX*/
+        int     action[MAXACT]; /* ACT_XXXX */
+        char    *command;       /* NULL==none */
 };
 
 extern struct reply_t gigaset_tab_cid_m10x[];
 extern struct reply_t gigaset_tab_nocid_m10x[];
 
 struct inbuf_t {
-        unsigned char           *rcvbuf;                /* usb-gigaset receive buffer */
+        unsigned char           *rcvbuf;        /* usb-gigaset receive buffer */
         struct bc_state         *bcs;
-        struct cardstate *cs;
-        int inputstate;
-
-        atomic_t head, tail;
-        unsigned char data[RBUFSIZE];
+        struct cardstate        *cs;
+        int                     inputstate;
+        atomic_t                head, tail;
+        unsigned char           data[RBUFSIZE];
 };
 
 /* isochronous write buffer structure
@@ -319,16 +337,9 @@ struct inbuf_t {
  *   if writesem <= 0, data[write..read-1] is currently being written to
  * - idle contains the byte value to repeat when the end of valid data is
  *   reached; if nextread==write (buffer contains no data to send), either the
- *   BAS_OUTBUFPAD bytes immediately before data[write] (if write>=BAS_OUTBUFPAD)
- *   or those of the pad area (if write<BAS_OUTBUFPAD) are also filled with that
- *   value
- * - optionally, the following statistics on the buffer's usage can be collected:
- *   maxfill: maximum number of bytes occupied
- *   idlefills: number of times a frame of idle bytes is prepared
- *   emptygets: number of times the buffer was empty when a data frame was requested
- *   backtoback: number of times two data packets were entered into the buffer
- *    without intervening idle flags
- *   nakedback: set if no idle flags have been inserted since the last data packet
+ *   BAS_OUTBUFPAD bytes immediately before data[write] (if
+ *   write>=BAS_OUTBUFPAD) or those of the pad area (if write<BAS_OUTBUFPAD)
+ *   are also filled with that value
  */
 struct isowbuf_t {
         atomic_t        read;
@@ -358,34 +369,28 @@ struct isow_urbctx_t {
  * it is currently assigned a B channel
  */
 struct at_state_t {
-        struct list_head        list;
-        int                     waiting;
-        int                     getstring;
-        atomic_t                timer_index;
+        struct list_head        list;
+        int                     waiting;
+        int                     getstring;
+        unsigned                timer_index;
         unsigned long           timer_expires;
         int                     timer_active;
-        unsigned int            ConState;                           /* State of connection */
-        struct reply_t          *replystruct;
-        int                     cid;
-        int                     int_var[VAR_NUM];   /* see VAR_XXXX */
-        char                    *str_var[STR_NUM];  /* see STR_XXXX */
-        unsigned                pending_commands;   /* see PC_XXXX */
-        atomic_t                seq_index;
-
-        struct cardstate    *cs;
-        struct bc_state         *bcs;
+        unsigned int            ConState;       /* State of connection */
+        struct reply_t          *replystruct;
+        int                     cid;
+        int                     int_var[VAR_NUM];       /* see VAR_XXXX */
+        char                    *str_var[STR_NUM];      /* see STR_XXXX */
+        unsigned                pending_commands;       /* see PC_XXXX */
+        unsigned                seq_index;
+
+        struct cardstate        *cs;
+        struct bc_state         *bcs;
 };
 
 struct resp_type_t {
         unsigned char   *response;
-        int             resp_code;           /* RSP_XXXX */
-        int             type;                /* RT_XXXX */
-};
-
-struct prot_skb {
-        atomic_t                empty;
-        struct semaphore        *sem;
-        struct sk_buff          *skb;
+        int             resp_code;      /* RSP_XXXX */
+        int             type;           /* RT_XXXX */
 };
 
 struct event_t {
@@ -398,29 +403,29 @@ struct event_t {
 
 /* This buffer holds all information about the used B-Channel */
 struct bc_state {
-        struct sk_buff *tx_skb;                        /* Current transfer buffer to modem */
-        struct sk_buff_head squeue;                    /* B-Channel send Queue */
+        struct sk_buff *tx_skb;         /* Current transfer buffer to modem */
+        struct sk_buff_head squeue;     /* B-Channel send Queue */
 
         /* Variables for debugging .. */
-        int corrupted;                                   /* Counter for corrupted packages */
-        int trans_down;                                  /* Counter of packages (downstream) */
-        int trans_up;                                    /* Counter of packages (upstream) */
+        int corrupted;                  /* Counter for corrupted packages */
+        int trans_down;                 /* Counter of packages (downstream) */
+        int trans_up;                   /* Counter of packages (upstream) */
 
         struct at_state_t at_state;
         unsigned long rcvbytes;
 
         __u16 fcs;
         struct sk_buff *skb;
-        int inputstate; /* see INS_XXXX */
+        int inputstate;                 /* see INS_XXXX */
 
         int channel;
 
         struct cardstate *cs;
 
-        unsigned chstate;                       /* bitmap (CHS_*) */
+        unsigned chstate;               /* bitmap (CHS_*) */
         int ignore;
-        unsigned        proto2;                 /* Layer 2 protocol (ISDN_PROTO_L2_*) */
-        char            *commands[AT_NUM]; /* see AT_XXXX */
+        unsigned proto2;                /* Layer 2 protocol (ISDN_PROTO_L2_*) */
+        char *commands[AT_NUM];         /* see AT_XXXX */
 
 #ifdef CONFIG_GIGASET_DEBUG
         int emptycount;
@@ -428,37 +433,39 @@ struct bc_state {
         int busy;
         int use_count;
 
-        /* hardware drivers */
+        /* private data of hardware drivers */
         union {
-                struct ser_bc_state *ser;                /* private data of serial hardware driver */
-                struct usb_bc_state *usb;                /* private data of usb hardware driver */
-                struct bas_bc_state *bas;
+                struct ser_bc_state *ser;       /* serial hardware driver */
+                struct usb_bc_state *usb;       /* usb hardware driver (m105) */
+                struct bas_bc_state *bas;       /* usb hardware driver (base) */
         } hw;
 };
 
 struct cardstate {
         struct gigaset_driver *driver;
         unsigned minor_index;
+        struct device *dev;
 
         const struct gigaset_ops *ops;
 
         /* Stuff to handle communication */
-        //wait_queue_head_t initwait;
         wait_queue_head_t waitqueue;
         int waiting;
-        atomic_t mode;                       /* see M_XXXX */
-        atomic_t mstate;                     /* Modem state: see MS_XXXX */
-                                             /* only changed by the event layer */
+        atomic_t mode;                  /* see M_XXXX */
+        atomic_t mstate;                /* Modem state: see MS_XXXX */
+                                        /* only changed by the event layer */
         int cmd_result;
 
         int channels;
-        struct bc_state *bcs;                /* Array of struct bc_state */
+        struct bc_state *bcs;           /* Array of struct bc_state */
 
-        int onechannel;                      /* data and commands transmitted in one stream (M10x) */
+        int onechannel;                 /* data and commands transmitted in one
+                                           stream (M10x) */
 
         spinlock_t lock;
-        struct at_state_t at_state;          /* at_state_t for cid == 0 */
-        struct list_head temp_at_states;     /* list of temporary "struct at_state_t"s without B channel */
+        struct at_state_t at_state;     /* at_state_t for cid == 0 */
+        struct list_head temp_at_states;/* list of temporary "struct
+                                           at_state_t"s without B channel */
 
         struct inbuf_t *inbuf;
 
@@ -474,58 +481,69 @@ struct cardstate {
         unsigned fwver[4];
         int gotfwver;
 
-        atomic_t running;                    /* !=0 if events are handled */
-        atomic_t connected;                  /* !=0 if hardware is connected */
+        unsigned running;               /* !=0 if events are handled */
+        unsigned connected;             /* !=0 if hardware is connected */
+        unsigned isdn_up;               /* !=0 after ISDN_STAT_RUN */
 
-        atomic_t cidmode;
+        unsigned cidmode;
 
-        int myid;                            /* id for communication with LL */
+        int myid;                       /* id for communication with LL */
         isdn_if iif;
 
         struct reply_t *tabnocid;
         struct reply_t *tabcid;
         int cs_init;
-        int ignoreframes;                    /* frames to ignore after setting up the B channel */
-        struct semaphore sem;                /* locks this structure: */
-                                             /*   connected is not changed, */
-                                             /*   hardware_up is not changed, */
-                                             /*   MState is not changed to or from MS_LOCKED */
+        int ignoreframes;               /* frames to ignore after setting up the
+                                           B channel */
+        struct mutex mutex;             /* locks this structure:
+                                         *   connected is not changed,
+                                         *   hardware_up is not changed,
+                                         *   MState is not changed to or from
+                                         *   MS_LOCKED */
 
         struct timer_list timer;
         int retry_count;
-        int dle;                             /* !=0 if modem commands/responses are dle encoded */
-        int cur_at_seq;                      /* sequence of AT commands being processed */
-        int curchannel;                      /* channel, those commands are meant for */
-        atomic_t commands_pending;           /* flag(s) in xxx.commands_pending have been set */
-        struct tasklet_struct event_tasklet; /* tasklet for serializing AT commands. Scheduled
-                                              *   -> for modem reponses (and incomming data for M10x)
-                                              *   -> on timeout
-                                              *   -> after setting bits in xxx.at_state.pending_command
-                                              *      (e.g. command from LL) */
-        struct tasklet_struct write_tasklet; /* tasklet for serial output
-                                              * (not used in base driver) */
+        int dle;                        /* !=0 if modem commands/responses are
+                                           dle encoded */
+        int cur_at_seq;                 /* sequence of AT commands being
+                                           processed */
+        int curchannel;                 /* channel those commands are meant
+                                           for */
+        atomic_t commands_pending;      /* flag(s) in xxx.commands_pending have
+                                           been set */
+        struct tasklet_struct event_tasklet;
+                                        /* tasklet for serializing AT commands.
+                                         * Scheduled
+                                         *   -> for modem reponses (and
+                                         *      incoming data for M10x)
+                                         *   -> on timeout
+                                         *   -> after setting bits in
+                                         *      xxx.at_state.pending_command
+                                         *      (e.g. command from LL) */
+        struct tasklet_struct write_tasklet;
+                                        /* tasklet for serial output
+                                         * (not used in base driver) */
 
         /* event queue */
         struct event_t events[MAX_EVENTS];
-        atomic_t ev_tail, ev_head;
+        unsigned ev_tail, ev_head;
         spinlock_t ev_lock;
 
         /* current modem response */
         unsigned char respdata[MAX_RESP_SIZE];
         unsigned cbytes;
 
-        /* hardware drivers */
+        /* private data of hardware drivers */
         union {
-                struct usb_cardstate *usb; /* private data of USB hardware driver */
-                struct ser_cardstate *ser; /* private data of serial hardware driver */
-                struct bas_cardstate *bas; /* private data of base hardware driver */
+                struct usb_cardstate *usb; /* USB hardware driver (m105) */
+                struct ser_cardstate *ser; /* serial hardware driver */
+                struct bas_cardstate *bas; /* USB hardware driver (base) */
         } hw;
 };
 
 struct gigaset_driver {
         struct list_head list;
-        spinlock_t lock;                       /* locks minor tables and blocked */
-        //struct semaphore sem;                /* locks this structure */
+        spinlock_t lock;                /* locks minor tables and blocked */
         struct tty_driver *tty;
         unsigned have_tty;
         unsigned minor;
@@ -553,37 +571,42 @@ struct bas_bc_state {
         struct isow_urbctx_t    isoouturbs[BAS_OUTURBS];
         struct isow_urbctx_t    *isooutdone, *isooutfree, *isooutovfl;
         struct isowbuf_t        *isooutbuf;
-        unsigned numsub;                        /* submitted URB counter (for diagnostic messages only) */
+        unsigned numsub;                /* submitted URB counter
+                                           (for diagnostic messages only) */
         struct tasklet_struct   sent_tasklet;
 
         /* isochronous input state */
         spinlock_t isoinlock;
         struct urb *isoinurbs[BAS_INURBS];
         unsigned char isoinbuf[BAS_INBUFSIZE * BAS_INURBS];
-        struct urb *isoindone;                  /* completed isoc read URB */
-        int loststatus;                         /* status of dropped URB */
-        unsigned isoinlost;                     /* number of bytes lost */
-        /* state of bit unstuffing algorithm (in addition to BC_state.inputstate) */
-        unsigned seqlen;                        /* number of '1' bits not yet unstuffed */
-        unsigned inbyte, inbits;                /* collected bits for next byte */
+        struct urb *isoindone;          /* completed isoc read URB */
+        int loststatus;                 /* status of dropped URB */
+        unsigned isoinlost;             /* number of bytes lost */
+        /* state of bit unstuffing algorithm
+           (in addition to BC_state.inputstate) */
+        unsigned seqlen;                /* number of '1' bits not yet
+                                           unstuffed */
+        unsigned inbyte, inbits;        /* collected bits for next byte */
         /* statistics */
-        unsigned goodbytes;                     /* bytes correctly received */
-        unsigned alignerrs;                     /* frames with incomplete byte at end */
-        unsigned fcserrs;                       /* FCS errors */
-        unsigned frameerrs;                     /* framing errors */
-        unsigned giants;                        /* long frames */
-        unsigned runts;                         /* short frames */
-        unsigned aborts;                        /* HDLC aborts */
-        unsigned shared0s;                      /* '0' bits shared between flags */
-        unsigned stolen0s;                      /* '0' stuff bits also serving as leading flag bits */
+        unsigned goodbytes;             /* bytes correctly received */
+        unsigned alignerrs;             /* frames with incomplete byte at end */
+        unsigned fcserrs;               /* FCS errors */
+        unsigned frameerrs;             /* framing errors */
+        unsigned giants;                /* long frames */
+        unsigned runts;                 /* short frames */
+        unsigned aborts;                /* HDLC aborts */
+        unsigned shared0s;              /* '0' bits shared between flags */
+        unsigned stolen0s;              /* '0' stuff bits also serving as
+                                           leading flag bits */
         struct tasklet_struct rcvd_tasklet;
 };
 
 struct gigaset_ops {
-        /* Called from ev-layer.c/interface.c for sending AT commands to the device */
+        /* Called from ev-layer.c/interface.c for sending AT commands to the
+           device */
         int (*write_cmd)(struct cardstate *cs,
-                         const unsigned char *buf, int len,
-                         struct tasklet_struct *wake_tasklet);
+                         const unsigned char *buf, int len,
+                         struct tasklet_struct *wake_tasklet);
 
         /* Called from interface.c for additional device control */
         int (*write_room)(struct cardstate *cs);
@@ -604,7 +627,8 @@ struct gigaset_ops {
         /* Called by gigaset_freecs() for freeing bcs->hw.xxx */
         int (*freebcshw)(struct bc_state *bcs);
 
-        /* Called by gigaset_stop() or gigaset_bchannel_down() for resetting bcs->hw.xxx */
+        /* Called by gigaset_stop() or gigaset_bchannel_down() for resetting
+           bcs->hw.xxx */
         void (*reinitbcshw)(struct bc_state *bcs);
 
         /* Called by gigaset_initcs() for setting up cs->hw.xxx */
@@ -613,13 +637,10 @@ struct gigaset_ops {
         /* Called by gigaset_freecs() for freeing cs->hw.xxx */
         void (*freecshw)(struct cardstate *cs);
 
-        ///* Called by gigaset_stop() for killing URBs, shutting down the device, ...
-        //   hardwareup: ==0: don't try to shut down the device, hardware is really not accessible
-        //             !=0: hardware still up */
-        //void (*stophw)(struct cardstate *cs, int hardwareup);
-
-        /* Called from common.c/interface.c for additional serial port control */
-        int (*set_modem_ctrl)(struct cardstate *cs, unsigned old_state, unsigned new_state);
+        /* Called from common.c/interface.c for additional serial port
+           control */
+        int (*set_modem_ctrl)(struct cardstate *cs, unsigned old_state,
+                              unsigned new_state);
         int (*baud_rate)(struct cardstate *cs, unsigned cflag);
         int (*set_line_ctrl)(struct cardstate *cs, unsigned cflag);
 
@@ -639,7 +660,7 @@ struct gigaset_ops {
  * <DLE_FLAG>:  0x10
  * <EVENT>:     ((a-z)* | (A-Z)* | (0-10)*)+
  */
-#define DLE_FLAG       0x10
+#define DLE_FLAG        0x10
 
 /* ===========================================================================
  *  Functions implemented in asyncdata.c
@@ -667,7 +688,8 @@ void gigaset_isoc_input(struct inbuf_t *inbuf);
 
 /* Called from bas-gigaset.c to process a block of data
  * received through the isochronous channel */
-void gigaset_isoc_receive(unsigned char *src, unsigned count, struct bc_state *bcs);
+void gigaset_isoc_receive(unsigned char *src, unsigned count,
+                          struct bc_state *bcs);
 
 /* Called from bas-gigaset.c to put a block of data
  * into the isochronous output buffer */
@@ -703,7 +725,7 @@ static inline void gigaset_isdn_rcv_err(struct bc_state *bcs)
         isdn_ctrl response;
 
         /* error -> LL */
-        dbg(DEBUG_CMD, "sending L1ERR");
+        gig_dbg(DEBUG_CMD, "sending L1ERR");
         response.driver = bcs->cs->myid;
         response.command = ISDN_STAT_L1ERR;
         response.arg = bcs->channel;
@@ -727,8 +749,8 @@ void gigaset_handle_modem_response(struct cardstate *cs);
  */
 
 /* initialize sysfs for device */
-void gigaset_init_dev_sysfs(struct usb_interface *interface);
-void gigaset_free_dev_sysfs(struct usb_interface *interface);
+void gigaset_init_dev_sysfs(struct cardstate *cs);
+void gigaset_free_dev_sysfs(struct cardstate *cs);
 
 /* ===========================================================================
  *  Functions implemented in common.c/gigaset.h
@@ -736,7 +758,7 @@ void gigaset_free_dev_sysfs(struct usb_interface *interface);
 
 void gigaset_bcs_reinit(struct bc_state *bcs);
 void gigaset_at_init(struct at_state_t *at_state, struct bc_state *bcs,
-                     struct cardstate *cs, int cid);
+                     struct cardstate *cs, int cid);
 int gigaset_get_channel(struct bc_state *bcs);
 void gigaset_free_channel(struct bc_state *bcs);
 int gigaset_get_channels(struct cardstate *cs);
@@ -745,16 +767,15 @@ void gigaset_block_channels(struct cardstate *cs);
 
 /* Allocate and initialize driver structure. */
 struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,
-                                          const char *procname,
-                                          const char *devname,
-                                          const char *devfsname,
-                                          const struct gigaset_ops *ops,
-                                          struct module *owner);
+                                          const char *procname,
+                                          const char *devname,
+                                          const char *devfsname,
+                                          const struct gigaset_ops *ops,
+                                          struct module *owner);
 
 /* Deallocate driver structure. */
 void gigaset_freedriver(struct gigaset_driver *drv);
 void gigaset_debugdrivers(void);
-struct cardstate *gigaset_get_cs_by_minor(unsigned minor);
 struct cardstate *gigaset_get_cs_by_tty(struct tty_struct *tty);
 struct cardstate *gigaset_get_cs_by_id(int id);
 
@@ -763,7 +784,8 @@ struct cardstate *gigaset_getunassignedcs(struct gigaset_driver *drv);
 void gigaset_unassign(struct cardstate *cs);
 void gigaset_blockdriver(struct gigaset_driver *drv);
 
-/* Allocate and initialize card state. Calls hardware dependent gigaset_init[b]cs(). */
+/* Allocate and initialize card state. Calls hardware dependent
+   gigaset_init[b]cs(). */
 struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
                                  int onechannel, int ignoreframes,
                                  int cidmode, const char *modulename);
@@ -788,8 +810,8 @@ void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *skb);
  * ptr must be kmalloc()ed (and not be freed by the caller).
  */
 struct event_t *gigaset_add_event(struct cardstate *cs,
-                                  struct at_state_t *at_state, int type,
-                                  void *ptr, int parameter, void *arg);
+                                  struct at_state_t *at_state, int type,
+                                  void *ptr, int parameter, void *arg);
 
 /* Called on CONFIG1 command from frontend. */
 int gigaset_enterconfigmode(struct cardstate *cs); //0: success <0: errorcode
@@ -799,7 +821,7 @@ static inline void gigaset_schedule_event(struct cardstate *cs)
 {
         unsigned long flags;
         spin_lock_irqsave(&cs->lock, flags);
-        if (atomic_read(&cs->running))
+        if (cs->running)
                 tasklet_schedule(&cs->event_tasklet);
         spin_unlock_irqrestore(&cs->lock, flags);
 }
@@ -810,7 +832,7 @@ static inline void gigaset_bchannel_down(struct bc_state *bcs)
 {
         gigaset_add_event(bcs->cs, &bcs->at_state, EV_BC_CLOSED, NULL, 0, NULL);
 
-        dbg(DEBUG_CMD, "scheduling BC_CLOSED");
+        gig_dbg(DEBUG_CMD, "scheduling BC_CLOSED");
         gigaset_schedule_event(bcs->cs);
 }
 
@@ -820,36 +842,19 @@ static inline void gigaset_bchannel_up(struct bc_state *bcs)
 {
         gigaset_add_event(bcs->cs, &bcs->at_state, EV_BC_OPEN, NULL, 0, NULL);
 
-        dbg(DEBUG_CMD, "scheduling BC_OPEN");
+        gig_dbg(DEBUG_CMD, "scheduling BC_OPEN");
         gigaset_schedule_event(bcs->cs);
 }
 
 /* handling routines for sk_buff */
 /* ============================= */
 
-/* private version of __skb_put()
- * append 'len' bytes to the content of 'skb', already knowing that the
- * existing buffer can accomodate them
- * returns a pointer to the location where the new bytes should be copied to
- * This function does not take any locks so it must be called with the
- * appropriate locks held only.
- */
-static inline unsigned char *gigaset_skb_put_quick(struct sk_buff *skb,
-                                                   unsigned int len)
-{
-        unsigned char *tmp = skb->tail;
-        /*SKB_LINEAR_ASSERT(skb);*/             /* not needed here */
-        skb->tail += len;
-        skb->len += len;
-        return tmp;
-}
-
 /* pass received skb to LL
  * Warning: skb must not be accessed anymore!
  */
 static inline void gigaset_rcv_skb(struct sk_buff *skb,
-                                   struct cardstate *cs,
-                                   struct bc_state *bcs)
+                                   struct cardstate *cs,
+                                   struct bc_state *bcs)
 {
         cs->iif.rcvcallb_skb(cs->myid, bcs->channel, skb);
         bcs->trans_down++;
@@ -859,8 +864,8 @@ static inline void gigaset_rcv_skb(struct sk_buff *skb,
  * Warning: skb must not be accessed anymore!
  */
 static inline void gigaset_rcv_error(struct sk_buff *procskb,
-                                     struct cardstate *cs,
-                                     struct bc_state *bcs)
+                                     struct cardstate *cs,
+                                     struct bc_state *bcs)
 {
         if (procskb)
                 dev_kfree_skb(procskb);
@@ -877,46 +882,9 @@ static inline void gigaset_rcv_error(struct sk_buff *procskb,
 /* bitwise byte inversion table */
 extern __u8 gigaset_invtab[];   /* in common.c */
 
-
 /* append received bytes to inbuf */
-static inline int gigaset_fill_inbuf(struct inbuf_t *inbuf,
-                                     const unsigned char *src,
-                                     unsigned numbytes)
-{
-        unsigned n, head, tail, bytesleft;
-
-        dbg(DEBUG_INTR, "received %u bytes", numbytes);
-
-        if (!numbytes)
-                return 0;
-
-        bytesleft = numbytes;
-        tail = atomic_read(&inbuf->tail);
-        head = atomic_read(&inbuf->head);
-        dbg(DEBUG_INTR, "buffer state: %u -> %u", head, tail);
-
-        while (bytesleft) {
-                if (head > tail)
-                        n = head - 1 - tail;
-                else if (head == 0)
-                        n = (RBUFSIZE-1) - tail;
-                else
-                        n = RBUFSIZE - tail;
-                if (!n) {
-                        err("buffer overflow (%u bytes lost)", bytesleft);
-                        break;
-                }
-                if (n > bytesleft)
-                        n = bytesleft;
-                memcpy(inbuf->data + tail, src, n);
-                bytesleft -= n;
-                tail = (tail + n) % RBUFSIZE;
-                src += n;
-        }
-        dbg(DEBUG_INTR, "setting tail to %u", tail);
-        atomic_set(&inbuf->tail, tail);
-        return numbytes != bytesleft;
-}
+int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src,
+                       unsigned numbytes);
 
 /* ===========================================================================
  *  Functions implemented in interface.c
@@ -924,7 +892,7 @@ static inline int gigaset_fill_inbuf(struct inbuf_t *inbuf,
 
 /* initialize interface */
 void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
-                           const char *devname, const char *devfsname);
+                           const char *devname, const char *devfsname);
 /* release interface */
 void gigaset_if_freedriver(struct gigaset_driver *drv);
 /* add minor */
@@ -933,6 +901,6 @@ void gigaset_if_init(struct cardstate *cs);
 void gigaset_if_free(struct cardstate *cs);
 /* device received data */
 void gigaset_if_receive(struct cardstate *cs,
-                        unsigned char *buffer, size_t len);
+                        unsigned char *buffer, size_t len);
 
 #endif
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
index 731a675f21b0..0815dbfb8291 100644
--- a/drivers/isdn/gigaset/i4l.c
+++ b/drivers/isdn/gigaset/i4l.c
@@ -1,9 +1,9 @@
 /*
  * Stuff used by all variants of the driver
  *
- * Copyright (c) 2001 by Stefan Eilers (Eilers.Stefan@epost.de),
- *                       Hansjoerg Lipp (hjlipp@web.de),
- *                       Tilman Schmidt (tilman@imap.cc).
+ * Copyright (c) 2001 by Stefan Eilers,
+ *                       Hansjoerg Lipp <hjlipp@web.de>,
+ *                       Tilman Schmidt <tilman@imap.cc>.
  *
  * =====================================================================
  *      This program is free software; you can redistribute it and/or
@@ -11,15 +11,11 @@
  *      published by the Free Software Foundation; either version 2 of
  *      the License, or (at your option) any later version.
  * =====================================================================
- * ToDo: ...
- * =====================================================================
- * Version: $Id: i4l.c,v 1.3.2.9 2006/02/04 18:28:16 hjlipp Exp $
- * =====================================================================
  */
 
 #include "gigaset.h"
 
-/* == Handling of I4L IO ============================================================================*/
+/* == Handling of I4L IO =====================================================*/
 
 /* writebuf_from_LL
  * called by LL to transmit data on an open channel
@@ -29,14 +25,16 @@
  * parameters:
  *      driverID        driver ID as assigned by LL
  *      channel         channel number
- *      ack             if != 0 LL wants to be notified on completion via statcallb(ISDN_STAT_BSENT)
+ *      ack             if != 0 LL wants to be notified on completion via
+ *                      statcallb(ISDN_STAT_BSENT)
  *      skb             skb containing data to send
  * return value:
  *      number of accepted bytes
  *      0 if temporarily unable to accept data (out of buffer space)
  *      <0 on error (eg. -EINVAL)
  */
-static int writebuf_from_LL(int driverID, int channel, int ack, struct sk_buff *skb)
+static int writebuf_from_LL(int driverID, int channel, int ack,
+                            struct sk_buff *skb)
 {
         struct cardstate *cs;
         struct bc_state *bcs;
@@ -54,31 +52,28 @@ static int writebuf_from_LL(int driverID, int channel, int ack, struct sk_buff *
         bcs = &cs->bcs[channel];
         len = skb->len;
 
-        dbg(DEBUG_LLDATA,
-            "Receiving data from LL (id: %d, channel: %d, ack: %d, size: %d)",
-            driverID, channel, ack, len);
+        gig_dbg(DEBUG_LLDATA,
+                "Receiving data from LL (id: %d, ch: %d, ack: %d, sz: %d)",
+                driverID, channel, ack, len);
 
         if (!len) {
                 if (ack)
-                        warn("not ACKing empty packet from LL");
+                        notice("%s: not ACKing empty packet", __func__);
                 return 0;
         }
         if (len > MAX_BUF_SIZE) {
-                err("%s: packet too large (%d bytes)", __func__, channel);
+                err("%s: packet too large (%d bytes)", __func__, len);
                 return -EINVAL;
         }
 
-        if (!atomic_read(&cs->connected))
-                return -ENODEV;
-
         skblen = ack ? len : 0;
         skb->head[0] = skblen & 0xff;
         skb->head[1] = skblen >> 8;
-        dbg(DEBUG_MCMD, "skb: len=%u, skblen=%u: %02x %02x", len, skblen,
-             (unsigned) skb->head[0], (unsigned) skb->head[1]);
+        gig_dbg(DEBUG_MCMD, "skb: len=%u, skblen=%u: %02x %02x",
+                len, skblen, (unsigned) skb->head[0], (unsigned) skb->head[1]);
 
         /* pass to device-specific module */
-        return cs->ops->send_skb(bcs, skb);
+        return cs->ops->send_skb(bcs, skb); //FIXME cs->ops->send_skb() must handle !cs->connected correctly
 }
 
 void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *skb)
@@ -89,14 +84,14 @@ void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *skb)
         ++bcs->trans_up;
 
         if (skb->len)
-                warn("%s: skb->len==%d", __func__, skb->len);
+                dev_warn(bcs->cs->dev, "%s: skb->len==%d\n",
+                         __func__, skb->len);
 
         len = (unsigned char) skb->head[0] |
               (unsigned) (unsigned char) skb->head[1] << 8;
         if (len) {
-                dbg(DEBUG_MCMD,
-                    "Acknowledge sending to LL (id: %d, channel: %d size: %u)",
-                    bcs->cs->myid, bcs->channel, len);
+                gig_dbg(DEBUG_MCMD, "ACKing to LL (id: %d, ch: %d, sz: %u)",
+                        bcs->cs->myid, bcs->channel, len);
 
                 response.driver = bcs->cs->myid;
                 response.command = ISDN_STAT_BSENT;
@@ -119,15 +114,12 @@ static int command_from_LL(isdn_ctrl *cntrl)
         struct bc_state *bcs;
         int retval = 0;
         struct setup_parm *sp;
+        unsigned param;
+        unsigned long flags;
 
-        //dbg(DEBUG_ANY, "Gigaset_HW: Receiving command");
         gigaset_debugdrivers();
 
-        /* Terminate this call if no device is present. Bt if the command is "ISDN_CMD_LOCK" or
-         * "ISDN_CMD_UNLOCK" then execute it due to the fact that they are device independent !
-         */
-        //FIXME "remove test for &connected"
-        if ((!cs || !atomic_read(&cs->connected))) {
+        if (!cs) {
                 warn("LL tried to access unknown device with nr. %d",
                      cntrl->driver);
                 return -ENODEV;
@@ -135,29 +127,30 @@ static int command_from_LL(isdn_ctrl *cntrl)
 
         switch (cntrl->command) {
         case ISDN_CMD_IOCTL:
-
-                dbg(DEBUG_ANY, "ISDN_CMD_IOCTL (driver:%d,arg: %ld)",
-                    cntrl->driver, cntrl->arg);
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_IOCTL (driver: %d, arg: %ld)",
+                        cntrl->driver, cntrl->arg);
 
                 warn("ISDN_CMD_IOCTL is not supported.");
                 return -EINVAL;
 
         case ISDN_CMD_DIAL:
-                dbg(DEBUG_ANY, "ISDN_CMD_DIAL (driver: %d, channel: %ld, "
-                    "phone: %s,ownmsn: %s, si1: %d, si2: %d)",
-                    cntrl->driver, cntrl->arg,
-                    cntrl->parm.setup.phone, cntrl->parm.setup.eazmsn,
-                    cntrl->parm.setup.si1, cntrl->parm.setup.si2);
+                gig_dbg(DEBUG_ANY,
+                        "ISDN_CMD_DIAL (driver: %d, ch: %ld, "
+                        "phone: %s, ownmsn: %s, si1: %d, si2: %d)",
+                        cntrl->driver, cntrl->arg,
+                        cntrl->parm.setup.phone, cntrl->parm.setup.eazmsn,
+                        cntrl->parm.setup.si1, cntrl->parm.setup.si2);
 
                 if (cntrl->arg >= cs->channels) {
-                        err("invalid channel (%d)", (int) cntrl->arg);
+                        err("ISDN_CMD_DIAL: invalid channel (%d)",
+                            (int) cntrl->arg);
                         return -EINVAL;
                 }
 
                 bcs = cs->bcs + cntrl->arg;
 
                 if (!gigaset_get_channel(bcs)) {
-                        err("channel not free");
+                        err("ISDN_CMD_DIAL: channel not free");
                         return -EBUSY;
                 }
 
@@ -169,42 +162,46 @@ static int command_from_LL(isdn_ctrl *cntrl)
                 }
                 *sp = cntrl->parm.setup;
 
-                if (!gigaset_add_event(cs, &bcs->at_state, EV_DIAL, sp,
-                                       atomic_read(&bcs->at_state.seq_index),
-                                       NULL)) {
+                spin_lock_irqsave(&cs->lock, flags);
+                param = bcs->at_state.seq_index;
+                spin_unlock_irqrestore(&cs->lock, flags);
+
+                if (!gigaset_add_event(cs, &bcs->at_state, EV_DIAL, sp, param,
+                                       NULL)) {
                         //FIXME what should we do?
                         kfree(sp);
                         gigaset_free_channel(bcs);
                         return -ENOMEM;
                 }
 
-                dbg(DEBUG_CMD, "scheduling DIAL");
+                gig_dbg(DEBUG_CMD, "scheduling DIAL");
                 gigaset_schedule_event(cs);
                 break;
         case ISDN_CMD_ACCEPTD: //FIXME
-                dbg(DEBUG_ANY, "ISDN_CMD_ACCEPTD");
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_ACCEPTD");
 
                 if (cntrl->arg >= cs->channels) {
-                        err("invalid channel (%d)", (int) cntrl->arg);
+                        err("ISDN_CMD_ACCEPTD: invalid channel (%d)",
+                            (int) cntrl->arg);
                         return -EINVAL;
                 }
 
                 if (!gigaset_add_event(cs, &cs->bcs[cntrl->arg].at_state,
-                                       EV_ACCEPT, NULL, 0, NULL)) {
+                                       EV_ACCEPT, NULL, 0, NULL)) {
                         //FIXME what should we do?
                         return -ENOMEM;
                 }
 
-                dbg(DEBUG_CMD, "scheduling ACCEPT");
+                gig_dbg(DEBUG_CMD, "scheduling ACCEPT");
                 gigaset_schedule_event(cs);
 
                 break;
         case ISDN_CMD_ACCEPTB:
-                dbg(DEBUG_ANY, "ISDN_CMD_ACCEPTB");
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_ACCEPTB");
                 break;
         case ISDN_CMD_HANGUP:
-                dbg(DEBUG_ANY,
-                    "ISDN_CMD_HANGUP (channel: %d)", (int) cntrl->arg);
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_HANGUP (ch: %d)",
+                        (int) cntrl->arg);
 
                 if (cntrl->arg >= cs->channels) {
                         err("ISDN_CMD_HANGUP: invalid channel (%u)",
@@ -213,66 +210,68 @@ static int command_from_LL(isdn_ctrl *cntrl)
                 }
 
                 if (!gigaset_add_event(cs, &cs->bcs[cntrl->arg].at_state,
-                                       EV_HUP, NULL, 0, NULL)) {
+                                       EV_HUP, NULL, 0, NULL)) {
                         //FIXME what should we do?
                         return -ENOMEM;
                 }
 
-                dbg(DEBUG_CMD, "scheduling HUP");
+                gig_dbg(DEBUG_CMD, "scheduling HUP");
                 gigaset_schedule_event(cs);
 
                 break;
-        case ISDN_CMD_CLREAZ:               /* Do not signal incoming signals */ //FIXME
-                dbg(DEBUG_ANY, "ISDN_CMD_CLREAZ");
+        case ISDN_CMD_CLREAZ: /* Do not signal incoming signals */ //FIXME
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_CLREAZ");
                 break;
-        case ISDN_CMD_SETEAZ:               /* Signal incoming calls for given MSN */ //FIXME
-                dbg(DEBUG_ANY,
-                    "ISDN_CMD_SETEAZ (id:%d, channel: %ld, number: %s)",
-                    cntrl->driver, cntrl->arg, cntrl->parm.num);
+        case ISDN_CMD_SETEAZ: /* Signal incoming calls for given MSN */ //FIXME
+                gig_dbg(DEBUG_ANY,
+                        "ISDN_CMD_SETEAZ (id: %d, ch: %ld, number: %s)",
+                        cntrl->driver, cntrl->arg, cntrl->parm.num);
                 break;
-        case ISDN_CMD_SETL2:                /* Set L2 to given protocol */
-                dbg(DEBUG_ANY, "ISDN_CMD_SETL2 (Channel: %ld, Proto: %lx)",
-                     cntrl->arg & 0xff, (cntrl->arg >> 8));
+        case ISDN_CMD_SETL2: /* Set L2 to given protocol */
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_SETL2 (ch: %ld, proto: %lx)",
+                        cntrl->arg & 0xff, (cntrl->arg >> 8));
 
                 if ((cntrl->arg & 0xff) >= cs->channels) {
-                        err("invalid channel (%u)",
+                        err("ISDN_CMD_SETL2: invalid channel (%u)",
                             (unsigned) cntrl->arg & 0xff);
                         return -EINVAL;
                 }
 
                 if (!gigaset_add_event(cs, &cs->bcs[cntrl->arg & 0xff].at_state,
-                                       EV_PROTO_L2, NULL, cntrl->arg >> 8,
-                                       NULL)) {
+                                       EV_PROTO_L2, NULL, cntrl->arg >> 8,
+                                       NULL)) {
                         //FIXME what should we do?
                         return -ENOMEM;
                 }
 
-                dbg(DEBUG_CMD, "scheduling PROTO_L2");
+                gig_dbg(DEBUG_CMD, "scheduling PROTO_L2");
                 gigaset_schedule_event(cs);
                 break;
-        case ISDN_CMD_SETL3:              /* Set L3 to given protocol */
-                dbg(DEBUG_ANY, "ISDN_CMD_SETL3 (Channel: %ld, Proto: %lx)",
-                     cntrl->arg & 0xff, (cntrl->arg >> 8));
+        case ISDN_CMD_SETL3: /* Set L3 to given protocol */
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_SETL3 (ch: %ld, proto: %lx)",
+                        cntrl->arg & 0xff, (cntrl->arg >> 8));
 
                 if ((cntrl->arg & 0xff) >= cs->channels) {
-                        err("invalid channel (%u)",
+                        err("ISDN_CMD_SETL3: invalid channel (%u)",
                             (unsigned) cntrl->arg & 0xff);
                         return -EINVAL;
                 }
 
                 if (cntrl->arg >> 8 != ISDN_PROTO_L3_TRANS) {
-                        err("invalid protocol %lu", cntrl->arg >> 8);
+                        err("ISDN_CMD_SETL3: invalid protocol %lu",
+                            cntrl->arg >> 8);
                         return -EINVAL;
                 }
 
                 break;
         case ISDN_CMD_PROCEED:
-                dbg(DEBUG_ANY, "ISDN_CMD_PROCEED"); //FIXME
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_PROCEED"); //FIXME
                 break;
         case ISDN_CMD_ALERT:
-                dbg(DEBUG_ANY, "ISDN_CMD_ALERT"); //FIXME
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_ALERT"); //FIXME
                 if (cntrl->arg >= cs->channels) {
-                        err("invalid channel (%d)", (int) cntrl->arg);
+                        err("ISDN_CMD_ALERT: invalid channel (%d)",
+                            (int) cntrl->arg);
                         return -EINVAL;
                 }
                 //bcs = cs->bcs + cntrl->arg;
@@ -280,32 +279,31 @@ static int command_from_LL(isdn_ctrl *cntrl)
                 // FIXME
                 break;
         case ISDN_CMD_REDIR:
-                dbg(DEBUG_ANY, "ISDN_CMD_REDIR"); //FIXME
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_REDIR"); //FIXME
                 break;
         case ISDN_CMD_PROT_IO:
-                dbg(DEBUG_ANY, "ISDN_CMD_PROT_IO");
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_PROT_IO");
                 break;
         case ISDN_CMD_FAXCMD:
-                dbg(DEBUG_ANY, "ISDN_CMD_FAXCMD");
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_FAXCMD");
                 break;
         case ISDN_CMD_GETL2:
-                dbg(DEBUG_ANY, "ISDN_CMD_GETL2");
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_GETL2");
                 break;
         case ISDN_CMD_GETL3:
-                dbg(DEBUG_ANY, "ISDN_CMD_GETL3");
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_GETL3");
                 break;
         case ISDN_CMD_GETEAZ:
-                dbg(DEBUG_ANY, "ISDN_CMD_GETEAZ");
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_GETEAZ");
                 break;
         case ISDN_CMD_SETSIL:
-                dbg(DEBUG_ANY, "ISDN_CMD_SETSIL");
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_SETSIL");
                 break;
         case ISDN_CMD_GETSIL:
-                dbg(DEBUG_ANY, "ISDN_CMD_GETSIL");
+                gig_dbg(DEBUG_ANY, "ISDN_CMD_GETSIL");
                 break;
         default:
-                err("unknown command %d from LL",
-                     cntrl->command);
+                err("unknown command %d from LL", cntrl->command);
                 return -EINVAL;
         }
 
@@ -350,7 +348,8 @@ int gigaset_isdn_setup_dial(struct at_state_t *at_state, void *data)
                 proto = 2; /* 0: Bitsynchron, 1: HDLC, 2: voice */
                 break;
         default:
-                err("invalid protocol: %u", bcs->proto2);
+                dev_err(bcs->cs->dev, "%s: invalid L2 protocol: %u\n",
+                        __func__, bcs->proto2);
                 return -EINVAL;
         }
 
@@ -378,7 +377,7 @@ int gigaset_isdn_setup_dial(struct at_state_t *at_state, void *data)
                 bcs->commands[i] = NULL;
                 if (length[i] &&
                     !(bcs->commands[i] = kmalloc(length[i], GFP_ATOMIC))) {
-                        err("out of memory");
+                        dev_err(bcs->cs->dev, "out of memory\n");
                         return -ENOMEM;
                 }
         }
@@ -396,10 +395,14 @@ int gigaset_isdn_setup_dial(struct at_state_t *at_state, void *data)
         }
 
         if (bcs->commands[AT_MSN])
-                snprintf(bcs->commands[AT_MSN], length[AT_MSN], "^SMSN=%s\r", sp->eazmsn);
-        snprintf(bcs->commands[AT_BC   ], length[AT_BC   ], "^SBC=%s\r", bc);
-        snprintf(bcs->commands[AT_PROTO], length[AT_PROTO], "^SBPR=%u\r", proto);
-        snprintf(bcs->commands[AT_ISO  ], length[AT_ISO  ], "^SISO=%u\r", (unsigned)bcs->channel + 1);
+                snprintf(bcs->commands[AT_MSN], length[AT_MSN],
+                         "^SMSN=%s\r", sp->eazmsn);
+        snprintf(bcs->commands[AT_BC   ], length[AT_BC   ],
+                 "^SBC=%s\r", bc);
+        snprintf(bcs->commands[AT_PROTO], length[AT_PROTO],
+                 "^SBPR=%u\r", proto);
+        snprintf(bcs->commands[AT_ISO  ], length[AT_ISO  ],
+                 "^SISO=%u\r", (unsigned)bcs->channel + 1);
 
         return 0;
 }
@@ -419,7 +422,8 @@ int gigaset_isdn_setup_accept(struct at_state_t *at_state)
                 proto = 2; /* 0: Bitsynchron, 1: HDLC, 2: voice */
                 break;
         default:
-                err("invalid protocol: %u", bcs->proto2);
+                dev_err(at_state->cs->dev, "%s: invalid protocol: %u\n",
+                        __func__, bcs->proto2);
                 return -EINVAL;
         }
 
@@ -436,13 +440,15 @@ int gigaset_isdn_setup_accept(struct at_state_t *at_state)
                 bcs->commands[i] = NULL;
                 if (length[i] &&
                     !(bcs->commands[i] = kmalloc(length[i], GFP_ATOMIC))) {
-                        err("out of memory");
+                        dev_err(at_state->cs->dev, "out of memory\n");
                         return -ENOMEM;
                 }
         }
 
-        snprintf(bcs->commands[AT_PROTO], length[AT_PROTO], "^SBPR=%u\r", proto);
-        snprintf(bcs->commands[AT_ISO  ], length[AT_ISO  ], "^SISO=%u\r", (unsigned) bcs->channel + 1);
+        snprintf(bcs->commands[AT_PROTO], length[AT_PROTO],
+                 "^SBPR=%u\r", proto);
+        snprintf(bcs->commands[AT_ISO  ], length[AT_ISO  ],
+                 "^SISO=%u\r", (unsigned) bcs->channel + 1);
 
         return 0;
 }
@@ -473,7 +479,7 @@ int gigaset_isdn_icall(struct at_state_t *at_state)
                 response.parm.setup.si1 = 1;
                 response.parm.setup.si2 = 2;
         } else {
-                warn("RING ignored - unsupported BC %s",
+                dev_warn(cs->dev, "RING ignored - unsupported BC %s\n",
                      at_state->str_var[STR_ZBC]);
                 return ICALL_IGNORE;
         }
@@ -491,18 +497,17 @@ int gigaset_isdn_icall(struct at_state_t *at_state)
                 response.parm.setup.eazmsn[0] = 0;
 
         if (!bcs) {
-                notice("no channel for incoming call");
-                dbg(DEBUG_CMD, "Sending ICALLW");
+                dev_notice(cs->dev, "no channel for incoming call\n");
                 response.command = ISDN_STAT_ICALLW;
                 response.arg = 0; //FIXME
         } else {
-                dbg(DEBUG_CMD, "Sending ICALL");
+                gig_dbg(DEBUG_CMD, "Sending ICALL");
                 response.command = ISDN_STAT_ICALL;
                 response.arg = bcs->channel; //FIXME
         }
         response.driver = cs->myid;
         retval = cs->iif.statcallb(&response);
-        dbg(DEBUG_CMD, "Response: %d", retval);
+        gig_dbg(DEBUG_CMD, "Response: %d", retval);
         switch (retval) {
         case 0: /* no takers */
                 return ICALL_IGNORE;
@@ -512,7 +517,8 @@ int gigaset_isdn_icall(struct at_state_t *at_state)
         case 2: /* reject */
                 return ICALL_REJECT;
         case 3: /* incomplete */
-                warn("LL requested unsupported feature: Incomplete Number");
+                dev_warn(cs->dev,
+                       "LL requested unsupported feature: Incomplete Number\n");
                 return ICALL_IGNORE;
         case 4: /* proceeding */
                 /* Gigaset will send ALERTING anyway.
@@ -520,10 +526,11 @@ int gigaset_isdn_icall(struct at_state_t *at_state)
                  */
                 return ICALL_ACCEPT;
         case 5: /* deflect */
-                warn("LL requested unsupported feature: Call Deflection");
+                dev_warn(cs->dev,
+                         "LL requested unsupported feature: Call Deflection\n");
                 return ICALL_IGNORE;
         default:
-                err("LL error %d on ICALL", retval);
+                dev_err(cs->dev, "LL error %d on ICALL\n", retval);
                 return ICALL_IGNORE;
         }
 }
@@ -533,7 +540,7 @@ int gigaset_register_to_LL(struct cardstate *cs, const char *isdnid)
 {
         isdn_if *iif = &cs->iif;
 
-        dbg(DEBUG_ANY, "Register driver capabilities to LL");
+        gig_dbg(DEBUG_ANY, "Register driver capabilities to LL");
 
         //iif->id[sizeof(iif->id) - 1]=0;
         //strncpy(iif->id, isdnid, sizeof(iif->id) - 1);
@@ -542,26 +549,26 @@ int gigaset_register_to_LL(struct cardstate *cs, const char *isdnid)
                 return -ENOMEM; //FIXME EINVAL/...??
 
         iif->owner = THIS_MODULE;
-        iif->channels = cs->channels;                        /* I am supporting just one channel *//* I was supporting...*/
+        iif->channels = cs->channels;
         iif->maxbufsize = MAX_BUF_SIZE;
-        iif->features = ISDN_FEATURE_L2_TRANS |   /* Our device is very advanced, therefore */
+        iif->features = ISDN_FEATURE_L2_TRANS |
                 ISDN_FEATURE_L2_HDLC |
 #ifdef GIG_X75
                 ISDN_FEATURE_L2_X75I |
 #endif
                 ISDN_FEATURE_L3_TRANS |
                 ISDN_FEATURE_P_EURO;
-        iif->hl_hdrlen = HW_HDR_LEN;              /* Area for storing ack */
+        iif->hl_hdrlen = HW_HDR_LEN;            /* Area for storing ack */
         iif->command = command_from_LL;
         iif->writebuf_skb = writebuf_from_LL;
-        iif->writecmd = NULL;                     /* Don't support isdnctrl */
-        iif->readstat = NULL;                     /* Don't support isdnctrl */
-        iif->rcvcallb_skb = NULL;                 /* Will be set by LL */
-        iif->statcallb = NULL;                    /* Will be set by LL */
+        iif->writecmd = NULL;                   /* Don't support isdnctrl */
+        iif->readstat = NULL;                   /* Don't support isdnctrl */
+        iif->rcvcallb_skb = NULL;               /* Will be set by LL */
+        iif->statcallb = NULL;                  /* Will be set by LL */
 
         if (!register_isdn(iif))
                 return 0;
 
-        cs->myid = iif->channels;                 /* Set my device id */
+        cs->myid = iif->channels;               /* Set my device id */
         return 1;
 }
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index 3a81d9c65141..08e4c4eea14d 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -9,8 +9,6 @@
  *    published by the Free Software Foundation; either version 2 of
  *    the License, or (at your option) any later version.
  * =====================================================================
- * Version: $Id: interface.c,v 1.14.4.15 2006/02/04 18:28:16 hjlipp Exp $
- * =====================================================================
  */
 
 #include "gigaset.h"
@@ -24,7 +22,7 @@ static int if_lock(struct cardstate *cs, int *arg)
 {
         int cmd = *arg;
 
-        dbg(DEBUG_IF, "%u: if_lock (%d)", cs->minor_index, cmd);
+        gig_dbg(DEBUG_IF, "%u: if_lock (%d)", cs->minor_index, cmd);
 
         if (cmd > 1)
                 return -EINVAL;
@@ -35,7 +33,7 @@ static int if_lock(struct cardstate *cs, int *arg)
         }
 
         if (!cmd && atomic_read(&cs->mstate) == MS_LOCKED
-            && atomic_read(&cs->connected)) {
+            && cs->connected) {
                 cs->ops->set_modem_ctrl(cs, 0, TIOCM_DTR|TIOCM_RTS);
                 cs->ops->baud_rate(cs, B115200);
                 cs->ops->set_line_ctrl(cs, CS8);
@@ -44,12 +42,12 @@ static int if_lock(struct cardstate *cs, int *arg)
 
         cs->waiting = 1;
         if (!gigaset_add_event(cs, &cs->at_state, EV_IF_LOCK,
-                               NULL, cmd, NULL)) {
+                               NULL, cmd, NULL)) {
                 cs->waiting = 0;
                 return -ENOMEM;
         }
 
-        dbg(DEBUG_CMD, "scheduling IF_LOCK");
+        gig_dbg(DEBUG_CMD, "scheduling IF_LOCK");
         gigaset_schedule_event(cs);
 
         wait_event(cs->waitqueue, !cs->waiting);
@@ -68,7 +66,7 @@ static int if_version(struct cardstate *cs, unsigned arg[4])
         static const unsigned compat[4] = GIG_COMPAT;
         unsigned cmd = arg[0];
 
-        dbg(DEBUG_IF, "%u: if_version (%d)", cs->minor_index, cmd);
+        gig_dbg(DEBUG_IF, "%u: if_version (%d)", cs->minor_index, cmd);
 
         switch (cmd) {
         case GIGVER_DRIVER:
@@ -80,12 +78,12 @@ static int if_version(struct cardstate *cs, unsigned arg[4])
         case GIGVER_FWBASE:
                 cs->waiting = 1;
                 if (!gigaset_add_event(cs, &cs->at_state, EV_IF_VER,
-                                       NULL, 0, arg)) {
+                                       NULL, 0, arg)) {
                         cs->waiting = 0;
                         return -ENOMEM;
                 }
 
-                dbg(DEBUG_CMD, "scheduling IF_VER");
+                gig_dbg(DEBUG_CMD, "scheduling IF_VER");
                 gigaset_schedule_event(cs);
 
                 wait_event(cs->waitqueue, !cs->waiting);
@@ -101,7 +99,7 @@ static int if_version(struct cardstate *cs, unsigned arg[4])
 
 static int if_config(struct cardstate *cs, int *arg)
 {
-        dbg(DEBUG_IF, "%u: if_config (%d)", cs->minor_index, *arg);
+        gig_dbg(DEBUG_IF, "%u: if_config (%d)", cs->minor_index, *arg);
 
         if (*arg != 1)
                 return -EINVAL;
@@ -109,6 +107,11 @@ static int if_config(struct cardstate *cs, int *arg)
         if (atomic_read(&cs->mstate) != MS_LOCKED)
                 return -EBUSY;
 
+        if (!cs->connected) {
+                err("not connected!");
+                return -ENODEV;
+        }
+
         *arg = 0;
         return gigaset_enterconfigmode(cs);
 }
@@ -119,7 +122,7 @@ static int if_config(struct cardstate *cs, int *arg)
 static int  if_open(struct tty_struct *tty, struct file *filp);
 static void if_close(struct tty_struct *tty, struct file *filp);
 static int  if_ioctl(struct tty_struct *tty, struct file *file,
-                     unsigned int cmd, unsigned long arg);
+                     unsigned int cmd, unsigned long arg);
 static int  if_write_room(struct tty_struct *tty);
 static int  if_chars_in_buffer(struct tty_struct *tty);
 static void if_throttle(struct tty_struct *tty);
@@ -127,9 +130,9 @@ static void if_unthrottle(struct tty_struct *tty);
 static void if_set_termios(struct tty_struct *tty, struct termios *old);
 static int  if_tiocmget(struct tty_struct *tty, struct file *file);
 static int  if_tiocmset(struct tty_struct *tty, struct file *file,
-                        unsigned int set, unsigned int clear);
+                        unsigned int set, unsigned int clear);
 static int  if_write(struct tty_struct *tty,
-                     const unsigned char *buf, int count);
+                     const unsigned char *buf, int count);
 
 static struct tty_operations if_ops = {
         .open =                 if_open,
@@ -153,8 +156,8 @@ static int if_open(struct tty_struct *tty, struct file *filp)
         struct cardstate *cs;
         unsigned long flags;
 
-        dbg(DEBUG_IF, "%d+%d: %s()", tty->driver->minor_start, tty->index,
-            __FUNCTION__);
+        gig_dbg(DEBUG_IF, "%d+%d: %s()",
+                tty->driver->minor_start, tty->index, __func__);
 
         tty->driver_data = NULL;
 
@@ -162,7 +165,7 @@ static int if_open(struct tty_struct *tty, struct file *filp)
         if (!cs)
                 return -ENODEV;
 
-        if (down_interruptible(&cs->sem))
+        if (mutex_lock_interruptible(&cs->mutex))
                 return -ERESTARTSYS; // FIXME -EINTR?
         tty->driver_data = cs;
 
@@ -173,10 +176,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
                 cs->tty = tty;
                 spin_unlock_irqrestore(&cs->lock, flags);
                 tty->low_latency = 1; //FIXME test
-                //FIXME
         }
 
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
         return 0;
 }
 
@@ -187,30 +189,29 @@ static void if_close(struct tty_struct *tty, struct file *filp)
 
         cs = (struct cardstate *) tty->driver_data;
         if (!cs) {
-                err("cs==NULL in %s", __FUNCTION__);
+                err("cs==NULL in %s", __func__);
                 return;
         }
 
-        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
-        down(&cs->sem);
+        mutex_lock(&cs->mutex);
 
         if (!cs->open_count)
-                warn("%s: device not opened", __FUNCTION__);
+                warn("%s: device not opened", __func__);
         else {
                 if (!--cs->open_count) {
                         spin_lock_irqsave(&cs->lock, flags);
                         cs->tty = NULL;
                         spin_unlock_irqrestore(&cs->lock, flags);
-                        //FIXME
                 }
         }
 
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
 }
 
 static int if_ioctl(struct tty_struct *tty, struct file *file,
-                    unsigned int cmd, unsigned long arg)
+                    unsigned int cmd, unsigned long arg)
 {
         struct cardstate *cs;
         int retval = -ENODEV;
@@ -220,17 +221,17 @@ static int if_ioctl(struct tty_struct *tty, struct file *file,
 
         cs = (struct cardstate *) tty->driver_data;
         if (!cs) {
-                err("cs==NULL in %s", __FUNCTION__);
+                err("cs==NULL in %s", __func__);
                 return -ENODEV;
         }
 
-        dbg(DEBUG_IF, "%u: %s(0x%x)", cs->minor_index, __FUNCTION__, cmd);
+        gig_dbg(DEBUG_IF, "%u: %s(0x%x)", cs->minor_index, __func__, cmd);
 
-        if (down_interruptible(&cs->sem))
+        if (mutex_lock_interruptible(&cs->mutex))
                 return -ERESTARTSYS; // FIXME -EINTR?
 
         if (!cs->open_count)
-                warn("%s: device not opened", __FUNCTION__);
+                warn("%s: device not opened", __func__);
         else {
                 retval = 0;
                 switch (cmd) {
@@ -250,37 +251,40 @@ static int if_ioctl(struct tty_struct *tty, struct file *file,
                         break;
                 case GIGASET_BRKCHARS:
                         //FIXME test if MS_LOCKED
-                        gigaset_dbg_buffer(DEBUG_IF, "GIGASET_BRKCHARS",
-                                           6, (const unsigned char *) arg, 1);
-                        if (!atomic_read(&cs->connected)) {
-                                dbg(DEBUG_ANY, "can't communicate with unplugged device");
+                        if (!cs->connected) {
+                                gig_dbg(DEBUG_ANY,
+                                    "can't communicate with unplugged device");
                                 retval = -ENODEV;
                                 break;
                         }
                         retval = copy_from_user(&buf,
-                                                (const unsigned char __user *) arg, 6)
-                                 ? -EFAULT : 0;
-                        if (retval >= 0)
+                                        (const unsigned char __user *) arg, 6)
+                                ? -EFAULT : 0;
+                        if (retval >= 0) {
+                                gigaset_dbg_buffer(DEBUG_IF, "GIGASET_BRKCHARS",
+                                                6, (const unsigned char *) arg);
                                 retval = cs->ops->brkchars(cs, buf);
+                        }
                         break;
                 case GIGASET_VERSION:
-                        retval = copy_from_user(version, (unsigned __user *) arg,
-                                                sizeof version) ? -EFAULT : 0;
+                        retval = copy_from_user(version,
+                                        (unsigned __user *) arg, sizeof version)
+                                ? -EFAULT : 0;
                         if (retval >= 0)
                                 retval = if_version(cs, version);
                         if (retval >= 0)
-                                retval = copy_to_user((unsigned __user *) arg, version,
-                                                      sizeof version)
-                                         ? -EFAULT : 0;
+                                retval = copy_to_user((unsigned __user *) arg,
+                                                      version, sizeof version)
+                                        ? -EFAULT : 0;
                         break;
-                default:
-                        dbg(DEBUG_ANY, "%s: arg not supported - 0x%04x",
-                            __FUNCTION__, cmd);
+                default:
+                        gig_dbg(DEBUG_ANY, "%s: arg not supported - 0x%04x",
+                                __func__, cmd);
                         retval = -ENOIOCTLCMD;
                 }
         }
 
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
 
         return retval;
 }
@@ -292,25 +296,25 @@ static int if_tiocmget(struct tty_struct *tty, struct file *file)
 
         cs = (struct cardstate *) tty->driver_data;
         if (!cs) {
-                err("cs==NULL in %s", __FUNCTION__);
+                err("cs==NULL in %s", __func__);
                 return -ENODEV;
         }
 
-        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
-        if (down_interruptible(&cs->sem))
+        if (mutex_lock_interruptible(&cs->mutex))
                 return -ERESTARTSYS; // FIXME -EINTR?
 
         // FIXME read from device?
         retval = cs->control_state & (TIOCM_RTS|TIOCM_DTR);
 
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
 
         return retval;
 }
 
 static int if_tiocmset(struct tty_struct *tty, struct file *file,
-                       unsigned int set, unsigned int clear)
+                       unsigned int set, unsigned int clear)
 {
         struct cardstate *cs;
         int retval;
@@ -318,18 +322,18 @@ static int if_tiocmset(struct tty_struct *tty, struct file *file,
 
         cs = (struct cardstate *) tty->driver_data;
         if (!cs) {
-                err("cs==NULL in %s", __FUNCTION__);
+                err("cs==NULL in %s", __func__);
                 return -ENODEV;
         }
 
-        dbg(DEBUG_IF,
-            "%u: %s(0x%x, 0x%x)", cs->minor_index, __FUNCTION__, set, clear);
+        gig_dbg(DEBUG_IF, "%u: %s(0x%x, 0x%x)",
+                cs->minor_index, __func__, set, clear);
 
-        if (down_interruptible(&cs->sem))
+        if (mutex_lock_interruptible(&cs->mutex))
                 return -ERESTARTSYS; // FIXME -EINTR?
 
-        if (!atomic_read(&cs->connected)) {
-                dbg(DEBUG_ANY, "can't communicate with unplugged device");
+        if (!cs->connected) {
+                gig_dbg(DEBUG_ANY, "can't communicate with unplugged device");
                 retval = -ENODEV;
         } else {
                 mc = (cs->control_state | set) & ~clear & (TIOCM_RTS|TIOCM_DTR);
@@ -337,7 +341,7 @@ static int if_tiocmset(struct tty_struct *tty, struct file *file,
                 cs->control_state = mc;
         }
 
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
 
         return retval;
 }
@@ -349,29 +353,29 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
 
         cs = (struct cardstate *) tty->driver_data;
         if (!cs) {
-                err("cs==NULL in %s", __FUNCTION__);
+                err("cs==NULL in %s", __func__);
                 return -ENODEV;
         }
 
-        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
-        if (down_interruptible(&cs->sem))
+        if (mutex_lock_interruptible(&cs->mutex))
                 return -ERESTARTSYS; // FIXME -EINTR?
 
         if (!cs->open_count)
-                warn("%s: device not opened", __FUNCTION__);
+                warn("%s: device not opened", __func__);
         else if (atomic_read(&cs->mstate) != MS_LOCKED) {
                 warn("can't write to unlocked device");
                 retval = -EBUSY;
-        } else if (!atomic_read(&cs->connected)) {
-                dbg(DEBUG_ANY, "can't write to unplugged device");
+        } else if (!cs->connected) {
+                gig_dbg(DEBUG_ANY, "can't write to unplugged device");
                 retval = -EBUSY; //FIXME
         } else {
                 retval = cs->ops->write_cmd(cs, buf, count,
-                                            &cs->if_wake_tasklet);
+                                            &cs->if_wake_tasklet);
         }
 
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
 
         return retval;
 }
@@ -383,27 +387,27 @@ static int if_write_room(struct tty_struct *tty)
 
         cs = (struct cardstate *) tty->driver_data;
         if (!cs) {
-                err("cs==NULL in %s", __FUNCTION__);
+                err("cs==NULL in %s", __func__);
                 return -ENODEV;
         }
 
-        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
-        if (down_interruptible(&cs->sem))
+        if (mutex_lock_interruptible(&cs->mutex))
                 return -ERESTARTSYS; // FIXME -EINTR?
 
         if (!cs->open_count)
-                warn("%s: device not opened", __FUNCTION__);
+                warn("%s: device not opened", __func__);
         else if (atomic_read(&cs->mstate) != MS_LOCKED) {
                 warn("can't write to unlocked device");
                 retval = -EBUSY; //FIXME
-        } else if (!atomic_read(&cs->connected)) {
-                dbg(DEBUG_ANY, "can't write to unplugged device");
+        } else if (!cs->connected) {
+                gig_dbg(DEBUG_ANY, "can't write to unplugged device");
                 retval = -EBUSY; //FIXME
         } else
                 retval = cs->ops->write_room(cs);
 
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
 
         return retval;
 }
@@ -415,27 +419,27 @@ static int if_chars_in_buffer(struct tty_struct *tty)
 
         cs = (struct cardstate *) tty->driver_data;
         if (!cs) {
-                err("cs==NULL in %s", __FUNCTION__);
+                err("cs==NULL in %s", __func__);
                 return -ENODEV;
         }
 
-        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
-        if (down_interruptible(&cs->sem))
+        if (mutex_lock_interruptible(&cs->mutex))
                 return -ERESTARTSYS; // FIXME -EINTR?
 
         if (!cs->open_count)
-                warn("%s: device not opened", __FUNCTION__);
+                warn("%s: device not opened", __func__);
         else if (atomic_read(&cs->mstate) != MS_LOCKED) {
                 warn("can't write to unlocked device");
                 retval = -EBUSY;
-        } else if (!atomic_read(&cs->connected)) {
-                dbg(DEBUG_ANY, "can't write to unplugged device");
+        } else if (!cs->connected) {
+                gig_dbg(DEBUG_ANY, "can't write to unplugged device");
                 retval = -EBUSY; //FIXME
         } else
                 retval = cs->ops->chars_in_buffer(cs);
 
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
 
         return retval;
 }
@@ -446,21 +450,21 @@ static void if_throttle(struct tty_struct *tty)
 
         cs = (struct cardstate *) tty->driver_data;
         if (!cs) {
-                err("cs==NULL in %s", __FUNCTION__);
+                err("cs==NULL in %s", __func__);
                 return;
         }
 
-        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
-        down(&cs->sem);
+        mutex_lock(&cs->mutex);
 
         if (!cs->open_count)
-                warn("%s: device not opened", __FUNCTION__);
+                warn("%s: device not opened", __func__);
         else {
                 //FIXME
         }
 
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
 }
 
 static void if_unthrottle(struct tty_struct *tty)
@@ -469,21 +473,21 @@ static void if_unthrottle(struct tty_struct *tty)
 
         cs = (struct cardstate *) tty->driver_data;
         if (!cs) {
-                err("cs==NULL in %s", __FUNCTION__);
+                err("cs==NULL in %s", __func__);
                 return;
         }
 
-        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
-        down(&cs->sem);
+        mutex_lock(&cs->mutex);
 
         if (!cs->open_count)
-                warn("%s: device not opened", __FUNCTION__);
+                warn("%s: device not opened", __func__);
         else {
                 //FIXME
         }
 
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
 }
 
 static void if_set_termios(struct tty_struct *tty, struct termios *old)
@@ -496,21 +500,21 @@ static void if_set_termios(struct tty_struct *tty, struct termios *old)
 
         cs = (struct cardstate *) tty->driver_data;
         if (!cs) {
-                err("cs==NULL in %s", __FUNCTION__);
+                err("cs==NULL in %s", __func__);
                 return;
         }
 
-        dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __FUNCTION__);
+        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
-        down(&cs->sem);
+        mutex_lock(&cs->mutex);
 
         if (!cs->open_count) {
-                warn("%s: device not opened", __FUNCTION__);
+                warn("%s: device not opened", __func__);
                 goto out;
         }
 
-        if (!atomic_read(&cs->connected)) {
-                dbg(DEBUG_ANY, "can't communicate with unplugged device");
+        if (!cs->connected) {
+                gig_dbg(DEBUG_ANY, "can't communicate with unplugged device");
                 goto out;
         }
 
@@ -518,8 +522,8 @@ static void if_set_termios(struct tty_struct *tty, struct termios *old)
         iflag = tty->termios->c_iflag;
         cflag = tty->termios->c_cflag;
         old_cflag = old ? old->c_cflag : cflag; //FIXME?
-        dbg(DEBUG_IF, "%u: iflag %x cflag %x old %x", cs->minor_index,
-            iflag, cflag, old_cflag);
+        gig_dbg(DEBUG_IF, "%u: iflag %x cflag %x old %x",
+                cs->minor_index, iflag, cflag, old_cflag);
 
         /* get a local copy of the current port settings */
         control_state = cs->control_state;
@@ -531,14 +535,15 @@ static void if_set_termios(struct tty_struct *tty, struct termios *old)
          * Premature optimization is the root of all evil.
          */
 
-        /* reassert DTR and (maybe) RTS on transition from B0 */
+        /* reassert DTR and (maybe) RTS on transition from B0 */
         if ((old_cflag & CBAUD) == B0) {
                 new_state = control_state | TIOCM_DTR;
                 /* don't set RTS if using hardware flow control */
                 if (!(old_cflag & CRTSCTS))
                         new_state |= TIOCM_RTS;
-                dbg(DEBUG_IF, "%u: from B0 - set DTR%s", cs->minor_index,
-                    (new_state & TIOCM_RTS) ? " only" : "/RTS");
+                gig_dbg(DEBUG_IF, "%u: from B0 - set DTR%s",
+                        cs->minor_index,
+                        (new_state & TIOCM_RTS) ? " only" : "/RTS");
                 cs->ops->set_modem_ctrl(cs, control_state, new_state);
                 control_state = new_state;
         }
@@ -547,7 +552,7 @@ static void if_set_termios(struct tty_struct *tty, struct termios *old)
 
         if ((cflag & CBAUD) == B0) {
                 /* Drop RTS and DTR */
-                dbg(DEBUG_IF, "%u: to B0 - drop DTR/RTS", cs->minor_index);
+                gig_dbg(DEBUG_IF, "%u: to B0 - drop DTR/RTS", cs->minor_index);
                 new_state = control_state & ~(TIOCM_DTR | TIOCM_RTS);
                 cs->ops->set_modem_ctrl(cs, control_state, new_state);
                 control_state = new_state;
@@ -567,15 +572,17 @@ static void if_set_termios(struct tty_struct *tty, struct termios *old)
          * Just do what we have seen with SniffUSB on Win98.
          */
         /* Drop DTR/RTS if no flow control otherwise assert */
-        dbg(DEBUG_IF, "%u: control_state %x", cs->minor_index, control_state);
+        gig_dbg(DEBUG_IF, "%u: control_state %x",
+                cs->minor_index, control_state);
         new_state = control_state;
         if ((iflag & IXOFF) || (iflag & IXON) || (cflag & CRTSCTS))
                 new_state |= TIOCM_DTR | TIOCM_RTS;
         else
                 new_state &= ~(TIOCM_DTR | TIOCM_RTS);
         if (new_state != control_state) {
-                dbg(DEBUG_IF, "%u: new_state %x", cs->minor_index, new_state);
-                gigaset_set_modem_ctrl(cs, control_state, new_state); // FIXME: mct_u232.c sets the old state here. is this a bug?
+                gig_dbg(DEBUG_IF, "%u: new_state %x",
+                        cs->minor_index, new_state);
+                gigaset_set_modem_ctrl(cs, control_state, new_state);
                 control_state = new_state;
         }
 #endif
@@ -584,7 +591,7 @@ static void if_set_termios(struct tty_struct *tty, struct termios *old)
         cs->control_state = control_state;
 
 out:
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
 }
 
 
@@ -600,7 +607,7 @@ static void if_wake(unsigned long data)
 
         if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
             tty->ldisc.write_wakeup) {
-                dbg(DEBUG_IF, "write wakeup call");
+                gig_dbg(DEBUG_IF, "write wakeup call");
                 tty->ldisc.write_wakeup(tty);
         }
 
@@ -635,14 +642,14 @@ void gigaset_if_free(struct cardstate *cs)
 }
 
 void gigaset_if_receive(struct cardstate *cs,
-                        unsigned char *buffer, size_t len)
+                        unsigned char *buffer, size_t len)
 {
         unsigned long flags;
         struct tty_struct *tty;
 
         spin_lock_irqsave(&cs->lock, flags);
         if ((tty = cs->tty) == NULL)
-                dbg(DEBUG_ANY, "receive on closed device");
+                gig_dbg(DEBUG_ANY, "receive on closed device");
         else {
                 tty_buffer_request_room(tty, len);
                 tty_insert_flip_string(tty, buffer, len);
@@ -655,13 +662,13 @@ EXPORT_SYMBOL_GPL(gigaset_if_receive);
 /* gigaset_if_initdriver
  * Initialize tty interface.
  * parameters:
- *      drv             Driver
- *      procname        Name of the driver (e.g. for /proc/tty/drivers)
- *      devname         Name of the device files (prefix without minor number)
- *      devfsname       Devfs name of the device files without %d
+ *      drv             Driver
+ *      procname        Name of the driver (e.g. for /proc/tty/drivers)
+ *      devname         Name of the device files (prefix without minor number)
+ *      devfsname       Devfs name of the device files without %d
  */
 void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
-                           const char *devname, const char *devfsname)
+                           const char *devname, const char *devfsname)
 {
         unsigned minors = drv->minors;
         int ret;
@@ -696,7 +703,7 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
                 warn("failed to register tty driver (error %d)", ret);
                 goto error;
         }
-        dbg(DEBUG_IF, "tty driver initialized");
+        gig_dbg(DEBUG_IF, "tty driver initialized");
         drv->have_tty = 1;
         return;
 
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c
index 5744eb91b315..45f017ed6e8c 100644
--- a/drivers/isdn/gigaset/isocdata.c
+++ b/drivers/isdn/gigaset/isocdata.c
@@ -10,10 +10,6 @@
  *      published by the Free Software Foundation; either version 2 of
  *      the License, or (at your option) any later version.
  * =====================================================================
- * ToDo: ...
- * =====================================================================
- * Version: $Id: isocdata.c,v 1.2.2.5 2005/11/13 23:05:19 hjlipp Exp $
- * =====================================================================
  */
 
 #include "gigaset.h"
@@ -87,14 +83,14 @@ static inline int isowbuf_startwrite(struct isowbuf_t *iwb)
 {
         if (!atomic_dec_and_test(&iwb->writesem)) {
                 atomic_inc(&iwb->writesem);
-                dbg(DEBUG_ISO,
-                    "%s: couldn't acquire iso write semaphore", __func__);
+                gig_dbg(DEBUG_ISO, "%s: couldn't acquire iso write semaphore",
+                        __func__);
                 return 0;
         }
 #ifdef CONFIG_GIGASET_DEBUG
-        dbg(DEBUG_ISO,
-            "%s: acquired iso write semaphore, data[write]=%02x, nbits=%d",
-            __func__, iwb->data[atomic_read(&iwb->write)], iwb->wbits);
+        gig_dbg(DEBUG_ISO,
+                "%s: acquired iso write semaphore, data[write]=%02x, nbits=%d",
+                __func__, iwb->data[atomic_read(&iwb->write)], iwb->wbits);
 #endif
         return 1;
 }
@@ -147,7 +143,7 @@ static inline void isowbuf_putflag(struct isowbuf_t *iwb)
         /* recover the idle flag byte */
         write = atomic_read(&iwb->write);
         iwb->idle = iwb->data[write];
-        dbg(DEBUG_ISO, "idle fill byte %02x", iwb->idle);
+        gig_dbg(DEBUG_ISO, "idle fill byte %02x", iwb->idle);
         /* mask extraneous bits in buffer */
         iwb->data[write] &= (1 << iwb->wbits) - 1;
 }
@@ -166,15 +162,14 @@ int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size)
         read = atomic_read(&iwb->nextread);
         write = atomic_read(&iwb->write);
         if (likely(read == write)) {
-                //dbg(DEBUG_STREAM, "%s: send buffer empty", __func__);
                 /* return idle frame */
                 return read < BAS_OUTBUFPAD ?
-                        BAS_OUTBUFSIZE : read - BAS_OUTBUFPAD;
+                        BAS_OUTBUFSIZE : read - BAS_OUTBUFPAD;
         }
 
         limit = read + size;
-        dbg(DEBUG_STREAM,
-            "%s: read=%d write=%d limit=%d", __func__, read, write, limit);
+        gig_dbg(DEBUG_STREAM, "%s: read=%d write=%d limit=%d",
+                __func__, read, write, limit);
 #ifdef CONFIG_GIGASET_DEBUG
         if (unlikely(size < 0 || size > BAS_OUTBUFPAD)) {
                 err("invalid size %d", size);
@@ -196,11 +191,12 @@ int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size)
                                 return -EBUSY;
                         /* write position could have changed */
                         if (limit >= (write = atomic_read(&iwb->write))) {
-                                pbyte = iwb->data[write]; /* save partial byte */
+                                pbyte = iwb->data[write]; /* save
+                                                             partial byte */
                                 limit = write + BAS_OUTBUFPAD;
-                                dbg(DEBUG_STREAM,
-                                    "%s: filling %d->%d with %02x",
-                                    __func__, write, limit, iwb->idle);
+                                gig_dbg(DEBUG_STREAM,
+                                        "%s: filling %d->%d with %02x",
+                                        __func__, write, limit, iwb->idle);
                                 if (write + BAS_OUTBUFPAD < BAS_OUTBUFSIZE)
                                         memset(iwb->data + write, iwb->idle,
                                                BAS_OUTBUFPAD);
@@ -211,9 +207,11 @@ int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size)
                                                - write);
                                         limit = 0;
                                 }
-                                dbg(DEBUG_STREAM, "%s: restoring %02x at %d",
-                                    __func__, pbyte, limit);
-                                iwb->data[limit] = pbyte; /* restore partial byte */
+                                gig_dbg(DEBUG_STREAM,
+                                        "%s: restoring %02x at %d",
+                                        __func__, pbyte, limit);
+                                iwb->data[limit] = pbyte; /* restore
+                                                             partial byte */
                                 atomic_set(&iwb->write, limit);
                         }
                         isowbuf_donewrite(iwb);
@@ -242,19 +240,17 @@ int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size)
  * write hex bytes to syslog for debugging
  */
 static inline void dump_bytes(enum debuglevel level, const char *tag,
-                              unsigned char *bytes, int count)
+                              unsigned char *bytes, int count)
 {
 #ifdef CONFIG_GIGASET_DEBUG
         unsigned char c;
         static char dbgline[3 * 32 + 1];
         static const char hexdigit[] = "0123456789abcdef";
         int i = 0;
-        IFNULLRET(tag);
-        IFNULLRET(bytes);
         while (count-- > 0) {
                 if (i > sizeof(dbgline) - 4) {
                         dbgline[i] = '\0';
-                        dbg(level, "%s:%s", tag, dbgline);
+                        gig_dbg(level, "%s:%s", tag, dbgline);
                         i = 0;
                 }
                 c = *bytes++;
@@ -264,7 +260,7 @@ static inline void dump_bytes(enum debuglevel level, const char *tag,
                 dbgline[i++] = hexdigit[c & 0x0f];
         }
         dbgline[i] = '\0';
-        dbg(level, "%s:%s", tag, dbgline);
+        gig_dbg(level, "%s:%s", tag, dbgline);
 #endif
 }
 
@@ -380,7 +376,7 @@ static u16 stufftab[5 * 256] = {
  */
 
 static inline int hdlc_bitstuff_byte(struct isowbuf_t *iwb, unsigned char cin,
-                                     int ones)
+                                     int ones)
 {
         u16 stuff;
         int shiftinc, newones;
@@ -422,7 +418,7 @@ static inline int hdlc_bitstuff_byte(struct isowbuf_t *iwb, unsigned char cin,
  */
 
 static inline int hdlc_buildframe(struct isowbuf_t *iwb,
-                                  unsigned char *in, int count)
+                                  unsigned char *in, int count)
 {
         int ones;
         u16 fcs;
@@ -431,8 +427,8 @@ static inline int hdlc_buildframe(struct isowbuf_t *iwb,
 
         if (isowbuf_freebytes(iwb) < count + count / 5 + 6 ||
             !isowbuf_startwrite(iwb)) {
-                dbg(DEBUG_ISO, "%s: %d bytes free -> -EAGAIN",
-                    __func__, isowbuf_freebytes(iwb));
+                gig_dbg(DEBUG_ISO, "%s: %d bytes free -> -EAGAIN",
+                        __func__, isowbuf_freebytes(iwb));
                 return -EAGAIN;
         }
 
@@ -484,11 +480,11 @@ static inline int trans_buildframe(struct isowbuf_t *iwb,
 
         if (isowbuf_freebytes(iwb) < count ||
             !isowbuf_startwrite(iwb)) {
-                dbg(DEBUG_ISO, "can't put %d bytes", count);
+                gig_dbg(DEBUG_ISO, "can't put %d bytes", count);
                 return -EAGAIN;
         }
 
-        dbg(DEBUG_STREAM, "put %d bytes", count);
+        gig_dbg(DEBUG_STREAM, "put %d bytes", count);
         write = atomic_read(&iwb->write);
         do {
                 c = gigaset_invtab[*in++];
@@ -508,11 +504,13 @@ int gigaset_isoc_buildframe(struct bc_state *bcs, unsigned char *in, int len)
         switch (bcs->proto2) {
         case ISDN_PROTO_L2_HDLC:
                 result = hdlc_buildframe(bcs->hw.bas->isooutbuf, in, len);
-                dbg(DEBUG_ISO, "%s: %d bytes HDLC -> %d", __func__, len, result);
+                gig_dbg(DEBUG_ISO, "%s: %d bytes HDLC -> %d",
+                        __func__, len, result);
                 break;
         default:                        /* assume transparent */
                 result = trans_buildframe(bcs->hw.bas->isooutbuf, in, len);
-                dbg(DEBUG_ISO, "%s: %d bytes trans -> %d", __func__, len, result);
+                gig_dbg(DEBUG_ISO, "%s: %d bytes trans -> %d",
+                        __func__, len, result);
         }
         return result;
 }
@@ -528,13 +526,13 @@ static inline void hdlc_putbyte(unsigned char c, struct bc_state *bcs)
                 return;
         }
         if (unlikely(bcs->skb->len == SBUFSIZE)) {
-                warn("received oversized packet discarded");
+                dev_warn(bcs->cs->dev, "received oversized packet discarded\n");
                 bcs->hw.bas->giants++;
                 dev_kfree_skb_any(bcs->skb);
                 bcs->skb = NULL;
                 return;
         }
-        *gigaset_skb_put_quick(bcs->skb, 1) = c;
+        *__skb_put(bcs->skb, 1) = c;
 }
 
 /* hdlc_flush
@@ -549,7 +547,7 @@ static inline void hdlc_flush(struct bc_state *bcs)
                 if ((bcs->skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)
                         skb_reserve(bcs->skb, HW_HDR_LEN);
                 else
-                        err("could not allocate skb");
+                        dev_err(bcs->cs->dev, "could not allocate skb\n");
         }
 
         /* reset packet state */
@@ -571,23 +569,25 @@ static inline void hdlc_done(struct bc_state *bcs)
 
         if ((procskb = bcs->skb) == NULL) {
                 /* previous error */
-                dbg(DEBUG_ISO, "%s: skb=NULL", __func__);
+                gig_dbg(DEBUG_ISO, "%s: skb=NULL", __func__);
                 gigaset_rcv_error(NULL, bcs->cs, bcs);
         } else if (procskb->len < 2) {
-                notice("received short frame (%d octets)", procskb->len);
+                dev_notice(bcs->cs->dev, "received short frame (%d octets)\n",
+                           procskb->len);
                 bcs->hw.bas->runts++;
                 gigaset_rcv_error(procskb, bcs->cs, bcs);
         } else if (bcs->fcs != PPP_GOODFCS) {
-                notice("frame check error (0x%04x)", bcs->fcs);
+                dev_notice(bcs->cs->dev, "frame check error (0x%04x)\n",
+                           bcs->fcs);
                 bcs->hw.bas->fcserrs++;
                 gigaset_rcv_error(procskb, bcs->cs, bcs);
         } else {
                 procskb->len -= 2;              /* subtract FCS */
                 procskb->tail -= 2;
-                dbg(DEBUG_ISO,
-                    "%s: good frame (%d octets)", __func__, procskb->len);
+                gig_dbg(DEBUG_ISO, "%s: good frame (%d octets)",
+                        __func__, procskb->len);
                 dump_bytes(DEBUG_STREAM,
-                           "rcv data", procskb->data, procskb->len);
+                           "rcv data", procskb->data, procskb->len);
                 bcs->hw.bas->goodbytes += procskb->len;
                 gigaset_rcv_skb(procskb, bcs->cs, bcs);
         }
@@ -595,7 +595,7 @@ static inline void hdlc_done(struct bc_state *bcs)
         if ((bcs->skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)
                 skb_reserve(bcs->skb, HW_HDR_LEN);
         else
-                err("could not allocate skb");
+                dev_err(bcs->cs->dev, "could not allocate skb\n");
         bcs->fcs = PPP_INITFCS;
 }
 
@@ -610,14 +610,14 @@ static inline void hdlc_frag(struct bc_state *bcs, unsigned inbits)
                 return;
         }
 
-        notice("received partial byte (%d bits)", inbits);
+        dev_notice(bcs->cs->dev, "received partial byte (%d bits)\n", inbits);
         bcs->hw.bas->alignerrs++;
         gigaset_rcv_error(bcs->skb, bcs->cs, bcs);
 
         if ((bcs->skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)
                 skb_reserve(bcs->skb, HW_HDR_LEN);
         else
-                err("could not allocate skb");
+                dev_err(bcs->cs->dev, "could not allocate skb\n");
         bcs->fcs = PPP_INITFCS;
 }
 
@@ -659,16 +659,12 @@ static unsigned char bitcounts[256] = {
  *      bcs     receiving B channel structure
  */
 static inline void hdlc_unpack(unsigned char *src, unsigned count,
-                               struct bc_state *bcs)
+                               struct bc_state *bcs)
 {
-        struct bas_bc_state *ubc;
+        struct bas_bc_state *ubc = bcs->hw.bas;
         int inputstate;
         unsigned seqlen, inbyte, inbits;
 
-        IFNULLRET(bcs);
-        ubc = bcs->hw.bas;
-        IFNULLRET(ubc);
-
         /* load previous state:
          * inputstate = set of flag bits:
          * - INS_flag_hunt: no complete opening flag received since connection setup or last abort
@@ -856,7 +852,7 @@ static inline void hdlc_unpack(unsigned char *src, unsigned count,
  *      bcs     receiving B channel structure
  */
 static inline void trans_receive(unsigned char *src, unsigned count,
-                                 struct bc_state *bcs)
+                                 struct bc_state *bcs)
 {
         struct sk_buff *skb;
         int dobytes;
@@ -870,7 +866,7 @@ static inline void trans_receive(unsigned char *src, unsigned count,
         if (unlikely((skb = bcs->skb) == NULL)) {
                 bcs->skb = skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN);
                 if (!skb) {
-                        err("could not allocate skb");
+                        dev_err(bcs->cs->dev, "could not allocate skb\n");
                         return;
                 }
                 skb_reserve(skb, HW_HDR_LEN);
@@ -888,7 +884,8 @@ static inline void trans_receive(unsigned char *src, unsigned count,
                         gigaset_rcv_skb(skb, bcs->cs, bcs);
                         bcs->skb = skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN);
                         if (!skb) {
-                                err("could not allocate skb");
+                                dev_err(bcs->cs->dev,
+                                        "could not allocate skb\n");
                                 return;
                         }
                         skb_reserve(bcs->skb, HW_HDR_LEN);
@@ -921,8 +918,8 @@ static void cmd_loop(unsigned char *src, int numbytes, struct inbuf_t *inbuf)
                 case '\r':
                 case '\n':
                         /* end of line */
-                        dbg(DEBUG_TRANSCMD, "%s: End of Command (%d Bytes)",
-                            __func__, cbytes);
+                        gig_dbg(DEBUG_TRANSCMD, "%s: End of Command (%d Bytes)",
+                                __func__, cbytes);
                         cs->cbytes = cbytes;
                         gigaset_handle_modem_response(cs);
                         cbytes = 0;
@@ -932,7 +929,7 @@ static void cmd_loop(unsigned char *src, int numbytes, struct inbuf_t *inbuf)
                         if (cbytes < MAX_RESP_SIZE - 1)
                                 cbytes++;
                         else
-                                warn("response too large");
+                                dev_warn(cs->dev, "response too large\n");
                 }
         }
 
@@ -951,27 +948,27 @@ void gigaset_isoc_input(struct inbuf_t *inbuf)
 
         head = atomic_read(&inbuf->head);
         while (head != (tail = atomic_read(&inbuf->tail))) {
-                dbg(DEBUG_INTR, "buffer state: %u -> %u", head, tail);
+                gig_dbg(DEBUG_INTR, "buffer state: %u -> %u", head, tail);
                 if (head > tail)
                         tail = RBUFSIZE;
                 src = inbuf->data + head;
                 numbytes = tail - head;
-                dbg(DEBUG_INTR, "processing %u bytes", numbytes);
+                gig_dbg(DEBUG_INTR, "processing %u bytes", numbytes);
 
                 if (atomic_read(&cs->mstate) == MS_LOCKED) {
                         gigaset_dbg_buffer(DEBUG_LOCKCMD, "received response",
-                                           numbytes, src, 0);
+                                           numbytes, src);
                         gigaset_if_receive(inbuf->cs, src, numbytes);
                 } else {
                         gigaset_dbg_buffer(DEBUG_CMD, "received response",
-                                           numbytes, src, 0);
+                                           numbytes, src);
                         cmd_loop(src, numbytes, inbuf);
                 }
 
                 head += numbytes;
                 if (head == RBUFSIZE)
                         head = 0;
-                dbg(DEBUG_INTR, "setting head to %u", head);
+                gig_dbg(DEBUG_INTR, "setting head to %u", head);
                 atomic_set(&inbuf->head, head);
         }
 }
@@ -992,18 +989,18 @@ void gigaset_isoc_input(struct inbuf_t *inbuf)
  */
 int gigaset_isoc_send_skb(struct bc_state *bcs, struct sk_buff *skb)
 {
-        int len;
-
-        IFNULLRETVAL(bcs, -EFAULT);
-        IFNULLRETVAL(skb, -EFAULT);
-        len = skb->len;
+        int len = skb->len;
+        unsigned long flags;
 
         skb_queue_tail(&bcs->squeue, skb);
-        dbg(DEBUG_ISO,
-            "%s: skb queued, qlen=%d", __func__, skb_queue_len(&bcs->squeue));
+        gig_dbg(DEBUG_ISO, "%s: skb queued, qlen=%d",
+                __func__, skb_queue_len(&bcs->squeue));
 
         /* tasklet submits URB if necessary */
-        tasklet_schedule(&bcs->hw.bas->sent_tasklet);
+        spin_lock_irqsave(&bcs->cs->lock, flags);
+        if (bcs->cs->connected)
+                tasklet_schedule(&bcs->hw.bas->sent_tasklet);
+        spin_unlock_irqrestore(&bcs->cs->lock, flags);
 
         return len;     /* ok so far */
 }
diff --git a/drivers/isdn/gigaset/proc.c b/drivers/isdn/gigaset/proc.c
index c6915fa2be6c..d267a636b53c 100644
--- a/drivers/isdn/gigaset/proc.c
+++ b/drivers/isdn/gigaset/proc.c
@@ -1,7 +1,7 @@
 /*
  * Stuff used by all variants of the driver
  *
- * Copyright (c) 2001 by Stefan Eilers <Eilers.Stefan@epost.de>,
+ * Copyright (c) 2001 by Stefan Eilers,
  *                       Hansjoerg Lipp <hjlipp@web.de>,
  *                       Tilman Schmidt <tilman@imap.cc>.
  *
@@ -11,26 +11,29 @@
  *      published by the Free Software Foundation; either version 2 of
  *      the License, or (at your option) any later version.
  * =====================================================================
- * ToDo: ...
- * =====================================================================
- * Version: $Id: proc.c,v 1.5.2.13 2006/02/04 18:28:16 hjlipp Exp $
- * =====================================================================
  */
 
 #include "gigaset.h"
 #include <linux/ctype.h>
 
-static ssize_t show_cidmode(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_cidmode(struct device *dev, struct device_attribute *attr,
+                            char *buf)
 {
-        struct usb_interface *intf = to_usb_interface(dev);
-        struct cardstate *cs = usb_get_intfdata(intf);
-        return sprintf(buf, "%d\n", atomic_read(&cs->cidmode)); // FIXME use scnprintf for 13607 bit architectures (if PAGE_SIZE==4096)
+        int ret;
+        unsigned long flags;
+        struct cardstate *cs = dev_get_drvdata(dev);
+
+        spin_lock_irqsave(&cs->lock, flags);
+        ret = sprintf(buf, "%u\n", cs->cidmode);
+        spin_unlock_irqrestore(&cs->lock, flags);
+
+        return ret;
 }
 
-static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t count)
 {
-        struct usb_interface *intf = to_usb_interface(dev);
-        struct cardstate *cs = usb_get_intfdata(intf);
+        struct cardstate *cs = dev_get_drvdata(dev);
         long int value;
         char *end;
 
@@ -41,23 +44,23 @@ static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr, co
         if (value < 0 || value > 1)
                         return -EINVAL;
 
-        if (down_interruptible(&cs->sem))
+        if (mutex_lock_interruptible(&cs->mutex))
                 return -ERESTARTSYS; // FIXME -EINTR?
 
         cs->waiting = 1;
         if (!gigaset_add_event(cs, &cs->at_state, EV_PROC_CIDMODE,
-                               NULL, value, NULL)) {
+                               NULL, value, NULL)) {
                 cs->waiting = 0;
-                up(&cs->sem);
+                mutex_unlock(&cs->mutex);
                 return -ENOMEM;
         }
 
-        dbg(DEBUG_CMD, "scheduling PROC_CIDMODE");
+        gig_dbg(DEBUG_CMD, "scheduling PROC_CIDMODE");
         gigaset_schedule_event(cs);
 
         wait_event(cs->waitqueue, !cs->waiting);
 
-        up(&cs->sem);
+        mutex_unlock(&cs->mutex);
 
         return count;
 }
@@ -65,17 +68,15 @@ static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr, co
 static DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode);
 
 /* free sysfs for device */
-void gigaset_free_dev_sysfs(struct usb_interface *interface)
+void gigaset_free_dev_sysfs(struct cardstate *cs)
 {
-        dbg(DEBUG_INIT, "removing sysfs entries");
-        device_remove_file(&interface->dev, &dev_attr_cidmode);
+        gig_dbg(DEBUG_INIT, "removing sysfs entries");
+        device_remove_file(cs->dev, &dev_attr_cidmode);
 }
-EXPORT_SYMBOL_GPL(gigaset_free_dev_sysfs);
 
 /* initialize sysfs for device */
-void gigaset_init_dev_sysfs(struct usb_interface *interface)
+void gigaset_init_dev_sysfs(struct cardstate *cs)
 {
-        dbg(DEBUG_INIT, "setting up sysfs");
-        device_create_file(&interface->dev, &dev_attr_cidmode);
+        gig_dbg(DEBUG_INIT, "setting up sysfs");
+        device_create_file(cs->dev, &dev_attr_cidmode);
 }
-EXPORT_SYMBOL_GPL(gigaset_init_dev_sysfs);
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index 323fc7349dec..bfb73fd5077e 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -1,7 +1,7 @@
 /*
  * USB driver for Gigaset 307x directly or using M105 Data.
  *
- * Copyright (c) 2001 by Stefan Eilers <Eilers.Stefan@epost.de>
+ * Copyright (c) 2001 by Stefan Eilers
  *                   and Hansjoerg Lipp <hjlipp@web.de>.
  *
  * This driver was derived from the USB skeleton driver by
@@ -13,10 +13,6 @@
  *      published by the Free Software Foundation; either version 2 of
  *      the License, or (at your option) any later version.
  * =====================================================================
- * ToDo: ...
- * =====================================================================
- * Version: $Id: usb-gigaset.c,v 1.85.4.18 2006/02/04 18:28:16 hjlipp Exp $
- * =====================================================================
  */
 
 #include "gigaset.h"
@@ -29,7 +25,7 @@
 #include <linux/moduleparam.h>
 
 /* Version Information */
-#define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Stefan Eilers <Eilers.Stefan@epost.de>"
+#define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Stefan Eilers"
 #define DRIVER_DESC "USB Driver for Gigaset 307x using M105"
 
 /* Module parameters */
@@ -62,10 +58,6 @@ static struct usb_device_id gigaset_table [] = {
 
 MODULE_DEVICE_TABLE(usb, gigaset_table);
 
-/* Get a minor range for your devices from the usb maintainer */
-#define USB_SKEL_MINOR_BASE     200
-
-
 /*
  * Control requests (empty fields: 00)
  *
@@ -114,7 +106,7 @@ MODULE_DEVICE_TABLE(usb, gigaset_table);
  */
 
 static int gigaset_probe(struct usb_interface *interface,
-                         const struct usb_device_id *id);
+                         const struct usb_device_id *id);
 static void gigaset_disconnect(struct usb_interface *interface);
 
 static struct gigaset_driver *driver = NULL;
@@ -122,29 +114,29 @@ static struct cardstate *cardstate = NULL;
 
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver gigaset_usb_driver = {
-        .name =         GIGASET_MODULENAME,
-        .probe =        gigaset_probe,
-        .disconnect =   gigaset_disconnect,
-        .id_table =     gigaset_table,
+        .name =         GIGASET_MODULENAME,
+        .probe =        gigaset_probe,
+        .disconnect =   gigaset_disconnect,
+        .id_table =     gigaset_table,
 };
 
 struct usb_cardstate {
-        struct usb_device       *udev;                  /* save off the usb device pointer */
-        struct usb_interface    *interface;             /* the interface for this device */
-        atomic_t                busy;                   /* bulk output in progress */
-
-        /* Output buffer for commands (M105: and data)*/
-        unsigned char           *bulk_out_buffer;       /* the buffer to send data */
-        int                     bulk_out_size;          /* the size of the send buffer */
-        __u8                    bulk_out_endpointAddr;  /* the address of the bulk out endpoint */
-        struct urb              *bulk_out_urb;          /* the urb used to transmit data */
-
-        /* Input buffer for command responses (M105: and data)*/
-        int                     rcvbuf_size;            /* the size of the receive buffer */
-        struct urb              *read_urb;              /* the urb used to receive data */
-        __u8                    int_in_endpointAddr;    /* the address of the bulk in endpoint */
-
-        char                    bchars[6];              /* req. 0x19 */
+        struct usb_device       *udev;          /* usb device pointer */
+        struct usb_interface    *interface;     /* interface for this device */
+        atomic_t                busy;           /* bulk output in progress */
+
+        /* Output buffer */
+        unsigned char           *bulk_out_buffer;
+        int                     bulk_out_size;
+        __u8                    bulk_out_endpointAddr;
+        struct urb              *bulk_out_urb;
+
+        /* Input buffer */
+        int                     rcvbuf_size;
+        struct urb              *read_urb;
+        __u8                    int_in_endpointAddr;
+
+        char                    bchars[6];              /* for request 0x19 */
 };
 
 struct usb_bc_state {};
@@ -157,19 +149,20 @@ static inline unsigned tiocm_to_gigaset(unsigned state)
 #ifdef CONFIG_GIGASET_UNDOCREQ
 /* WARNING: EXPERIMENTAL! */
 static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
-                                  unsigned new_state)
+                                  unsigned new_state)
 {
+        struct usb_device *udev = cs->hw.usb->udev;
         unsigned mask, val;
         int r;
 
         mask = tiocm_to_gigaset(old_state ^ new_state);
         val = tiocm_to_gigaset(new_state);
 
-        dbg(DEBUG_USBREQ, "set flags 0x%02x with mask 0x%02x", val, mask);
-        r = usb_control_msg(cs->hw.usb->udev,
-                            usb_sndctrlpipe(cs->hw.usb->udev, 0), 7, 0x41,
-                            (val & 0xff) | ((mask & 0xff) << 8), 0,
-                            NULL, 0, 2000 /*timeout??*/); // don't use this in an interrupt/BH
+        gig_dbg(DEBUG_USBREQ, "set flags 0x%02x with mask 0x%02x", val, mask);
+        // don't use this in an interrupt/BH
+        r = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 7, 0x41,
+                            (val & 0xff) | ((mask & 0xff) << 8), 0,
+                            NULL, 0, 2000 /* timeout? */);
         if (r < 0)
                 return r;
         //..
@@ -178,30 +171,29 @@ static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
 
 static int set_value(struct cardstate *cs, u8 req, u16 val)
 {
+        struct usb_device *udev = cs->hw.usb->udev;
         int r, r2;
 
-        dbg(DEBUG_USBREQ, "request %02x (%04x)", (unsigned)req, (unsigned)val);
-        r = usb_control_msg(cs->hw.usb->udev,
-                            usb_sndctrlpipe(cs->hw.usb->udev, 0), 0x12, 0x41,
-                            0xf /*?*/, 0,
-                            NULL, 0, 2000 /*?*/); /* no idea, what this does */
+        gig_dbg(DEBUG_USBREQ, "request %02x (%04x)",
+                (unsigned)req, (unsigned)val);
+        r = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x12, 0x41,
+                            0xf /*?*/, 0, NULL, 0, 2000 /*?*/);
+                            /* no idea what this does */
         if (r < 0) {
-                err("error %d on request 0x12", -r);
+                dev_err(&udev->dev, "error %d on request 0x12\n", -r);
                 return r;
         }
 
-        r = usb_control_msg(cs->hw.usb->udev,
-                            usb_sndctrlpipe(cs->hw.usb->udev, 0), req, 0x41,
-                            val, 0,
-                            NULL, 0, 2000 /*?*/);
+        r = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), req, 0x41,
+                            val, 0, NULL, 0, 2000 /*?*/);
         if (r < 0)
-                err("error %d on request 0x%02x", -r, (unsigned)req);
+                dev_err(&udev->dev, "error %d on request 0x%02x\n",
+                        -r, (unsigned)req);
 
-        r2 = usb_control_msg(cs->hw.usb->udev,
-                             usb_sndctrlpipe(cs->hw.usb->udev, 0), 0x19, 0x41,
-                             0, 0, cs->hw.usb->bchars, 6, 2000 /*?*/);
+        r2 = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
+                             0, 0, cs->hw.usb->bchars, 6, 2000 /*?*/);
         if (r2 < 0)
-                err("error %d on request 0x19", -r2);
+                dev_err(&udev->dev, "error %d on request 0x19\n", -r2);
 
         return r < 0 ? r : (r2 < 0 ? r2 : 0);
 }
@@ -229,8 +221,8 @@ static int gigaset_baud_rate(struct cardstate *cs, unsigned cflag)
         case B115200: rate =  115200; break;
         default:
                 rate =  9600;
-                err("unsupported baudrate request 0x%x,"
-                    " using default of B9600", cflag);
+                dev_err(cs->dev, "unsupported baudrate request 0x%x,"
+                        " using default of B9600\n", cflag);
         }
 
         val = 0x383fff / rate + 1;
@@ -259,7 +251,7 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
         case CS8:
                 val |= 8 << 8; break;
         default:
-                err("CSIZE was not CS5-CS8, using default of 8");
+                dev_err(cs->dev, "CSIZE was not CS5-CS8, using default of 8\n");
                 val |= 8 << 8;
                 break;
         }
@@ -277,7 +269,7 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
 
 #else
 static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
-                                  unsigned new_state)
+                                  unsigned new_state)
 {
         return -EINVAL;
 }
@@ -309,15 +301,12 @@ static int gigaset_close_bchannel(struct bc_state *bcs)
         return 0;
 }
 
-//void send_ack_to_LL(void *data);
 static int write_modem(struct cardstate *cs);
 static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb);
 
 
-/* Handling of send queue. If there is already a skb opened, put data to
- * the transfer buffer by calling "write_modem". Otherwise take a new skb out of the queue.
- * This function will be called by the ISR via "transmit_chars" (USB: B-Channel Bulk callback handler
- * via immediate task queue) or by writebuf_from_LL if the LL wants to transmit data.
+/* Write tasklet handler: Continue sending current skb, or send command, or
+ * start sending an skb from the send queue.
  */
 static void gigaset_modem_fill(unsigned long data)
 {
@@ -327,10 +316,10 @@ static void gigaset_modem_fill(unsigned long data)
         unsigned long flags;
         int again;
 
-        dbg(DEBUG_OUTPUT, "modem_fill");
+        gig_dbg(DEBUG_OUTPUT, "modem_fill");
 
         if (atomic_read(&cs->hw.usb->busy)) {
-                dbg(DEBUG_OUTPUT, "modem_fill: busy");
+                gig_dbg(DEBUG_OUTPUT, "modem_fill: busy");
                 return;
         }
 
@@ -341,26 +330,27 @@ static void gigaset_modem_fill(unsigned long data)
                         cb = cs->cmdbuf;
                         spin_unlock_irqrestore(&cs->cmdlock, flags);
                         if (cb) { /* commands to send? */
-                                dbg(DEBUG_OUTPUT, "modem_fill: cb");
+                                gig_dbg(DEBUG_OUTPUT, "modem_fill: cb");
                                 if (send_cb(cs, cb) < 0) {
-                                        dbg(DEBUG_OUTPUT,
-                                            "modem_fill: send_cb failed");
-                                        again = 1; /* no callback will be called! */
+                                        gig_dbg(DEBUG_OUTPUT,
+                                                "modem_fill: send_cb failed");
+                                        again = 1; /* no callback will be
+                                                      called! */
                                 }
                         } else { /* skbs to send? */
                                 bcs->tx_skb = skb_dequeue(&bcs->squeue);
                                 if (bcs->tx_skb)
-                                        dbg(DEBUG_INTR,
-                                            "Dequeued skb (Adr: %lx)!",
-                                            (unsigned long) bcs->tx_skb);
+                                        gig_dbg(DEBUG_INTR,
+                                                "Dequeued skb (Adr: %lx)!",
+                                                (unsigned long) bcs->tx_skb);
                         }
                 }
 
                 if (bcs->tx_skb) {
-                        dbg(DEBUG_OUTPUT, "modem_fill: tx_skb");
+                        gig_dbg(DEBUG_OUTPUT, "modem_fill: tx_skb");
                         if (write_modem(cs) < 0) {
-                                dbg(DEBUG_OUTPUT,
-                                    "modem_fill: write_modem failed");
+                                gig_dbg(DEBUG_OUTPUT,
+                                        "modem_fill: write_modem failed");
                                 // FIXME should we tell the LL?
                                 again = 1; /* no callback will be called! */
                         }
@@ -371,88 +361,85 @@ static void gigaset_modem_fill(unsigned long data)
 /**
  *      gigaset_read_int_callback
  *
- *      It is called if the data was received from the device. This is almost similiar to
- *      the interrupt service routine in the serial device.
+ *      It is called if the data was received from the device.
  */
 static void gigaset_read_int_callback(struct urb *urb, struct pt_regs *regs)
 {
+        struct inbuf_t *inbuf = urb->context;
+        struct cardstate *cs = inbuf->cs;
         int resubmit = 0;
         int r;
-        struct cardstate *cs;
         unsigned numbytes;
         unsigned char *src;
-        //unsigned long flags;
-        struct inbuf_t *inbuf;
-
-        IFNULLRET(urb);
-        inbuf = (struct inbuf_t *) urb->context;
-        IFNULLRET(inbuf);
-        //spin_lock_irqsave(&inbuf->lock, flags);
-        cs = inbuf->cs;
-        IFNULLGOTO(cs, exit);
-        IFNULLGOTO(cardstate, exit);
-
-        if (!atomic_read(&cs->connected)) {
-                err("%s: disconnected", __func__);
-                goto exit;
-        }
+        unsigned long flags;
 
         if (!urb->status) {
+                if (!cs->connected) {
+                        err("%s: disconnected", __func__); /* should never happen */
+                        return;
+                }
+
                 numbytes = urb->actual_length;
 
                 if (numbytes) {
                         src = inbuf->rcvbuf;
                         if (unlikely(*src))
-                                warn("%s: There was no leading 0, but 0x%02x!",
-                                     __func__, (unsigned) *src);
+                                dev_warn(cs->dev,
+                                    "%s: There was no leading 0, but 0x%02x!\n",
+                                         __func__, (unsigned) *src);
                         ++src; /* skip leading 0x00 */
                         --numbytes;
                         if (gigaset_fill_inbuf(inbuf, src, numbytes)) {
-                                dbg(DEBUG_INTR, "%s-->BH", __func__);
+                                gig_dbg(DEBUG_INTR, "%s-->BH", __func__);
                                 gigaset_schedule_event(inbuf->cs);
                         }
                 } else
-                        dbg(DEBUG_INTR, "Received zero block length");
+                        gig_dbg(DEBUG_INTR, "Received zero block length");
                 resubmit = 1;
         } else {
                 /* The urb might have been killed. */
-                dbg(DEBUG_ANY, "%s - nonzero read bulk status received: %d",
-                    __func__, urb->status);
-                if (urb->status != -ENOENT) /* not killed */
+                gig_dbg(DEBUG_ANY, "%s - nonzero read bulk status received: %d",
+                        __func__, urb->status);
+                if (urb->status != -ENOENT) { /* not killed */
+                        if (!cs->connected) {
+                                err("%s: disconnected", __func__); /* should never happen */
+                                return;
+                        }
                         resubmit = 1;
+                }
         }
-exit:
-        //spin_unlock_irqrestore(&inbuf->lock, flags);
+
         if (resubmit) {
-                r = usb_submit_urb(urb, SLAB_ATOMIC);
+                spin_lock_irqsave(&cs->lock, flags);
+                r = cs->connected ? usb_submit_urb(urb, SLAB_ATOMIC) : -ENODEV;
+                spin_unlock_irqrestore(&cs->lock, flags);
                 if (r)
-                        err("error %d when resubmitting urb.", -r);
+                        dev_err(cs->dev, "error %d when resubmitting urb.\n",
+                                -r);
         }
 }
 
 
-/* This callback routine is called when data was transmitted to a B-Channel.
- * Therefore it has to check if there is still data to transmit. This
- * happens by calling modem_fill via task queue.
- *
- */
+/* This callback routine is called when data was transmitted to the device. */
 static void gigaset_write_bulk_callback(struct urb *urb, struct pt_regs *regs)
 {
-        struct cardstate *cs = (struct cardstate *) urb->context;
+        struct cardstate *cs = urb->context;
+        unsigned long flags;
 
-        IFNULLRET(cs);
-#ifdef CONFIG_GIGASET_DEBUG
-        if (!atomic_read(&cs->connected)) {
-                err("%s:not connected", __func__);
-                return;
-        }
-#endif
         if (urb->status)
-                err("bulk transfer failed (status %d)", -urb->status); /* That's all we can do. Communication problems
-                                                                           are handeled by timeouts or network protocols */
+                dev_err(cs->dev, "bulk transfer failed (status %d)\n",
+                        -urb->status);
+                /* That's all we can do. Communication problems
+                   are handled by timeouts or network protocols. */
 
-        atomic_set(&cs->hw.usb->busy, 0);
-        tasklet_schedule(&cs->write_tasklet);
+        spin_lock_irqsave(&cs->lock, flags);
+        if (!cs->connected) {
+                err("%s: not connected", __func__);
+        } else {
+                atomic_set(&cs->hw.usb->busy, 0);
+                tasklet_schedule(&cs->write_tasklet);
+        }
+        spin_unlock_irqrestore(&cs->lock, flags);
 }
 
 static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb)
@@ -469,8 +456,8 @@ static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb)
 
                         spin_lock_irqsave(&cs->cmdlock, flags);
                         cs->cmdbytes -= cs->curlen;
-                        dbg(DEBUG_OUTPUT, "send_cb: sent %u bytes, %u left",
-                            cs->curlen, cs->cmdbytes);
+                        gig_dbg(DEBUG_OUTPUT, "send_cb: sent %u bytes, %u left",
+                                cs->curlen, cs->cmdbytes);
                         cs->cmdbuf = cb = cb->next;
                         if (cb) {
                                 cb->prev = NULL;
@@ -487,52 +474,51 @@ static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb)
                 }
                 if (cb) {
                         count = min(cb->len, ucs->bulk_out_size);
+                        gig_dbg(DEBUG_OUTPUT, "send_cb: send %d bytes", count);
+
                         usb_fill_bulk_urb(ucs->bulk_out_urb, ucs->udev,
-                                          usb_sndbulkpipe(ucs->udev,
-                                             ucs->bulk_out_endpointAddr & 0x0f),
-                                          cb->buf + cb->offset, count,
-                                          gigaset_write_bulk_callback, cs);
+                                          usb_sndbulkpipe(ucs->udev,
+                                             ucs->bulk_out_endpointAddr & 0x0f),
+                                          cb->buf + cb->offset, count,
+                                          gigaset_write_bulk_callback, cs);
 
                         cb->offset += count;
                         cb->len -= count;
                         atomic_set(&ucs->busy, 1);
-                        dbg(DEBUG_OUTPUT, "send_cb: send %d bytes", count);
 
-                        status = usb_submit_urb(ucs->bulk_out_urb, SLAB_ATOMIC);
+                        spin_lock_irqsave(&cs->lock, flags);
+                        status = cs->connected ? usb_submit_urb(ucs->bulk_out_urb, SLAB_ATOMIC) : -ENODEV;
+                        spin_unlock_irqrestore(&cs->lock, flags);
+
                         if (status) {
                                 atomic_set(&ucs->busy, 0);
-                                err("could not submit urb (error %d).",
+                                err("could not submit urb (error %d)\n",
                                     -status);
-                                cb->len = 0; /* skip urb => remove cb+wakeup in next loop cycle */
+                                cb->len = 0; /* skip urb => remove cb+wakeup
+                                                in next loop cycle */
                         }
                 }
-        } while (cb && status); /* bei Fehler naechster Befehl //FIXME: ist das OK? */
+        } while (cb && status); /* next command on error */
 
         return status;
 }
 
-/* Write string into transbuf and send it to modem.
- */
+/* Send command to device. */
 static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,
-                             int len, struct tasklet_struct *wake_tasklet)
+                             int len, struct tasklet_struct *wake_tasklet)
 {
         struct cmdbuf_t *cb;
         unsigned long flags;
 
         gigaset_dbg_buffer(atomic_read(&cs->mstate) != MS_LOCKED ?
-                             DEBUG_TRANSCMD : DEBUG_LOCKCMD,
-                           "CMD Transmit", len, buf, 0);
-
-        if (!atomic_read(&cs->connected)) {
-                err("%s: not connected", __func__);
-                return -ENODEV;
-        }
+                             DEBUG_TRANSCMD : DEBUG_LOCKCMD,
+                           "CMD Transmit", len, buf);
 
         if (len <= 0)
                 return 0;
 
         if (!(cb = kmalloc(sizeof(struct cmdbuf_t) + len, GFP_ATOMIC))) {
-                err("%s: out of memory", __func__);
+                dev_err(cs->dev, "%s: out of memory\n", __func__);
                 return -ENOMEM;
         }
 
@@ -554,7 +540,10 @@ static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,
         cs->lastcmdbuf = cb;
         spin_unlock_irqrestore(&cs->cmdlock, flags);
 
-        tasklet_schedule(&cs->write_tasklet);
+        spin_lock_irqsave(&cs->lock, flags);
+        if (cs->connected)
+                tasklet_schedule(&cs->write_tasklet);
+        spin_unlock_irqrestore(&cs->lock, flags);
         return len;
 }
 
@@ -578,11 +567,12 @@ static int gigaset_chars_in_buffer(struct cardstate *cs)
 static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
 {
 #ifdef CONFIG_GIGASET_UNDOCREQ
-        gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf, 0);
+        struct usb_device *udev = cs->hw.usb->udev;
+
+        gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
         memcpy(cs->hw.usb->bchars, buf, 6);
-        return usb_control_msg(cs->hw.usb->udev,
-                               usb_sndctrlpipe(cs->hw.usb->udev, 0), 0x19, 0x41,
-                               0, 0, &buf, 6, 2000);
+        return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
+                               0, 0, &buf, 6, 2000);
 #else
         return -EINVAL;
 #endif
@@ -604,7 +594,6 @@ static int gigaset_initbcshw(struct bc_state *bcs)
         if (!bcs->hw.usb)
                 return 0;
 
-        //bcs->hw.usb->trans_flg = READY_TO_TRNSMIT; /* B-Channel ready to transmit */
         return 1;
 }
 
@@ -614,7 +603,6 @@ static void gigaset_reinitbcshw(struct bc_state *bcs)
 
 static void gigaset_freecshw(struct cardstate *cs)
 {
-        //FIXME
         tasklet_kill(&cs->write_tasklet);
         kfree(cs->hw.usb);
 }
@@ -639,33 +627,21 @@ static int gigaset_initcshw(struct cardstate *cs)
         //ucs->urb_cmd_out = NULL;
         ucs->read_urb = NULL;
         tasklet_init(&cs->write_tasklet,
-                     &gigaset_modem_fill, (unsigned long) cs);
+                     &gigaset_modem_fill, (unsigned long) cs);
 
         return 1;
 }
 
-/* Writes the data of the current open skb into the modem.
- * We have to protect against multiple calls until the
- * callback handler () is called , due to the fact that we
- * are just allowed to send data once to an endpoint. Therefore
- * we using "trans_flg" to synchonize ...
- */
+/* Send data from current skb to the device. */
 static int write_modem(struct cardstate *cs)
 {
-        int ret;
+        int ret = 0;
         int count;
         struct bc_state *bcs = &cs->bcs[0]; /* only one channel */
         struct usb_cardstate *ucs = cs->hw.usb;
-        //unsigned long flags;
-
-        IFNULLRETVAL(bcs->tx_skb, -EINVAL);
-
-        dbg(DEBUG_WRITE, "len: %d...", bcs->tx_skb->len);
+        unsigned long flags;
 
-        ret = -ENODEV;
-        IFNULLGOTO(ucs->bulk_out_buffer, error);
-        IFNULLGOTO(ucs->bulk_out_urb, error);
-        ret = 0;
+        gig_dbg(DEBUG_WRITE, "len: %d...", bcs->tx_skb->len);
 
         if (!bcs->tx_skb->len) {
                 dev_kfree_skb_any(bcs->tx_skb);
@@ -679,40 +655,42 @@ static int write_modem(struct cardstate *cs)
         count = min(bcs->tx_skb->len, (unsigned) ucs->bulk_out_size);
         memcpy(ucs->bulk_out_buffer, bcs->tx_skb->data, count);
         skb_pull(bcs->tx_skb, count);
-
-        usb_fill_bulk_urb(ucs->bulk_out_urb, ucs->udev,
-                          usb_sndbulkpipe(ucs->udev,
-                                          ucs->bulk_out_endpointAddr & 0x0f),
-                          ucs->bulk_out_buffer, count,
-                          gigaset_write_bulk_callback, cs);
         atomic_set(&ucs->busy, 1);
-        dbg(DEBUG_OUTPUT, "write_modem: send %d bytes", count);
+        gig_dbg(DEBUG_OUTPUT, "write_modem: send %d bytes", count);
+
+        spin_lock_irqsave(&cs->lock, flags);
+        if (cs->connected) {
+                usb_fill_bulk_urb(ucs->bulk_out_urb, ucs->udev,
+                                  usb_sndbulkpipe(ucs->udev,
+                                                  ucs->bulk_out_endpointAddr & 0x0f),
+                                  ucs->bulk_out_buffer, count,
+                                  gigaset_write_bulk_callback, cs);
+                ret = usb_submit_urb(ucs->bulk_out_urb, SLAB_ATOMIC);
+        } else {
+                ret = -ENODEV;
+        }
+        spin_unlock_irqrestore(&cs->lock, flags);
 
-        ret = usb_submit_urb(ucs->bulk_out_urb, SLAB_ATOMIC);
         if (ret) {
-                err("could not submit urb (error %d).", -ret);
+                err("could not submit urb (error %d)\n", -ret);
                 atomic_set(&ucs->busy, 0);
         }
+
         if (!bcs->tx_skb->len) {
                 /* skb sent completely */
                 gigaset_skb_sent(bcs, bcs->tx_skb); //FIXME also, when ret<0?
 
-                dbg(DEBUG_INTR,
-                    "kfree skb (Adr: %lx)!", (unsigned long) bcs->tx_skb);
+                gig_dbg(DEBUG_INTR, "kfree skb (Adr: %lx)!",
+                        (unsigned long) bcs->tx_skb);
                 dev_kfree_skb_any(bcs->tx_skb);
                 bcs->tx_skb = NULL;
         }
 
         return ret;
-error:
-        dev_kfree_skb_any(bcs->tx_skb);
-        bcs->tx_skb = NULL;
-        return ret;
-
 }
 
 static int gigaset_probe(struct usb_interface *interface,
-                         const struct usb_device_id *id)
+                         const struct usb_device_id *id)
 {
         int retval;
         struct usb_device *udev = interface_to_usbdev(interface);
@@ -720,16 +698,14 @@ static int gigaset_probe(struct usb_interface *interface,
         struct usb_host_interface *hostif;
         struct cardstate *cs = NULL;
         struct usb_cardstate *ucs = NULL;
-        //struct usb_interface_descriptor *iface_desc;
         struct usb_endpoint_descriptor *endpoint;
-        //isdn_ctrl command;
         int buffer_size;
         int alt;
-        //unsigned long flags;
 
-        info("%s: Check if device matches .. (Vendor: 0x%x, Product: 0x%x)",
-            __func__, le16_to_cpu(udev->descriptor.idVendor),
-            le16_to_cpu(udev->descriptor.idProduct));
+        gig_dbg(DEBUG_ANY,
+                "%s: Check if device matches .. (Vendor: 0x%x, Product: 0x%x)",
+                __func__, le16_to_cpu(udev->descriptor.idVendor),
+                le16_to_cpu(udev->descriptor.idProduct));
 
         retval = -ENODEV; //FIXME
 
@@ -744,7 +720,7 @@ static int gigaset_probe(struct usb_interface *interface,
         ifnum = hostif->desc.bInterfaceNumber; // FIXME ?
 
         if (alt != 0 || ifnum != 0) {
-                warn("ifnum %d, alt %d", ifnum, alt);
+                dev_warn(&udev->dev, "ifnum %d, alt %d\n", ifnum, alt);
                 return -ENODEV;
         }
 
@@ -752,42 +728,29 @@ static int gigaset_probe(struct usb_interface *interface,
          *
          */
         if (hostif->desc.bInterfaceClass != 255) {
-                info("%s: Device matched, but iface_desc[%d]->bInterfaceClass==%d !",
-                       __func__, ifnum, hostif->desc.bInterfaceClass);
+                dev_info(&udev->dev,
+                "%s: Device matched but iface_desc[%d]->bInterfaceClass==%d!\n",
+                         __func__, ifnum, hostif->desc.bInterfaceClass);
                 return -ENODEV;
         }
 
-        info("%s: Device matched ... !", __func__);
+        dev_info(&udev->dev, "%s: Device matched ... !\n", __func__);
 
         cs = gigaset_getunassignedcs(driver);
         if (!cs) {
-                warn("No free cardstate!");
+                dev_warn(&udev->dev, "no free cardstate\n");
                 return -ENODEV;
         }
         ucs = cs->hw.usb;
 
-#if 0
-        if (usb_set_configuration(udev, udev->config[0].desc.bConfigurationValue) < 0) {
-                warn("set_configuration failed");
-                goto error;
-        }
-
-
-        if (usb_set_interface(udev, ifnum/*==0*/, alt/*==0*/) < 0) {
-                warn("usb_set_interface failed, device %d interface %d altsetting %d",
-                     udev->devnum, ifnum, alt);
-                goto error;
-        }
-#endif
+        /* save off device structure ptrs for later use */
+        usb_get_dev(udev);
+        ucs->udev = udev;
+        ucs->interface = interface;
+        cs->dev = &interface->dev;
 
-        /* set up the endpoint information */
-        /* check out the endpoints */
-        /* We will get 2 endpoints: One for sending commands to the device (bulk out) and one to
-         * poll messages from the device(int in).
-         * Therefore we will have an almost similiar situation as with our serial port handler.
-         * If an connection will be established, we will have to create data in/out pipes
-         * dynamically...
-         */
+        /* save address of controller structure */
+        usb_set_intfdata(interface, cs); // dev_set_drvdata(&interface->dev, cs);
 
         endpoint = &hostif->endpoint[0].desc;
 
@@ -796,14 +759,14 @@ static int gigaset_probe(struct usb_interface *interface,
         ucs->bulk_out_endpointAddr = endpoint->bEndpointAddress;
         ucs->bulk_out_buffer = kmalloc(buffer_size, GFP_KERNEL);
         if (!ucs->bulk_out_buffer) {
-                err("Couldn't allocate bulk_out_buffer");
+                dev_err(cs->dev, "Couldn't allocate bulk_out_buffer\n");
                 retval = -ENOMEM;
                 goto error;
         }
 
         ucs->bulk_out_urb = usb_alloc_urb(0, SLAB_KERNEL);
         if (!ucs->bulk_out_urb) {
-                err("Couldn't allocate bulk_out_buffer");
+                dev_err(cs->dev, "Couldn't allocate bulk_out_urb\n");
                 retval = -ENOMEM;
                 goto error;
         }
@@ -811,12 +774,10 @@ static int gigaset_probe(struct usb_interface *interface,
         endpoint = &hostif->endpoint[1].desc;
 
         atomic_set(&ucs->busy, 0);
-        ucs->udev = udev;
-        ucs->interface = interface;
 
         ucs->read_urb = usb_alloc_urb(0, SLAB_KERNEL);
         if (!ucs->read_urb) {
-                err("No free urbs available");
+                dev_err(cs->dev, "No free urbs available\n");
                 retval = -ENOMEM;
                 goto error;
         }
@@ -825,38 +786,33 @@ static int gigaset_probe(struct usb_interface *interface,
         ucs->int_in_endpointAddr = endpoint->bEndpointAddress;
         cs->inbuf[0].rcvbuf = kmalloc(buffer_size, GFP_KERNEL);
         if (!cs->inbuf[0].rcvbuf) {
-                err("Couldn't allocate rcvbuf");
+                dev_err(cs->dev, "Couldn't allocate rcvbuf\n");
                 retval = -ENOMEM;
                 goto error;
         }
         /* Fill the interrupt urb and send it to the core */
         usb_fill_int_urb(ucs->read_urb, udev,
-                         usb_rcvintpipe(udev,
-                                        endpoint->bEndpointAddress & 0x0f),
-                         cs->inbuf[0].rcvbuf, buffer_size,
-                         gigaset_read_int_callback,
-                         cs->inbuf + 0, endpoint->bInterval);
+                         usb_rcvintpipe(udev,
+                                        endpoint->bEndpointAddress & 0x0f),
+                         cs->inbuf[0].rcvbuf, buffer_size,
+                         gigaset_read_int_callback,
+                         cs->inbuf + 0, endpoint->bInterval);
 
         retval = usb_submit_urb(ucs->read_urb, SLAB_KERNEL);
         if (retval) {
-                err("Could not submit URB!");
+                dev_err(cs->dev, "Could not submit URB (error %d)\n", -retval);
                 goto error;
         }
 
         /* tell common part that the device is ready */
         if (startmode == SM_LOCKED)
                 atomic_set(&cs->mstate, MS_LOCKED);
+
         if (!gigaset_start(cs)) {
                 tasklet_kill(&cs->write_tasklet);
                 retval = -ENODEV; //FIXME
                 goto error;
         }
-
-        /* save address of controller structure */
-        usb_set_intfdata(interface, cs);
-
-        /* set up device sysfs */
-        gigaset_init_dev_sysfs(interface);
         return 0;
 
 error:
@@ -868,48 +824,45 @@ error:
         kfree(cs->inbuf[0].rcvbuf);
         if (ucs->read_urb != NULL)
                 usb_free_urb(ucs->read_urb);
+        usb_set_intfdata(interface, NULL);
         ucs->read_urb = ucs->bulk_out_urb = NULL;
         cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL;
+        usb_put_dev(ucs->udev);
+        ucs->udev = NULL;
+        ucs->interface = NULL;
         gigaset_unassign(cs);
         return retval;
 }
 
-/**
- *      skel_disconnect
- */
 static void gigaset_disconnect(struct usb_interface *interface)
 {
         struct cardstate *cs;
         struct usb_cardstate *ucs;
 
         cs = usb_get_intfdata(interface);
-
-        /* clear device sysfs */
-        gigaset_free_dev_sysfs(interface);
-
-        usb_set_intfdata(interface, NULL);
         ucs = cs->hw.usb;
         usb_kill_urb(ucs->read_urb);
-        //info("GigaSet USB device #%d will be disconnected", minor);
 
         gigaset_stop(cs);
 
+        usb_set_intfdata(interface, NULL);
         tasklet_kill(&cs->write_tasklet);
 
-        usb_kill_urb(ucs->bulk_out_urb);  /* FIXME: nur, wenn noetig */
-        //usb_kill_urb(ucs->urb_cmd_out);  /* FIXME: nur, wenn noetig */
+        usb_kill_urb(ucs->bulk_out_urb);        /* FIXME: only if active? */
 
         kfree(ucs->bulk_out_buffer);
         if (ucs->bulk_out_urb != NULL)
                 usb_free_urb(ucs->bulk_out_urb);
-        //if(ucs->urb_cmd_out != NULL)
-        //      usb_free_urb(ucs->urb_cmd_out);
         kfree(cs->inbuf[0].rcvbuf);
         if (ucs->read_urb != NULL)
                 usb_free_urb(ucs->read_urb);
-        ucs->read_urb = ucs->bulk_out_urb/*=ucs->urb_cmd_out*/=NULL;
+        ucs->read_urb = ucs->bulk_out_urb = NULL;
         cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL;
 
+        usb_put_dev(ucs->udev);
+        ucs->interface = NULL;
+        ucs->udev = NULL;
+        cs->dev = NULL;
         gigaset_unassign(cs);
 }
 
@@ -942,9 +895,9 @@ static int __init usb_gigaset_init(void)
 
         /* allocate memory for our driver state and intialize it */
         if ((driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
-                                       GIGASET_MODULENAME, GIGASET_DEVNAME,
-                                       GIGASET_DEVFSNAME, &ops,
-                                       THIS_MODULE)) == NULL)
+                                       GIGASET_MODULENAME, GIGASET_DEVNAME,
+                                       GIGASET_DEVFSNAME, &ops,
+                                       THIS_MODULE)) == NULL)
                 goto error;
 
         /* allocate memory for our device state and intialize it */
@@ -981,8 +934,8 @@ error:	if (cardstate)
 static void __exit usb_gigaset_exit(void)
 {
         gigaset_blockdriver(driver); /* => probe will fail
-                                      * => no gigaset_start any more
-                                      */
+                                      * => no gigaset_start any more
+                                      */
 
         gigaset_shutdown(cardstate);
         /* from now on, no isdn callback should be possible */
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 2c4f20b7f021..3f5b64794542 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -14,13 +14,7 @@ config LEDS_CLASS
           This option enables the led sysfs class in /sys/class/leds.  You'll
           need this to do anything useful with LEDs.  If unsure, say N.
 
-config LEDS_TRIGGERS
-        bool "LED Trigger support"
-        depends NEW_LEDS
-        help
-          This option enables trigger support for the leds class.
-          These triggers allow kernel events to drive the LEDs and can
-          be configured via sysfs. If unsure, say Y.
+comment "LED drivers"
 
 config LEDS_CORGI
         tristate "LED Support for the Sharp SL-C7x0 series"
@@ -59,6 +53,23 @@ config LEDS_TOSA
           This option enables support for the LEDs on Sharp Zaurus
           SL-6000 series.
 
+config LEDS_S3C24XX
+        tristate "LED Support for Samsung S3C24XX GPIO LEDs"
+        depends on LEDS_CLASS && ARCH_S3C2410
+        help
+          This option enables support for LEDs connected to GPIO lines
+          on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440.
+
+comment "LED Triggers"
+
+config LEDS_TRIGGERS
+        bool "LED Trigger support"
+        depends NEW_LEDS
+        help
+          This option enables trigger support for the leds class.
+          These triggers allow kernel events to drive the LEDs and can
+          be configured via sysfs. If unsure, say Y.
+
 config LEDS_TRIGGER_TIMER
         tristate "LED Timer Trigger"
         depends LEDS_TRIGGERS
@@ -67,7 +78,7 @@ config LEDS_TRIGGER_TIMER
           via sysfs. If unsure, say Y.
 
 config LEDS_TRIGGER_IDE_DISK
-        bool "LED Timer Trigger"
+        bool "LED IDE Disk Trigger"
         depends LEDS_TRIGGERS && BLK_DEV_IDEDISK
         help
           This allows LEDs to be controlled by IDE disk activity.
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index 40699d3cabbf..40f042633bf5 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o
 obj-$(CONFIG_LEDS_SPITZ)                += leds-spitz.o
 obj-$(CONFIG_LEDS_IXP4XX)               += leds-ixp4xx-gpio.o
 obj-$(CONFIG_LEDS_TOSA)                 += leds-tosa.o
+obj-$(CONFIG_LEDS_S3C24XX)              += leds-s3c24xx.o
 
 # LED Triggers
 obj-$(CONFIG_LEDS_TRIGGER_TIMER)        += ledtrig-timer.o
diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c
new file mode 100644
index 000000000000..650cf72dc675
--- /dev/null
+++ b/drivers/leds/leds-s3c24xx.c
@@ -0,0 +1,163 @@
+/* drivers/leds/leds-s3c24xx.c
+ *
+ * (c) 2006 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C24XX - LEDs GPIO driver
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/leds.h>
+
+#include <asm/arch/hardware.h>
+#include <asm/arch/regs-gpio.h>
+#include <asm/arch/leds-gpio.h>
+
+/* our context */
+
+struct s3c24xx_gpio_led {
+        struct led_classdev              cdev;
+        struct s3c24xx_led_platdata     *pdata;
+};
+
+static inline struct s3c24xx_gpio_led *pdev_to_gpio(struct platform_device *dev)
+{
+        return platform_get_drvdata(dev);
+}
+
+static inline struct s3c24xx_gpio_led *to_gpio(struct led_classdev *led_cdev)
+{
+        return container_of(led_cdev, struct s3c24xx_gpio_led, cdev);
+}
+
+static void s3c24xx_led_set(struct led_classdev *led_cdev,
+                            enum led_brightness value)
+{
+        struct s3c24xx_gpio_led *led = to_gpio(led_cdev);
+        struct s3c24xx_led_platdata *pd = led->pdata;
+
+        /* there will be a sort delay between setting the output and
+         * going from output to input when using tristate. */
+
+        s3c2410_gpio_setpin(pd->gpio, (value ? 1 : 0) ^
+                            (pd->flags & S3C24XX_LEDF_ACTLOW));
+
+        if (pd->flags & S3C24XX_LEDF_TRISTATE)
+                s3c2410_gpio_cfgpin(pd->gpio,
+                                    value ? S3C2410_GPIO_OUTPUT : S3C2410_GPIO_INPUT);
+
+}
+
+static int s3c24xx_led_remove(struct platform_device *dev)
+{
+        struct s3c24xx_gpio_led *led = pdev_to_gpio(dev);
+
+        led_classdev_unregister(&led->cdev);
+        kfree(led);
+
+        return 0;
+}
+
+static int s3c24xx_led_probe(struct platform_device *dev)
+{
+        struct s3c24xx_led_platdata *pdata = dev->dev.platform_data;
+        struct s3c24xx_gpio_led *led;
+        int ret;
+
+        led = kzalloc(sizeof(struct s3c24xx_gpio_led), GFP_KERNEL);
+        if (led == NULL) {
+                dev_err(&dev->dev, "No memory for device\n");
+                return -ENOMEM;
+        }
+
+        platform_set_drvdata(dev, led);
+
+        led->cdev.brightness_set = s3c24xx_led_set;
+        led->cdev.default_trigger = pdata->def_trigger;
+        led->cdev.name = pdata->name;
+
+        led->pdata = pdata;
+
+        /* no point in having a pull-up if we are always driving */
+
+        if (pdata->flags & S3C24XX_LEDF_TRISTATE) {
+                s3c2410_gpio_setpin(pdata->gpio, 0);
+                s3c2410_gpio_cfgpin(pdata->gpio, S3C2410_GPIO_INPUT);
+        } else {
+                s3c2410_gpio_pullup(pdata->gpio, 0);
+                s3c2410_gpio_setpin(pdata->gpio, 0);
+                s3c2410_gpio_cfgpin(pdata->gpio, S3C2410_GPIO_OUTPUT);
+        }
+
+        /* register our new led device */
+
+        ret = led_classdev_register(&dev->dev, &led->cdev);
+        if (ret < 0) {
+                dev_err(&dev->dev, "led_classdev_register failed\n");
+                goto exit_err1;
+        }
+
+        return 0;
+
+ exit_err1:
+        kfree(led);
+        return ret;
+}
+
+
+#ifdef CONFIG_PM
+static int s3c24xx_led_suspend(struct platform_device *dev, pm_message_t state)
+{
+        struct s3c24xx_gpio_led *led = pdev_to_gpio(dev);
+
+        led_classdev_suspend(&led->cdev);
+        return 0;
+}
+
+static int s3c24xx_led_resume(struct platform_device *dev)
+{
+        struct s3c24xx_gpio_led *led = pdev_to_gpio(dev);
+
+        led_classdev_resume(&led->cdev);
+        return 0;
+}
+#else
+#define s3c24xx_led_suspend NULL
+#define s3c24xx_led_resume NULL
+#endif
+
+static struct platform_driver s3c24xx_led_driver = {
+        .probe          = s3c24xx_led_probe,
+        .remove         = s3c24xx_led_remove,
+        .suspend        = s3c24xx_led_suspend,
+        .resume         = s3c24xx_led_resume,
+        .driver         = {
+                .name           = "s3c24xx_led",
+                .owner          = THIS_MODULE,
+        },
+};
+
+static int __init s3c24xx_led_init(void)
+{
+        return platform_driver_register(&s3c24xx_led_driver);
+}
+
+static void __exit s3c24xx_led_exit(void)
+{
+        platform_driver_unregister(&s3c24xx_led_driver);
+}
+
+module_init(s3c24xx_led_init);
+module_exit(s3c24xx_led_exit);
+
+MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
+MODULE_DESCRIPTION("S3C24XX LED driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index fd2aae150ccc..ac25a48362ac 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -139,11 +139,12 @@ config MD_RAID5_RESHAPE
           is online.  However it is still EXPERIMENTAL code.  It should
           work, but please be sure that you have backups.
 
-          You will need a version of mdadm newer than 2.3.1.   During the
-          early stage of reshape there is a critical section where live data
-          is being over-written.  A crash during this time needs extra care
-          for recovery.  The newer mdadm takes a copy of the data in the
-          critical section and will restore it, if necessary, after a crash.
+          You will need mdadm verion 2.4.1 or later to use this
+          feature safely.  During the early stage of reshape there is
+          a critical section where live data is being over-written.  A
+          crash during this time needs extra care for recovery.  The
+          newer mdadm takes a copy of the data in the critical section
+          and will restore it, if necessary, after a crash.
 
           The mdadm usage is e.g.
                mdadm --grow /dev/md1 --raid-disks=6
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 4092a5e37ffc..b3ea2d63db9b 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -84,4 +84,4 @@ obj-$(CONFIG_USB_IBMCAM)        += usbvideo/
 obj-$(CONFIG_USB_KONICAWC)      += usbvideo/
 obj-$(CONFIG_USB_VICAM)         += usbvideo/
 
-EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
diff --git a/drivers/media/video/bt8xx/Makefile b/drivers/media/video/bt8xx/Makefile
index 94350f21cdc0..db641a36b197 100644
--- a/drivers/media/video/bt8xx/Makefile
+++ b/drivers/media/video/bt8xx/Makefile
@@ -9,4 +9,4 @@ bttv-objs      :=      bttv-driver.o bttv-cards.o bttv-if.o \
 obj-$(CONFIG_VIDEO_BT848) += bttv.o
 
 EXTRA_CFLAGS += -I$(src)/..
-EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
diff --git a/drivers/media/video/cx25840/Makefile b/drivers/media/video/cx25840/Makefile
index 32a896c23d1e..6e8665be8954 100644
--- a/drivers/media/video/cx25840/Makefile
+++ b/drivers/media/video/cx25840/Makefile
@@ -3,4 +3,4 @@ cx25840-objs    := cx25840-core.o cx25840-audio.o cx25840-firmware.o \
 
 obj-$(CONFIG_VIDEO_CX25840) += cx25840.o
 
-EXTRA_CFLAGS += -I$(src)/..
+EXTRA_CFLAGS += -Idrivers/media/video
diff --git a/drivers/media/video/cx88/Makefile b/drivers/media/video/cx88/Makefile
index 6482b9aa6a1f..0dcd09b9b727 100644
--- a/drivers/media/video/cx88/Makefile
+++ b/drivers/media/video/cx88/Makefile
@@ -8,9 +8,9 @@ obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
 obj-$(CONFIG_VIDEO_CX88_ALSA) += cx88-alsa.o
 obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
 
-EXTRA_CFLAGS += -I$(src)/..
-EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
-EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends
+EXTRA_CFLAGS += -Idrivers/media/video
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
+EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
 
 extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1
 extra-cflags-$(CONFIG_DVB_CX22702)   += -DHAVE_CX22702=1
diff --git a/drivers/media/video/em28xx/Makefile b/drivers/media/video/em28xx/Makefile
index da457a05b0dd..826d0e340753 100644
--- a/drivers/media/video/em28xx/Makefile
+++ b/drivers/media/video/em28xx/Makefile
@@ -3,4 +3,4 @@ em28xx-objs     := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \
 
 obj-$(CONFIG_VIDEO_EM28XX) += em28xx.o
 
-EXTRA_CFLAGS += -I$(src)/..
+EXTRA_CFLAGS += -Idrivers/media/video
diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile
index 1ba998424bbd..be7b9ee697d6 100644
--- a/drivers/media/video/saa7134/Makefile
+++ b/drivers/media/video/saa7134/Makefile
@@ -11,9 +11,9 @@ obj-$(CONFIG_VIDEO_SAA7134_OSS) += saa7134-oss.o
 
 obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
 
-EXTRA_CFLAGS += -I$(src)/..
-EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
-EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends
+EXTRA_CFLAGS += -Idrivers/media/video
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
+EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
 
 extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1
 extra-cflags-$(CONFIG_DVB_MT352)     += -DHAVE_MT352=1
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index c98571c9d5a6..13de05532e0a 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -32,6 +32,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
+#include <linux/dma-mapping.h>
 
 #include "saa7134-reg.h"
 #include "saa7134.h"
@@ -870,7 +871,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
                pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
                dev->pci_lat,pci_resource_start(pci_dev,0));
         pci_set_master(pci_dev);
-        if (!pci_dma_supported(pci_dev,0xffffffff)) {
+        if (!pci_dma_supported(pci_dev, DMA_32BIT_MASK)) {
                 printk("%s: Oops: no 32bit PCI DMA ???\n",dev->name);
                 err = -EIO;
                 goto fail1;
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index dd628cb51e31..7fac438b5c32 100644
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -129,8 +129,8 @@ config MTDRAM_ABS_POS
           allocating space from Linux's available memory. Otherwise, leave
           this set to zero. Most people will want to leave this as zero.
 
-config MTD_BLKMTD
-        tristate "MTD emulation using block device"
+config MTD_BLOCK2MTD
+        tristate "MTD using block device"
         depends on MTD
         help
           This driver allows a block device to appear as an MTD. It would
@@ -141,15 +141,6 @@ config MTD_BLKMTD
           Testing MTD users (eg JFFS2) on large media and media that might
           be removed during a write (using the floppy drive).
 
-config MTD_BLOCK2MTD
-        tristate "MTD using block device (rewrite)"
-        depends on MTD && EXPERIMENTAL
-        help
-          This driver is basically the same at MTD_BLKMTD above, but
-          experienced some interface changes plus serious speedups.  In
-          the long term, it should replace MTD_BLKMTD.  Right now, you
-          shouldn't entrust important data to it yet.
-
 comment "Disk-On-Chip Device Drivers"
 
 config MTD_DOC2000
diff --git a/drivers/mtd/devices/Makefile b/drivers/mtd/devices/Makefile
index 7c5ed2178380..b6573670316f 100644
--- a/drivers/mtd/devices/Makefile
+++ b/drivers/mtd/devices/Makefile
@@ -21,7 +21,6 @@ obj-$(CONFIG_MTD_PMC551)	+= pmc551.o
 obj-$(CONFIG_MTD_MS02NV)        += ms02-nv.o
 obj-$(CONFIG_MTD_MTDRAM)        += mtdram.o
 obj-$(CONFIG_MTD_LART)          += lart.o
-obj-$(CONFIG_MTD_BLKMTD)        += blkmtd.o
 obj-$(CONFIG_MTD_BLOCK2MTD)     += block2mtd.o
 obj-$(CONFIG_MTD_DATAFLASH)     += mtd_dataflash.o
 obj-$(CONFIG_MTD_M25P80)        += m25p80.o
diff --git a/drivers/mtd/devices/blkmtd.c b/drivers/mtd/devices/blkmtd.c
deleted file mode 100644
index 79f2e1f23ebd..000000000000
--- a/drivers/mtd/devices/blkmtd.c
+++ /dev/null
@@ -1,819 +0,0 @@
-/*
- * $Id: blkmtd.c,v 1.27 2005/11/07 11:14:24 gleixner Exp $
- *
- * blkmtd.c - use a block device as a fake MTD
- *
- * Author: Simon Evans <spse@secret.org.uk>
- *
- * Copyright (C) 2001,2002 Simon Evans
- *
- * Licence: GPL
- *
- * How it works:
- *      The driver uses raw/io to read/write the device and the page
- *      cache to cache access. Writes update the page cache with the
- *      new data and mark it dirty and add the page into a BIO which
- *      is then written out.
- *
- *      It can be loaded Read-Only to prevent erases and writes to the
- *      medium.
- *
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/blkdev.h>
-#include <linux/bio.h>
-#include <linux/pagemap.h>
-#include <linux/list.h>
-#include <linux/init.h>
-#include <linux/mount.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mutex.h>
-
-#define err(format, arg...) printk(KERN_ERR "blkmtd: " format "\n" , ## arg)
-#define info(format, arg...) printk(KERN_INFO "blkmtd: " format "\n" , ## arg)
-#define warn(format, arg...) printk(KERN_WARNING "blkmtd: " format "\n" , ## arg)
-#define crit(format, arg...) printk(KERN_CRIT "blkmtd: " format "\n" , ## arg)
-
-
-/* Default erase size in K, always make it a multiple of PAGE_SIZE */
-#define CONFIG_MTD_BLKDEV_ERASESIZE (128 << 10) /* 128KiB */
-#define VERSION "$Revision: 1.27 $"
-
-/* Info for the block device */
-struct blkmtd_dev {
-        struct list_head list;
-        struct block_device *blkdev;
-        struct mtd_info mtd_info;
-        struct mutex wrbuf_mutex;
-};
-
-
-/* Static info about the MTD, used in cleanup_module */
-static LIST_HEAD(blkmtd_device_list);
-
-
-static void blkmtd_sync(struct mtd_info *mtd);
-
-#define MAX_DEVICES 4
-
-/* Module parameters passed by insmod/modprobe */
-static char *device[MAX_DEVICES];    /* the block device to use */
-static int erasesz[MAX_DEVICES];     /* optional default erase size */
-static int ro[MAX_DEVICES];          /* optional read only flag */
-static int sync;
-
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Simon Evans <spse@secret.org.uk>");
-MODULE_DESCRIPTION("Emulate an MTD using a block device");
-module_param_array(device, charp, NULL, 0);
-MODULE_PARM_DESC(device, "block device to use");
-module_param_array(erasesz, int, NULL, 0);
-MODULE_PARM_DESC(erasesz, "optional erase size to use in KiB. eg 4=4KiB.");
-module_param_array(ro, bool, NULL, 0);
-MODULE_PARM_DESC(ro, "1=Read only, writes and erases cause errors");
-module_param(sync, bool, 0);
-MODULE_PARM_DESC(sync, "1=Synchronous writes");
-
-
-/* completion handler for BIO reads */
-static int bi_read_complete(struct bio *bio, unsigned int bytes_done, int error)
-{
-        if (bio->bi_size)
-                return 1;
-
-        complete((struct completion*)bio->bi_private);
-        return 0;
-}
-
-
-/* completion handler for BIO writes */
-static int bi_write_complete(struct bio *bio, unsigned int bytes_done, int error)
-{
-        const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
-        struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1;
-
-        if (bio->bi_size)
-                return 1;
-
-        if(!uptodate)
-                err("bi_write_complete: not uptodate\n");
-
-        do {
-                struct page *page = bvec->bv_page;
-                DEBUG(3, "Cleaning up page %ld\n", page->index);
-                if (--bvec >= bio->bi_io_vec)
-                        prefetchw(&bvec->bv_page->flags);
-
-                if (uptodate) {
-                        SetPageUptodate(page);
-                } else {
-                        ClearPageUptodate(page);
-                        SetPageError(page);
-                }
-                clear_page_dirty(page);
-                unlock_page(page);
-                page_cache_release(page);
-        } while (bvec >= bio->bi_io_vec);
-
-        complete((struct completion*)bio->bi_private);
-        return 0;
-}
-
-
-/* read one page from the block device */
-static int blkmtd_readpage(struct blkmtd_dev *dev, struct page *page)
-{
-        struct bio *bio;
-        struct completion event;
-        int err = -ENOMEM;
-
-        if(PageUptodate(page)) {
-                DEBUG(2, "blkmtd: readpage page %ld is already upto date\n", page->index);
-                unlock_page(page);
-                return 0;
-        }
-
-        ClearPageUptodate(page);
-        ClearPageError(page);
-
-        bio = bio_alloc(GFP_KERNEL, 1);
-        if(bio) {
-                init_completion(&event);
-                bio->bi_bdev = dev->blkdev;
-                bio->bi_sector = page->index << (PAGE_SHIFT-9);
-                bio->bi_private = &event;
-                bio->bi_end_io = bi_read_complete;
-                if(bio_add_page(bio, page, PAGE_SIZE, 0) == PAGE_SIZE) {
-                        submit_bio(READ_SYNC, bio);
-                        wait_for_completion(&event);
-                        err = test_bit(BIO_UPTODATE, &bio->bi_flags) ? 0 : -EIO;
-                        bio_put(bio);
-                }
-        }
-
-        if(err)
-                SetPageError(page);
-        else
-                SetPageUptodate(page);
-        flush_dcache_page(page);
-        unlock_page(page);
-        return err;
-}
-
-
-/* write out the current BIO and wait for it to finish */
-static int blkmtd_write_out(struct bio *bio)
-{
-        struct completion event;
-        int err;
-
-        if(!bio->bi_vcnt) {
-                bio_put(bio);
-                return 0;
-        }
-
-        init_completion(&event);
-        bio->bi_private = &event;
-        bio->bi_end_io = bi_write_complete;
-        submit_bio(WRITE_SYNC, bio);
-        wait_for_completion(&event);
-        DEBUG(3, "submit_bio completed, bi_vcnt = %d\n", bio->bi_vcnt);
-        err = test_bit(BIO_UPTODATE, &bio->bi_flags) ? 0 : -EIO;
-        bio_put(bio);
-        return err;
-}
-
-
-/**
- * blkmtd_add_page - add a page to the current BIO
- * @bio: bio to add to (NULL to alloc initial bio)
- * @blkdev: block device
- * @page: page to add
- * @pagecnt: pages left to add
- *
- * Adds a page to the current bio, allocating it if necessary. If it cannot be
- * added, the current bio is written out and a new one is allocated. Returns
- * the new bio to add or NULL on error
- */
-static struct bio *blkmtd_add_page(struct bio *bio, struct block_device *blkdev,
-                                   struct page *page, int pagecnt)
-{
-
- retry:
-        if(!bio) {
-                bio = bio_alloc(GFP_KERNEL, pagecnt);
-                if(!bio)
-                        return NULL;
-                bio->bi_sector = page->index << (PAGE_SHIFT-9);
-                bio->bi_bdev = blkdev;
-        }
-
-        if(bio_add_page(bio, page, PAGE_SIZE, 0) != PAGE_SIZE) {
-                blkmtd_write_out(bio);
-                bio = NULL;
-                goto retry;
-        }
-        return bio;
-}
-
-
-/**
- * write_pages - write block of data to device via the page cache
- * @dev: device to write to
- * @buf: data source or NULL if erase (output is set to 0xff)
- * @to: offset into output device
- * @len: amount to data to write
- * @retlen: amount of data written
- *
- * Grab pages from the page cache and fill them with the source data.
- * Non page aligned start and end result in a readin of the page and
- * part of the page being modified. Pages are added to the bio and then written
- * out.
- */
-static int write_pages(struct blkmtd_dev *dev, const u_char *buf, loff_t to,
-                    size_t len, size_t *retlen)
-{
-        int pagenr, offset;
-        size_t start_len = 0, end_len;
-        int pagecnt = 0;
-        int err = 0;
-        struct bio *bio = NULL;
-        size_t thislen = 0;
-
-        pagenr = to >> PAGE_SHIFT;
-        offset = to & ~PAGE_MASK;
-
-        DEBUG(2, "blkmtd: write_pages: buf = %p to = %ld len = %zd pagenr = %d offset = %d\n",
-              buf, (long)to, len, pagenr, offset);
-
-        /* see if we have to do a partial write at the start */
-        if(offset) {
-                start_len = ((offset + len) > PAGE_SIZE) ? PAGE_SIZE - offset : len;
-                len -= start_len;
-        }
-
-        /* calculate the length of the other two regions */
-        end_len = len & ~PAGE_MASK;
-        len -= end_len;
-
-        if(start_len)
-                pagecnt++;
-
-        if(len)
-                pagecnt += len >> PAGE_SHIFT;
-
-        if(end_len)
-                pagecnt++;
-
-        mutex_lock(&dev->wrbuf_mutex);
-
-        DEBUG(3, "blkmtd: write: start_len = %zd len = %zd end_len = %zd pagecnt = %d\n",
-              start_len, len, end_len, pagecnt);
-
-        if(start_len) {
-                /* do partial start region */
-                struct page *page;
-
-                DEBUG(3, "blkmtd: write: doing partial start, page = %d len = %zd offset = %d\n",
-                      pagenr, start_len, offset);
-
-                BUG_ON(!buf);
-                page = read_cache_page(dev->blkdev->bd_inode->i_mapping, pagenr, (filler_t *)blkmtd_readpage, dev);
-                lock_page(page);
-                if(PageDirty(page)) {
-                        err("to = %lld start_len = %zd len = %zd end_len = %zd pagenr = %d\n",
-                            to, start_len, len, end_len, pagenr);
-                        BUG();
-                }
-                memcpy(page_address(page)+offset, buf, start_len);
-                set_page_dirty(page);
-                SetPageUptodate(page);
-                buf += start_len;
-                thislen = start_len;
-                bio = blkmtd_add_page(bio, dev->blkdev, page, pagecnt);
-                if(!bio) {
-                        err = -ENOMEM;
-                        err("bio_add_page failed\n");
-                        goto write_err;
-                }
-                pagecnt--;
-                pagenr++;
-        }
-
-        /* Now do the main loop to a page aligned, n page sized output */
-        if(len) {
-                int pagesc = len >> PAGE_SHIFT;
-                DEBUG(3, "blkmtd: write: whole pages start = %d, count = %d\n",
-                      pagenr, pagesc);
-                while(pagesc) {
-                        struct page *page;
-
-                        /* see if page is in the page cache */
-                        DEBUG(3, "blkmtd: write: grabbing page %d from page cache\n", pagenr);
-                        page = grab_cache_page(dev->blkdev->bd_inode->i_mapping, pagenr);
-                        if(PageDirty(page)) {
-                                BUG();
-                        }
-                        if(!page) {
-                                warn("write: cannot grab cache page %d", pagenr);
-                                err = -ENOMEM;
-                                goto write_err;
-                        }
-                        if(!buf) {
-                                memset(page_address(page), 0xff, PAGE_SIZE);
-                        } else {
-                                memcpy(page_address(page), buf, PAGE_SIZE);
-                                buf += PAGE_SIZE;
-                        }
-                        bio = blkmtd_add_page(bio, dev->blkdev, page, pagecnt);
-                        if(!bio) {
-                                err = -ENOMEM;
-                                err("bio_add_page failed\n");
-                                goto write_err;
-                        }
-                        pagenr++;
-                        pagecnt--;
-                        set_page_dirty(page);
-                        SetPageUptodate(page);
-                        pagesc--;
-                        thislen += PAGE_SIZE;
-                }
-        }
-
-        if(end_len) {
-                /* do the third region */
-                struct page *page;
-                DEBUG(3, "blkmtd: write: doing partial end, page = %d len = %zd\n",
-                      pagenr, end_len);
-                BUG_ON(!buf);
-                page = read_cache_page(dev->blkdev->bd_inode->i_mapping, pagenr, (filler_t *)blkmtd_readpage, dev);
-                lock_page(page);
-                if(PageDirty(page)) {
-                        err("to = %lld start_len = %zd len = %zd end_len = %zd pagenr = %d\n",
-                            to, start_len, len, end_len, pagenr);
-                        BUG();
-                }
-                memcpy(page_address(page), buf, end_len);
-                set_page_dirty(page);
-                SetPageUptodate(page);
-                DEBUG(3, "blkmtd: write: writing out partial end\n");
-                thislen += end_len;
-                bio = blkmtd_add_page(bio, dev->blkdev, page, pagecnt);
-                if(!bio) {
-                        err = -ENOMEM;
-                        err("bio_add_page failed\n");
-                        goto write_err;
-                }
-                pagenr++;
-        }
-
-        DEBUG(3, "blkmtd: write: got %d vectors to write\n", bio->bi_vcnt);
- write_err:
-        if(bio)
-                blkmtd_write_out(bio);
-
-        DEBUG(2, "blkmtd: write: end, retlen = %zd, err = %d\n", *retlen, err);
-        mutex_unlock(&dev->wrbuf_mutex);
-
-        if(retlen)
-                *retlen = thislen;
-        return err;
-}
-
-
-/* erase a specified part of the device */
-static int blkmtd_erase(struct mtd_info *mtd, struct erase_info *instr)
-{
-        struct blkmtd_dev *dev = mtd->priv;
-        struct mtd_erase_region_info *einfo = mtd->eraseregions;
-        int numregions = mtd->numeraseregions;
-        size_t from;
-        u_long len;
-        int err = -EIO;
-        size_t retlen;
-
-        instr->state = MTD_ERASING;
-        from = instr->addr;
-        len = instr->len;
-
-        /* check erase region has valid start and length */
-        DEBUG(2, "blkmtd: erase: dev = `%s' from = 0x%zx len = 0x%lx\n",
-              mtd->name+9, from, len);
-        while(numregions) {
-                DEBUG(3, "blkmtd: checking erase region = 0x%08X size = 0x%X num = 0x%x\n",
-                      einfo->offset, einfo->erasesize, einfo->numblocks);
-                if(from >= einfo->offset
-                   && from < einfo->offset + (einfo->erasesize * einfo->numblocks)) {
-                        if(len == einfo->erasesize
-                           && ( (from - einfo->offset) % einfo->erasesize == 0))
-                                break;
-                }
-                numregions--;
-                einfo++;
-        }
-
-        if(!numregions) {
-                /* Not a valid erase block */
-                err("erase: invalid erase request 0x%lX @ 0x%08zX", len, from);
-                instr->state = MTD_ERASE_FAILED;
-                err = -EIO;
-        }
-
-        if(instr->state != MTD_ERASE_FAILED) {
-                /* do the erase */
-                DEBUG(3, "Doing erase from = %zd len = %ld\n", from, len);
-                err = write_pages(dev, NULL, from, len, &retlen);
-                if(err || retlen != len) {
-                        err("erase failed err = %d", err);
-                        instr->state = MTD_ERASE_FAILED;
-                } else {
-                        instr->state = MTD_ERASE_DONE;
-                }
-        }
-
-        DEBUG(3, "blkmtd: erase: checking callback\n");
-        mtd_erase_callback(instr);
-        DEBUG(2, "blkmtd: erase: finished (err = %d)\n", err);
-        return err;
-}
-
-
-/* read a range of the data via the page cache */
-static int blkmtd_read(struct mtd_info *mtd, loff_t from, size_t len,
-                       size_t *retlen, u_char *buf)
-{
-        struct blkmtd_dev *dev = mtd->priv;
-        int err = 0;
-        int offset;
-        int pagenr, pages;
-        size_t thislen = 0;
-
-        DEBUG(2, "blkmtd: read: dev = `%s' from = %lld len = %zd buf = %p\n",
-              mtd->name+9, from, len, buf);
-
-        if(from > mtd->size)
-                return -EINVAL;
-        if(from + len > mtd->size)
-                len = mtd->size - from;
-
-        pagenr = from >> PAGE_SHIFT;
-        offset = from - (pagenr << PAGE_SHIFT);
-
-        pages = (offset+len+PAGE_SIZE-1) >> PAGE_SHIFT;
-        DEBUG(3, "blkmtd: read: pagenr = %d offset = %d, pages = %d\n",
-              pagenr, offset, pages);
-
-        while(pages) {
-                struct page *page;
-                int cpylen;
-
-                DEBUG(3, "blkmtd: read: looking for page: %d\n", pagenr);
-                page = read_cache_page(dev->blkdev->bd_inode->i_mapping, pagenr, (filler_t *)blkmtd_readpage, dev);
-                if(IS_ERR(page)) {
-                        err = -EIO;
-                        goto readerr;
-                }
-
-                cpylen = (PAGE_SIZE > len) ? len : PAGE_SIZE;
-                if(offset+cpylen > PAGE_SIZE)
-                        cpylen = PAGE_SIZE-offset;
-
-                memcpy(buf + thislen, page_address(page) + offset, cpylen);
-                offset = 0;
-                len -= cpylen;
-                thislen += cpylen;
-                pagenr++;
-                pages--;
-                if(!PageDirty(page))
-                        page_cache_release(page);
-        }
-
- readerr:
-        if(retlen)
-                *retlen = thislen;
-        DEBUG(2, "blkmtd: end read: retlen = %zd, err = %d\n", thislen, err);
-        return err;
-}
-
-
-/* write data to the underlying device */
-static int blkmtd_write(struct mtd_info *mtd, loff_t to, size_t len,
-                        size_t *retlen, const u_char *buf)
-{
-        struct blkmtd_dev *dev = mtd->priv;
-        int err;
-
-        if(!len)
-                return 0;
-
-        DEBUG(2, "blkmtd: write: dev = `%s' to = %lld len = %zd buf = %p\n",
-              mtd->name+9, to, len, buf);
-
-        if(to >= mtd->size) {
-                return -ENOSPC;
-        }
-
-        if(to + len > mtd->size) {
-                len = mtd->size - to;
-        }
-
-        err = write_pages(dev, buf, to, len, retlen);
-        if(err > 0)
-                err = 0;
-        DEBUG(2, "blkmtd: write: end, err = %d\n", err);
-        return err;
-}
-
-
-/* sync the device - wait until the write queue is empty */
-static void blkmtd_sync(struct mtd_info *mtd)
-{
-        /* Currently all writes are synchronous */
-}
-
-
-static void free_device(struct blkmtd_dev *dev)
-{
-        DEBUG(2, "blkmtd: free_device() dev = %p\n", dev);
-        if(dev) {
-                kfree(dev->mtd_info.eraseregions);
-                kfree(dev->mtd_info.name);
-                if(dev->blkdev) {
-                        invalidate_inode_pages(dev->blkdev->bd_inode->i_mapping);
-                        close_bdev_excl(dev->blkdev);
-                }
-                kfree(dev);
-        }
-}
-
-
-/* For a given size and initial erase size, calculate the number
- * and size of each erase region. Goes round the loop twice,
- * once to find out how many regions, then allocates space,
- * then round the loop again to fill it in.
- */
-static struct mtd_erase_region_info *calc_erase_regions(
-        size_t erase_size, size_t total_size, int *regions)
-{
-        struct mtd_erase_region_info *info = NULL;
-
-        DEBUG(2, "calc_erase_regions, es = %zd size = %zd regions = %d\n",
-              erase_size, total_size, *regions);
-        /* Make any user specified erasesize be a power of 2
-           and at least PAGE_SIZE */
-        if(erase_size) {
-                int es = erase_size;
-                erase_size = 1;
-                while(es != 1) {
-                        es >>= 1;
-                        erase_size <<= 1;
-                }
-                if(erase_size < PAGE_SIZE)
-                        erase_size = PAGE_SIZE;
-        } else {
-                erase_size = CONFIG_MTD_BLKDEV_ERASESIZE;
-        }
-
-        *regions = 0;
-
-        do {
-                int tot_size = total_size;
-                int er_size = erase_size;
-                int count = 0, offset = 0, regcnt = 0;
-
-                while(tot_size) {
-                        count = tot_size / er_size;
-                        if(count) {
-                                tot_size = tot_size % er_size;
-                                if(info) {
-                                        DEBUG(2, "adding to erase info off=%d er=%d cnt=%d\n",
-                                              offset, er_size, count);
-                                        (info+regcnt)->offset = offset;
-                                        (info+regcnt)->erasesize = er_size;
-                                        (info+regcnt)->numblocks = count;
-                                        (*regions)++;
-                                }
-                                regcnt++;
-                                offset += (count * er_size);
-                        }
-                        while(er_size > tot_size)
-                                er_size >>= 1;
-                }
-                if(info == NULL) {
-                        info = kmalloc(regcnt * sizeof(struct mtd_erase_region_info), GFP_KERNEL);
-                        if(!info)
-                                break;
-                }
-        } while(!(*regions));
-        DEBUG(2, "calc_erase_regions done, es = %zd size = %zd regions = %d\n",
-              erase_size, total_size, *regions);
-        return info;
-}
-
-
-static struct blkmtd_dev *add_device(char *devname, int readonly, int erase_size)
-{
-        struct block_device *bdev;
-        int mode;
-        struct blkmtd_dev *dev;
-
-        if(!devname)
-                return NULL;
-
-        /* Get a handle on the device */
-
-
-#ifdef MODULE
-        mode = (readonly) ? O_RDONLY : O_RDWR;
-        bdev = open_bdev_excl(devname, mode, NULL);
-#else
-        mode = (readonly) ? FMODE_READ : FMODE_WRITE;
-        bdev = open_by_devnum(name_to_dev_t(devname), mode);
-#endif
-        if(IS_ERR(bdev)) {
-                err("error: cannot open device %s", devname);
-                DEBUG(2, "blkmtd: opening bdev returned %ld\n", PTR_ERR(bdev));
-                return NULL;
-        }
-
-        DEBUG(1, "blkmtd: found a block device major = %d, minor = %d\n",
-              MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev));
-
-        if(MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
-                err("attempting to use an MTD device as a block device");
-                blkdev_put(bdev);
-                return NULL;
-        }
-
-        dev = kmalloc(sizeof(struct blkmtd_dev), GFP_KERNEL);
-        if(dev == NULL) {
-                blkdev_put(bdev);
-                return NULL;
-        }
-
-        memset(dev, 0, sizeof(struct blkmtd_dev));
-        dev->blkdev = bdev;
-        if(!readonly) {
-                mutex_init(&dev->wrbuf_mutex);
-        }
-
-        dev->mtd_info.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
-
-        /* Setup the MTD structure */
-        /* make the name contain the block device in */
-        dev->mtd_info.name = kmalloc(sizeof("blkmtd: ") + strlen(devname), GFP_KERNEL);
-        if(dev->mtd_info.name == NULL)
-                goto devinit_err;
-
-        sprintf(dev->mtd_info.name, "blkmtd: %s", devname);
-        dev->mtd_info.eraseregions = calc_erase_regions(erase_size, dev->mtd_info.size,
-                                                        &dev->mtd_info.numeraseregions);
-        if(dev->mtd_info.eraseregions == NULL)
-                goto devinit_err;
-
-        dev->mtd_info.erasesize = dev->mtd_info.eraseregions->erasesize;
-        DEBUG(1, "blkmtd: init: found %d erase regions\n",
-              dev->mtd_info.numeraseregions);
-
-        if(readonly) {
-                dev->mtd_info.type = MTD_ROM;
-                dev->mtd_info.flags = MTD_CAP_ROM;
-        } else {
-                dev->mtd_info.type = MTD_RAM;
-                dev->mtd_info.flags = MTD_CAP_RAM;
-                dev->mtd_info.erase = blkmtd_erase;
-                dev->mtd_info.write = blkmtd_write;
-                dev->mtd_info.writev = default_mtd_writev;
-                dev->mtd_info.sync = blkmtd_sync;
-        }
-        dev->mtd_info.read = blkmtd_read;
-        dev->mtd_info.readv = default_mtd_readv;
-        dev->mtd_info.priv = dev;
-        dev->mtd_info.owner = THIS_MODULE;
-
-        list_add(&dev->list, &blkmtd_device_list);
-        if (add_mtd_device(&dev->mtd_info)) {
-                /* Device didnt get added, so free the entry */
-                list_del(&dev->list);
-                goto devinit_err;
-        } else {
-                info("mtd%d: [%s] erase_size = %dKiB %s",
-                     dev->mtd_info.index, dev->mtd_info.name + strlen("blkmtd: "),
-                     dev->mtd_info.erasesize >> 10,
-                     readonly ? "(read-only)" : "");
-        }
-
-        return dev;
-
- devinit_err:
-        free_device(dev);
-        return NULL;
-}
-
-
-/* Cleanup and exit - sync the device and kill of the kernel thread */
-static void __devexit cleanup_blkmtd(void)
-{
-        struct list_head *temp1, *temp2;
-
-        /* Remove the MTD devices */
-        list_for_each_safe(temp1, temp2, &blkmtd_device_list) {
-                struct blkmtd_dev *dev = list_entry(temp1, struct blkmtd_dev,
-                                                    list);
-                blkmtd_sync(&dev->mtd_info);
-                del_mtd_device(&dev->mtd_info);
-                info("mtd%d: [%s] removed", dev->mtd_info.index,
-                     dev->mtd_info.name + strlen("blkmtd: "));
-                list_del(&dev->list);
-                free_device(dev);
-        }
-}
-
-#ifndef MODULE
-
-/* Handle kernel boot params */
-
-
-static int __init param_blkmtd_device(char *str)
-{
-        int i;
-
-        for(i = 0; i < MAX_DEVICES; i++) {
-                device[i] = str;
-                DEBUG(2, "blkmtd: device setup: %d = %s\n", i, device[i]);
-                strsep(&str, ",");
-        }
-        return 1;
-}
-
-
-static int __init param_blkmtd_erasesz(char *str)
-{
-        int i;
-        for(i = 0; i < MAX_DEVICES; i++) {
-                char *val = strsep(&str, ",");
-                if(val)
-                        erasesz[i] = simple_strtoul(val, NULL, 0);
-                DEBUG(2, "blkmtd: erasesz setup: %d = %d\n", i, erasesz[i]);
-        }
-
-        return 1;
-}
-
-
-static int __init param_blkmtd_ro(char *str)
-{
-        int i;
-        for(i = 0; i < MAX_DEVICES; i++) {
-                char *val = strsep(&str, ",");
-                if(val)
-                        ro[i] = simple_strtoul(val, NULL, 0);
-                DEBUG(2, "blkmtd: ro setup: %d = %d\n", i, ro[i]);
-        }
-
-        return 1;
-}
-
-
-static int __init param_blkmtd_sync(char *str)
-{
-        if(str[0] == '1')
-                sync = 1;
-        return 1;
-}
-
-__setup("blkmtd_device=", param_blkmtd_device);
-__setup("blkmtd_erasesz=", param_blkmtd_erasesz);
-__setup("blkmtd_ro=", param_blkmtd_ro);
-__setup("blkmtd_sync=", param_blkmtd_sync);
-
-#endif
-
-
-/* Startup */
-static int __init init_blkmtd(void)
-{
-        int i;
-
-        info("version " VERSION);
-        /* Check args - device[0] is the bare minimum*/
-        if(!device[0]) {
-                err("error: missing `device' name\n");
-                return -EINVAL;
-        }
-
-        for(i = 0; i < MAX_DEVICES; i++)
-                add_device(device[i], ro[i], erasesz[i] << 10);
-
-        if(list_empty(&blkmtd_device_list))
-                return -EINVAL;
-
-        return 0;
-}
-
-module_init(init_blkmtd);
-module_exit(cleanup_blkmtd);
diff --git a/drivers/net/chelsio/Makefile b/drivers/net/chelsio/Makefile
index 91e927827c43..54c78d94f48b 100644
--- a/drivers/net/chelsio/Makefile
+++ b/drivers/net/chelsio/Makefile
@@ -4,7 +4,7 @@
 
 obj-$(CONFIG_CHELSIO_T1) += cxgb.o
 
-EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/chelsio $(DEBUG_FLAGS)
+EXTRA_CFLAGS += -Idrivers/net/chelsio $(DEBUG_FLAGS)
 
 
 cxgb-objs := cxgb2.o espi.o pm3393.o sge.o subr.o mv88x201x.o
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 6e2ec56cde0b..606243d11793 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  *
  * Filename:      irda-usb.c
- * Version:       0.9b
+ * Version:       0.10
  * Description:   IrDA-USB Driver
  * Status:        Experimental 
  * Author:        Dag Brattli <dag@brattli.net>
@@ -9,6 +9,9 @@
  *      Copyright (C) 2000, Roman Weissgaerber <weissg@vienna.at>
  *      Copyright (C) 2001, Dag Brattli <dag@brattli.net>
  *      Copyright (C) 2001, Jean Tourrilhes <jt@hpl.hp.com>
+ *      Copyright (C) 2004, SigmaTel, Inc. <irquality@sigmatel.com>
+ *      Copyright (C) 2005, Milan Beno <beno@pobox.sk>
+ *      Copyright (C) 2006, Nick Fedchik <nick@fedchik.org.ua>
  *          
  *      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
@@ -61,6 +64,7 @@
 #include <linux/slab.h>
 #include <linux/rtnetlink.h>
 #include <linux/usb.h>
+#include <linux/firmware.h>
 
 #include "irda-usb.h"
 
@@ -78,8 +82,12 @@ static struct usb_device_id dongles[] = {
         { USB_DEVICE(0x50f, 0x180), .driver_info = IUC_SPEED_BUG | IUC_NO_WINDOW },
         /* Extended Systems, Inc.,  XTNDAccess IrDA USB (ESI-9685) */
         { USB_DEVICE(0x8e9, 0x100), .driver_info = IUC_SPEED_BUG | IUC_NO_WINDOW },
+        /* SigmaTel STIR4210/4220/4116 USB IrDA (VFIR) Bridge */
+        { USB_DEVICE(0x66f, 0x4210), .driver_info = IUC_STIR_4210 | IUC_SPEED_BUG },
+        { USB_DEVICE(0x66f, 0x4220), .driver_info = IUC_STIR_4210 | IUC_SPEED_BUG },
+        { USB_DEVICE(0x66f, 0x4116), .driver_info = IUC_STIR_4210 | IUC_SPEED_BUG },
         { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS |
-                       USB_DEVICE_ID_MATCH_INT_SUBCLASS,
+          USB_DEVICE_ID_MATCH_INT_SUBCLASS,
           .bInterfaceClass = USB_CLASS_APP_SPEC,
           .bInterfaceSubClass = USB_CLASS_IRDA,
           .driver_info = IUC_DEFAULT, },
@@ -99,6 +107,7 @@ MODULE_DEVICE_TABLE(usb, dongles);
 
 /*------------------------------------------------------------------*/
 
+static void irda_usb_init_qos(struct irda_usb_cb *self) ;
 static struct irda_class_desc *irda_usb_find_class_desc(struct usb_interface *intf);
 static void irda_usb_disconnect(struct usb_interface *intf);
 static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self);
@@ -141,7 +150,24 @@ static void irda_usb_build_header(struct irda_usb_cb *self,
                                   __u8 *header,
                                   int   force)
 {
-        /* Set the negotiated link speed */
+        /* Here we check if we have an STIR421x chip,
+         * and if either speed or xbofs (or both) needs
+         * to be changed.
+         */
+        if (self->capability & IUC_STIR_4210 &&
+            ((self->new_speed != -1) || (self->new_xbofs != -1))) {
+
+                /* With STIR421x, speed and xBOFs must be set at the same
+                 * time, even if only one of them changes.
+                 */
+                if (self->new_speed == -1)
+                        self->new_speed = self->speed ;
+
+                if (self->new_xbofs == -1)
+                        self->new_xbofs = self->xbofs ;
+        }
+
+        /* Set the link speed */
         if (self->new_speed != -1) {
                 /* Hum... Ugly hack :-(
                  * Some device are not compliant with the spec and change
@@ -191,7 +217,11 @@ static void irda_usb_build_header(struct irda_usb_cb *self,
                         *header = SPEED_4000000;
                         self->new_xbofs = 0;
                         break;
-                }
+                case 16000000:
+                        *header = SPEED_16000000;
+                        self->new_xbofs = 0;
+                        break;
+                }
         } else
                 /* No change */
                 *header = 0;
@@ -235,6 +265,32 @@ static void irda_usb_build_header(struct irda_usb_cb *self,
         }
 }
 
+/*
+*   calculate turnaround time for SigmaTel header
+*/
+static __u8 get_turnaround_time(struct sk_buff *skb)
+{
+        int turnaround_time = irda_get_mtt(skb);
+
+        if ( turnaround_time == 0 )
+                return 0;
+        else if ( turnaround_time <= 10 )
+                return 1;
+        else if ( turnaround_time <= 50 )
+                return 2;
+        else if ( turnaround_time <= 100 )
+                return 3;
+        else if ( turnaround_time <= 500 )
+                return 4;
+        else if ( turnaround_time <= 1000 )
+                return 5;
+        else if ( turnaround_time <= 5000 )
+                return 6;
+        else
+                return 7;
+}
+
+
 /*------------------------------------------------------------------*/
 /*
  * Send a command to change the speed of the dongle
@@ -262,12 +318,18 @@ static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self)
         /* Set the new speed and xbofs in this fake frame */
         irda_usb_build_header(self, frame, 1);
 
+        if ( self->capability & IUC_STIR_4210 ) {
+                if (frame[0] == 0) return ; // do nothing if no change
+                frame[1] = 0; // other parameters don't change here
+                frame[2] = 0;
+        }
+
         /* Submit the 0 length IrDA frame to trigger new speed settings */
         usb_fill_bulk_urb(urb, self->usbdev,
                       usb_sndbulkpipe(self->usbdev, self->bulk_out_ep),
                       frame, IRDA_USB_SPEED_MTU,
                       speed_bulk_callback, self);
-        urb->transfer_buffer_length = USB_IRDA_HEADER;
+        urb->transfer_buffer_length = self->header_length;
         urb->transfer_flags = 0;
 
         /* Irq disabled -> GFP_ATOMIC */
@@ -383,16 +445,35 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
          * allocation will be done lower in skb_push().
          * Also, we don't use directly skb_cow(), because it require
          * headroom >= 16, which force unnecessary copies - Jean II */
-        if (skb_headroom(skb) < USB_IRDA_HEADER) {
+        if (skb_headroom(skb) < self->header_length) {
                 IRDA_DEBUG(0, "%s(), Insuficient skb headroom.\n", __FUNCTION__);
-                if (skb_cow(skb, USB_IRDA_HEADER)) {
+                if (skb_cow(skb, self->header_length)) {
                         IRDA_WARNING("%s(), failed skb_cow() !!!\n", __FUNCTION__);
                         goto drop;
                 }
         }
 
         /* Change setting for next frame */
-        irda_usb_build_header(self, skb_push(skb, USB_IRDA_HEADER), 0);
+
+        if ( self->capability & IUC_STIR_4210 ) {
+                __u8 turnaround_time;
+                __u8* frame;
+                turnaround_time = get_turnaround_time( skb );
+                frame= skb_push(skb, self->header_length);
+                irda_usb_build_header(self, frame, 0);
+                frame[2] = turnaround_time;
+                if ((skb->len != 0) &&
+                    ((skb->len % 128) == 0) &&
+                    ((skb->len % 512) != 0)) {
+                        /* add extra byte for special SigmaTel feature */
+                        frame[1] = 1;
+                        skb_put(skb, 1);
+                } else {
+                        frame[1] = 0;
+                }
+        } else {
+                irda_usb_build_header(self, skb_push(skb, self->header_length), 0);
+        }
 
         /* FIXME: Make macro out of this one */
         ((struct irda_skb_cb *)skb->cb)->context = self;
@@ -795,7 +876,7 @@ static void irda_usb_receive(struct urb *urb, struct pt_regs *regs)
         }
         
         /* Check for empty frames */
-        if (urb->actual_length <= USB_IRDA_HEADER) {
+        if (urb->actual_length <= self->header_length) {
                 IRDA_WARNING("%s(), empty frame!\n", __FUNCTION__);
                 goto done;
         }
@@ -816,7 +897,11 @@ static void irda_usb_receive(struct urb *urb, struct pt_regs *regs)
         docopy = (urb->actual_length < IRDA_RX_COPY_THRESHOLD);
 
         /* Allocate a new skb */
-        newskb = dev_alloc_skb(docopy ? urb->actual_length : IRDA_SKB_MAX_MTU);
+        if ( self->capability & IUC_STIR_4210 )
+                newskb = dev_alloc_skb(docopy ? urb->actual_length : IRDA_SKB_MAX_MTU + USB_IRDA_SIGMATEL_HEADER);
+        else
+                newskb = dev_alloc_skb(docopy ? urb->actual_length : IRDA_SKB_MAX_MTU);
+
         if (!newskb)  {
                 self->stats.rx_dropped++;
                 /* We could deliver the current skb, but this would stall
@@ -845,7 +930,7 @@ static void irda_usb_receive(struct urb *urb, struct pt_regs *regs)
 
         /* Set proper length on skb & remove USB-IrDA header */
         skb_put(dataskb, urb->actual_length);
-        skb_pull(dataskb, USB_IRDA_HEADER);
+        skb_pull(dataskb, self->header_length);
 
         /* Ask the networking layer to queue the packet for the IrDA stack */
         dataskb->dev = self->netdev;
@@ -937,6 +1022,191 @@ static int irda_usb_is_receiving(struct irda_usb_cb *self)
         return 0; /* For now */
 }
 
+
+#define STIR421X_PATCH_PRODUCT_VERSION_STR       "Product Version: "
+#define STIR421X_PATCH_COMPONENT_VERSION_STR     "Component Version: "
+#define STIR421X_PATCH_DATA_TAG_STR              "STMP"
+#define STIR421X_PATCH_FILE_VERSION_MAX_OFFSET   512     /* version info is before here */
+#define STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET     512     /* patch image starts before here */
+#define STIR421X_PATCH_FILE_END_OF_HEADER_TAG    0x1A    /* marks end of patch file header (PC DOS text file EOF character) */
+
+/*
+ * Known firmware patches for STIR421x dongles
+ */
+static char * stir421x_patches[] = {
+        "42101001.sb",
+        "42101002.sb",
+};
+
+static int stir421x_get_patch_version(unsigned char * patch, const unsigned long patch_len)
+{
+        unsigned int version_offset;
+        unsigned long version_major, version_minor, version_build;
+        unsigned char * version_start;
+        int version_found = 0;
+
+        for (version_offset = 0;
+             version_offset < STIR421X_PATCH_FILE_END_OF_HEADER_TAG;
+             version_offset++) {
+                if (!memcmp(patch + version_offset,
+                            STIR421X_PATCH_PRODUCT_VERSION_STR,
+                            sizeof(STIR421X_PATCH_PRODUCT_VERSION_STR) - 1)) {
+                                    version_found = 1;
+                                    version_start = patch +
+                                            version_offset +
+                                            sizeof(STIR421X_PATCH_PRODUCT_VERSION_STR) - 1;
+                                    break;
+                }
+        }
+
+        /* We couldn't find a product version on this patch */
+        if (!version_found)
+                return -EINVAL;
+
+        /* Let's check if the product version is dotted */
+        if (version_start[3] != '.' ||
+            version_start[7] != '.')
+                return -EINVAL;
+
+        version_major = simple_strtoul(version_start, NULL, 10);
+        version_minor = simple_strtoul(version_start + 4, NULL, 10);
+        version_build = simple_strtoul(version_start + 8, NULL, 10);
+
+        IRDA_DEBUG(2, "%s(), Major: %ld Minor: %ld Build: %ld\n",
+                   __FUNCTION__,
+                   version_major, version_minor, version_build);
+
+        return (((version_major) << 12) +
+                ((version_minor) << 8) +
+                ((version_build / 10) << 4) +
+                (version_build % 10));
+
+}
+
+
+static int stir421x_upload_patch (struct irda_usb_cb *self,
+                                  unsigned char * patch,
+                                  const unsigned int patch_len)
+{
+    int retval = 0;
+    int actual_len;
+    unsigned int i = 0, download_amount = 0;
+    unsigned char * patch_chunk;
+
+    IRDA_DEBUG (2, "%s(), Uploading STIR421x Patch\n", __FUNCTION__);
+
+    patch_chunk = kzalloc(STIR421X_MAX_PATCH_DOWNLOAD_SIZE, GFP_KERNEL);
+    if (patch_chunk == NULL)
+            return -ENOMEM;
+
+    /* break up patch into 1023-byte sections */
+    for (i = 0; retval >= 0 && i < patch_len; i += download_amount) {
+            download_amount = patch_len - i;
+            if (download_amount > STIR421X_MAX_PATCH_DOWNLOAD_SIZE)
+                    download_amount = STIR421X_MAX_PATCH_DOWNLOAD_SIZE;
+
+            /* download the patch section */
+            memcpy(patch_chunk, patch + i, download_amount);
+
+            retval = usb_bulk_msg (self->usbdev,
+                                   usb_sndbulkpipe (self->usbdev,
+                                                    self->bulk_out_ep),
+                                   patch_chunk, download_amount,
+                                   &actual_len, msecs_to_jiffies (500));
+            IRDA_DEBUG (2, "%s(), Sent %u bytes\n", __FUNCTION__,
+                        actual_len);
+            if (retval == 0)
+                    mdelay(10);
+    }
+
+    kfree(patch_chunk);
+
+    if (i != patch_len) {
+            IRDA_ERROR ("%s(), Pushed %d bytes (!= patch_len (%d))\n",
+                       __FUNCTION__, i, patch_len);
+            retval = -EIO;
+    }
+
+    if (retval < 0)
+            /* todo - mark device as not ready */
+            IRDA_ERROR ("%s(), STIR421x patch upload failed (%d)\n",
+                        __FUNCTION__, retval);
+
+    return retval;
+}
+
+
+static int stir421x_patch_device(struct irda_usb_cb *self)
+{
+        unsigned int i, patch_found = 0, data_found = 0, data_offset;
+        int patch_version, ret = 0;
+        const struct firmware *fw_entry;
+
+        for (i = 0; i < ARRAY_SIZE(stir421x_patches); i++) {
+                if(request_firmware(&fw_entry, stir421x_patches[i], &self->usbdev->dev) != 0) {
+                        IRDA_ERROR( "%s(), Patch %s is not available\n", __FUNCTION__, stir421x_patches[i]);
+                        continue;
+                }
+
+                /* We found a patch from userspace */
+                patch_version = stir421x_get_patch_version (fw_entry->data, fw_entry->size);
+
+                if (patch_version < 0) {
+                        /* Couldn't fetch a version, let's move on to the next file */
+                        IRDA_ERROR("%s(), version parsing failed\n", __FUNCTION__);
+                        ret = patch_version;
+                        release_firmware(fw_entry);
+                        continue;
+                }
+
+                if (patch_version != self->usbdev->descriptor.bcdDevice) {
+                        /* Patch version and device don't match */
+                        IRDA_ERROR ("%s(), wrong patch version (%d <-> %d)\n",
+                                    __FUNCTION__,
+                                    patch_version, self->usbdev->descriptor.bcdDevice);
+                        ret = -EINVAL;
+                        release_firmware(fw_entry);
+                        continue;
+                }
+
+                /* If we're here, we've found a correct patch */
+                patch_found = 1;
+                break;
+
+        }
+
+        /* We couldn't find a valid firmware, let's leave */
+        if (!patch_found)
+                return ret;
+
+        /* The actual image starts after the "STMP" keyword */
+        for (data_offset = 0; data_offset < STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET; data_offset++) {
+                if (!memcmp(fw_entry->data + data_offset,
+                            STIR421X_PATCH_DATA_TAG_STR,
+                            sizeof(STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET))) {
+                        IRDA_DEBUG(2, "%s(), found patch data for STIR421x at offset %d\n",
+                                   __FUNCTION__, data_offset);
+                        data_found = 1;
+                        break;
+                }
+        }
+
+        /* We couldn't find "STMP" from the header */
+        if (!data_found)
+                return -EINVAL;
+
+        /* Let's upload the patch to the target */
+        ret = stir421x_upload_patch(self,
+                                    &fw_entry->data[data_offset + sizeof(STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET)],
+                                    fw_entry->size - (data_offset + sizeof(STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET)));
+
+        release_firmware(fw_entry);
+
+        return ret;
+
+}
+
+
 /********************** IRDA DEVICE CALLBACKS **********************/
 /*
  * Main calls from the IrDA/Network subsystem.
@@ -972,6 +1242,11 @@ static int irda_usb_net_open(struct net_device *netdev)
                 return -1;
         }
 
+        if(self->needspatch) {
+                IRDA_WARNING("%s(), device needs patch\n", __FUNCTION__) ;
+                return -EIO ;
+        }
+
         /* Initialise default speed and xbofs value
          * (IrLAP will change that soon) */
         self->speed = -1;
@@ -1050,7 +1325,7 @@ static int irda_usb_net_close(struct net_device *netdev)
         del_timer(&self->rx_defer_timer);
 
         /* Deallocate all the Rx path buffers (URBs and skb) */
-        for (i = 0; i < IU_MAX_RX_URBS; i++) {
+        for (i = 0; i < self->max_rx_urb; i++) {
                 struct urb *urb = self->rx_urb[i];
                 struct sk_buff *skb = (struct sk_buff *) urb->context;
                 /* Cancel the receive command */
@@ -1426,8 +1701,22 @@ static int irda_usb_probe(struct usb_interface *intf,
         spin_lock_init(&self->lock);
         init_timer(&self->rx_defer_timer);
 
+        self->capability = id->driver_info;
+        self->needspatch = ((self->capability & IUC_STIR_4210) != 0) ;
+
         /* Create all of the needed urbs */
-        for (i = 0; i < IU_MAX_RX_URBS; i++) {
+        if (self->capability & IUC_STIR_4210) {
+                self->max_rx_urb = IU_SIGMATEL_MAX_RX_URBS;
+                self->header_length = USB_IRDA_SIGMATEL_HEADER;
+        } else {
+                self->max_rx_urb = IU_MAX_RX_URBS;
+                self->header_length = USB_IRDA_HEADER;
+        }
+
+        self->rx_urb = kzalloc(self->max_rx_urb * sizeof(struct urb *),
+                                GFP_KERNEL);
+
+        for (i = 0; i < self->max_rx_urb; i++) {
                 self->rx_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
                 if (!self->rx_urb[i]) {
                         goto err_out_1;
@@ -1479,17 +1768,28 @@ static int irda_usb_probe(struct usb_interface *intf,
                 goto err_out_3;
         }
 
+        self->usbdev = dev;
+
         /* Find IrDA class descriptor */
         irda_desc = irda_usb_find_class_desc(intf);
         ret = -ENODEV;
         if (irda_desc == NULL)
                 goto err_out_3;
 
+        if (self->needspatch) {
+                ret = usb_control_msg (self->usbdev, usb_sndctrlpipe (self->usbdev, 0),
+                                       0x02, 0x40, 0, 0, 0, 0, msecs_to_jiffies(500));
+                if (ret < 0) {
+                        IRDA_DEBUG (0, "usb_control_msg failed %d\n", ret);
+                        goto err_out_3;
+                } else {
+                        mdelay(10);
+                }
+        }
+
         self->irda_desc =  irda_desc;
         self->present = 1;
         self->netopen = 0;
-        self->capability = id->driver_info;
-        self->usbdev = dev;
         self->usbintf = intf;
 
         /* Allocate the buffer for speed changes */
@@ -1508,6 +1808,28 @@ static int irda_usb_probe(struct usb_interface *intf,
 
         IRDA_MESSAGE("IrDA: Registered device %s\n", net->name);
         usb_set_intfdata(intf, self);
+
+        if (self->needspatch) {
+                /* Now we fetch and upload the firmware patch */
+                ret = stir421x_patch_device(self);
+                self->needspatch = (ret < 0);
+                if (ret < 0) {
+                        printk("patch_device failed\n");
+                        goto err_out_4;
+                }
+
+                /* replace IrDA class descriptor with what patched device is now reporting */
+                irda_desc = irda_usb_find_class_desc (self->usbintf);
+                if (irda_desc == NULL) {
+                        ret = -ENODEV;
+                        goto err_out_4;
+                }
+                if (self->irda_desc)
+                        kfree (self->irda_desc);
+                self->irda_desc = irda_desc;
+                irda_usb_init_qos(self);
+        }
+
         return 0;
 
 err_out_4:
@@ -1518,7 +1840,7 @@ err_out_3:
 err_out_2:
         usb_free_urb(self->tx_urb);
 err_out_1:
-        for (i = 0; i < IU_MAX_RX_URBS; i++) {
+        for (i = 0; i < self->max_rx_urb; i++) {
                 if (self->rx_urb[i])
                         usb_free_urb(self->rx_urb[i]);
         }
@@ -1571,7 +1893,7 @@ static void irda_usb_disconnect(struct usb_interface *intf)
                 /*netif_device_detach(self->netdev);*/
                 netif_stop_queue(self->netdev);
                 /* Stop all the receive URBs. Must be synchronous. */
-                for (i = 0; i < IU_MAX_RX_URBS; i++)
+                for (i = 0; i < self->max_rx_urb; i++)
                         usb_kill_urb(self->rx_urb[i]);
                 /* Cancel Tx and speed URB.
                  * Make sure it's synchronous to avoid races. */
@@ -1586,8 +1908,9 @@ static void irda_usb_disconnect(struct usb_interface *intf)
         self->usbintf = NULL;
 
         /* Clean up our urbs */
-        for (i = 0; i < IU_MAX_RX_URBS; i++)
+        for (i = 0; i < self->max_rx_urb; i++)
                 usb_free_urb(self->rx_urb[i]);
+        kfree(self->rx_urb);
         /* Clean up Tx and speed URB */
         usb_free_urb(self->tx_urb);
         usb_free_urb(self->speed_urb);
@@ -1648,6 +1971,6 @@ module_exit(usb_irda_cleanup);
  */
 module_param(qos_mtt_bits, int, 0);
 MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time");
-MODULE_AUTHOR("Roman Weissgaerber <weissg@vienna.at>, Dag Brattli <dag@brattli.net> and Jean Tourrilhes <jt@hpl.hp.com>");
-MODULE_DESCRIPTION("IrDA-USB Dongle Driver"); 
+MODULE_AUTHOR("Roman Weissgaerber <weissg@vienna.at>, Dag Brattli <dag@brattli.net>, Jean Tourrilhes <jt@hpl.hp.com> and Nick Fedchik <nick@fedchik.org.ua>");
+MODULE_DESCRIPTION("IrDA-USB Dongle Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/irda/irda-usb.h b/drivers/net/irda/irda-usb.h
index 4026af42dd47..d833db52cebf 100644
--- a/drivers/net/irda/irda-usb.h
+++ b/drivers/net/irda/irda-usb.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  *
  * Filename:      irda-usb.h
- * Version:       0.9b
+ * Version:       0.10
  * Description:   IrDA-USB Driver
  * Status:        Experimental 
  * Author:        Dag Brattli <dag@brattli.net>
@@ -9,6 +9,9 @@
  *      Copyright (C) 2001, Roman Weissgaerber <weissg@vienna.at>
  *      Copyright (C) 2000, Dag Brattli <dag@brattli.net>
  *      Copyright (C) 2001, Jean Tourrilhes <jt@hpl.hp.com>
+ *      Copyright (C) 2004, SigmaTel, Inc. <irquality@sigmatel.com>
+ *      Copyright (C) 2005, Milan Beno <beno@pobox.sk>
+ *      Copyright (C) 2006, Nick FEdchik <nick@fedchik.org.ua>
  *          
  *      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
@@ -31,6 +34,9 @@
 #include <net/irda/irda.h>
 #include <net/irda/irda_device.h>      /* struct irlap_cb */
 
+#define PATCH_FILE_SIZE_MAX     65536
+#define PATCH_FILE_SIZE_MIN     80
+
 #define RX_COPY_THRESHOLD 200
 #define IRDA_USB_MAX_MTU 2051
 #define IRDA_USB_SPEED_MTU 64           /* Weird, but work like this */
@@ -79,15 +85,16 @@
 /* Inbound header */
 #define MEDIA_BUSY    0x80
 
-#define SPEED_2400    0x01
-#define SPEED_9600    0x02
-#define SPEED_19200   0x03
-#define SPEED_38400   0x04
-#define SPEED_57600   0x05
-#define SPEED_115200  0x06
-#define SPEED_576000  0x07
-#define SPEED_1152000 0x08
-#define SPEED_4000000 0x09
+#define SPEED_2400     0x01
+#define SPEED_9600     0x02
+#define SPEED_19200    0x03
+#define SPEED_38400    0x04
+#define SPEED_57600    0x05
+#define SPEED_115200   0x06
+#define SPEED_576000   0x07
+#define SPEED_1152000  0x08
+#define SPEED_4000000  0x09
+#define SPEED_16000000 0x0a
 
 /* Basic capabilities */
 #define IUC_DEFAULT     0x00    /* Basic device compliant with 1.0 spec */
@@ -100,11 +107,14 @@
 #define IUC_SMALL_PKT   0x10    /* Device doesn't behave with big Rx packets */
 #define IUC_MAX_WINDOW  0x20    /* Device underestimate the Rx window */
 #define IUC_MAX_XBOFS   0x40    /* Device need more xbofs than advertised */
+#define IUC_STIR_4210   0x80    /* SigmaTel 4210/4220/4116 VFIR */
 
 /* USB class definitions */
-#define USB_IRDA_HEADER   0x01
-#define USB_CLASS_IRDA    0x02 /* USB_CLASS_APP_SPEC subclass */ 
-#define USB_DT_IRDA       0x21
+#define USB_IRDA_HEADER            0x01
+#define USB_CLASS_IRDA             0x02 /* USB_CLASS_APP_SPEC subclass */
+#define USB_DT_IRDA                0x21
+#define USB_IRDA_SIGMATEL_HEADER   0x03
+#define IU_SIGMATEL_MAX_RX_URBS    (IU_MAX_ACTIVE_RX_URBS + USB_IRDA_SIGMATEL_HEADER)
 
 struct irda_class_desc {
         __u8  bLength;
@@ -123,6 +133,7 @@ struct irda_class_desc {
  * (6.2.5, USB-IrDA class spec 1.0) */
 
 #define IU_REQ_GET_CLASS_DESC   0x06
+#define STIR421X_MAX_PATCH_DOWNLOAD_SIZE 1023
 
 struct irda_usb_cb {
         struct irda_class_desc *irda_desc;
@@ -136,7 +147,8 @@ struct irda_usb_cb {
         __u16 bulk_out_mtu;             /* Max Tx packet size in bytes */
         __u8  bulk_int_ep;              /* Interrupt Endpoint assignments */
 
-        struct urb *rx_urb[IU_MAX_RX_URBS];     /* URBs used to receive data frames */
+        __u8  max_rx_urb;
+        struct urb **rx_urb;            /* URBs used to receive data frames */
         struct urb *idle_rx_urb;        /* Pointer to idle URB in Rx path */
         struct urb *tx_urb;             /* URB used to send data frames */
         struct urb *speed_urb;          /* URB used to send speed commands */
@@ -157,6 +169,9 @@ struct irda_usb_cb {
         __u32 speed;                    /* Current speed */
         __s32 new_speed;                /* speed we need to set */
 
+        __u8 header_length;             /* USB-IrDA frame header size */
+        int needspatch;                 /* device needs firmware patch */
+
         struct timer_list rx_defer_timer;       /* Wait for Rx error to clear */
 };
 
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index ec94ecdb103d..bbcfc8ec35a1 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -11,6 +11,7 @@
  *     Copyright (c) 2002      Daniele Peri
  *     All Rights Reserved.
  *     Copyright (c) 2002      Jean Tourrilhes
+ *     Copyright (c) 2006      Linus Walleij
  *
  *
  * Based on smc-ircc.c:
@@ -61,6 +62,9 @@
 
 #include <linux/spinlock.h>
 #include <linux/pm.h>
+#ifdef CONFIG_PCI
+#include <linux/pci.h>
+#endif
 
 #include <net/irda/wrapper.h>
 #include <net/irda/irda.h>
@@ -100,6 +104,22 @@ MODULE_PARM_DESC(ircc_transceiver, "Transceiver type");
 
 /* Types */
 
+#ifdef CONFIG_PCI
+struct smsc_ircc_subsystem_configuration {
+        unsigned short vendor; /* PCI vendor ID */
+        unsigned short device; /* PCI vendor ID */
+        unsigned short subvendor; /* PCI subsystem vendor ID */
+        unsigned short subdevice; /* PCI sybsystem device ID */
+        unsigned short sir_io; /* I/O port for SIR */
+        unsigned short fir_io; /* I/O port for FIR */
+        unsigned char  fir_irq; /* FIR IRQ */
+        unsigned char  fir_dma; /* FIR DMA */
+        unsigned short cfg_base; /* I/O port for chip configuration */
+        int (*preconfigure)(struct pci_dev *dev, struct smsc_ircc_subsystem_configuration *conf); /* Preconfig function */
+        const char *name;       /* name shown as info */
+};
+#endif
+
 struct smsc_transceiver {
         char *name;
         void (*set_for_speed)(int fir_base, u32 speed);
@@ -202,6 +222,16 @@ static int __init smsc_superio_flat(const struct smsc_chip *chips, unsigned shor
 static int __init smsc_superio_paged(const struct smsc_chip *chips, unsigned short cfg_base, char *type);
 static int __init smsc_superio_fdc(unsigned short cfg_base);
 static int __init smsc_superio_lpc(unsigned short cfg_base);
+#ifdef CONFIG_PCI
+static int __init preconfigure_smsc_chip(struct smsc_ircc_subsystem_configuration *conf);
+static int __init preconfigure_through_82801(struct pci_dev *dev, struct smsc_ircc_subsystem_configuration *conf);
+static int __init preconfigure_through_ali(struct pci_dev *dev, struct smsc_ircc_subsystem_configuration *conf);
+static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
+                                                    unsigned short ircc_fir,
+                                                    unsigned short ircc_sir,
+                                                    unsigned char ircc_dma,
+                                                    unsigned char ircc_irq);
+#endif
 
 /* Transceivers specific functions */
 
@@ -353,6 +383,13 @@ static int __init smsc_ircc_init(void)
                 return ret;
         }
 
+#ifdef CONFIG_PCI
+        if (smsc_ircc_preconfigure_subsystems(ircc_cfg, ircc_fir, ircc_sir, ircc_dma, ircc_irq) < 0) {
+                /* Ignore errors from preconfiguration */
+                IRDA_ERROR("%s, Preconfiguration failed !\n", driver_name);
+        }
+#endif
+
         dev_count = 0;
 
         if (ircc_fir > 0 && ircc_sir > 0) {
@@ -2285,6 +2322,280 @@ static int __init smsc_superio_lpc(unsigned short cfg_base)
         return ret;
 }
 
+/*
+ * Look for some specific subsystem setups that need
+ * pre-configuration not properly done by the BIOS (especially laptops)
+ * This code is based in part on smcinit.c, tosh1800-smcinit.c
+ * and tosh2450-smcinit.c. The table lists the device entries
+ * for ISA bridges with an LPC (Local Peripheral Configurator)
+ * that are in turn used to configure the SMSC device with default
+ * SIR and FIR I/O ports, DMA and IRQ.
+ */
+#ifdef CONFIG_PCI
+#define PCIID_VENDOR_INTEL 0x8086
+#define PCIID_VENDOR_ALI 0x10b9
+static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __devinitdata = {
+        {
+                .vendor = PCIID_VENDOR_INTEL, /* Intel 82801DBM LPC bridge */
+                .device = 0x24cc,
+                .subvendor = 0x103c,
+                .subdevice = 0x088c,
+                .sir_io = 0x02f8, /* Quite certain these are the same for nc8000 as for nc6000 */
+                .fir_io = 0x0130,
+                .fir_irq = 0x09,
+                .fir_dma = 0x03,
+                .cfg_base = 0x004e,
+                .preconfigure = preconfigure_through_82801,
+                .name = "HP nc8000",
+        },
+        {
+                .vendor = PCIID_VENDOR_INTEL, /* Intel 82801DBM LPC bridge */
+                .device = 0x24cc,
+                .subvendor = 0x103c,
+                .subdevice = 0x0890,
+                .sir_io = 0x02f8,
+                .fir_io = 0x0130,
+                .fir_irq = 0x09,
+                .fir_dma = 0x03,
+                .cfg_base = 0x004e,
+                .preconfigure = preconfigure_through_82801,
+                .name = "HP nc6000",
+        },
+        {
+                .vendor = PCIID_VENDOR_INTEL, /* Intel 82801DB/DBL (ICH4/ICH4-L) LPC Interface Bridge */
+                .device = 0x24c0,
+                .subvendor = 0x1179,
+                .subdevice = 0xffff, /* 0xffff is "any", Not sure, 0x0001 or 0x0002 */
+                .sir_io = 0x03f8,
+                .fir_io = 0x0130,
+                .fir_irq = 0x07,
+                .fir_dma = 0x01,
+                .cfg_base = 0x002e,
+                .preconfigure = preconfigure_through_82801,
+                .name = "Toshiba Satellite 2450",
+        },
+        {
+                .vendor = PCIID_VENDOR_INTEL, /* Intel 82801CAM ISA bridge */
+                .device = 0x248c, /* Some use 24cc? */
+                .subvendor = 0x1179,
+                .subdevice = 0xffff, /* 0xffff is "any", Not sure, 0x0001 or 0x0002 */
+                .sir_io = 0x03f8,
+                .fir_io = 0x0130,
+                .fir_irq = 0x03,
+                .fir_dma = 0x03,
+                .cfg_base = 0x002e,
+                .preconfigure = preconfigure_through_82801,
+                .name = "Toshiba Satellite 5100/5200, Tecra 9100",
+        },
+        {
+                .vendor = PCIID_VENDOR_ALI, /* ALi M1533/M1535 PCI to ISA Bridge [Aladdin IV/V/V+] */
+                .device = 0x1533,
+                .subvendor = 0x1179,
+                .subdevice = 0xffff, /* 0xffff is "any", Not sure, 0x0001 or 0x0002 */
+                .sir_io = 0x02e8,
+                .fir_io = 0x02f8,
+                .fir_irq = 0x07,
+                .fir_dma = 0x03,
+                .cfg_base = 0x002e,
+                .preconfigure = preconfigure_through_ali,
+                .name = "Toshiba Satellite 1800",
+        },
+        { } // Terminator
+};
+
+
+/*
+ * This sets up the basic SMSC parameters (FIR port, SIR port, FIR DMA, FIR IRQ)
+ * through the chip configuration port.
+ */
+static int __init preconfigure_smsc_chip(struct smsc_ircc_subsystem_configuration *conf)
+{
+        unsigned short iobase = conf->cfg_base;
+        unsigned char tmpbyte;
+
+        outb(LPC47N227_CFGACCESSKEY, iobase); // enter configuration state
+        outb(SMSCSIOFLAT_DEVICEID_REG, iobase); // set for device ID
+        tmpbyte = inb(iobase +1); // Read device ID
+        IRDA_DEBUG(0, "Detected Chip id: 0x%02x, setting up registers...\n",tmpbyte);
+
+        /* Disable UART1 and set up SIR I/O port */
+        outb(0x24, iobase);  // select CR24 - UART1 base addr
+        outb(0x00, iobase + 1); // disable UART1
+        outb(SMSCSIOFLAT_UART2BASEADDR_REG, iobase);  // select CR25 - UART2 base addr
+        outb( (conf->sir_io >> 2), iobase + 1); // bits 2-9 of 0x3f8
+        tmpbyte = inb(iobase + 1);
+        if (tmpbyte != (conf->sir_io >> 2) ) {
+                IRDA_WARNING("ERROR: could not configure SIR ioport.\n");
+                return -ENXIO;
+        }
+
+        /* Set up FIR IRQ channel for UART2 */
+        outb(SMSCSIOFLAT_UARTIRQSELECT_REG, iobase); // select CR28 - UART1,2 IRQ select
+        tmpbyte = inb(iobase + 1);
+        tmpbyte &= SMSCSIOFLAT_UART1IRQSELECT_MASK; // Do not touch the UART1 portion
+        tmpbyte |= (conf->fir_irq & SMSCSIOFLAT_UART2IRQSELECT_MASK);
+        outb(tmpbyte, iobase + 1);
+        tmpbyte = inb(iobase + 1) & SMSCSIOFLAT_UART2IRQSELECT_MASK;
+        if (tmpbyte != conf->fir_irq) {
+                IRDA_WARNING("ERROR: could not configure FIR IRQ channel.\n");
+                return -ENXIO;
+        }
+
+        /* Set up FIR I/O port */
+        outb(SMSCSIOFLAT_FIRBASEADDR_REG, iobase);  // CR2B - SCE (FIR) base addr
+        outb((conf->fir_io >> 3), iobase + 1);
+        tmpbyte = inb(iobase + 1);
+        if (tmpbyte != (conf->fir_io >> 3) ) {
+                IRDA_WARNING("ERROR: could not configure FIR I/O port.\n");
+                return -ENXIO;
+        }
+
+        /* Set up FIR DMA channel */
+        outb(SMSCSIOFLAT_FIRDMASELECT_REG, iobase);  // CR2C - SCE (FIR) DMA select
+        outb((conf->fir_dma & LPC47N227_FIRDMASELECT_MASK), iobase + 1); // DMA
+        tmpbyte = inb(iobase + 1) & LPC47N227_FIRDMASELECT_MASK;
+        if (tmpbyte != (conf->fir_dma & LPC47N227_FIRDMASELECT_MASK)) {
+                IRDA_WARNING("ERROR: could not configure FIR DMA channel.\n");
+                return -ENXIO;
+        }
+
+        outb(SMSCSIOFLAT_UARTMODE0C_REG, iobase);  // CR0C - UART mode
+        tmpbyte = inb(iobase + 1);
+        tmpbyte &= ~SMSCSIOFLAT_UART2MODE_MASK | SMSCSIOFLAT_UART2MODE_VAL_IRDA;
+        outb(tmpbyte, iobase + 1); // enable IrDA (HPSIR) mode, high speed
+
+        outb(LPC47N227_APMBOOTDRIVE_REG, iobase);  // CR07 - Auto Pwr Mgt/boot drive sel
+        tmpbyte = inb(iobase + 1);
+        outb(tmpbyte | LPC47N227_UART2AUTOPWRDOWN_MASK, iobase + 1); // enable UART2 autopower down
+
+        /* This one was not part of tosh1800 */
+        outb(0x0a, iobase);  // CR0a - ecp fifo / ir mux
+        tmpbyte = inb(iobase + 1);
+        outb(tmpbyte | 0x40, iobase + 1); // send active device to ir port
+
+        outb(LPC47N227_UART12POWER_REG, iobase);  // CR02 - UART 1,2 power
+        tmpbyte = inb(iobase + 1);
+        outb(tmpbyte | LPC47N227_UART2POWERDOWN_MASK, iobase + 1); // UART2 power up mode, UART1 power down
+
+        outb(LPC47N227_FDCPOWERVALIDCONF_REG, iobase);  // CR00 - FDC Power/valid config cycle
+        tmpbyte = inb(iobase + 1);
+        outb(tmpbyte | LPC47N227_VALID_MASK, iobase + 1); // valid config cycle done
+
+        outb(LPC47N227_CFGEXITKEY, iobase);  // Exit configuration
+
+        return 0;
+}
+
+/* 82801CAM registers */
+#define VID 0x00
+#define DID 0x02
+#define PIRQA_ROUT 0x60
+#define PCI_DMA_C 0x90
+#define COM_DEC 0xe0
+#define LPC_EN 0xe6
+#define GEN2_DEC 0xec
+/*
+ * Sets up the I/O range using the 82801CAM ISA bridge, 82801DBM LPC bridge or
+ * Intel 82801DB/DBL (ICH4/ICH4-L) LPC Interface Bridge. They all work the same way!
+ */
+static int __init preconfigure_through_82801(struct pci_dev *dev,
+                                  struct smsc_ircc_subsystem_configuration *conf)
+{
+        unsigned short tmpword;
+        int ret;
+
+        IRDA_MESSAGE("Setting up the SMSC device via the 82801 controller.\n");
+        pci_write_config_byte(dev, COM_DEC, 0x10);
+
+        /* Enable LPC */
+        pci_read_config_word(dev, LPC_EN, &tmpword); /* LPC_EN register */
+        tmpword &= 0xfffd; /* mask bit 1 */
+        tmpword |= 0x0001; /* set bit 0 : COMA addr range enable */
+        pci_write_config_word(dev, LPC_EN, tmpword);
+
+        /* Setup DMA */
+        pci_write_config_word(dev, PCI_DMA_C, 0xc0c0); /* LPC I/F DMA on, channel 3  -- rtm (?? PCI DMA ?) */
+        pci_write_config_word(dev, GEN2_DEC, 0x131); /* LPC I/F 2nd decode range */
+
+        /* Pre-configure chip */
+        ret = preconfigure_smsc_chip(conf);
+
+        /* Disable LPC */
+        pci_read_config_word(dev, LPC_EN, &tmpword); /* LPC_EN register */
+        tmpword &= 0xfffc; /* mask bit 1 and bit 0, COMA addr range disable */
+        pci_write_config_word(dev, LPC_EN, tmpword);
+        return ret;
+}
+
+static int __init preconfigure_through_ali(struct pci_dev *dev,
+                                  struct smsc_ircc_subsystem_configuration *conf)
+{
+        /* TODO: put in ALi 1533 configuration here. */
+        IRDA_MESSAGE("SORRY: %s has an unsupported bridge controller (ALi): not pre-configured.\n", conf->name);
+        return -ENODEV;
+}
+
+static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
+                                                    unsigned short ircc_fir,
+                                                    unsigned short ircc_sir,
+                                                    unsigned char ircc_dma,
+                                                    unsigned char ircc_irq)
+{
+        struct pci_dev *dev = NULL;
+        unsigned short ss_vendor = 0x0000;
+        unsigned short ss_device = 0x0000;
+        int ret = 0;
+
+        dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev);
+
+        while (dev != NULL) {
+                struct smsc_ircc_subsystem_configuration *conf;
+
+                /*
+                 * Cache the subsystem vendor/device: some manufacturers fail to set
+                 * this for all components, so we save it in case there is just
+                 * 0x0000 0x0000 on the device we want to check.
+                 */
+                if (dev->subsystem_vendor != 0x0000U) {
+                        ss_vendor = dev->subsystem_vendor;
+                        ss_device = dev->subsystem_device;
+                }
+                conf = subsystem_configurations;
+                for( ; conf->subvendor; conf++) {
+                        if(conf->vendor == dev->vendor &&
+                           conf->device == dev->device &&
+                           conf->subvendor == ss_vendor && /* Sometimes these are cached values */
+                           (conf->subdevice == ss_device || conf->subdevice == 0xffff)) {
+                                struct smsc_ircc_subsystem_configuration tmpconf;
+
+                                memcpy(&tmpconf, conf, sizeof(struct smsc_ircc_subsystem_configuration));
+
+                                /* Override the default values with anything passed in as parameter */
+                                if (ircc_cfg != 0)
+                                        tmpconf.cfg_base = ircc_cfg;
+                                if (ircc_fir != 0)
+                                        tmpconf.fir_io = ircc_fir;
+                                if (ircc_sir != 0)
+                                        tmpconf.sir_io = ircc_sir;
+                                if (ircc_dma != 0xff)
+                                        tmpconf.fir_dma = ircc_dma;
+                                if (ircc_irq != 0xff)
+                                        tmpconf.fir_irq = ircc_irq;
+
+                                IRDA_MESSAGE("Detected unconfigured %s SMSC IrDA chip, pre-configuring device.\n", conf->name);
+                                if (conf->preconfigure)
+                                        ret = conf->preconfigure(dev, &tmpconf);
+                                else
+                                        ret = -ENODEV;
+                        }
+                }
+                dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev);
+        }
+
+        return ret;
+}
+#endif // CONFIG_PCI
+
 /************************************************
  *
  * Transceivers specific functions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 75b35ad760de..66e74f740261 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -87,6 +87,7 @@ static void write_msg(struct console *con, const char *msg, unsigned int len)
 }
 
 static struct console netconsole = {
+        .name = "netcon",
         .flags = CON_ENABLED | CON_PRINTBUFFER,
         .write = write_msg
 };
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 0b5358072172..73e271e59c6a 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -497,21 +497,20 @@ static void tg3_write_mem(struct tg3 *tp, u32 off, u32 val)
         unsigned long flags;
 
         spin_lock_irqsave(&tp->indirect_lock, flags);
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
+        if (tp->tg3_flags & TG3_FLAG_SRAM_USE_CONFIG) {
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
 
-        /* Always leave this as zero. */
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
-        spin_unlock_irqrestore(&tp->indirect_lock, flags);
-}
+                /* Always leave this as zero. */
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
+        } else {
+                tw32_f(TG3PCI_MEM_WIN_BASE_ADDR, off);
+                tw32_f(TG3PCI_MEM_WIN_DATA, val);
 
-static void tg3_write_mem_fast(struct tg3 *tp, u32 off, u32 val)
-{
-        /* If no workaround is needed, write to mem space directly */
-        if (tp->write32 != tg3_write_indirect_reg32)
-                tw32(NIC_SRAM_WIN_BASE + off, val);
-        else
-                tg3_write_mem(tp, off, val);
+                /* Always leave this as zero. */
+                tw32_f(TG3PCI_MEM_WIN_BASE_ADDR, 0);
+        }
+        spin_unlock_irqrestore(&tp->indirect_lock, flags);
 }
 
 static void tg3_read_mem(struct tg3 *tp, u32 off, u32 *val)
@@ -519,11 +518,19 @@ static void tg3_read_mem(struct tg3 *tp, u32 off, u32 *val)
         unsigned long flags;
 
         spin_lock_irqsave(&tp->indirect_lock, flags);
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
-        pci_read_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
+        if (tp->tg3_flags & TG3_FLAG_SRAM_USE_CONFIG) {
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
+                pci_read_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
 
-        /* Always leave this as zero. */
-        pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
+                /* Always leave this as zero. */
+                pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
+        } else {
+                tw32_f(TG3PCI_MEM_WIN_BASE_ADDR, off);
+                *val = tr32(TG3PCI_MEM_WIN_DATA);
+
+                /* Always leave this as zero. */
+                tw32_f(TG3PCI_MEM_WIN_BASE_ADDR, 0);
+        }
         spin_unlock_irqrestore(&tp->indirect_lock, flags);
 }
 
@@ -1367,12 +1374,12 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
                 }
         }
 
+        tg3_write_sig_post_reset(tp, RESET_KIND_SHUTDOWN);
+
         /* Finally, set the new power state. */
         pci_write_config_word(tp->pdev, pm + PCI_PM_CTRL, power_control);
         udelay(100);    /* Delay after power state change */
 
-        tg3_write_sig_post_reset(tp, RESET_KIND_SHUTDOWN);
-
         return 0;
 }
 
@@ -5828,10 +5835,14 @@ static int tg3_reset_hw(struct tg3 *tp)
                           GRC_MODE_NO_TX_PHDR_CSUM |
                           GRC_MODE_NO_RX_PHDR_CSUM);
         tp->grc_mode |= GRC_MODE_HOST_SENDBDS;
-        if (tp->tg3_flags & TG3_FLAG_NO_TX_PSEUDO_CSUM)
-                tp->grc_mode |= GRC_MODE_NO_TX_PHDR_CSUM;
-        if (tp->tg3_flags & TG3_FLAG_NO_RX_PSEUDO_CSUM)
-                tp->grc_mode |= GRC_MODE_NO_RX_PHDR_CSUM;
+
+        /* Pseudo-header checksum is done by hardware logic and not
+         * the offload processers, so make the chip do the pseudo-
+         * header checksums on receive.  For transmit it is more
+         * convenient to do the pseudo-header checksum in software
+         * as Linux does that on transmit for us in all cases.
+         */
+        tp->grc_mode |= GRC_MODE_NO_TX_PHDR_CSUM;
 
         tw32(GRC_MODE,
              tp->grc_mode |
@@ -6535,11 +6546,11 @@ static void tg3_timer(unsigned long __opaque)
                 if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
                         u32 val;
 
-                        tg3_write_mem_fast(tp, NIC_SRAM_FW_CMD_MBOX,
-                                           FWCMD_NICDRV_ALIVE2);
-                        tg3_write_mem_fast(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4);
+                        tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX,
+                                      FWCMD_NICDRV_ALIVE2);
+                        tg3_write_mem(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4);
                         /* 5 seconds timeout */
-                        tg3_write_mem_fast(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 5);
+                        tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 5);
                         val = tr32(GRC_RX_CPU_EVENT);
                         val |= (1 << 14);
                         tw32(GRC_RX_CPU_EVENT, val);
@@ -8034,9 +8045,13 @@ static int tg3_test_nvram(struct tg3 *tp)
                 for (i = 0; i < size; i++)
                         csum8 += buf8[i];
 
-                if (csum8 == 0)
-                        return 0;
-                return -EIO;
+                if (csum8 == 0) {
+                        err = 0;
+                        goto out;
+                }
+
+                err = -EIO;
+                goto out;
         }
 
         /* Bootstrap checksum at offset 0x10 */
@@ -9531,8 +9546,11 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
         tp->led_ctrl = LED_CTRL_MODE_PHY_1;
 
         /* Do not even try poking around in here on Sun parts.  */
-        if (tp->tg3_flags2 & TG3_FLG2_SUN_570X)
+        if (tp->tg3_flags2 & TG3_FLG2_SUN_570X) {
+                /* All SUN chips are built-in LOMs. */
+                tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;
                 return;
+        }
 
         tg3_read_mem(tp, NIC_SRAM_DATA_SIG, &val);
         if (val == NIC_SRAM_DATA_SIG_MAGIC) {
@@ -9630,9 +9648,7 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                     tp->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL)
                         tp->led_ctrl = LED_CTRL_MODE_PHY_2;
 
-                if ((GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700) &&
-                    (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701) &&
-                    (nic_cfg & NIC_SRAM_DATA_CFG_EEPROM_WP))
+                if (nic_cfg & NIC_SRAM_DATA_CFG_EEPROM_WP)
                         tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;
 
                 if (nic_cfg & NIC_SRAM_DATA_CFG_ASF_ENABLE) {
@@ -10257,6 +10273,13 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                 pci_write_config_word(tp->pdev, PCI_COMMAND, pci_cmd);
         }
 
+        if (tp->write32 == tg3_write_indirect_reg32 ||
+            ((tp->tg3_flags & TG3_FLAG_PCIX_MODE) &&
+             (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
+              GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)) ||
+            (tp->tg3_flags2 & TG3_FLG2_SUN_570X))
+                tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;
+
         /* Get eeprom hw config before calling tg3_set_power_state().
          * In particular, the TG3_FLAG_EEPROM_WRITE_PROT flag must be
          * determined before calling tg3_set_power_state() so that
@@ -10299,15 +10322,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         if (tp->pci_chip_rev_id == CHIPREV_ID_5700_B0)
                 tp->tg3_flags |= TG3_FLAG_BROKEN_CHECKSUMS;
 
-        /* Pseudo-header checksum is done by hardware logic and not
-         * the offload processers, so make the chip do the pseudo-
-         * header checksums on receive.  For transmit it is more
-         * convenient to do the pseudo-header checksum in software
-         * as Linux does that on transmit for us in all cases.
-         */
-        tp->tg3_flags |= TG3_FLAG_NO_TX_PSEUDO_CSUM;
-        tp->tg3_flags &= ~TG3_FLAG_NO_RX_PSEUDO_CSUM;
-
         /* Derive initial jumbo mode from MTU assigned in
          * ether_setup() via the alloc_etherdev() call
          */
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index c43cc3264202..8c8b987d1250 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2171,8 +2171,7 @@ struct tg3 {
 #define TG3_FLAG_PCIX_MODE              0x00020000
 #define TG3_FLAG_PCI_HIGH_SPEED         0x00040000
 #define TG3_FLAG_PCI_32BIT              0x00080000
-#define TG3_FLAG_NO_TX_PSEUDO_CSUM      0x00100000
-#define TG3_FLAG_NO_RX_PSEUDO_CSUM      0x00200000
+#define TG3_FLAG_SRAM_USE_CONFIG        0x00100000
 #define TG3_FLAG_SERDES_WOL_CAP         0x00400000
 #define TG3_FLAG_JUMBO_RING_ENABLE      0x00800000
 #define TG3_FLAG_10_100_ONLY            0x01000000
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index d121644646b9..98b83a85c60e 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -100,8 +100,6 @@ static struct pci_device_id parport_serial_pci_tbl[] = {
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo },
         { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo },
-        { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo },
         { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9845,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo },
         { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855,
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 929dd8090578..65d090dbef46 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -147,6 +147,16 @@ config RTC_DRV_SA1100
           To compile this driver as a module, choose M here: the
           module will be called rtc-sa1100.
 
+config RTC_DRV_VR41XX
+        tristate "NEC VR41XX"
+        depends on RTC_CLASS && CPU_VR41XX
+        help
+          If you say Y here you will get access to the real time clock
+          built into your NEC VR41XX CPU.
+
+          To compile this driver as a module, choose M here: the
+          module will be called rtc-vr41xx.
+
 config RTC_DRV_TEST
         tristate "Test driver/device"
         depends on RTC_CLASS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 8d4c7fe88d58..a9ca0f171686 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -19,3 +19,4 @@ obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
 obj-$(CONFIG_RTC_DRV_M48T86)    += rtc-m48t86.o
 obj-$(CONFIG_RTC_DRV_EP93XX)    += rtc-ep93xx.o
 obj-$(CONFIG_RTC_DRV_SA1100)    += rtc-sa1100.o
+obj-$(CONFIG_RTC_DRV_VR41XX)    += rtc-vr41xx.o
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 8533936d50d8..413c7d54ea10 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -96,6 +96,8 @@ exit_idr:
         idr_remove(&rtc_idr, id);
 
 exit:
+        dev_err(dev, "rtc core: unable to register %s, err = %d\n",
+                        name, err);
         return ERR_PTR(err);
 }
 EXPORT_SYMBOL_GPL(rtc_device_register);
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c
index 358695a416f3..9be81fd4737c 100644
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -1,6 +1,8 @@
 /*
  * An rtc/i2c driver for the Dallas DS1672
- * Copyright 2005 Alessandro Zummo
+ * Copyright 2005-06 Tower Technologies
+ *
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -11,7 +13,7 @@
 #include <linux/i2c.h>
 #include <linux/rtc.h>
 
-#define DRV_VERSION "0.2"
+#define DRV_VERSION "0.3"
 
 /* Addresses to scan: none. This chip cannot be detected. */
 static unsigned short normal_i2c[] = { I2C_CLIENT_END };
@@ -25,6 +27,7 @@ I2C_CLIENT_INSMOD;
 #define DS1672_REG_CONTROL      4
 #define DS1672_REG_TRICKLE      5
 
+#define DS1672_REG_CONTROL_EOSC 0x80
 
 /* Prototypes */
 static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind);
@@ -53,8 +56,7 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)
 
         dev_dbg(&client->dev,
                 "%s: raw read data - counters=%02x,%02x,%02x,%02x\n"
-                __FUNCTION__,
-                buf[0], buf[1], buf[2], buf[3]);
+                __FUNCTION__, buf[0], buf[1], buf[2], buf[3]);
 
         time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
 
@@ -62,8 +64,7 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)
 
         dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
                 "mday=%d, mon=%d, year=%d, wday=%d\n",
-                __FUNCTION__,
-                tm->tm_sec, tm->tm_min, tm->tm_hour,
+                __FUNCTION__, tm->tm_sec, tm->tm_min, tm->tm_hour,
                 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
 
         return 0;
@@ -72,16 +73,17 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)
 static int ds1672_set_mmss(struct i2c_client *client, unsigned long secs)
 {
         int xfer;
-        unsigned char buf[5];
+        unsigned char buf[6];
 
         buf[0] = DS1672_REG_CNT_BASE;
         buf[1] = secs & 0x000000FF;
         buf[2] = (secs & 0x0000FF00) >> 8;
         buf[3] = (secs & 0x00FF0000) >> 16;
         buf[4] = (secs & 0xFF000000) >> 24;
+        buf[5] = 0;     /* set control reg to enable counting */
 
-        xfer = i2c_master_send(client, buf, 5);
-        if (xfer != 5) {
+        xfer = i2c_master_send(client, buf, 6);
+        if (xfer != 6) {
                 dev_err(&client->dev, "%s: send: %d\n", __FUNCTION__, xfer);
                 return -EIO;
         }
@@ -120,6 +122,40 @@ static int ds1672_rtc_set_mmss(struct device *dev, unsigned long secs)
         return ds1672_set_mmss(to_i2c_client(dev), secs);
 }
 
+static int ds1672_get_control(struct i2c_client *client, u8 *status)
+{
+        unsigned char addr = DS1672_REG_CONTROL;
+
+        struct i2c_msg msgs[] = {
+                { client->addr, 0, 1, &addr },          /* setup read ptr */
+                { client->addr, I2C_M_RD, 1, status },  /* read control */
+        };
+
+        /* read control register */
+        if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
+                dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
+                return -EIO;
+        }
+
+        return 0;
+}
+
+/* following are the sysfs callback functions */
+static ssize_t show_control(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        u8 control;
+        int err;
+
+        err = ds1672_get_control(client, &control);
+        if (err)
+                return err;
+
+        return sprintf(buf, "%s\n", (control & DS1672_REG_CONTROL_EOSC)
+                                        ? "disabled" : "enabled");
+}
+static DEVICE_ATTR(control, S_IRUGO, show_control, NULL);
+
 static struct rtc_class_ops ds1672_rtc_ops = {
         .read_time      = ds1672_rtc_read_time,
         .set_time       = ds1672_rtc_set_time,
@@ -128,7 +164,6 @@ static struct rtc_class_ops ds1672_rtc_ops = {
 
 static int ds1672_attach(struct i2c_adapter *adapter)
 {
-        dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
         return i2c_probe(adapter, &addr_data, ds1672_probe);
 }
 
@@ -137,8 +172,6 @@ static int ds1672_detach(struct i2c_client *client)
         int err;
         struct rtc_device *rtc = i2c_get_clientdata(client);
 
-        dev_dbg(&client->dev, "%s\n", __FUNCTION__);
-
         if (rtc)
                 rtc_device_unregister(rtc);
 
@@ -162,6 +195,7 @@ static struct i2c_driver ds1672_driver = {
 static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)
 {
         int err = 0;
+        u8 control;
         struct i2c_client *client;
         struct rtc_device *rtc;
 
@@ -195,13 +229,23 @@ static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)
 
         if (IS_ERR(rtc)) {
                 err = PTR_ERR(rtc);
-                dev_err(&client->dev,
-                        "unable to register the class device\n");
                 goto exit_detach;
         }
 
         i2c_set_clientdata(client, rtc);
 
+        /* read control register */
+        err = ds1672_get_control(client, &control);
+        if (err)
+                goto exit_detach;
+
+        if (control & DS1672_REG_CONTROL_EOSC)
+                dev_warn(&client->dev, "Oscillator not enabled. "
+                                        "Set time to enable.\n");
+
+        /* Register sysfs hooks */
+        device_create_file(&client->dev, &dev_attr_control);
+
         return 0;
 
 exit_detach:
diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c
index 0dd80ea686a9..e1a1169e4664 100644
--- a/drivers/rtc/rtc-ep93xx.c
+++ b/drivers/rtc/rtc-ep93xx.c
@@ -67,7 +67,6 @@ static int ep93xx_rtc_proc(struct device *dev, struct seq_file *seq)
 
         ep93xx_get_swcomp(dev, &preload, &delete);
 
-        seq_printf(seq, "24hr\t\t: yes\n");
         seq_printf(seq, "preload\t\t: %d\n", preload);
         seq_printf(seq, "delete\t\t: %d\n", delete);
 
@@ -110,7 +109,6 @@ static int __devinit ep93xx_rtc_probe(struct platform_device *dev)
                                 &dev->dev, &ep93xx_rtc_ops, THIS_MODULE);
 
         if (IS_ERR(rtc)) {
-                dev_err(&dev->dev, "unable to register\n");
                 return PTR_ERR(rtc);
         }
 
diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c
index db445c872b1b..f6e7ee04f3dc 100644
--- a/drivers/rtc/rtc-m48t86.c
+++ b/drivers/rtc/rtc-m48t86.c
@@ -23,7 +23,7 @@
 #define M48T86_REG_SECALRM      0x01
 #define M48T86_REG_MIN          0x02
 #define M48T86_REG_MINALRM      0x03
-#define M48T86_REG_HOUR 0x04
+#define M48T86_REG_HOUR         0x04
 #define M48T86_REG_HOURALRM     0x05
 #define M48T86_REG_DOW          0x06 /* 1 = sunday */
 #define M48T86_REG_DOM          0x07
@@ -127,9 +127,6 @@ static int m48t86_rtc_proc(struct device *dev, struct seq_file *seq)
 
         reg = ops->readb(M48T86_REG_B);
 
-        seq_printf(seq, "24hr\t\t: %s\n",
-                 (reg & M48T86_REG_B_H24) ? "yes" : "no");
-
         seq_printf(seq, "mode\t\t: %s\n",
                  (reg & M48T86_REG_B_DM) ? "binary" : "bcd");
 
@@ -154,10 +151,8 @@ static int __devinit m48t86_rtc_probe(struct platform_device *dev)
         struct rtc_device *rtc = rtc_device_register("m48t86",
                                 &dev->dev, &m48t86_rtc_ops, THIS_MODULE);
 
-        if (IS_ERR(rtc)) {
-                dev_err(&dev->dev, "unable to register\n");
+        if (IS_ERR(rtc))
                 return PTR_ERR(rtc);
-        }
 
         platform_set_drvdata(dev, rtc);
 
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index d857d45bdbe8..ba9a583b7b68 100644
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -227,14 +227,7 @@ static int pcf8563_rtc_set_time(struct device *dev, struct rtc_time *tm)
         return pcf8563_set_datetime(to_i2c_client(dev), tm);
 }
 
-static int pcf8563_rtc_proc(struct device *dev, struct seq_file *seq)
-{
-        seq_printf(seq, "24hr\t\t: yes\n");
-        return 0;
-}
-
 static struct rtc_class_ops pcf8563_rtc_ops = {
-        .proc           = pcf8563_rtc_proc,
         .read_time      = pcf8563_rtc_read_time,
         .set_time       = pcf8563_rtc_set_time,
 };
@@ -297,8 +290,6 @@ static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind)
 
         if (IS_ERR(rtc)) {
                 err = PTR_ERR(rtc);
-                dev_err(&client->dev,
-                        "unable to register the class device\n");
                 goto exit_detach;
         }
 
@@ -321,8 +312,6 @@ static int pcf8563_detach(struct i2c_client *client)
         int err;
         struct rtc_device *rtc = i2c_get_clientdata(client);
 
-        dev_dbg(&client->dev, "%s\n", __FUNCTION__);
-
         if (rtc)
                 rtc_device_unregister(rtc);
 
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index 90b8a97a0919..cef5f5a3bbf9 100644
--- a/drivers/rtc/rtc-proc.c
+++ b/drivers/rtc/rtc-proc.c
@@ -71,6 +71,8 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
                                 alrm.pending ? "yes" : "no");
         }
 
+        seq_printf(seq, "24hr\t\t: yes\n");
+
         if (ops->proc)
                 ops->proc(class_dev->dev, seq);
 
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c
index 396c8681f66c..7553d797603f 100644
--- a/drivers/rtc/rtc-rs5c372.c
+++ b/drivers/rtc/rtc-rs5c372.c
@@ -151,9 +151,8 @@ static int rs5c372_rtc_proc(struct device *dev, struct seq_file *seq)
 {
         int err, osc, trim;
 
-        seq_printf(seq, "24hr\t\t: yes\n");
-
-        if ((err = rs5c372_get_trim(to_i2c_client(dev), &osc, &trim)) == 0) {
+        err = rs5c372_get_trim(to_i2c_client(dev), &osc, &trim);
+        if (err == 0) {
                 seq_printf(seq, "%d.%03d KHz\n", osc / 1000, osc % 1000);
                 seq_printf(seq, "trim\t: %d\n", trim);
         }
@@ -170,30 +169,31 @@ static struct rtc_class_ops rs5c372_rtc_ops = {
 static ssize_t rs5c372_sysfs_show_trim(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        int trim;
+        int err, trim;
 
-        if (rs5c372_get_trim(to_i2c_client(dev), NULL, &trim) == 0)
-                return sprintf(buf, "0x%2x\n", trim);
+        err = rs5c372_get_trim(to_i2c_client(dev), NULL, &trim);
+        if (err)
+                return err;
 
-        return 0;
+        return sprintf(buf, "0x%2x\n", trim);
 }
 static DEVICE_ATTR(trim, S_IRUGO, rs5c372_sysfs_show_trim, NULL);
 
 static ssize_t rs5c372_sysfs_show_osc(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        int osc;
+        int err, osc;
 
-        if (rs5c372_get_trim(to_i2c_client(dev), &osc, NULL) == 0)
-                return sprintf(buf, "%d.%03d KHz\n", osc / 1000, osc % 1000);
+        err = rs5c372_get_trim(to_i2c_client(dev), &osc, NULL);
+        if (err)
+                return err;
 
-        return 0;
+        return sprintf(buf, "%d.%03d KHz\n", osc / 1000, osc % 1000);
 }
 static DEVICE_ATTR(osc, S_IRUGO, rs5c372_sysfs_show_osc, NULL);
 
 static int rs5c372_attach(struct i2c_adapter *adapter)
 {
-        dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
         return i2c_probe(adapter, &addr_data, rs5c372_probe);
 }
 
@@ -233,8 +233,6 @@ static int rs5c372_probe(struct i2c_adapter *adapter, int address, int kind)
 
         if (IS_ERR(rtc)) {
                 err = PTR_ERR(rtc);
-                dev_err(&client->dev,
-                        "unable to register the class device\n");
                 goto exit_detach;
         }
 
@@ -260,8 +258,6 @@ static int rs5c372_detach(struct i2c_client *client)
         int err;
         struct rtc_device *rtc = i2c_get_clientdata(client);
 
-        dev_dbg(&client->dev, "%s\n", __FUNCTION__);
-
         if (rtc)
                 rtc_device_unregister(rtc);
 
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 83b2bb480a16..a23ec54989f6 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -160,19 +160,19 @@ static int sa1100_rtc_open(struct device *dev)
         ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, SA_INTERRUPT,
                                 "rtc 1Hz", dev);
         if (ret) {
-                printk(KERN_ERR "rtc: IRQ%d already in use.\n", IRQ_RTC1Hz);
+                dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
                 goto fail_ui;
         }
         ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, SA_INTERRUPT,
                                 "rtc Alrm", dev);
         if (ret) {
-                printk(KERN_ERR "rtc: IRQ%d already in use.\n", IRQ_RTCAlrm);
+                dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
                 goto fail_ai;
         }
         ret = request_irq(IRQ_OST1, timer1_interrupt, SA_INTERRUPT,
                                 "rtc timer", dev);
         if (ret) {
-                printk(KERN_ERR "rtc: IRQ%d already in use.\n", IRQ_OST1);
+                dev_err(dev, "IRQ %d already in use.\n", IRQ_OST1);
                 goto fail_pi;
         }
         return 0;
@@ -332,7 +332,7 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
          */
         if (RTTR == 0) {
                 RTTR = RTC_DEF_DIVIDER + (RTC_DEF_TRIM << 16);
-                printk(KERN_WARNING "rtc: warning: initializing default clock divider/trim value\n");
+                dev_warn(&pdev->dev, "warning: initializing default clock divider/trim value\n");
                 /* The current RTC value probably doesn't make sense either */
                 RCNR = 0;
         }
@@ -340,15 +340,11 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
         rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops,
                                 THIS_MODULE);
 
-        if (IS_ERR(rtc)) {
-                dev_err(&pdev->dev, "Unable to register the RTC device\n");
+        if (IS_ERR(rtc))
                 return PTR_ERR(rtc);
-        }
 
         platform_set_drvdata(pdev, rtc);
 
-        dev_info(&pdev->dev, "SA11xx/PXA2xx RTC Registered\n");
-
         return 0;
 }
 
diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
index 43d107487820..e1f7e8e86daf 100644
--- a/drivers/rtc/rtc-test.c
+++ b/drivers/rtc/rtc-test.c
@@ -49,7 +49,6 @@ static int test_rtc_proc(struct device *dev, struct seq_file *seq)
 {
         struct platform_device *plat_dev = to_platform_device(dev);
 
-        seq_printf(seq, "24hr\t\t: yes\n");
         seq_printf(seq, "test\t\t: yes\n");
         seq_printf(seq, "id\t\t: %d\n", plat_dev->id);
 
@@ -120,8 +119,6 @@ static int test_probe(struct platform_device *plat_dev)
                                                 &test_rtc_ops, THIS_MODULE);
         if (IS_ERR(rtc)) {
                 err = PTR_ERR(rtc);
-                dev_err(&plat_dev->dev,
-                        "unable to register the class device\n");
                 return err;
         }
         device_create_file(&plat_dev->dev, &dev_attr_irq);
diff --git a/drivers/char/vr41xx_rtc.c b/drivers/rtc/rtc-vr41xx.c
index b109d9a502d6..4d49fd501198 100644
--- a/drivers/char/vr41xx_rtc.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -1,7 +1,7 @@
 /*
- *  Driver for NEC VR4100 series  Real Time Clock unit.
+ *  Driver for NEC VR4100 series Real Time Clock unit.
  *
- *  Copyright (C) 2003-2005  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *  Copyright (C) 2003-2006  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
  *
  *  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
@@ -17,23 +17,18 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <linux/platform_device.h>
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/irq.h>
-#include <linux/mc146818rtc.h>
-#include <linux/miscdevice.h>
 #include <linux/module.h>
-#include <linux/poll.h>
+#include <linux/platform_device.h>
 #include <linux/rtc.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
-#include <linux/wait.h>
 
 #include <asm/div64.h>
 #include <asm/io.h>
-#include <asm/time.h>
 #include <asm/uaccess.h>
 #include <asm/vr41xx/vr41xx.h>
 
@@ -99,27 +94,11 @@ static void __iomem *rtc2_base;
 
 static unsigned long epoch = 1970;      /* Jan 1 1970 00:00:00 */
 
-static spinlock_t rtc_task_lock;
-static wait_queue_head_t rtc_wait;
-static unsigned long rtc_irq_data;
-static struct fasync_struct *rtc_async_queue;
-static rtc_task_t *rtc_callback;
+static spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED;
 static char rtc_name[] = "RTC";
 static unsigned long periodic_frequency;
 static unsigned long periodic_count;
 
-typedef enum {
-        RTC_RELEASE,
-        RTC_OPEN,
-} rtc_status_t;
-
-static rtc_status_t rtc_status;
-
-typedef enum {
-        FUNCTION_RTC_IOCTL,
-        FUNCTION_RTC_CONTROL,
-} rtc_callfrom_t;
-
 struct resource rtc_resource[2] = {
         {       .name   = rtc_name,
                 .flags  = IORESOURCE_MEM,       },
@@ -129,7 +108,9 @@ struct resource rtc_resource[2] = {
 
 static inline unsigned long read_elapsed_second(void)
 {
+
         unsigned long first_low, first_mid, first_high;
+
         unsigned long second_low, second_mid, second_high;
 
         do {
@@ -156,50 +137,36 @@ static inline void write_elapsed_second(unsigned long sec)
         spin_unlock_irq(&rtc_lock);
 }
 
-static void set_alarm(struct rtc_time *time)
+static void vr41xx_rtc_release(struct device *dev)
 {
-        unsigned long alarm_sec;
-
-        alarm_sec = mktime(time->tm_year + 1900, time->tm_mon + 1, time->tm_mday,
-                           time->tm_hour, time->tm_min, time->tm_sec);
-
-        spin_lock_irq(&rtc_lock);
-
-        rtc1_write(ECMPLREG, (uint16_t)(alarm_sec << 15));
-        rtc1_write(ECMPMREG, (uint16_t)(alarm_sec >> 1));
-        rtc1_write(ECMPHREG, (uint16_t)(alarm_sec >> 17));
-
-        spin_unlock_irq(&rtc_lock);
-}
-
-static void read_alarm(struct rtc_time *time)
-{
-        unsigned long low, mid, high;
 
         spin_lock_irq(&rtc_lock);
 
-        low = rtc1_read(ECMPLREG);
-        mid = rtc1_read(ECMPMREG);
-        high = rtc1_read(ECMPHREG);
+        rtc1_write(ECMPLREG, 0);
+        rtc1_write(ECMPMREG, 0);
+        rtc1_write(ECMPHREG, 0);
+        rtc1_write(RTCL1LREG, 0);
+        rtc1_write(RTCL1HREG, 0);
 
         spin_unlock_irq(&rtc_lock);
 
-        to_tm((high << 17) | (mid << 1) | (low >> 15), time);
-        time->tm_year -= 1900;
+        disable_irq(ELAPSEDTIME_IRQ);
+        disable_irq(RTCLONG1_IRQ);
 }
 
-static void read_time(struct rtc_time *time)
+static int vr41xx_rtc_read_time(struct device *dev, struct rtc_time *time)
 {
         unsigned long epoch_sec, elapsed_sec;
 
         epoch_sec = mktime(epoch, 1, 1, 0, 0, 0);
         elapsed_sec = read_elapsed_second();
 
-        to_tm(epoch_sec + elapsed_sec, time);
-        time->tm_year -= 1900;
+        rtc_time_to_tm(epoch_sec + elapsed_sec, time);
+
+        return 0;
 }
 
-static void set_time(struct rtc_time *time)
+static int vr41xx_rtc_set_time(struct device *dev, struct rtc_time *time)
 {
         unsigned long epoch_sec, current_sec;
 
@@ -208,73 +175,49 @@ static void set_time(struct rtc_time *time)
                              time->tm_hour, time->tm_min, time->tm_sec);
 
         write_elapsed_second(current_sec - epoch_sec);
+
+        return 0;
 }
 
-static ssize_t rtc_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
+static int vr41xx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
 {
-        DECLARE_WAITQUEUE(wait, current);
-        unsigned long irq_data;
-        int retval = 0;
-
-        if (count != sizeof(unsigned int) && count != sizeof(unsigned long))
-                return -EINVAL;
-
-        add_wait_queue(&rtc_wait, &wait);
-
-        do {
-                __set_current_state(TASK_INTERRUPTIBLE);
+        unsigned long low, mid, high;
+        struct rtc_time *time = &wkalrm->time;
 
-                spin_lock_irq(&rtc_lock);
-                irq_data = rtc_irq_data;
-                rtc_irq_data = 0;
-                spin_unlock_irq(&rtc_lock);
+        spin_lock_irq(&rtc_lock);
 
-                if (irq_data != 0)
-                        break;
+        low = rtc1_read(ECMPLREG);
+        mid = rtc1_read(ECMPMREG);
+        high = rtc1_read(ECMPHREG);
 
-                if (file->f_flags & O_NONBLOCK) {
-                        retval = -EAGAIN;
-                        break;
-                }
+        spin_unlock_irq(&rtc_lock);
 
-                if (signal_pending(current)) {
-                        retval = -ERESTARTSYS;
-                        break;
-                }
-        } while (1);
+        rtc_time_to_tm((high << 17) | (mid << 1) | (low >> 15), time);
 
-        if (retval == 0) {
-                if (count == sizeof(unsigned int)) {
-                        retval = put_user(irq_data, (unsigned int __user *)buf);
-                        if (retval == 0)
-                                retval = sizeof(unsigned int);
-                } else {
-                        retval = put_user(irq_data, (unsigned long __user *)buf);
-                        if (retval == 0)
-                                retval = sizeof(unsigned long);
-                }
+        return 0;
+}
 
-        }
+static int vr41xx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
+{
+        unsigned long alarm_sec;
+        struct rtc_time *time = &wkalrm->time;
 
-        __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&rtc_wait, &wait);
+        alarm_sec = mktime(time->tm_year + 1900, time->tm_mon + 1, time->tm_mday,
+                           time->tm_hour, time->tm_min, time->tm_sec);
 
-        return retval;
-}
+        spin_lock_irq(&rtc_lock);
 
-static unsigned int rtc_poll(struct file *file, struct poll_table_struct *table)
-{
-        poll_wait(file, &rtc_wait, table);
+        rtc1_write(ECMPLREG, (uint16_t)(alarm_sec << 15));
+        rtc1_write(ECMPMREG, (uint16_t)(alarm_sec >> 1));
+        rtc1_write(ECMPHREG, (uint16_t)(alarm_sec >> 17));
 
-        if (rtc_irq_data != 0)
-                return POLLIN | POLLRDNORM;
+        spin_unlock_irq(&rtc_lock);
 
         return 0;
 }
 
-static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, rtc_callfrom_t from)
+static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
 {
-        struct rtc_time time;
         unsigned long count;
 
         switch (cmd) {
@@ -290,33 +233,6 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, rtc_callfrom_t from
         case RTC_PIE_OFF:
                 disable_irq(RTCLONG1_IRQ);
                 break;
-        case RTC_ALM_SET:
-                if (copy_from_user(&time, (struct rtc_time __user *)arg,
-                                   sizeof(struct rtc_time)))
-                        return -EFAULT;
-
-                set_alarm(&time);
-                break;
-        case RTC_ALM_READ:
-                memset(&time, 0, sizeof(struct rtc_time));
-                read_alarm(&time);
-                break;
-        case RTC_RD_TIME:
-                memset(&time, 0, sizeof(struct rtc_time));
-                read_time(&time);
-                if (copy_to_user((void __user *)arg, &time, sizeof(struct rtc_time)))
-                        return -EFAULT;
-                break;
-        case RTC_SET_TIME:
-                if (capable(CAP_SYS_TIME) == 0)
-                        return -EACCES;
-
-                if (copy_from_user(&time, (struct rtc_time __user *)arg,
-                                   sizeof(struct rtc_time)))
-                        return -EFAULT;
-
-                set_time(&time);
-                break;
         case RTC_IRQP_READ:
                 return put_user(periodic_frequency, (unsigned long __user *)arg);
                 break;
@@ -324,8 +240,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, rtc_callfrom_t from
                 if (arg > MAX_PERIODIC_RATE)
                         return -EINVAL;
 
-                if (from == FUNCTION_RTC_IOCTL && arg > MAX_USER_PERIODIC_RATE &&
-                    capable(CAP_SYS_RESOURCE) == 0)
+                if (arg > MAX_USER_PERIODIC_RATE && capable(CAP_SYS_RESOURCE) == 0)
                         return -EACCES;
 
                 periodic_frequency = arg;
@@ -361,205 +276,46 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, rtc_callfrom_t from
         return 0;
 }
 
-static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-                     unsigned long arg)
-{
-        return rtc_do_ioctl(cmd, arg, FUNCTION_RTC_IOCTL);
-}
-
-static int rtc_open(struct inode *inode, struct file *file)
-{
-        spin_lock_irq(&rtc_lock);
-
-        if (rtc_status == RTC_OPEN) {
-                spin_unlock_irq(&rtc_lock);
-                return -EBUSY;
-        }
-
-        rtc_status = RTC_OPEN;
-        rtc_irq_data = 0;
-
-        spin_unlock_irq(&rtc_lock);
-
-        return 0;
-}
-
-static int rtc_release(struct inode *inode, struct file *file)
-{
-        if (file->f_flags & FASYNC)
-                (void)fasync_helper(-1, file, 0, &rtc_async_queue);
-
-        spin_lock_irq(&rtc_lock);
-
-        rtc1_write(ECMPLREG, 0);
-        rtc1_write(ECMPMREG, 0);
-        rtc1_write(ECMPHREG, 0);
-        rtc1_write(RTCL1LREG, 0);
-        rtc1_write(RTCL1HREG, 0);
-
-        rtc_status = RTC_RELEASE;
-
-        spin_unlock_irq(&rtc_lock);
-
-        disable_irq(ELAPSEDTIME_IRQ);
-        disable_irq(RTCLONG1_IRQ);
-
-        return 0;
-}
-
-static int rtc_fasync(int fd, struct file *file, int on)
-{
-        return fasync_helper(fd, file, on, &rtc_async_queue);
-}
-
-static struct file_operations rtc_fops = {
-        .owner          = THIS_MODULE,
-        .llseek         = no_llseek,
-        .read           = rtc_read,
-        .poll           = rtc_poll,
-        .ioctl          = rtc_ioctl,
-        .open           = rtc_open,
-        .release        = rtc_release,
-        .fasync         = rtc_fasync,
-};
-
 static irqreturn_t elapsedtime_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-        spin_lock(&rtc_lock);
-        rtc2_write(RTCINTREG, ELAPSEDTIME_INT);
-
-        rtc_irq_data += 0x100;
-        rtc_irq_data &= ~0xff;
-        rtc_irq_data |= RTC_AF;
-        spin_unlock(&rtc_lock);
+        struct platform_device *pdev = (struct platform_device *)dev_id;
+        struct rtc_device *rtc = platform_get_drvdata(pdev);
 
-        spin_lock(&rtc_lock);
-        if (rtc_callback)
-                rtc_callback->func(rtc_callback->private_data);
-        spin_unlock(&rtc_lock);
-
-        wake_up_interruptible(&rtc_wait);
+        rtc2_write(RTCINTREG, ELAPSEDTIME_INT);
 
-        kill_fasync(&rtc_async_queue, SIGIO, POLL_IN);
+        rtc_update_irq(&rtc->class_dev, 1, RTC_AF);
 
         return IRQ_HANDLED;
 }
 
 static irqreturn_t rtclong1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
+        struct platform_device *pdev = (struct platform_device *)dev_id;
+        struct rtc_device *rtc = platform_get_drvdata(pdev);
         unsigned long count = periodic_count;
 
-        spin_lock(&rtc_lock);
         rtc2_write(RTCINTREG, RTCLONG1_INT);
 
         rtc1_write(RTCL1LREG, count);
         rtc1_write(RTCL1HREG, count >> 16);
 
-        rtc_irq_data += 0x100;
-        rtc_irq_data &= ~0xff;
-        rtc_irq_data |= RTC_PF;
-        spin_unlock(&rtc_lock);
-
-        spin_lock(&rtc_task_lock);
-        if (rtc_callback)
-                rtc_callback->func(rtc_callback->private_data);
-        spin_unlock(&rtc_task_lock);
-
-        wake_up_interruptible(&rtc_wait);
-
-        kill_fasync(&rtc_async_queue, SIGIO, POLL_IN);
+        rtc_update_irq(&rtc->class_dev, 1, RTC_PF);
 
         return IRQ_HANDLED;
 }
 
-int rtc_register(rtc_task_t *task)
-{
-        if (task == NULL || task->func == NULL)
-                return -EINVAL;
-
-        spin_lock_irq(&rtc_lock);
-        if (rtc_status == RTC_OPEN) {
-                spin_unlock_irq(&rtc_lock);
-                return -EBUSY;
-        }
-
-        spin_lock(&rtc_task_lock);
-        if (rtc_callback != NULL) {
-                spin_unlock(&rtc_task_lock);
-                spin_unlock_irq(&rtc_task_lock);
-                return -EBUSY;
-        }
-
-        rtc_callback = task;
-        spin_unlock(&rtc_task_lock);
-
-        rtc_status = RTC_OPEN;
-
-        spin_unlock_irq(&rtc_lock);
-
-        return 0;
-}
-
-EXPORT_SYMBOL_GPL(rtc_register);
-
-int rtc_unregister(rtc_task_t *task)
-{
-        spin_lock_irq(&rtc_task_lock);
-        if (task == NULL || rtc_callback != task) {
-                spin_unlock_irq(&rtc_task_lock);
-                return -ENXIO;
-        }
-
-        spin_lock(&rtc_lock);
-
-        rtc1_write(ECMPLREG, 0);
-        rtc1_write(ECMPMREG, 0);
-        rtc1_write(ECMPHREG, 0);
-        rtc1_write(RTCL1LREG, 0);
-        rtc1_write(RTCL1HREG, 0);
-
-        rtc_status = RTC_RELEASE;
-
-        spin_unlock(&rtc_lock);
-
-        rtc_callback = NULL;
-
-        spin_unlock_irq(&rtc_task_lock);
-
-        disable_irq(ELAPSEDTIME_IRQ);
-        disable_irq(RTCLONG1_IRQ);
-
-        return 0;
-}
-
-EXPORT_SYMBOL_GPL(rtc_unregister);
-
-int rtc_control(rtc_task_t *task, unsigned int cmd, unsigned long arg)
-{
-        int retval = 0;
-
-        spin_lock_irq(&rtc_task_lock);
-
-        if (rtc_callback != task)
-                retval = -ENXIO;
-        else
-                rtc_do_ioctl(cmd, arg, FUNCTION_RTC_CONTROL);
-
-        spin_unlock_irq(&rtc_task_lock);
-
-        return retval;
-}
-
-EXPORT_SYMBOL_GPL(rtc_control);
-
-static struct miscdevice rtc_miscdevice = {
-        .minor  = RTC_MINOR,
-        .name   = rtc_name,
-        .fops   = &rtc_fops,
+static struct rtc_class_ops vr41xx_rtc_ops = {
+        .release        = vr41xx_rtc_release,
+        .ioctl          = vr41xx_rtc_ioctl,
+        .read_time      = vr41xx_rtc_read_time,
+        .set_time       = vr41xx_rtc_set_time,
+        .read_alarm     = vr41xx_rtc_read_alarm,
+        .set_alarm      = vr41xx_rtc_set_alarm,
 };
 
 static int __devinit rtc_probe(struct platform_device *pdev)
 {
+        struct rtc_device *rtc;
         unsigned int irq;
         int retval;
 
@@ -577,13 +333,13 @@ static int __devinit rtc_probe(struct platform_device *pdev)
                 return -EBUSY;
         }
 
-        retval = misc_register(&rtc_miscdevice);
-        if (retval < 0) {
+        rtc = rtc_device_register(rtc_name, &pdev->dev, &vr41xx_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc)) {
                 iounmap(rtc1_base);
                 iounmap(rtc2_base);
                 rtc1_base = NULL;
                 rtc2_base = NULL;
-                return retval;
+                return PTR_ERR(rtc);
         }
 
         spin_lock_irq(&rtc_lock);
@@ -594,24 +350,20 @@ static int __devinit rtc_probe(struct platform_device *pdev)
         rtc1_write(RTCL1LREG, 0);
         rtc1_write(RTCL1HREG, 0);
 
-        rtc_status = RTC_RELEASE;
-        rtc_irq_data = 0;
-
         spin_unlock_irq(&rtc_lock);
 
-        init_waitqueue_head(&rtc_wait);
-
         irq = ELAPSEDTIME_IRQ;
         retval = request_irq(irq, elapsedtime_interrupt, SA_INTERRUPT,
-                             "elapsed_time", NULL);
+                             "elapsed_time", pdev);
         if (retval == 0) {
                 irq = RTCLONG1_IRQ;
                 retval = request_irq(irq, rtclong1_interrupt, SA_INTERRUPT,
-                                     "rtclong1", NULL);
+                                     "rtclong1", pdev);
         }
 
         if (retval < 0) {
                 printk(KERN_ERR "rtc: IRQ%d is busy\n", irq);
+                rtc_device_unregister(rtc);
                 if (irq == RTCLONG1_IRQ)
                         free_irq(ELAPSEDTIME_IRQ, NULL);
                 iounmap(rtc1_base);
@@ -621,23 +373,25 @@ static int __devinit rtc_probe(struct platform_device *pdev)
                 return retval;
         }
 
+        platform_set_drvdata(pdev, rtc);
+
         disable_irq(ELAPSEDTIME_IRQ);
         disable_irq(RTCLONG1_IRQ);
 
-        spin_lock_init(&rtc_task_lock);
-
         printk(KERN_INFO "rtc: Real Time Clock of NEC VR4100 series\n");
 
         return 0;
 }
 
-static int __devexit rtc_remove(struct platform_device *dev)
+static int __devexit rtc_remove(struct platform_device *pdev)
 {
-        int retval;
+        struct rtc_device *rtc;
 
-        retval = misc_deregister(&rtc_miscdevice);
-        if (retval < 0)
-                return retval;
+        rtc = platform_get_drvdata(pdev);
+        if (rtc != NULL)
+                rtc_device_unregister(rtc);
+
+        platform_set_drvdata(pdev, NULL);
 
         free_irq(ELAPSEDTIME_IRQ, NULL);
         free_irq(RTCLONG1_IRQ, NULL);
@@ -651,7 +405,7 @@ static int __devexit rtc_remove(struct platform_device *dev)
 
 static struct platform_device *rtc_platform_device;
 
-static struct platform_driver rtc_device_driver = {
+static struct platform_driver rtc_platform_driver = {
         .probe          = rtc_probe,
         .remove         = __devexit_p(rtc_remove),
         .driver         = {
@@ -686,7 +440,7 @@ static int __init vr41xx_rtc_init(void)
         }
 
         rtc_platform_device = platform_device_alloc("RTC", -1);
-        if (!rtc_platform_device)
+        if (rtc_platform_device == NULL)
                 return -ENOMEM;
 
         retval = platform_device_add_resources(rtc_platform_device,
@@ -700,7 +454,7 @@ static int __init vr41xx_rtc_init(void)
                 return retval;
         }
 
-        retval = platform_driver_register(&rtc_device_driver);
+        retval = platform_driver_register(&rtc_platform_driver);
         if (retval < 0)
                 platform_device_unregister(rtc_platform_device);
 
@@ -709,7 +463,7 @@ static int __init vr41xx_rtc_init(void)
 
 static void __exit vr41xx_rtc_exit(void)
 {
-        platform_driver_unregister(&rtc_device_driver);
+        platform_driver_unregister(&rtc_platform_driver);
         platform_device_unregister(rtc_platform_device);
 }
 
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index 621d17afc0d9..788b6d1f8f2f 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -19,7 +19,7 @@
 #include <linux/rtc.h>
 #include <linux/delay.h>
 
-#define DRV_VERSION "1.0.6"
+#define DRV_VERSION "1.0.7"
 
 /* Addresses to scan: none. This chip is located at
  * 0x6f and uses a two bytes register addressing.
@@ -451,8 +451,6 @@ static int x1205_rtc_proc(struct device *dev, struct seq_file *seq)
 {
         int err, dtrim, atrim;
 
-        seq_printf(seq, "24hr\t\t: yes\n");
-
         if ((err = x1205_get_dtrim(to_i2c_client(dev), &dtrim)) == 0)
                 seq_printf(seq, "digital_trim\t: %d ppm\n", dtrim);
 
@@ -473,30 +471,31 @@ static struct rtc_class_ops x1205_rtc_ops = {
 static ssize_t x1205_sysfs_show_atrim(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        int atrim;
+        int err, atrim;
 
-        if (x1205_get_atrim(to_i2c_client(dev), &atrim) == 0)
-                return sprintf(buf, "%d.%02d pF\n",
-                        atrim / 1000, atrim % 1000);
-        return 0;
+        err = x1205_get_atrim(to_i2c_client(dev), &atrim);
+        if (err)
+                return err;
+
+        return sprintf(buf, "%d.%02d pF\n", atrim / 1000, atrim % 1000);
 }
 static DEVICE_ATTR(atrim, S_IRUGO, x1205_sysfs_show_atrim, NULL);
 
 static ssize_t x1205_sysfs_show_dtrim(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        int dtrim;
+        int err, dtrim;
 
-        if (x1205_get_dtrim(to_i2c_client(dev), &dtrim) == 0)
-                return sprintf(buf, "%d ppm\n", dtrim);
+        err = x1205_get_dtrim(to_i2c_client(dev), &dtrim);
+        if (err)
+                return err;
 
-        return 0;
+        return sprintf(buf, "%d ppm\n", dtrim);
 }
 static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL);
 
 static int x1205_attach(struct i2c_adapter *adapter)
 {
-        dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
         return i2c_probe(adapter, &addr_data, x1205_probe);
 }
 
@@ -545,8 +544,6 @@ static int x1205_probe(struct i2c_adapter *adapter, int address, int kind)
 
         if (IS_ERR(rtc)) {
                 err = PTR_ERR(rtc);
-                dev_err(&client->dev,
-                        "unable to register the class device\n");
                 goto exit_detach;
         }
 
@@ -585,8 +582,6 @@ static int x1205_detach(struct i2c_client *client)
         int err;
         struct rtc_device *rtc = i2c_get_clientdata(client);
 
-        dev_dbg(&client->dev, "%s\n", __FUNCTION__);
-
         if (rtc)
                 rtc_device_unregister(rtc);
 
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 0a9f12c4e911..a3bfebcf31ef 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -1257,25 +1257,28 @@ __dasd_start_head(struct dasd_device * device)
         if (list_empty(&device->ccw_queue))
                 return;
         cqr = list_entry(device->ccw_queue.next, struct dasd_ccw_req, list);
-        /* check FAILFAST */
+        if (cqr->status != DASD_CQR_QUEUED)
+                return;
+        /* Non-temporary stop condition will trigger fail fast */
         if (device->stopped & ~DASD_STOPPED_PENDING &&
             test_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags) &&
             (!dasd_eer_enabled(device))) {
                 cqr->status = DASD_CQR_FAILED;
                 dasd_schedule_bh(device);
+                return;
         }
-        if ((cqr->status == DASD_CQR_QUEUED) &&
-            (!device->stopped)) {
-                /* try to start the first I/O that can be started */
-                rc = device->discipline->start_IO(cqr);
-                if (rc == 0)
-                        dasd_set_timer(device, cqr->expires);
-                else if (rc == -EACCES) {
-                        dasd_schedule_bh(device);
-                } else
-                        /* Hmpf, try again in 1/2 sec */
-                        dasd_set_timer(device, 50);
-        }
+        /* Don't try to start requests if device is stopped */
+        if (device->stopped)
+                return;
+
+        rc = device->discipline->start_IO(cqr);
+        if (rc == 0)
+                dasd_set_timer(device, cqr->expires);
+        else if (rc == -EACCES) {
+                dasd_schedule_bh(device);
+        } else
+                /* Hmpf, try again in 1/2 sec */
+                dasd_set_timer(device, 50);
 }
 
 /*
@@ -1968,7 +1971,7 @@ int
 dasd_generic_set_offline (struct ccw_device *cdev)
 {
         struct dasd_device *device;
-        int max_count;
+        int max_count, open_count;
 
         device = dasd_device_from_cdev(cdev);
         if (IS_ERR(device))
@@ -1985,10 +1988,16 @@ dasd_generic_set_offline (struct ccw_device *cdev)
          * in the other openers.
          */
         max_count = device->bdev ? 0 : -1;
-        if (atomic_read(&device->open_count) > max_count) {
-                printk (KERN_WARNING "Can't offline dasd device with open"
-                        " count = %i.\n",
-                        atomic_read(&device->open_count));
+        open_count = (int) atomic_read(&device->open_count);
+        if (open_count > max_count) {
+                if (open_count > 0)
+                        printk (KERN_WARNING "Can't offline dasd device with "
+                                "open count = %i.\n",
+                                open_count);
+                else
+                        printk (KERN_WARNING "%s",
+                                "Can't offline dasd device due to internal "
+                                "use\n");
                 clear_bit(DASD_FLAG_OFFLINE, &device->flags);
                 dasd_put_device(device);
                 return -EBUSY;
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 1aa3c261718a..ad23aede356c 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -294,23 +294,40 @@ out_error:
 #endif                          /* CONFIG_DASD_PROFILE */
 }
 
+/*
+ * Create dasd proc-fs entries.
+ * In case creation failed, cleanup and return -ENOENT.
+ */
 int
 dasd_proc_init(void)
 {
         dasd_proc_root_entry = proc_mkdir("dasd", &proc_root);
+        if (!dasd_proc_root_entry)
+                goto out_nodasd;
         dasd_proc_root_entry->owner = THIS_MODULE;
         dasd_devices_entry = create_proc_entry("devices",
                                                S_IFREG | S_IRUGO | S_IWUSR,
                                                dasd_proc_root_entry);
+        if (!dasd_devices_entry)
+                goto out_nodevices;
         dasd_devices_entry->proc_fops = &dasd_devices_file_ops;
         dasd_devices_entry->owner = THIS_MODULE;
         dasd_statistics_entry = create_proc_entry("statistics",
                                                   S_IFREG | S_IRUGO | S_IWUSR,
                                                   dasd_proc_root_entry);
+        if (!dasd_statistics_entry)
+                goto out_nostatistics;
         dasd_statistics_entry->read_proc = dasd_statistics_read;
         dasd_statistics_entry->write_proc = dasd_statistics_write;
         dasd_statistics_entry->owner = THIS_MODULE;
         return 0;
+
+ out_nostatistics:
+        remove_proc_entry("devices", dasd_proc_root_entry);
+ out_nodevices:
+        remove_proc_entry("dasd", &proc_root);
+ out_nodasd:
+        return -ENOENT;
 }
 
 void
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index 6badd8403409..d4d2ff0a9da2 100644
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -54,7 +54,7 @@ kbd_alloc(void) {
         if (!kbd)
                 goto out;
         kbd->key_maps = kzalloc(sizeof(key_maps), GFP_KERNEL);
-        if (!key_maps)
+        if (!kbd->key_maps)
                 goto out_kbd;
         for (i = 0; i < ARRAY_SIZE(key_maps); i++) {
                 if (key_maps[i]) {
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 5c65cf3e5cc0..b70d92690242 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -432,8 +432,8 @@ tapeblock_ioctl(
 ) {
         int rc;
         int minor;
-        struct gendisk *disk = inode->i_bdev->bd_disk;
-        struct tape_device *device = disk->private_data;
+        struct gendisk *disk;
+        struct tape_device *device;
 
         rc     = 0;
         disk   = inode->i_bdev->bd_disk;
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 389ee2c0f443..e6e4086d3224 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -210,18 +210,14 @@ tape_state_set(struct tape_device *device, enum tape_state newstate)
                 return;
         }
         DBF_EVENT(4, "ts. dev:  %x\n", device->first_minor);
-        if (device->tape_state < TO_SIZE && device->tape_state >= 0)
-                str = tape_state_verbose[device->tape_state];
-        else
-                str = "UNKNOWN TS";
-        DBF_EVENT(4, "old ts:   %s\n", str);
-        if (device->tape_state < TO_SIZE && device->tape_state >=0 )
+        DBF_EVENT(4, "old ts:\t\n");
+        if (device->tape_state < TS_SIZE && device->tape_state >=0 )
                 str = tape_state_verbose[device->tape_state];
         else
                 str = "UNKNOWN TS";
         DBF_EVENT(4, "%s\n", str);
         DBF_EVENT(4, "new ts:\t\n");
-        if (newstate < TO_SIZE && newstate >= 0)
+        if (newstate < TS_SIZE && newstate >= 0)
                 str = tape_state_verbose[newstate];
         else
                 str = "UNKNOWN TS";
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index cb8e2e672b68..0960bef7b199 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -414,11 +414,11 @@ cio_ignore_proc_init (void)
         entry = create_proc_entry ("cio_ignore", S_IFREG | S_IRUGO | S_IWUSR,
                                    &proc_root);
         if (!entry)
-                return 0;
+                return -ENOENT;
 
         entry->proc_fops = &cio_ignore_proc_fops;
 
-        return 1;
+        return 0;
 }
 
 __initcall (cio_ignore_proc_init);
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index cbb86fa5f293..5b20d8c9c025 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -67,7 +67,7 @@ cio_debug_init (void)
                 goto out_unregister;
         debug_register_view (cio_debug_msg_id, &debug_sprintf_view);
         debug_set_level (cio_debug_msg_id, 2);
-        cio_debug_trace_id = debug_register ("cio_trace", 16, 4, 8);
+        cio_debug_trace_id = debug_register ("cio_trace", 16, 4, 16);
         if (!cio_debug_trace_id)
                 goto out_unregister;
         debug_register_view (cio_debug_trace_id, &debug_hex_ascii_view);
diff --git a/drivers/s390/cio/cio_debug.h b/drivers/s390/cio/cio_debug.h
index 6af8b27d366b..f88844adae1b 100644
--- a/drivers/s390/cio/cio_debug.h
+++ b/drivers/s390/cio/cio_debug.h
@@ -3,6 +3,11 @@
 
 #include <asm/debug.h>
 
+/* for use of debug feature */
+extern debug_info_t *cio_debug_msg_id;
+extern debug_info_t *cio_debug_trace_id;
+extern debug_info_t *cio_debug_crw_id;
+
 #define CIO_TRACE_EVENT(imp, txt) do { \
                 debug_text_event(cio_debug_trace_id, imp, txt); \
         } while (0)
@@ -15,18 +20,19 @@
                 debug_sprintf_event(cio_debug_crw_id, imp , ##args); \
         } while (0)
 
-#define CIO_HEX_EVENT(imp, args...) do { \
-                debug_event(cio_debug_trace_id, imp, ##args); \
-        } while (0)
+static inline void
+CIO_HEX_EVENT(int level, void *data, int length)
+{
+        while (length > 0) {
+                debug_event(cio_debug_trace_id, level, data, length);
+                length -= cio_debug_trace_id->buf_size;
+                data += cio_debug_trace_id->buf_size;
+        }
+}
 
 #define CIO_DEBUG(printk_level,event_level,msg...) ({ \
         if (cio_show_msg) printk(printk_level msg); \
         CIO_MSG_EVENT (event_level, msg); \
 })
 
-/* for use of debug feature */
-extern debug_info_t *cio_debug_msg_id;
-extern debug_info_t *cio_debug_trace_id;
-extern debug_info_t *cio_debug_crw_id;
-
 #endif
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 25f678d0780b..e8e41e6eb42a 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -1508,10 +1508,12 @@ static void tw_transfer_internal(TW_Device_Extension *tw_dev, int request_id,
         struct scsi_cmnd *cmd = tw_dev->srb[request_id];
         void *buf;
         unsigned int transfer_len;
+        unsigned long flags = 0;
 
         if (cmd->use_sg) {
                 struct scatterlist *sg =
                         (struct scatterlist *)cmd->request_buffer;
+                local_irq_save(flags);
                 buf = kmap_atomic(sg->page, KM_IRQ0) + sg->offset;
                 transfer_len = min(sg->length, len);
         } else {
@@ -1526,6 +1528,7 @@ static void tw_transfer_internal(TW_Device_Extension *tw_dev, int request_id,
 
                 sg = (struct scatterlist *)cmd->request_buffer;
                 kunmap_atomic(buf - sg->offset, KM_IRQ0);
+                local_irq_restore(flags);
         }
 }
 
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index ff48066d4c4f..1b8429cb3c96 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -207,7 +207,6 @@ static struct scsi_host_template ahci_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = AHCI_MAX_SG,
@@ -517,25 +516,7 @@ static void ahci_fill_cmd_slot(struct ahci_port_priv *pp, u32 opts)
         pp->cmd_slot[0].tbl_addr_hi = cpu_to_le32((pp->cmd_tbl_dma >> 16) >> 16);
 }
 
-static int ahci_poll_register(void __iomem *reg, u32 mask, u32 val,
-                              unsigned long interval_msec,
-                              unsigned long timeout_msec)
-{
-        unsigned long timeout;
-        u32 tmp;
-
-        timeout = jiffies + (timeout_msec * HZ) / 1000;
-        do {
-                tmp = readl(reg);
-                if ((tmp & mask) == val)
-                        return 0;
-                msleep(interval_msec);
-        } while (time_before(jiffies, timeout));
-
-        return -1;
-}
-
-static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)
+static int ahci_softreset(struct ata_port *ap, unsigned int *class)
 {
         struct ahci_host_priv *hpriv = ap->host_set->private_data;
         struct ahci_port_priv *pp = ap->private_data;
@@ -544,6 +525,7 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)
         const u32 cmd_fis_len = 5; /* five dwords */
         const char *reason = NULL;
         struct ata_taskfile tf;
+        u32 tmp;
         u8 *fis;
         int rc;
 
@@ -565,8 +547,6 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)
         /* check BUSY/DRQ, perform Command List Override if necessary */
         ahci_tf_read(ap, &tf);
         if (tf.command & (ATA_BUSY | ATA_DRQ)) {
-                u32 tmp;
-
                 if (!(hpriv->cap & HOST_CAP_CLO)) {
                         rc = -EIO;
                         reason = "port busy but no CLO";
@@ -576,10 +556,10 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)
                 tmp = readl(port_mmio + PORT_CMD);
                 tmp |= PORT_CMD_CLO;
                 writel(tmp, port_mmio + PORT_CMD);
-                readl(port_mmio + PORT_CMD); /* flush */
 
-                if (ahci_poll_register(port_mmio + PORT_CMD, PORT_CMD_CLO, 0x0,
-                                       1, 500)) {
+                tmp = ata_wait_register(port_mmio + PORT_CMD,
+                                        PORT_CMD_CLO, PORT_CMD_CLO, 1, 500);
+                if (tmp & PORT_CMD_CLO) {
                         rc = -EIO;
                         reason = "CLO failed";
                         goto fail_restart;
@@ -600,9 +580,9 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)
         fis[1] &= ~(1 << 7);    /* turn off Command FIS bit */
 
         writel(1, port_mmio + PORT_CMD_ISSUE);
-        readl(port_mmio + PORT_CMD_ISSUE);      /* flush */
 
-        if (ahci_poll_register(port_mmio + PORT_CMD_ISSUE, 0x1, 0x0, 1, 500)) {
+        tmp = ata_wait_register(port_mmio + PORT_CMD_ISSUE, 0x1, 0x1, 1, 500);
+        if (tmp & 0x1) {
                 rc = -EIO;
                 reason = "1st FIS failed";
                 goto fail;
@@ -647,22 +627,19 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)
  fail_restart:
         ahci_start_engine(ap);
  fail:
-        if (verbose)
-                printk(KERN_ERR "ata%u: softreset failed (%s)\n",
-                       ap->id, reason);
-        else
-                DPRINTK("EXIT, rc=%d reason=\"%s\"\n", rc, reason);
+        printk(KERN_ERR "ata%u: softreset failed (%s)\n",
+               ap->id, reason);
         return rc;
 }
 
-static int ahci_hardreset(struct ata_port *ap, int verbose, unsigned int *class)
+static int ahci_hardreset(struct ata_port *ap, unsigned int *class)
 {
         int rc;
 
         DPRINTK("ENTER\n");
 
         ahci_stop_engine(ap);
-        rc = sata_std_hardreset(ap, verbose, class);
+        rc = sata_std_hardreset(ap, class);
         ahci_start_engine(ap);
 
         if (rc == 0)
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 83839706f5e0..62dabf74188e 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -209,7 +209,6 @@ static struct scsi_host_template piix_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = LIBATA_MAX_PRD,
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index ef57f253031c..dfcb96f3e60c 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -294,18 +294,6 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
         if (sht->unchecked_isa_dma && privsize)
                 gfp_mask |= __GFP_DMA;
 
-        /* Check to see if this host has any error handling facilities */
-        if (!sht->eh_strategy_handler && !sht->eh_abort_handler &&
-            !sht->eh_device_reset_handler && !sht->eh_bus_reset_handler &&
-            !sht->eh_host_reset_handler) {
-                printk(KERN_ERR "ERROR: SCSI host `%s' has no error handling\n"
-                                "ERROR: This is not a safe way to run your "
-                                        "SCSI host\n"
-                                "ERROR: The error handling must be added to "
-                                "this driver\n", sht->proc_name);
-                dump_stack();
-        }
-
         shost = kzalloc(sizeof(struct Scsi_Host) + privsize, gfp_mask);
         if (!shost)
                 return NULL;
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 2b2feb6462a9..5d38a6cc5736 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1425,12 +1425,9 @@ static int ata_bus_probe(struct ata_port *ap)
         /* read IDENTIFY page and configure devices */
         for (i = 0; i < ATA_MAX_DEVICES; i++) {
                 dev = &ap->device[i];
-                dev->class = classes[i];
 
-                if (!tries[i]) {
-                        ata_down_xfermask_limit(ap, dev, 1);
-                        ata_dev_disable(ap, dev);
-                }
+                if (tries[i])
+                        dev->class = classes[i];
 
                 if (!ata_dev_enabled(dev))
                         continue;
@@ -1458,12 +1455,12 @@ static int ata_bus_probe(struct ata_port *ap)
                                 break;
                         }
                 rc = 0;
-        } else {
+        } else
                 rc = ata_set_mode(ap, &dev);
-                if (rc) {
-                        down_xfermask = 1;
-                        goto fail;
-                }
+
+        if (rc) {
+                down_xfermask = 1;
+                goto fail;
         }
 
         for (i = 0; i < ATA_MAX_DEVICES; i++)
@@ -1491,6 +1488,11 @@ static int ata_bus_probe(struct ata_port *ap)
                         tries[dev->devno] = 0;
         }
 
+        if (!tries[dev->devno]) {
+                ata_down_xfermask_limit(ap, dev, 1);
+                ata_dev_disable(ap, dev);
+        }
+
         goto retry;
 }
 
@@ -1750,7 +1752,7 @@ int ata_set_sata_spd_needed(struct ata_port *ap)
  *      0 if spd doesn't need to be changed, 1 if spd has been
  *      changed.  -EOPNOTSUPP if SCR registers are inaccessible.
  */
-static int ata_set_sata_spd(struct ata_port *ap)
+int ata_set_sata_spd(struct ata_port *ap)
 {
         u32 scontrol;
 
@@ -2246,8 +2248,10 @@ static unsigned int ata_bus_softreset(struct ata_port *ap,
          * the bus shows 0xFF because the odd clown forgets the D7
          * pulldown resistor.
          */
-        if (ata_check_status(ap) == 0xFF)
+        if (ata_check_status(ap) == 0xFF) {
+                printk(KERN_ERR "ata%u: SRST failed (status 0xFF)\n", ap->id);
                 return AC_ERR_OTHER;
+        }
 
         ata_bus_post_reset(ap, devmask);
 
@@ -2383,12 +2387,16 @@ void ata_std_probeinit(struct ata_port *ap)
         if ((ap->flags & ATA_FLAG_SATA) && ap->ops->scr_read) {
                 u32 spd;
 
+                /* set cable type and resume link */
+                ap->cbl = ATA_CBL_SATA;
                 sata_phy_resume(ap);
 
+                /* init sata_spd_limit to the current value */
                 spd = (scr_read(ap, SCR_CONTROL) & 0xf0) >> 4;
                 if (spd)
                         ap->sata_spd_limit &= (1 << spd) - 1;
 
+                /* wait for device */
                 if (sata_dev_present(ap))
                         ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
         }
@@ -2397,7 +2405,6 @@ void ata_std_probeinit(struct ata_port *ap)
 /**
  *      ata_std_softreset - reset host port via ATA SRST
  *      @ap: port to reset
- *      @verbose: fail verbosely
  *      @classes: resulting classes of attached devices
  *
  *      Reset host port using ATA SRST.  This function is to be used
@@ -2409,7 +2416,7 @@ void ata_std_probeinit(struct ata_port *ap)
  *      RETURNS:
  *      0 on success, -errno otherwise.
  */
-int ata_std_softreset(struct ata_port *ap, int verbose, unsigned int *classes)
+int ata_std_softreset(struct ata_port *ap, unsigned int *classes)
 {
         unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS;
         unsigned int devmask = 0, err_mask;
@@ -2435,12 +2442,8 @@ int ata_std_softreset(struct ata_port *ap, int verbose, unsigned int *classes)
         DPRINTK("about to softreset, devmask=%x\n", devmask);
         err_mask = ata_bus_softreset(ap, devmask);
         if (err_mask) {
-                if (verbose)
-                        printk(KERN_ERR "ata%u: SRST failed (err_mask=0x%x)\n",
-                               ap->id, err_mask);
-                else
-                        DPRINTK("EXIT, softreset failed (err_mask=0x%x)\n",
-                                err_mask);
+                printk(KERN_ERR "ata%u: SRST failed (err_mask=0x%x)\n",
+                       ap->id, err_mask);
                 return -EIO;
         }
 
@@ -2457,7 +2460,6 @@ int ata_std_softreset(struct ata_port *ap, int verbose, unsigned int *classes)
 /**
  *      sata_std_hardreset - reset host port via SATA phy reset
  *      @ap: port to reset
- *      @verbose: fail verbosely
  *      @class: resulting class of attached device
  *
  *      SATA phy-reset host port using DET bits of SControl register.
@@ -2470,7 +2472,7 @@ int ata_std_softreset(struct ata_port *ap, int verbose, unsigned int *classes)
  *      RETURNS:
  *      0 on success, -errno otherwise.
  */
-int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class)
+int sata_std_hardreset(struct ata_port *ap, unsigned int *class)
 {
         u32 scontrol;
 
@@ -2510,11 +2512,8 @@ int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class)
         }
 
         if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
-                if (verbose)
-                        printk(KERN_ERR "ata%u: COMRESET failed "
-                               "(device not ready)\n", ap->id);
-                else
-                        DPRINTK("EXIT, device not ready\n");
+                printk(KERN_ERR
+                       "ata%u: COMRESET failed (device not ready)\n", ap->id);
                 return -EIO;
         }
 
@@ -2545,10 +2544,6 @@ void ata_std_postreset(struct ata_port *ap, unsigned int *classes)
 {
         DPRINTK("ENTER\n");
 
-        /* set cable type if it isn't already set */
-        if (ap->cbl == ATA_CBL_NONE && ap->flags & ATA_FLAG_SATA)
-                ap->cbl = ATA_CBL_SATA;
-
         /* print link status */
         if (ap->cbl == ATA_CBL_SATA)
                 sata_print_link_status(ap);
@@ -2598,7 +2593,7 @@ int ata_std_probe_reset(struct ata_port *ap, unsigned int *classes)
         ata_reset_fn_t hardreset;
 
         hardreset = NULL;
-        if (ap->flags & ATA_FLAG_SATA && ap->ops->scr_read)
+        if (ap->cbl == ATA_CBL_SATA && ap->ops->scr_read)
                 hardreset = sata_std_hardreset;
 
         return ata_drive_probe_reset(ap, ata_std_probeinit,
@@ -2606,16 +2601,15 @@ int ata_std_probe_reset(struct ata_port *ap, unsigned int *classes)
                                      ata_std_postreset, classes);
 }
 
-int ata_do_reset(struct ata_port *ap,
-                 ata_reset_fn_t reset, ata_postreset_fn_t postreset,
-                 int verbose, unsigned int *classes)
+int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset,
+                 ata_postreset_fn_t postreset, unsigned int *classes)
 {
         int i, rc;
 
         for (i = 0; i < ATA_MAX_DEVICES; i++)
                 classes[i] = ATA_DEV_UNKNOWN;
 
-        rc = reset(ap, verbose, classes);
+        rc = reset(ap, classes);
         if (rc)
                 return rc;
 
@@ -2659,8 +2653,6 @@ int ata_do_reset(struct ata_port *ap,
  *      - If classification is supported, fill classes[] with
  *        recognized class codes.
  *      - If classification is not supported, leave classes[] alone.
- *      - If verbose is non-zero, print error message on failure;
- *        otherwise, shut up.
  *
  *      LOCKING:
  *      Kernel thread context (may sleep)
@@ -2680,7 +2672,7 @@ int ata_drive_probe_reset(struct ata_port *ap, ata_probeinit_fn_t probeinit,
                 probeinit(ap);
 
         if (softreset && !ata_set_sata_spd_needed(ap)) {
-                rc = ata_do_reset(ap, softreset, postreset, 0, classes);
+                rc = ata_do_reset(ap, softreset, postreset, classes);
                 if (rc == 0 && classes[0] != ATA_DEV_UNKNOWN)
                         goto done;
                 printk(KERN_INFO "ata%u: softreset failed, will try "
@@ -2692,7 +2684,7 @@ int ata_drive_probe_reset(struct ata_port *ap, ata_probeinit_fn_t probeinit,
                 goto done;
 
         while (1) {
-                rc = ata_do_reset(ap, hardreset, postreset, 0, classes);
+                rc = ata_do_reset(ap, hardreset, postreset, classes);
                 if (rc == 0) {
                         if (classes[0] != ATA_DEV_UNKNOWN)
                                 goto done;
@@ -2713,7 +2705,7 @@ int ata_drive_probe_reset(struct ata_port *ap, ata_probeinit_fn_t probeinit,
                        ap->id);
                 ssleep(5);
 
-                rc = ata_do_reset(ap, softreset, postreset, 0, classes);
+                rc = ata_do_reset(ap, softreset, postreset, classes);
         }
 
  done:
@@ -4846,7 +4838,7 @@ static struct ata_port * ata_host_add(const struct ata_probe_ent *ent,
 
         host->transportt = &ata_scsi_transport_template;
 
-        ap = (struct ata_port *) &host->hostdata[0];
+        ap = ata_shost_to_port(host);
 
         ata_host_init(ap, host, host_set, ent, port_no);
 
@@ -5059,7 +5051,7 @@ void ata_host_set_remove(struct ata_host_set *host_set)
 
 int ata_scsi_release(struct Scsi_Host *host)
 {
-        struct ata_port *ap = (struct ata_port *) &host->hostdata[0];
+        struct ata_port *ap = ata_shost_to_port(host);
         int i;
 
         DPRINTK("ENTER\n");
@@ -5226,6 +5218,52 @@ int ata_ratelimit(void)
         return rc;
 }
 
+/**
+ *      ata_wait_register - wait until register value changes
+ *      @reg: IO-mapped register
+ *      @mask: Mask to apply to read register value
+ *      @val: Wait condition
+ *      @interval_msec: polling interval in milliseconds
+ *      @timeout_msec: timeout in milliseconds
+ *
+ *      Waiting for some bits of register to change is a common
+ *      operation for ATA controllers.  This function reads 32bit LE
+ *      IO-mapped register @reg and tests for the following condition.
+ *
+ *      (*@reg & mask) != val
+ *
+ *      If the condition is met, it returns; otherwise, the process is
+ *      repeated after @interval_msec until timeout.
+ *
+ *      LOCKING:
+ *      Kernel thread context (may sleep)
+ *
+ *      RETURNS:
+ *      The final register value.
+ */
+u32 ata_wait_register(void __iomem *reg, u32 mask, u32 val,
+                      unsigned long interval_msec,
+                      unsigned long timeout_msec)
+{
+        unsigned long timeout;
+        u32 tmp;
+
+        tmp = ioread32(reg);
+
+        /* Calculate timeout _after_ the first read to make sure
+         * preceding writes reach the controller before starting to
+         * eat away the timeout.
+         */
+        timeout = jiffies + (timeout_msec * HZ) / 1000;
+
+        while ((tmp & mask) == val && time_before(jiffies, timeout)) {
+                msleep(interval_msec);
+                tmp = ioread32(reg);
+        }
+
+        return tmp;
+}
+
 /*
  * libata is essentially a library of internal helper functions for
  * low-level ATA host controller drivers.  As such, the API/ABI is
@@ -5262,6 +5300,7 @@ EXPORT_SYMBOL_GPL(ata_bmdma_irq_clear);
 EXPORT_SYMBOL_GPL(ata_bmdma_status);
 EXPORT_SYMBOL_GPL(ata_bmdma_stop);
 EXPORT_SYMBOL_GPL(ata_port_probe);
+EXPORT_SYMBOL_GPL(ata_set_sata_spd);
 EXPORT_SYMBOL_GPL(sata_phy_reset);
 EXPORT_SYMBOL_GPL(__sata_phy_reset);
 EXPORT_SYMBOL_GPL(ata_bus_reset);
@@ -5276,6 +5315,7 @@ EXPORT_SYMBOL_GPL(ata_dev_classify);
 EXPORT_SYMBOL_GPL(ata_dev_pair);
 EXPORT_SYMBOL_GPL(ata_port_disable);
 EXPORT_SYMBOL_GPL(ata_ratelimit);
+EXPORT_SYMBOL_GPL(ata_wait_register);
 EXPORT_SYMBOL_GPL(ata_busy_sleep);
 EXPORT_SYMBOL_GPL(ata_port_queue_task);
 EXPORT_SYMBOL_GPL(ata_scsi_ioctl);
diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c
index 9a8eea11b0be..16db62211716 100644
--- a/drivers/scsi/libata-eh.c
+++ b/drivers/scsi/libata-eh.c
@@ -64,7 +64,7 @@
 enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd)
 {
         struct Scsi_Host *host = cmd->device->host;
-        struct ata_port *ap = (struct ata_port *) &host->hostdata[0];
+        struct ata_port *ap = ata_shost_to_port(host);
         unsigned long flags;
         struct ata_queued_cmd *qc;
         enum scsi_eh_timer_return ret = EH_HANDLED;
@@ -97,9 +97,9 @@ enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd)
  *      RETURNS:
  *      Zero.
  */
-int ata_scsi_error(struct Scsi_Host *host)
+void ata_scsi_error(struct Scsi_Host *host)
 {
-        struct ata_port *ap = (struct ata_port *)&host->hostdata[0];
+        struct ata_port *ap = ata_shost_to_port(host);
 
         DPRINTK("ENTER\n");
 
@@ -116,7 +116,6 @@ int ata_scsi_error(struct Scsi_Host *host)
         scsi_eh_flush_done_q(&ap->eh_done_q);
 
         DPRINTK("EXIT\n");
-        return 0;
 }
 
 /**
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index c9c001490293..9871f8272df0 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -98,6 +98,7 @@ static const u8 def_control_mpage[CONTROL_MPAGE_LEN] = {
  * It just needs the eh_timed_out hook.
  */
 struct scsi_transport_template ata_scsi_transport_template = {
+        .eh_strategy_handler    = ata_scsi_error,
         .eh_timed_out           = ata_scsi_timed_out,
 };
 
@@ -394,7 +395,7 @@ void ata_dump_status(unsigned id, struct ata_taskfile *tf)
 
 int ata_scsi_device_resume(struct scsi_device *sdev)
 {
-        struct ata_port *ap = (struct ata_port *) &sdev->host->hostdata[0];
+        struct ata_port *ap = ata_shost_to_port(sdev->host);
         struct ata_device *dev = &ap->device[sdev->id];
 
         return ata_device_resume(ap, dev);
@@ -402,7 +403,7 @@ int ata_scsi_device_resume(struct scsi_device *sdev)
 
 int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state)
 {
-        struct ata_port *ap = (struct ata_port *) &sdev->host->hostdata[0];
+        struct ata_port *ap = ata_shost_to_port(sdev->host);
         struct ata_device *dev = &ap->device[sdev->id];
 
         return ata_device_suspend(ap, dev, state);
@@ -703,7 +704,7 @@ int ata_scsi_slave_config(struct scsi_device *sdev)
                 struct ata_port *ap;
                 struct ata_device *dev;
 
-                ap = (struct ata_port *) &sdev->host->hostdata[0];
+                ap = ata_shost_to_port(sdev->host);
                 dev = &ap->device[sdev->id];
 
                 ata_scsi_dev_config(sdev, dev);
@@ -2477,7 +2478,7 @@ int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
         struct scsi_device *scsidev = cmd->device;
         struct Scsi_Host *shost = scsidev->host;
 
-        ap = (struct ata_port *) &shost->hostdata[0];
+        ap = ata_shost_to_port(shost);
 
         spin_unlock(shost->host_lock);
         spin_lock(&ap->host_set->lock);
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index 652c08e3808e..3f8b0a863781 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -56,10 +56,8 @@ extern int ata_set_sata_spd_needed(struct ata_port *ap);
 extern int ata_down_xfermask_limit(struct ata_port *ap, struct ata_device *dev,
                                    int force_pio0);
 extern int ata_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev);
-extern int ata_do_reset(struct ata_port *ap,
-                        ata_reset_fn_t reset,
-                        ata_postreset_fn_t postreset,
-                        int verbose, unsigned int *classes);
+extern int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset,
+                        ata_postreset_fn_t postreset, unsigned int *classes);
 extern void ata_qc_free(struct ata_queued_cmd *qc);
 extern void ata_qc_issue(struct ata_queued_cmd *qc);
 extern int ata_check_atapi_dma(struct ata_queued_cmd *qc);
@@ -105,5 +103,6 @@ extern void ata_scsi_rbuf_fill(struct ata_scsi_args *args,
 
 /* libata-eh.c */
 extern enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd);
+extern void ata_scsi_error(struct Scsi_Host *host);
 
 #endif /* __LIBATA_H__ */
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c
index 1fca6f1afa99..a341fa8d3291 100644
--- a/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@ -143,7 +143,6 @@ static struct scsi_host_template adma_ata_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = LIBATA_MAX_PRD,
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index fd9f2173f062..08665ea1e94e 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -378,7 +378,6 @@ static struct scsi_host_template mv_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = MV_USE_Q_DEPTH,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = MV_MAX_SG_CT / 2,
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 3a0004c3c8b5..70c51088d371 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -201,7 +201,6 @@ static struct scsi_host_template nv_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = LIBATA_MAX_PRD,
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index 03c647cbfb59..aaf896a0c63a 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -112,7 +112,6 @@ static struct scsi_host_template pdc_ata_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = LIBATA_MAX_PRD,
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index 1b7a9316810c..54283e06070e 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -132,7 +132,6 @@ static struct scsi_host_template qs_ata_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = QS_MAX_PRD,
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index f29c3e733a00..c9333577330e 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -146,7 +146,6 @@ static struct scsi_host_template sil_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = LIBATA_MAX_PRD,
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index 646756abb10e..e9fd869140c5 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -86,6 +86,13 @@ enum {
         /* HOST_SLOT_STAT bits */
         HOST_SSTAT_ATTN         = (1 << 31),
 
+        /* HOST_CTRL bits */
+        HOST_CTRL_M66EN         = (1 << 16), /* M66EN PCI bus signal */
+        HOST_CTRL_TRDY          = (1 << 17), /* latched PCI TRDY */
+        HOST_CTRL_STOP          = (1 << 18), /* latched PCI STOP */
+        HOST_CTRL_DEVSEL        = (1 << 19), /* latched PCI DEVSEL */
+        HOST_CTRL_REQ64         = (1 << 20), /* latched PCI REQ64 */
+
         /*
          * Port registers
          * (8192 bytes @ +0x0000, +0x2000, +0x4000 and +0x6000 @ BAR2)
@@ -142,8 +149,12 @@ enum {
         PORT_IRQ_PWR_CHG        = (1 << 3), /* power management change */
         PORT_IRQ_PHYRDY_CHG     = (1 << 4), /* PHY ready change */
         PORT_IRQ_COMWAKE        = (1 << 5), /* COMWAKE received */
-        PORT_IRQ_UNK_FIS        = (1 << 6), /* Unknown FIS received */
-        PORT_IRQ_SDB_FIS        = (1 << 11), /* SDB FIS received */
+        PORT_IRQ_UNK_FIS        = (1 << 6), /* unknown FIS received */
+        PORT_IRQ_DEV_XCHG       = (1 << 7), /* device exchanged */
+        PORT_IRQ_8B10B          = (1 << 8), /* 8b/10b decode error threshold */
+        PORT_IRQ_CRC            = (1 << 9), /* CRC error threshold */
+        PORT_IRQ_HANDSHAKE      = (1 << 10), /* handshake error threshold */
+        PORT_IRQ_SDB_NOTIFY     = (1 << 11), /* SDB notify received */
 
         /* bits[27:16] are unmasked (raw) */
         PORT_IRQ_RAW_SHIFT      = 16,
@@ -174,7 +185,7 @@ enum {
         PORT_CERR_CMD_PCIPERR   = 27, /* ctrl[15:13] 110 - PCI parity err while fetching PRB */
         PORT_CERR_XFR_UNDEF     = 32, /* PSD ecode 00 - undefined */
         PORT_CERR_XFR_TGTABRT   = 33, /* PSD ecode 01 - target abort */
-        PORT_CERR_XFR_MSGABRT   = 34, /* PSD ecode 10 - master abort */
+        PORT_CERR_XFR_MSTABRT   = 34, /* PSD ecode 10 - master abort */
         PORT_CERR_XFR_PCIPERR   = 35, /* PSD ecode 11 - PCI prity err during transfer */
         PORT_CERR_SENDSERVICE   = 36, /* FIS received while sending service */
 
@@ -207,6 +218,11 @@ enum {
         BID_SIL3132             = 1,
         BID_SIL3131             = 2,
 
+        /* host flags */
+        SIL24_COMMON_FLAGS      = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                                  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA,
+        SIL24_FLAG_PCIX_IRQ_WOC = (1 << 24), /* IRQ loss errata on PCI-X */
+
         IRQ_STAT_4PORTS         = 0xf,
 };
 
@@ -281,7 +297,6 @@ static struct scsi_host_template sil24_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = LIBATA_MAX_PRD,
@@ -334,9 +349,8 @@ static struct ata_port_info sil24_port_info[] = {
         /* sil_3124 */
         {
                 .sht            = &sil24_sht,
-                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
-                                  SIL24_NPORTS2FLAG(4),
+                .host_flags     = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(4) |
+                                  SIL24_FLAG_PCIX_IRQ_WOC,
                 .pio_mask       = 0x1f,                 /* pio0-4 */
                 .mwdma_mask     = 0x07,                 /* mwdma0-2 */
                 .udma_mask      = 0x3f,                 /* udma0-5 */
@@ -345,9 +359,7 @@ static struct ata_port_info sil24_port_info[] = {
         /* sil_3132 */
         {
                 .sht            = &sil24_sht,
-                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
-                                  SIL24_NPORTS2FLAG(2),
+                .host_flags     = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(2),
                 .pio_mask       = 0x1f,                 /* pio0-4 */
                 .mwdma_mask     = 0x07,                 /* mwdma0-2 */
                 .udma_mask      = 0x3f,                 /* udma0-5 */
@@ -356,9 +368,7 @@ static struct ata_port_info sil24_port_info[] = {
         /* sil_3131/sil_3531 */
         {
                 .sht            = &sil24_sht,
-                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
-                                  SIL24_NPORTS2FLAG(1),
+                .host_flags     = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(1),
                 .pio_mask       = 0x1f,                 /* pio0-4 */
                 .mwdma_mask     = 0x07,                 /* mwdma0-2 */
                 .udma_mask      = 0x3f,                 /* udma0-5 */
@@ -427,15 +437,30 @@ static void sil24_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
         *tf = pp->tf;
 }
 
-static int sil24_softreset(struct ata_port *ap, int verbose,
-                           unsigned int *class)
+static int sil24_init_port(struct ata_port *ap)
+{
+        void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr;
+        u32 tmp;
+
+        writel(PORT_CS_INIT, port + PORT_CTRL_STAT);
+        ata_wait_register(port + PORT_CTRL_STAT,
+                          PORT_CS_INIT, PORT_CS_INIT, 10, 100);
+        tmp = ata_wait_register(port + PORT_CTRL_STAT,
+                                PORT_CS_RDY, 0, 10, 100);
+
+        if ((tmp & (PORT_CS_INIT | PORT_CS_RDY)) != PORT_CS_RDY)
+                return -EIO;
+        return 0;
+}
+
+static int sil24_softreset(struct ata_port *ap, unsigned int *class)
 {
         void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr;
         struct sil24_port_priv *pp = ap->private_data;
         struct sil24_prb *prb = &pp->cmd_block[0].ata.prb;
         dma_addr_t paddr = pp->cmd_block_dma;
-        unsigned long timeout = jiffies + ATA_TMOUT_BOOT * HZ;
-        u32 irq_enable, irq_stat;
+        u32 mask, irq_enable, irq_stat;
+        const char *reason;
 
         DPRINTK("ENTER\n");
 
@@ -449,34 +474,35 @@ static int sil24_softreset(struct ata_port *ap, int verbose,
         irq_enable = readl(port + PORT_IRQ_ENABLE_SET);
         writel(irq_enable, port + PORT_IRQ_ENABLE_CLR);
 
-        /*
-         * XXX: Not sure whether the following sleep is needed or not.
-         * The original driver had it.  So....
-         */
-        msleep(10);
+        /* put the port into known state */
+        if (sil24_init_port(ap)) {
+                reason ="port not ready";
+                goto err;
+        }
 
-        prb->ctrl = PRB_CTRL_SRST;
+        /* do SRST */
+        prb->ctrl = cpu_to_le16(PRB_CTRL_SRST);
         prb->fis[1] = 0; /* no PM yet */
 
         writel((u32)paddr, port + PORT_CMD_ACTIVATE);
+        writel((u64)paddr >> 32, port + PORT_CMD_ACTIVATE + 4);
 
-        do {
-                irq_stat = readl(port + PORT_IRQ_STAT);
-                writel(irq_stat, port + PORT_IRQ_STAT);         /* clear irq */
-
-                irq_stat >>= PORT_IRQ_RAW_SHIFT;
-                if (irq_stat & (PORT_IRQ_COMPLETE | PORT_IRQ_ERROR))
-                        break;
+        mask = (PORT_IRQ_COMPLETE | PORT_IRQ_ERROR) << PORT_IRQ_RAW_SHIFT;
+        irq_stat = ata_wait_register(port + PORT_IRQ_STAT, mask, 0x0,
+                                     100, ATA_TMOUT_BOOT / HZ * 1000);
 
-                msleep(100);
-        } while (time_before(jiffies, timeout));
+        writel(irq_stat, port + PORT_IRQ_STAT); /* clear IRQs */
+        irq_stat >>= PORT_IRQ_RAW_SHIFT;
 
         /* restore IRQs */
         writel(irq_enable, port + PORT_IRQ_ENABLE_SET);
 
         if (!(irq_stat & PORT_IRQ_COMPLETE)) {
-                DPRINTK("EXIT, srst failed\n");
-                return -EIO;
+                if (irq_stat & PORT_IRQ_ERROR)
+                        reason = "SRST command error";
+                else
+                        reason = "timeout";
+                goto err;
         }
 
         sil24_update_tf(ap);
@@ -488,15 +514,55 @@ static int sil24_softreset(struct ata_port *ap, int verbose,
  out:
         DPRINTK("EXIT, class=%u\n", *class);
         return 0;
+
+ err:
+        printk(KERN_ERR "ata%u: softreset failed (%s)\n", ap->id, reason);
+        return -EIO;
 }
 
-static int sil24_hardreset(struct ata_port *ap, int verbose,
-                           unsigned int *class)
+static int sil24_hardreset(struct ata_port *ap, unsigned int *class)
 {
-        unsigned int dummy_class;
+        void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr;
+        const char *reason;
+        int tout_msec;
+        u32 tmp;
+
+        /* sil24 does the right thing(tm) without any protection */
+        ata_set_sata_spd(ap);
+
+        tout_msec = 100;
+        if (sata_dev_present(ap))
+                tout_msec = 5000;
 
-        /* sil24 doesn't report device signature after hard reset */
-        return sata_std_hardreset(ap, verbose, &dummy_class);
+        writel(PORT_CS_DEV_RST, port + PORT_CTRL_STAT);
+        tmp = ata_wait_register(port + PORT_CTRL_STAT,
+                                PORT_CS_DEV_RST, PORT_CS_DEV_RST, 10, tout_msec);
+
+        /* SStatus oscillates between zero and valid status for short
+         * duration after DEV_RST, give it time to settle.
+         */
+        msleep(100);
+
+        if (tmp & PORT_CS_DEV_RST) {
+                if (!sata_dev_present(ap))
+                        return 0;
+                reason = "link not ready";
+                goto err;
+        }
+
+        if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
+                reason = "device not ready";
+                goto err;
+        }
+
+        /* sil24 doesn't report device class code after hardreset,
+         * leave *class alone.
+         */
+        return 0;
+
+ err:
+        printk(KERN_ERR "ata%u: hardreset failed (%s)\n", ap->id, reason);
+        return -EIO;
 }
 
 static int sil24_probe_reset(struct ata_port *ap, unsigned int *classes)
@@ -532,6 +598,7 @@ static void sil24_qc_prep(struct ata_queued_cmd *qc)
         union sil24_cmd_block *cb = pp->cmd_block + qc->tag;
         struct sil24_prb *prb;
         struct sil24_sge *sge;
+        u16 ctrl = 0;
 
         switch (qc->tf.protocol) {
         case ATA_PROT_PIO:
@@ -539,7 +606,6 @@ static void sil24_qc_prep(struct ata_queued_cmd *qc)
         case ATA_PROT_NODATA:
                 prb = &cb->ata.prb;
                 sge = cb->ata.sge;
-                prb->ctrl = 0;
                 break;
 
         case ATA_PROT_ATAPI:
@@ -552,12 +618,10 @@ static void sil24_qc_prep(struct ata_queued_cmd *qc)
 
                 if (qc->tf.protocol != ATA_PROT_ATAPI_NODATA) {
                         if (qc->tf.flags & ATA_TFLAG_WRITE)
-                                prb->ctrl = PRB_CTRL_PACKET_WRITE;
+                                ctrl = PRB_CTRL_PACKET_WRITE;
                         else
-                                prb->ctrl = PRB_CTRL_PACKET_READ;
-                } else
-                        prb->ctrl = 0;
-
+                                ctrl = PRB_CTRL_PACKET_READ;
+                }
                 break;
 
         default:
@@ -566,6 +630,7 @@ static void sil24_qc_prep(struct ata_queued_cmd *qc)
                 BUG();
         }
 
+        prb->ctrl = cpu_to_le16(ctrl);
         ata_tf_to_fis(&qc->tf, prb->fis, 0);
 
         if (qc->flags & ATA_QCFLAG_DMAMAP)
@@ -580,6 +645,8 @@ static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc)
         dma_addr_t paddr = pp->cmd_block_dma + qc->tag * sizeof(*pp->cmd_block);
 
         writel((u32)paddr, port + PORT_CMD_ACTIVATE);
+        writel((u64)paddr >> 32, port + PORT_CMD_ACTIVATE + 4);
+
         return 0;
 }
 
@@ -728,6 +795,10 @@ static inline void sil24_host_intr(struct ata_port *ap)
         slot_stat = readl(port + PORT_SLOT_STAT);
         if (!(slot_stat & HOST_SSTAT_ATTN)) {
                 struct sil24_port_priv *pp = ap->private_data;
+
+                if (ap->flags & SIL24_FLAG_PCIX_IRQ_WOC)
+                        writel(PORT_IRQ_COMPLETE, port + PORT_IRQ_STAT);
+
                 /*
                  * !HOST_SSAT_ATTN guarantees successful completion,
                  * so reading back tf registers is unnecessary for
@@ -859,6 +930,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         void __iomem *host_base = NULL;
         void __iomem *port_base = NULL;
         int i, rc;
+        u32 tmp;
 
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
@@ -911,35 +983,51 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         /*
          * Configure the device
          */
-        /*
-         * FIXME: This device is certainly 64-bit capable.  We just
-         * don't know how to use it.  After fixing 32bit activation in
-         * this function, enable 64bit masks here.
-         */
-        rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
-        if (rc) {
-                dev_printk(KERN_ERR, &pdev->dev,
-                           "32-bit DMA enable failed\n");
-                goto out_free;
-        }
-        rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
-        if (rc) {
-                dev_printk(KERN_ERR, &pdev->dev,
-                           "32-bit consistent DMA enable failed\n");
-                goto out_free;
+        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+                rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+                if (rc) {
+                        rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                        if (rc) {
+                                dev_printk(KERN_ERR, &pdev->dev,
+                                           "64-bit DMA enable failed\n");
+                                goto out_free;
+                        }
+                }
+        } else {
+                rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                if (rc) {
+                        dev_printk(KERN_ERR, &pdev->dev,
+                                   "32-bit DMA enable failed\n");
+                        goto out_free;
+                }
+                rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                if (rc) {
+                        dev_printk(KERN_ERR, &pdev->dev,
+                                   "32-bit consistent DMA enable failed\n");
+                        goto out_free;
+                }
         }
 
         /* GPIO off */
         writel(0, host_base + HOST_FLASH_CMD);
 
-        /* Mask interrupts during initialization */
+        /* Apply workaround for completion IRQ loss on PCI-X errata */
+        if (probe_ent->host_flags & SIL24_FLAG_PCIX_IRQ_WOC) {
+                tmp = readl(host_base + HOST_CTRL);
+                if (tmp & (HOST_CTRL_TRDY | HOST_CTRL_STOP | HOST_CTRL_DEVSEL))
+                        dev_printk(KERN_INFO, &pdev->dev,
+                                   "Applying completion IRQ loss on PCI-X "
+                                   "errata fix\n");
+                else
+                        probe_ent->host_flags &= ~SIL24_FLAG_PCIX_IRQ_WOC;
+        }
+
+        /* clear global reset & mask interrupts during initialization */
         writel(0, host_base + HOST_CTRL);
 
         for (i = 0; i < probe_ent->n_ports; i++) {
                 void __iomem *port = port_base + i * PORT_REGS_SIZE;
                 unsigned long portu = (unsigned long)port;
-                u32 tmp;
-                int cnt;
 
                 probe_ent->port[i].cmd_addr = portu + PORT_PRB;
                 probe_ent->port[i].scr_addr = portu + PORT_SCONTROL;
@@ -953,18 +1041,20 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 tmp = readl(port + PORT_CTRL_STAT);
                 if (tmp & PORT_CS_PORT_RST) {
                         writel(PORT_CS_PORT_RST, port + PORT_CTRL_CLR);
-                        readl(port + PORT_CTRL_STAT);   /* sync */
-                        for (cnt = 0; cnt < 10; cnt++) {
-                                msleep(10);
-                                tmp = readl(port + PORT_CTRL_STAT);
-                                if (!(tmp & PORT_CS_PORT_RST))
-                                        break;
-                        }
+                        tmp = ata_wait_register(port + PORT_CTRL_STAT,
+                                                PORT_CS_PORT_RST,
+                                                PORT_CS_PORT_RST, 10, 100);
                         if (tmp & PORT_CS_PORT_RST)
                                 dev_printk(KERN_ERR, &pdev->dev,
                                            "failed to clear port RST\n");
                 }
 
+                /* Configure IRQ WoC */
+                if (probe_ent->host_flags & SIL24_FLAG_PCIX_IRQ_WOC)
+                        writel(PORT_CS_IRQ_WOC, port + PORT_CTRL_STAT);
+                else
+                        writel(PORT_CS_IRQ_WOC, port + PORT_CTRL_CLR);
+
                 /* Zero error counters. */
                 writel(0x8000, port + PORT_DECODE_ERR_THRESH);
                 writel(0x8000, port + PORT_CRC_ERR_THRESH);
@@ -973,14 +1063,13 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 writel(0x0000, port + PORT_CRC_ERR_CNT);
                 writel(0x0000, port + PORT_HSHK_ERR_CNT);
 
-                /* FIXME: 32bit activation? */
-                writel(0, port + PORT_ACTIVATE_UPPER_ADDR);
-                writel(PORT_CS_32BIT_ACTV, port + PORT_CTRL_STAT);
+                /* Always use 64bit activation */
+                writel(PORT_CS_32BIT_ACTV, port + PORT_CTRL_CLR);
 
                 /* Configure interrupts */
                 writel(0xffff, port + PORT_IRQ_ENABLE_CLR);
-                writel(PORT_IRQ_COMPLETE | PORT_IRQ_ERROR | PORT_IRQ_SDB_FIS,
-                       port + PORT_IRQ_ENABLE_SET);
+                writel(PORT_IRQ_COMPLETE | PORT_IRQ_ERROR |
+                       PORT_IRQ_SDB_NOTIFY, port + PORT_IRQ_ENABLE_SET);
 
                 /* Clear interrupts */
                 writel(0x0fff0fff, port + PORT_IRQ_STAT);
@@ -988,11 +1077,6 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
                 /* Clear port multiplier enable and resume bits */
                 writel(PORT_CS_PM_EN | PORT_CS_RESUME, port + PORT_CTRL_CLR);
-
-                /* Reset itself */
-                if (__sil24_reset_controller(port))
-                        dev_printk(KERN_ERR, &pdev->dev,
-                                   "failed to reset controller\n");
         }
 
         /* Turn on interrupts */
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
index eb3cf5b534dc..3097821688dc 100644
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -87,7 +87,6 @@ static struct scsi_host_template sis_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = ATA_MAX_PRD,
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index a20bc8154753..d5eb5375e265 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -257,7 +257,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
         int len, index;
 
         /* Find  the ata_port */
-        ap = (struct ata_port *) &shost->hostdata[0];
+        ap = ata_shost_to_port(shost);
         if (ap == NULL)
                 return 0;
 
@@ -290,7 +290,6 @@ static struct scsi_host_template k2_sata_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = LIBATA_MAX_PRD,
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index 13dba63f6167..4c07ba1f6e62 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -182,7 +182,6 @@ static struct scsi_host_template pdc_sata_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = LIBATA_MAX_PRD,
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index 513dd78ea6fe..15f81bfc30f0 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -81,7 +81,6 @@ static struct scsi_host_template uli_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = LIBATA_MAX_PRD,
diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c
index de4e0eb224bb..17aefab5f42f 100644
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
@@ -94,7 +94,6 @@ static struct scsi_host_template svia_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = LIBATA_MAX_PRD,
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index b7d6a31628c2..0372be7ff1c9 100644
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -270,7 +270,6 @@ static struct scsi_host_template vsc_sata_sht = {
         .name                   = DRV_NAME,
         .ioctl                  = ata_scsi_ioctl,
         .queuecommand           = ata_scsi_queuecmd,
-        .eh_strategy_handler    = ata_scsi_error,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
         .sg_tablesize           = LIBATA_MAX_PRD,
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 5f0fdfb2618c..1c75646f9689 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1537,8 +1537,8 @@ int scsi_error_handler(void *data)
                  * what we need to do to get it up and online again (if we can).
                  * If we fail, we end up taking the thing offline.
                  */
-                if (shost->hostt->eh_strategy_handler) 
-                        shost->hostt->eh_strategy_handler(shost);
+                if (shost->transportt->eh_strategy_handler)
+                        shost->transportt->eh_strategy_handler(shost);
                 else
                         scsi_unjam_host(shost);
 
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c
index 93449a1a0065..0b49ff78efc1 100644
--- a/drivers/sn/ioc3.c
+++ b/drivers/sn/ioc3.c
@@ -11,6 +11,7 @@
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
 #include <linux/delay.h>
@@ -619,9 +620,9 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
         pci_set_master(pdev);
 
 #ifdef USE_64BIT_DMA
-        ret = pci_set_dma_mask(pdev, 0xffffffffffffffffULL);
+        ret = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
         if (!ret) {
-                ret = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);
+                ret = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
                 if (ret < 0) {
                         printk(KERN_WARNING "%s: Unable to obtain 64 bit DMA "
                                "for consistent allocations\n",
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 495db5755df9..5cf2b80add7a 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -28,6 +28,7 @@
   2005-09-10  v0.4.3 added HUAWEI E600 card and Audiovox AirCard
   2005-09-20  v0.4.4 increased recv buffer size: the card sometimes
                      wants to send >2000 bytes.
+  2006-04-10  v0.4.2 fixed two array overrun errors :-/
 
   Work sponsored by: Sigos GmbH, Germany <info@sigos.de>
 
@@ -582,14 +583,14 @@ static void option_setup_urbs(struct usb_serial *serial)
         portdata = usb_get_serial_port_data(port);
 
         /* Do indat endpoints first */
-        for (j = 0; j <= N_IN_URB; ++j) {
+        for (j = 0; j < N_IN_URB; ++j) {
                 portdata->in_urbs[j] = option_setup_urb (serial,
                   port->bulk_in_endpointAddress, USB_DIR_IN, port,
                   portdata->in_buffer[j], IN_BUFLEN, option_indat_callback);
         }
 
         /* outdat endpoints */
-        for (j = 0; j <= N_OUT_URB; ++j) {
+        for (j = 0; j < N_OUT_URB; ++j) {
                 portdata->out_urbs[j] = option_setup_urb (serial,
                   port->bulk_out_endpointAddress, USB_DIR_OUT, port,
                   portdata->out_buffer[j], OUT_BUFLEN, option_outdat_callback);
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index f87c0171f4ec..9060e7137441 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -961,7 +961,7 @@ config FB_ATY128
 
 config FB_ATY
         tristate "ATI Mach64 display support" if PCI || ATARI
-        depends on FB
+        depends on FB && !SPARC32
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index b39e72d5413b..d9d7d3c4cae2 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -3400,7 +3400,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi
         struct atyfb_par *par;
         int i, rc = -ENOMEM;
 
-        for (i = ARRAY_SIZE(aty_chips); i >= 0; i--)
+        for (i = ARRAY_SIZE(aty_chips) - 1; i >= 0; i--)
                 if (pdev->device == aty_chips[i].pci_id)
                         break;
 
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 944855b3e4af..8d8eadb64853 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -435,6 +435,11 @@ int fb_prepare_logo(struct fb_info *info, int rotate)
                         depth = info->var.green.length;
         }
 
+        if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR) {
+                /* assume console colormap */
+                depth = 4;
+        }
+
         if (depth >= 8) {
                 switch (info->fix.visual) {
                 case FB_VISUAL_TRUECOLOR:
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 8982e540214c..b0b9acfdd430 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -57,7 +57,7 @@ static unsigned short  *pmi_base  = NULL;
 static void            (*pmi_start)(void);
 static void            (*pmi_pal)(void);
 static int             depth;
-
+static int             vga_compat;
 /* --------------------------------------------------------------------- */
 
 static int vesafb_pan_display(struct fb_var_screeninfo *var,
@@ -83,9 +83,10 @@ static int vesafb_pan_display(struct fb_var_screeninfo *var,
 static void vesa_setpalette(int regno, unsigned red, unsigned green,
                             unsigned blue)
 {
+        int shift = 16 - depth;
+
 #ifdef __i386__
         struct { u_char blue, green, red, pad; } entry;
-        int shift = 16 - depth;
 
         if (pmi_setpal) {
                 entry.red   = red   >> shift;
@@ -101,14 +102,20 @@ static void vesa_setpalette(int regno, unsigned red, unsigned green,
                   "d" (regno),          /* EDX */
                   "D" (&entry),         /* EDI */
                   "S" (&pmi_pal));      /* ESI */
-        } else {
-                /* without protected mode interface, try VGA registers... */
+                return;
+        }
+#endif
+
+/*
+ * without protected mode interface and if VGA compatible,
+ * try VGA registers...
+ */
+        if (vga_compat) {
                 outb_p(regno,       dac_reg);
                 outb_p(red   >> shift, dac_val);
                 outb_p(green >> shift, dac_val);
                 outb_p(blue  >> shift, dac_val);
         }
-#endif
 }
 
 static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green,
@@ -214,6 +221,7 @@ static int __init vesafb_probe(struct platform_device *dev)
         if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
                 return -ENODEV;
 
+        vga_compat = (screen_info.capabilities & 2) ? 0 : 1;
         vesafb_fix.smem_start = screen_info.lfb_base;
         vesafb_defined.bits_per_pixel = screen_info.lfb_depth;
         if (15 == vesafb_defined.bits_per_pixel)
@@ -318,6 +326,12 @@ static int __init vesafb_probe(struct platform_device *dev)
                 }
         }
 
+        if (vesafb_defined.bits_per_pixel == 8 && !pmi_setpal && !vga_compat) {
+                printk(KERN_WARNING "vesafb: hardware palette is unchangeable,\n"
+                                    "        colors may be incorrect\n");
+                vesafb_fix.visual = FB_VISUAL_STATIC_PSEUDOCOLOR;
+        }
+
         vesafb_defined.xres_virtual = vesafb_defined.xres;
         vesafb_defined.yres_virtual = vesafb_fix.smem_len / vesafb_fix.line_length;
         if (ypan && vesafb_defined.yres_virtual > vesafb_defined.yres) {
@@ -354,7 +368,8 @@ static int __init vesafb_probe(struct platform_device *dev)
         printk(KERN_INFO "vesafb: %s: "
                "size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n",
                (vesafb_defined.bits_per_pixel > 8) ?
-               "Truecolor" : "Pseudocolor",
+               "Truecolor" : (vga_compat || pmi_setpal) ?
+               "Pseudocolor" : "Static Pseudocolor",
                screen_info.rsvd_size,
                screen_info.red_size,
                screen_info.green_size,
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index b0a0ae509c00..61c599b4a1e3 100644
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -127,12 +127,13 @@ static struct super_block *v9fs_get_sb(struct file_system_type
 
         if ((newfid = v9fs_session_init(v9ses, dev_name, data)) < 0) {
                 dprintk(DEBUG_ERROR, "problem initiating session\n");
-                kfree(v9ses);
-                return ERR_PTR(newfid);
+                sb = ERR_PTR(newfid);
+                goto out_free_session;
         }
 
         sb = sget(fs_type, NULL, v9fs_set_super, v9ses);
-
+        if (IS_ERR(sb))
+                goto out_close_session;
         v9fs_fill_super(sb, v9ses, flags);
 
         inode = v9fs_get_inode(sb, S_IFDIR | mode);
@@ -185,6 +186,12 @@ static struct super_block *v9fs_get_sb(struct file_system_type
 
         return sb;
 
+out_close_session:
+        v9fs_session_close(v9ses);
+out_free_session:
+        kfree(v9ses);
+        return sb;
+
 put_back_sb:
         /* deactivate_super calls v9fs_kill_super which will frees the rest */
         up_write(&sb->s_umount);
diff --git a/fs/Kconfig b/fs/Kconfig
index e207be68d4ca..2524629dc835 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -799,6 +799,7 @@ config PROC_KCORE
 config PROC_VMCORE
         bool "/proc/vmcore support (EXPERIMENTAL)"
         depends on PROC_FS && EXPERIMENTAL && CRASH_DUMP
+        default y
         help
         Exports the dump image of crashed kernel in ELF format.
 
@@ -861,7 +862,7 @@ config RAMFS
 
 config CONFIGFS_FS
         tristate "Userspace-driven configuration filesystem (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        depends on SYSFS && EXPERIMENTAL
         help
           configfs is a ram-based filesystem that provides the converse
           of sysfs's functionality. Where sysfs is a filesystem-based
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 8ed9b06a9828..5638c8f9362f 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -504,7 +504,7 @@ static int populate_groups(struct config_group *group)
         int ret = 0;
         int i;
 
-        if (group && group->default_groups) {
+        if (group->default_groups) {
                 /* FYI, we're faking mkdir here
                  * I'm not sure we need this semaphore, as we're called
                  * from our parent's mkdir.  That holds our parent's
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 242fe1a66ce5..1b4491cdd115 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -599,7 +599,7 @@ sys_epoll_ctl(int epfd, int op, int fd, struct epoll_event __user *event)
         switch (op) {
         case EPOLL_CTL_ADD:
                 if (!epi) {
-                        epds.events |= POLLERR | POLLHUP | POLLRDHUP;
+                        epds.events |= POLLERR | POLLHUP;
 
                         error = ep_insert(ep, &epds, tfile, fd);
                 } else
@@ -613,7 +613,7 @@ sys_epoll_ctl(int epfd, int op, int fd, struct epoll_event __user *event)
                 break;
         case EPOLL_CTL_MOD:
                 if (epi) {
-                        epds.events |= POLLERR | POLLHUP | POLLRDHUP;
+                        epds.events |= POLLERR | POLLHUP;
                         error = ep_modify(ep, epi, &epds);
                 } else
                         error = -ENOENT;
diff --git a/fs/exec.c b/fs/exec.c
index 0291a68a3626..3234a0c32d54 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -678,6 +678,18 @@ static int de_thread(struct task_struct *tsk)
                 while (leader->exit_state != EXIT_ZOMBIE)
                         yield();
 
+                /*
+                 * The only record we have of the real-time age of a
+                 * process, regardless of execs it's done, is start_time.
+                 * All the past CPU time is accumulated in signal_struct
+                 * from sister threads now dead.  But in this non-leader
+                 * exec, nothing survives from the original leader thread,
+                 * whose birth marks the true age of this process now.
+                 * When we take on its identity by switching to its PID, we
+                 * also take its birthdate (always earlier than our own).
+                 */
+                current->start_time = leader->start_time;
+
                 spin_lock(&leader->proc_lock);
                 spin_lock(&current->proc_lock);
                 proc_dentry1 = proc_pid_unhash(current);
@@ -723,7 +735,12 @@ static int de_thread(struct task_struct *tsk)
                 current->parent = current->real_parent = leader->real_parent;
                 leader->parent = leader->real_parent = child_reaper;
                 current->group_leader = current;
-                leader->group_leader = leader;
+                leader->group_leader = current;
+
+                /* Reduce leader to a thread */
+                detach_pid(leader, PIDTYPE_PGID);
+                detach_pid(leader, PIDTYPE_SID);
+                list_del_init(&leader->tasks);
 
                 add_parent(current);
                 add_parent(leader);
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
index 1041dab6de2f..14f5f6ea3e72 100644
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
@@ -974,6 +974,7 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
         if (o_blocks_count != le32_to_cpu(es->s_blocks_count)) {
                 ext3_warning(sb, __FUNCTION__,
                              "multiple resizers run on filesystem!");
+                unlock_super(sb);
                 err = -EBUSY;
                 goto exit_put;
         }
diff --git a/fs/fifo.c b/fs/fifo.c
index 889f722ee36d..49035b174b48 100644
--- a/fs/fifo.c
+++ b/fs/fifo.c
@@ -15,30 +15,35 @@
 #include <linux/fs.h>
 #include <linux/pipe_fs_i.h>
 
-static void wait_for_partner(struct inode* inode, unsigned int* cnt)
+static void wait_for_partner(struct inode* inode, unsigned int *cnt)
 {
         int cur = *cnt; 
-        while(cur == *cnt) {
-                pipe_wait(inode);
-                if(signal_pending(current))
+
+        while (cur == *cnt) {
+                pipe_wait(inode->i_pipe);
+                if (signal_pending(current))
                         break;
         }
 }
 
 static void wake_up_partner(struct inode* inode)
 {
-        wake_up_interruptible(PIPE_WAIT(*inode));
+        wake_up_interruptible(&inode->i_pipe->wait);
 }
 
 static int fifo_open(struct inode *inode, struct file *filp)
 {
+        struct pipe_inode_info *pipe;
         int ret;
 
-        mutex_lock(PIPE_MUTEX(*inode));
-        if (!inode->i_pipe) {
+        mutex_lock(&inode->i_mutex);
+        pipe = inode->i_pipe;
+        if (!pipe) {
                 ret = -ENOMEM;
-                if(!pipe_new(inode))
+                pipe = alloc_pipe_info(inode);
+                if (!pipe)
                         goto err_nocleanup;
+                inode->i_pipe = pipe;
         }
         filp->f_version = 0;
 
@@ -53,18 +58,18 @@ static int fifo_open(struct inode *inode, struct file *filp)
          *  opened, even when there is no process writing the FIFO.
          */
                 filp->f_op = &read_fifo_fops;
-                PIPE_RCOUNTER(*inode)++;
-                if (PIPE_READERS(*inode)++ == 0)
+                pipe->r_counter++;
+                if (pipe->readers++ == 0)
                         wake_up_partner(inode);
 
-                if (!PIPE_WRITERS(*inode)) {
+                if (!pipe->writers) {
                         if ((filp->f_flags & O_NONBLOCK)) {
                                 /* suppress POLLHUP until we have
                                  * seen a writer */
-                                filp->f_version = PIPE_WCOUNTER(*inode);
+                                filp->f_version = pipe->w_counter;
                         } else 
                         {
-                                wait_for_partner(inode, &PIPE_WCOUNTER(*inode));
+                                wait_for_partner(inode, &pipe->w_counter);
                                 if(signal_pending(current))
                                         goto err_rd;
                         }
@@ -78,16 +83,16 @@ static int fifo_open(struct inode *inode, struct file *filp)
          *  errno=ENXIO when there is no process reading the FIFO.
          */
                 ret = -ENXIO;
-                if ((filp->f_flags & O_NONBLOCK) && !PIPE_READERS(*inode))
+                if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
                         goto err;
 
                 filp->f_op = &write_fifo_fops;
-                PIPE_WCOUNTER(*inode)++;
-                if (!PIPE_WRITERS(*inode)++)
+                pipe->w_counter++;
+                if (!pipe->writers++)
                         wake_up_partner(inode);
 
-                if (!PIPE_READERS(*inode)) {
-                        wait_for_partner(inode, &PIPE_RCOUNTER(*inode));
+                if (!pipe->readers) {
+                        wait_for_partner(inode, &pipe->r_counter);
                         if (signal_pending(current))
                                 goto err_wr;
                 }
@@ -102,11 +107,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
          */
                 filp->f_op = &rdwr_fifo_fops;
 
-                PIPE_READERS(*inode)++;
-                PIPE_WRITERS(*inode)++;
-                PIPE_RCOUNTER(*inode)++;
-                PIPE_WCOUNTER(*inode)++;
-                if (PIPE_READERS(*inode) == 1 || PIPE_WRITERS(*inode) == 1)
+                pipe->readers++;
+                pipe->writers++;
+                pipe->r_counter++;
+                pipe->w_counter++;
+                if (pipe->readers == 1 || pipe->writers == 1)
                         wake_up_partner(inode);
                 break;
 
@@ -116,27 +121,27 @@ static int fifo_open(struct inode *inode, struct file *filp)
         }
 
         /* Ok! */
-        mutex_unlock(PIPE_MUTEX(*inode));
+        mutex_unlock(&inode->i_mutex);
         return 0;
 
 err_rd:
-        if (!--PIPE_READERS(*inode))
-                wake_up_interruptible(PIPE_WAIT(*inode));
+        if (!--pipe->readers)
+                wake_up_interruptible(&pipe->wait);
         ret = -ERESTARTSYS;
         goto err;
 
 err_wr:
-        if (!--PIPE_WRITERS(*inode))
-                wake_up_interruptible(PIPE_WAIT(*inode));
+        if (!--pipe->writers)
+                wake_up_interruptible(&pipe->wait);
         ret = -ERESTARTSYS;
         goto err;
 
 err:
-        if (!PIPE_READERS(*inode) && !PIPE_WRITERS(*inode))
+        if (!pipe->readers && !pipe->writers)
                 free_pipe_info(inode);
 
 err_nocleanup:
-        mutex_unlock(PIPE_MUTEX(*inode));
+        mutex_unlock(&inode->i_mutex);
         return ret;
 }
 
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 23d1f52eb1b8..6c740f860665 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1,6 +1,6 @@
 /*
   FUSE: Filesystem in Userspace
-  Copyright (C) 2001-2005  Miklos Szeredi <miklos@szeredi.hu>
+  Copyright (C) 2001-2006  Miklos Szeredi <miklos@szeredi.hu>
 
   This program can be distributed under the terms of the GNU GPL.
   See the file COPYING.
@@ -23,13 +23,11 @@ static kmem_cache_t *fuse_req_cachep;
 
 static struct fuse_conn *fuse_get_conn(struct file *file)
 {
-        struct fuse_conn *fc;
-        spin_lock(&fuse_lock);
-        fc = file->private_data;
-        if (fc && !fc->connected)
-                fc = NULL;
-        spin_unlock(&fuse_lock);
-        return fc;
+        /*
+         * Lockless access is OK, because file->private data is set
+         * once during mount and is valid until the file is released.
+         */
+        return file->private_data;
 }
 
 static void fuse_request_init(struct fuse_req *req)
@@ -74,10 +72,8 @@ static void restore_sigs(sigset_t *oldset)
  */
 void fuse_reset_request(struct fuse_req *req)
 {
-        int preallocated = req->preallocated;
         BUG_ON(atomic_read(&req->count) != 1);
         fuse_request_init(req);
-        req->preallocated = preallocated;
 }
 
 static void __fuse_get_request(struct fuse_req *req)
@@ -92,80 +88,52 @@ static void __fuse_put_request(struct fuse_req *req)
         atomic_dec(&req->count);
 }
 
-static struct fuse_req *do_get_request(struct fuse_conn *fc)
+struct fuse_req *fuse_get_req(struct fuse_conn *fc)
 {
         struct fuse_req *req;
-
-        spin_lock(&fuse_lock);
-        BUG_ON(list_empty(&fc->unused_list));
-        req = list_entry(fc->unused_list.next, struct fuse_req, list);
-        list_del_init(&req->list);
-        spin_unlock(&fuse_lock);
-        fuse_request_init(req);
-        req->preallocated = 1;
-        req->in.h.uid = current->fsuid;
-        req->in.h.gid = current->fsgid;
-        req->in.h.pid = current->pid;
-        return req;
-}
-
-/* This can return NULL, but only in case it's interrupted by a SIGKILL */
-struct fuse_req *fuse_get_request(struct fuse_conn *fc)
-{
-        int intr;
         sigset_t oldset;
+        int err;
 
-        atomic_inc(&fc->num_waiting);
         block_sigs(&oldset);
-        intr = down_interruptible(&fc->outstanding_sem);
+        err = wait_event_interruptible(fc->blocked_waitq, !fc->blocked);
         restore_sigs(&oldset);
-        if (intr) {
-                atomic_dec(&fc->num_waiting);
-                return NULL;
-        }
-        return do_get_request(fc);
-}
+        if (err)
+                return ERR_PTR(-EINTR);
 
-/* Must be called with fuse_lock held */
-static void fuse_putback_request(struct fuse_conn *fc, struct fuse_req *req)
-{
-        if (req->preallocated) {
-                atomic_dec(&fc->num_waiting);
-                list_add(&req->list, &fc->unused_list);
-        } else
-                fuse_request_free(req);
+        req = fuse_request_alloc();
+        if (!req)
+                return ERR_PTR(-ENOMEM);
 
-        /* If we are in debt decrease that first */
-        if (fc->outstanding_debt)
-                fc->outstanding_debt--;
-        else
-                up(&fc->outstanding_sem);
+        atomic_inc(&fc->num_waiting);
+        fuse_request_init(req);
+        req->in.h.uid = current->fsuid;
+        req->in.h.gid = current->fsgid;
+        req->in.h.pid = current->pid;
+        return req;
 }
 
 void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req)
 {
         if (atomic_dec_and_test(&req->count)) {
-                spin_lock(&fuse_lock);
-                fuse_putback_request(fc, req);
-                spin_unlock(&fuse_lock);
+                atomic_dec(&fc->num_waiting);
+                fuse_request_free(req);
         }
 }
 
-static void fuse_put_request_locked(struct fuse_conn *fc, struct fuse_req *req)
-{
-        if (atomic_dec_and_test(&req->count))
-                fuse_putback_request(fc, req);
-}
-
-void fuse_release_background(struct fuse_req *req)
+void fuse_release_background(struct fuse_conn *fc, struct fuse_req *req)
 {
         iput(req->inode);
         iput(req->inode2);
         if (req->file)
                 fput(req->file);
-        spin_lock(&fuse_lock);
+        spin_lock(&fc->lock);
         list_del(&req->bg_entry);
-        spin_unlock(&fuse_lock);
+        if (fc->num_background == FUSE_MAX_BACKGROUND) {
+                fc->blocked = 0;
+                wake_up_all(&fc->blocked_waitq);
+        }
+        fc->num_background--;
+        spin_unlock(&fc->lock);
 }
 
 /*
@@ -184,23 +152,23 @@ void fuse_release_background(struct fuse_req *req)
  * interrupted and put in the background, it will return with an error
  * and hence never be reset and reused.
  *
- * Called with fuse_lock, unlocks it
+ * Called with fc->lock, unlocks it
  */
 static void request_end(struct fuse_conn *fc, struct fuse_req *req)
 {
         list_del(&req->list);
         req->state = FUSE_REQ_FINISHED;
         if (!req->background) {
+                spin_unlock(&fc->lock);
                 wake_up(&req->waitq);
-                fuse_put_request_locked(fc, req);
-                spin_unlock(&fuse_lock);
+                fuse_put_request(fc, req);
         } else {
                 void (*end) (struct fuse_conn *, struct fuse_req *) = req->end;
                 req->end = NULL;
-                spin_unlock(&fuse_lock);
+                spin_unlock(&fc->lock);
                 down_read(&fc->sbput_sem);
                 if (fc->mounted)
-                        fuse_release_background(req);
+                        fuse_release_background(fc, req);
                 up_read(&fc->sbput_sem);
                 if (end)
                         end(fc, req);
@@ -242,6 +210,9 @@ static void background_request(struct fuse_conn *fc, struct fuse_req *req)
 {
         req->background = 1;
         list_add(&req->bg_entry, &fc->background);
+        fc->num_background++;
+        if (fc->num_background == FUSE_MAX_BACKGROUND)
+                fc->blocked = 1;
         if (req->inode)
                 req->inode = igrab(req->inode);
         if (req->inode2)
@@ -250,16 +221,16 @@ static void background_request(struct fuse_conn *fc, struct fuse_req *req)
                 get_file(req->file);
 }
 
-/* Called with fuse_lock held.  Releases, and then reacquires it. */
+/* Called with fc->lock held.  Releases, and then reacquires it. */
 static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)
 {
         sigset_t oldset;
 
-        spin_unlock(&fuse_lock);
+        spin_unlock(&fc->lock);
         block_sigs(&oldset);
         wait_event_interruptible(req->waitq, req->state == FUSE_REQ_FINISHED);
         restore_sigs(&oldset);
-        spin_lock(&fuse_lock);
+        spin_lock(&fc->lock);
         if (req->state == FUSE_REQ_FINISHED && !req->interrupted)
                 return;
 
@@ -273,9 +244,9 @@ static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)
                    locked state, there mustn't be any filesystem
                    operation (e.g. page fault), since that could lead
                    to deadlock */
-                spin_unlock(&fuse_lock);
+                spin_unlock(&fc->lock);
                 wait_event(req->waitq, !req->locked);
-                spin_lock(&fuse_lock);
+                spin_lock(&fc->lock);
         }
         if (req->state == FUSE_REQ_PENDING) {
                 list_del(&req->list);
@@ -304,19 +275,10 @@ static void queue_request(struct fuse_conn *fc, struct fuse_req *req)
         req->in.h.unique = fc->reqctr;
         req->in.h.len = sizeof(struct fuse_in_header) +
                 len_args(req->in.numargs, (struct fuse_arg *) req->in.args);
-        if (!req->preallocated) {
-                /* If request is not preallocated (either FORGET or
-                   RELEASE), then still decrease outstanding_sem, so
-                   user can't open infinite number of files while not
-                   processing the RELEASE requests.  However for
-                   efficiency do it without blocking, so if down()
-                   would block, just increase the debt instead */
-                if (down_trylock(&fc->outstanding_sem))
-                        fc->outstanding_debt++;
-        }
         list_add_tail(&req->list, &fc->pending);
         req->state = FUSE_REQ_PENDING;
         wake_up(&fc->waitq);
+        kill_fasync(&fc->fasync, SIGIO, POLL_IN);
 }
 
 /*
@@ -325,7 +287,7 @@ static void queue_request(struct fuse_conn *fc, struct fuse_req *req)
 void request_send(struct fuse_conn *fc, struct fuse_req *req)
 {
         req->isreply = 1;
-        spin_lock(&fuse_lock);
+        spin_lock(&fc->lock);
         if (!fc->connected)
                 req->out.h.error = -ENOTCONN;
         else if (fc->conn_error)
@@ -338,15 +300,16 @@ void request_send(struct fuse_conn *fc, struct fuse_req *req)
 
                 request_wait_answer(fc, req);
         }
-        spin_unlock(&fuse_lock);
+        spin_unlock(&fc->lock);
 }
 
 static void request_send_nowait(struct fuse_conn *fc, struct fuse_req *req)
 {
-        spin_lock(&fuse_lock);
+        spin_lock(&fc->lock);
+        background_request(fc, req);
         if (fc->connected) {
                 queue_request(fc, req);
-                spin_unlock(&fuse_lock);
+                spin_unlock(&fc->lock);
         } else {
                 req->out.h.error = -ENOTCONN;
                 request_end(fc, req);
@@ -362,9 +325,6 @@ void request_send_noreply(struct fuse_conn *fc, struct fuse_req *req)
 void request_send_background(struct fuse_conn *fc, struct fuse_req *req)
 {
         req->isreply = 1;
-        spin_lock(&fuse_lock);
-        background_request(fc, req);
-        spin_unlock(&fuse_lock);
         request_send_nowait(fc, req);
 }
 
@@ -373,16 +333,16 @@ void request_send_background(struct fuse_conn *fc, struct fuse_req *req)
  * anything that could cause a page-fault.  If the request was already
  * interrupted bail out.
  */
-static int lock_request(struct fuse_req *req)
+static int lock_request(struct fuse_conn *fc, struct fuse_req *req)
 {
         int err = 0;
         if (req) {
-                spin_lock(&fuse_lock);
+                spin_lock(&fc->lock);
                 if (req->interrupted)
                         err = -ENOENT;
                 else
                         req->locked = 1;
-                spin_unlock(&fuse_lock);
+                spin_unlock(&fc->lock);
         }
         return err;
 }
@@ -392,18 +352,19 @@ static int lock_request(struct fuse_req *req)
  * requester thread is currently waiting for it to be unlocked, so
  * wake it up.
  */
-static void unlock_request(struct fuse_req *req)
+static void unlock_request(struct fuse_conn *fc, struct fuse_req *req)
 {
         if (req) {
-                spin_lock(&fuse_lock);
+                spin_lock(&fc->lock);
                 req->locked = 0;
                 if (req->interrupted)
                         wake_up(&req->waitq);
-                spin_unlock(&fuse_lock);
+                spin_unlock(&fc->lock);
         }
 }
 
 struct fuse_copy_state {
+        struct fuse_conn *fc;
         int write;
         struct fuse_req *req;
         const struct iovec *iov;
@@ -416,11 +377,12 @@ struct fuse_copy_state {
         unsigned len;
 };
 
-static void fuse_copy_init(struct fuse_copy_state *cs, int write,
-                           struct fuse_req *req, const struct iovec *iov,
-                           unsigned long nr_segs)
+static void fuse_copy_init(struct fuse_copy_state *cs, struct fuse_conn *fc,
+                           int write, struct fuse_req *req,
+                           const struct iovec *iov, unsigned long nr_segs)
 {
         memset(cs, 0, sizeof(*cs));
+        cs->fc = fc;
         cs->write = write;
         cs->req = req;
         cs->iov = iov;
@@ -450,7 +412,7 @@ static int fuse_copy_fill(struct fuse_copy_state *cs)
         unsigned long offset;
         int err;
 
-        unlock_request(cs->req);
+        unlock_request(cs->fc, cs->req);
         fuse_copy_finish(cs);
         if (!cs->seglen) {
                 BUG_ON(!cs->nr_segs);
@@ -473,7 +435,7 @@ static int fuse_copy_fill(struct fuse_copy_state *cs)
         cs->seglen -= cs->len;
         cs->addr += cs->len;
 
-        return lock_request(cs->req);
+        return lock_request(cs->fc, cs->req);
 }
 
 /* Do as much copy to/from userspace buffer as we can */
@@ -585,9 +547,9 @@ static void request_wait(struct fuse_conn *fc)
                 if (signal_pending(current))
                         break;
 
-                spin_unlock(&fuse_lock);
+                spin_unlock(&fc->lock);
                 schedule();
-                spin_lock(&fuse_lock);
+                spin_lock(&fc->lock);
         }
         set_current_state(TASK_RUNNING);
         remove_wait_queue(&fc->waitq, &wait);
@@ -606,18 +568,21 @@ static ssize_t fuse_dev_readv(struct file *file, const struct iovec *iov,
                               unsigned long nr_segs, loff_t *off)
 {
         int err;
-        struct fuse_conn *fc;
         struct fuse_req *req;
         struct fuse_in *in;
         struct fuse_copy_state cs;
         unsigned reqsize;
+        struct fuse_conn *fc = fuse_get_conn(file);
+        if (!fc)
+                return -EPERM;
 
  restart:
-        spin_lock(&fuse_lock);
-        fc = file->private_data;
-        err = -EPERM;
-        if (!fc)
+        spin_lock(&fc->lock);
+        err = -EAGAIN;
+        if ((file->f_flags & O_NONBLOCK) && fc->connected &&
+            list_empty(&fc->pending))
                 goto err_unlock;
+
         request_wait(fc);
         err = -ENODEV;
         if (!fc->connected)
@@ -641,14 +606,14 @@ static ssize_t fuse_dev_readv(struct file *file, const struct iovec *iov,
                 request_end(fc, req);
                 goto restart;
         }
-        spin_unlock(&fuse_lock);
-        fuse_copy_init(&cs, 1, req, iov, nr_segs);
+        spin_unlock(&fc->lock);
+        fuse_copy_init(&cs, fc, 1, req, iov, nr_segs);
         err = fuse_copy_one(&cs, &in->h, sizeof(in->h));
         if (!err)
                 err = fuse_copy_args(&cs, in->numargs, in->argpages,
                                      (struct fuse_arg *) in->args, 0);
         fuse_copy_finish(&cs);
-        spin_lock(&fuse_lock);
+        spin_lock(&fc->lock);
         req->locked = 0;
         if (!err && req->interrupted)
                 err = -ENOENT;
@@ -663,12 +628,12 @@ static ssize_t fuse_dev_readv(struct file *file, const struct iovec *iov,
         else {
                 req->state = FUSE_REQ_SENT;
                 list_move_tail(&req->list, &fc->processing);
-                spin_unlock(&fuse_lock);
+                spin_unlock(&fc->lock);
         }
         return reqsize;
 
  err_unlock:
-        spin_unlock(&fuse_lock);
+        spin_unlock(&fc->lock);
         return err;
 }
 
@@ -735,9 +700,9 @@ static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov,
         struct fuse_copy_state cs;
         struct fuse_conn *fc = fuse_get_conn(file);
         if (!fc)
-                return -ENODEV;
+                return -EPERM;
 
-        fuse_copy_init(&cs, 0, NULL, iov, nr_segs);
+        fuse_copy_init(&cs, fc, 0, NULL, iov, nr_segs);
         if (nbytes < sizeof(struct fuse_out_header))
                 return -EINVAL;
 
@@ -749,7 +714,7 @@ static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov,
             oh.len != nbytes)
                 goto err_finish;
 
-        spin_lock(&fuse_lock);
+        spin_lock(&fc->lock);
         err = -ENOENT;
         if (!fc->connected)
                 goto err_unlock;
@@ -760,9 +725,9 @@ static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov,
                 goto err_unlock;
 
         if (req->interrupted) {
-                spin_unlock(&fuse_lock);
+                spin_unlock(&fc->lock);
                 fuse_copy_finish(&cs);
-                spin_lock(&fuse_lock);
+                spin_lock(&fc->lock);
                 request_end(fc, req);
                 return -ENOENT;
         }
@@ -770,12 +735,12 @@ static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov,
         req->out.h = oh;
         req->locked = 1;
         cs.req = req;
-        spin_unlock(&fuse_lock);
+        spin_unlock(&fc->lock);
 
         err = copy_out_args(&cs, &req->out, nbytes);
         fuse_copy_finish(&cs);
 
-        spin_lock(&fuse_lock);
+        spin_lock(&fc->lock);
         req->locked = 0;
         if (!err) {
                 if (req->interrupted)
@@ -787,7 +752,7 @@ static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov,
         return err ? err : nbytes;
 
  err_unlock:
-        spin_unlock(&fuse_lock);
+        spin_unlock(&fc->lock);
  err_finish:
         fuse_copy_finish(&cs);
         return err;
@@ -804,18 +769,19 @@ static ssize_t fuse_dev_write(struct file *file, const char __user *buf,
 
 static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
 {
-        struct fuse_conn *fc = fuse_get_conn(file);
         unsigned mask = POLLOUT | POLLWRNORM;
-
+        struct fuse_conn *fc = fuse_get_conn(file);
         if (!fc)
-                return -ENODEV;
+                return POLLERR;
 
         poll_wait(file, &fc->waitq, wait);
 
-        spin_lock(&fuse_lock);
-        if (!list_empty(&fc->pending))
-                mask |= POLLIN | POLLRDNORM;
-        spin_unlock(&fuse_lock);
+        spin_lock(&fc->lock);
+        if (!fc->connected)
+                mask = POLLERR;
+        else if (!list_empty(&fc->pending))
+                mask |= POLLIN | POLLRDNORM;
+        spin_unlock(&fc->lock);
 
         return mask;
 }
@@ -823,7 +789,7 @@ static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
 /*
  * Abort all requests on the given list (pending or processing)
  *
- * This function releases and reacquires fuse_lock
+ * This function releases and reacquires fc->lock
  */
 static void end_requests(struct fuse_conn *fc, struct list_head *head)
 {
@@ -832,7 +798,7 @@ static void end_requests(struct fuse_conn *fc, struct list_head *head)
                 req = list_entry(head->next, struct fuse_req, list);
                 req->out.h.error = -ECONNABORTED;
                 request_end(fc, req);
-                spin_lock(&fuse_lock);
+                spin_lock(&fc->lock);
         }
 }
 
@@ -863,10 +829,10 @@ static void end_io_requests(struct fuse_conn *fc)
                         req->end = NULL;
                         /* The end function will consume this reference */
                         __fuse_get_request(req);
-                        spin_unlock(&fuse_lock);
+                        spin_unlock(&fc->lock);
                         wait_event(req->waitq, !req->locked);
                         end(fc, req);
-                        spin_lock(&fuse_lock);
+                        spin_lock(&fc->lock);
                 }
         }
 }
@@ -893,35 +859,44 @@ static void end_io_requests(struct fuse_conn *fc)
  */
 void fuse_abort_conn(struct fuse_conn *fc)
 {
-        spin_lock(&fuse_lock);
+        spin_lock(&fc->lock);
         if (fc->connected) {
                 fc->connected = 0;
                 end_io_requests(fc);
                 end_requests(fc, &fc->pending);
                 end_requests(fc, &fc->processing);
                 wake_up_all(&fc->waitq);
+                kill_fasync(&fc->fasync, SIGIO, POLL_IN);
         }
-        spin_unlock(&fuse_lock);
+        spin_unlock(&fc->lock);
 }
 
 static int fuse_dev_release(struct inode *inode, struct file *file)
 {
-        struct fuse_conn *fc;
-
-        spin_lock(&fuse_lock);
-        fc = file->private_data;
+        struct fuse_conn *fc = fuse_get_conn(file);
         if (fc) {
+                spin_lock(&fc->lock);
                 fc->connected = 0;
                 end_requests(fc, &fc->pending);
                 end_requests(fc, &fc->processing);
-        }
-        spin_unlock(&fuse_lock);
-        if (fc)
+                spin_unlock(&fc->lock);
+                fasync_helper(-1, file, 0, &fc->fasync);
                 kobject_put(&fc->kobj);
+        }
 
         return 0;
 }
 
+static int fuse_dev_fasync(int fd, struct file *file, int on)
+{
+        struct fuse_conn *fc = fuse_get_conn(file);
+        if (!fc)
+                return -EPERM;
+
+        /* No locking - fasync_helper does its own locking */
+        return fasync_helper(fd, file, on, &fc->fasync);
+}
+
 const struct file_operations fuse_dev_operations = {
         .owner          = THIS_MODULE,
         .llseek         = no_llseek,
@@ -931,6 +906,7 @@ const struct file_operations fuse_dev_operations = {
         .writev         = fuse_dev_writev,
         .poll           = fuse_dev_poll,
         .release        = fuse_dev_release,
+        .fasync         = fuse_dev_fasync,
 };
 
 static struct miscdevice fuse_miscdevice = {
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 256355b80256..8d7546e832e8 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -117,8 +117,8 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd)
                         return 0;
 
                 fc = get_fuse_conn(inode);
-                req = fuse_get_request(fc);
-                if (!req)
+                req = fuse_get_req(fc);
+                if (IS_ERR(req))
                         return 0;
 
                 fuse_lookup_init(req, entry->d_parent->d_inode, entry, &outarg);
@@ -188,9 +188,9 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
         if (entry->d_name.len > FUSE_NAME_MAX)
                 return ERR_PTR(-ENAMETOOLONG);
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return ERR_PTR(-EINTR);
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return ERR_PTR(PTR_ERR(req));
 
         fuse_lookup_init(req, dir, entry, &outarg);
         request_send(fc, req);
@@ -244,15 +244,14 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode,
         struct file *file;
         int flags = nd->intent.open.flags - 1;
 
-        err = -ENOSYS;
         if (fc->no_create)
-                goto out;
+                return -ENOSYS;
 
-        err = -EINTR;
-        req = fuse_get_request(fc);
-        if (!req)
-                goto out;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
+        err = -ENOMEM;
         ff = fuse_file_alloc();
         if (!ff)
                 goto out_put_request;
@@ -314,7 +313,6 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode,
         fuse_file_free(ff);
  out_put_request:
         fuse_put_request(fc, req);
- out:
         return err;
 }
 
@@ -375,9 +373,9 @@ static int fuse_mknod(struct inode *dir, struct dentry *entry, int mode,
 {
         struct fuse_mknod_in inarg;
         struct fuse_conn *fc = get_fuse_conn(dir);
-        struct fuse_req *req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        struct fuse_req *req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.mode = mode;
@@ -407,9 +405,9 @@ static int fuse_mkdir(struct inode *dir, struct dentry *entry, int mode)
 {
         struct fuse_mkdir_in inarg;
         struct fuse_conn *fc = get_fuse_conn(dir);
-        struct fuse_req *req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        struct fuse_req *req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.mode = mode;
@@ -427,9 +425,9 @@ static int fuse_symlink(struct inode *dir, struct dentry *entry,
 {
         struct fuse_conn *fc = get_fuse_conn(dir);
         unsigned len = strlen(link) + 1;
-        struct fuse_req *req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        struct fuse_req *req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         req->in.h.opcode = FUSE_SYMLINK;
         req->in.numargs = 2;
@@ -444,9 +442,9 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry)
 {
         int err;
         struct fuse_conn *fc = get_fuse_conn(dir);
-        struct fuse_req *req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        struct fuse_req *req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         req->in.h.opcode = FUSE_UNLINK;
         req->in.h.nodeid = get_node_id(dir);
@@ -476,9 +474,9 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry)
 {
         int err;
         struct fuse_conn *fc = get_fuse_conn(dir);
-        struct fuse_req *req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        struct fuse_req *req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         req->in.h.opcode = FUSE_RMDIR;
         req->in.h.nodeid = get_node_id(dir);
@@ -504,9 +502,9 @@ static int fuse_rename(struct inode *olddir, struct dentry *oldent,
         int err;
         struct fuse_rename_in inarg;
         struct fuse_conn *fc = get_fuse_conn(olddir);
-        struct fuse_req *req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        struct fuse_req *req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.newdir = get_node_id(newdir);
@@ -553,9 +551,9 @@ static int fuse_link(struct dentry *entry, struct inode *newdir,
         struct fuse_link_in inarg;
         struct inode *inode = entry->d_inode;
         struct fuse_conn *fc = get_fuse_conn(inode);
-        struct fuse_req *req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        struct fuse_req *req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.oldnodeid = get_node_id(inode);
@@ -583,9 +581,9 @@ int fuse_do_getattr(struct inode *inode)
         int err;
         struct fuse_attr_out arg;
         struct fuse_conn *fc = get_fuse_conn(inode);
-        struct fuse_req *req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        struct fuse_req *req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         req->in.h.opcode = FUSE_GETATTR;
         req->in.h.nodeid = get_node_id(inode);
@@ -673,9 +671,9 @@ static int fuse_access(struct inode *inode, int mask)
         if (fc->no_access)
                 return 0;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.mask = mask;
@@ -780,9 +778,9 @@ static int fuse_readdir(struct file *file, void *dstbuf, filldir_t filldir)
         if (is_bad_inode(inode))
                 return -EIO;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         page = alloc_page(GFP_KERNEL);
         if (!page) {
@@ -809,11 +807,11 @@ static char *read_link(struct dentry *dentry)
 {
         struct inode *inode = dentry->d_inode;
         struct fuse_conn *fc = get_fuse_conn(inode);
-        struct fuse_req *req = fuse_get_request(fc);
+        struct fuse_req *req = fuse_get_req(fc);
         char *link;
 
-        if (!req)
-                return ERR_PTR(-EINTR);
+        if (IS_ERR(req))
+                return ERR_PTR(PTR_ERR(req));
 
         link = (char *) __get_free_page(GFP_KERNEL);
         if (!link) {
@@ -933,9 +931,9 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
                 }
         }
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         iattr_to_fattr(attr, &inarg);
@@ -995,9 +993,9 @@ static int fuse_setxattr(struct dentry *entry, const char *name,
         if (fc->no_setxattr)
                 return -EOPNOTSUPP;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.size = size;
@@ -1035,9 +1033,9 @@ static ssize_t fuse_getxattr(struct dentry *entry, const char *name,
         if (fc->no_getxattr)
                 return -EOPNOTSUPP;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.size = size;
@@ -1085,9 +1083,9 @@ static ssize_t fuse_listxattr(struct dentry *entry, char *list, size_t size)
         if (fc->no_listxattr)
                 return -EOPNOTSUPP;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.size = size;
@@ -1131,9 +1129,9 @@ static int fuse_removexattr(struct dentry *entry, const char *name)
         if (fc->no_removexattr)
                 return -EOPNOTSUPP;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         req->in.h.opcode = FUSE_REMOVEXATTR;
         req->in.h.nodeid = get_node_id(inode);
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 975f2697e866..e4f041a11bb5 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -22,9 +22,9 @@ static int fuse_send_open(struct inode *inode, struct file *file, int isdir,
         struct fuse_req *req;
         int err;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.flags = file->f_flags & ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
@@ -184,9 +184,9 @@ static int fuse_flush(struct file *file)
         if (fc->no_flush)
                 return 0;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.fh = ff->fh;
@@ -223,9 +223,9 @@ int fuse_fsync_common(struct file *file, struct dentry *de, int datasync,
         if ((!isdir && fc->no_fsync) || (isdir && fc->no_fsyncdir))
                 return 0;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
         inarg.fh = ff->fh;
@@ -297,9 +297,9 @@ static int fuse_readpage(struct file *file, struct page *page)
         if (is_bad_inode(inode))
                 goto out;
 
-        err = -EINTR;
-        req = fuse_get_request(fc);
-        if (!req)
+        req = fuse_get_req(fc);
+        err = PTR_ERR(req);
+        if (IS_ERR(req))
                 goto out;
 
         req->out.page_zeroing = 1;
@@ -368,10 +368,10 @@ static int fuse_readpages_fill(void *_data, struct page *page)
              (req->num_pages + 1) * PAGE_CACHE_SIZE > fc->max_read ||
              req->pages[req->num_pages - 1]->index + 1 != page->index)) {
                 fuse_send_readpages(req, data->file, inode);
-                data->req = req = fuse_get_request(fc);
-                if (!req) {
+                data->req = req = fuse_get_req(fc);
+                if (IS_ERR(req)) {
                         unlock_page(page);
-                        return -EINTR;
+                        return PTR_ERR(req);
                 }
         }
         req->pages[req->num_pages] = page;
@@ -392,13 +392,17 @@ static int fuse_readpages(struct file *file, struct address_space *mapping,
 
         data.file = file;
         data.inode = inode;
-        data.req = fuse_get_request(fc);
-        if (!data.req)
-                return -EINTR;
+        data.req = fuse_get_req(fc);
+        if (IS_ERR(data.req))
+                return PTR_ERR(data.req);
 
         err = read_cache_pages(mapping, pages, fuse_readpages_fill, &data);
-        if (!err)
-                fuse_send_readpages(data.req, file, inode);
+        if (!err) {
+                if (data.req->num_pages)
+                        fuse_send_readpages(data.req, file, inode);
+                else
+                        fuse_put_request(fc, data.req);
+        }
         return err;
 }
 
@@ -451,9 +455,9 @@ static int fuse_commit_write(struct file *file, struct page *page,
         if (is_bad_inode(inode))
                 return -EIO;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         req->num_pages = 1;
         req->pages[0] = page;
@@ -528,9 +532,9 @@ static ssize_t fuse_direct_io(struct file *file, const char __user *buf,
         if (is_bad_inode(inode))
                 return -EIO;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         while (count) {
                 size_t nres;
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index a16a04fcf41e..19c7185a7546 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -1,6 +1,6 @@
 /*
   FUSE: Filesystem in Userspace
-  Copyright (C) 2001-2005  Miklos Szeredi <miklos@szeredi.hu>
+  Copyright (C) 2001-2006  Miklos Szeredi <miklos@szeredi.hu>
 
   This program can be distributed under the terms of the GNU GPL.
   See the file COPYING.
@@ -18,8 +18,8 @@
 /** Max number of pages that can be used in a single read request */
 #define FUSE_MAX_PAGES_PER_REQ 32
 
-/** If more requests are outstanding, then the operation will block */
-#define FUSE_MAX_OUTSTANDING 10
+/** Maximum number of outstanding background requests */
+#define FUSE_MAX_BACKGROUND 10
 
 /** It could be as large as PATH_MAX, but would that have any uses? */
 #define FUSE_NAME_MAX 1024
@@ -131,8 +131,8 @@ struct fuse_conn;
  * A request to the client
  */
 struct fuse_req {
-        /** This can be on either unused_list, pending processing or
-            io lists in fuse_conn */
+        /** This can be on either pending processing or io lists in
+            fuse_conn */
         struct list_head list;
 
         /** Entry on the background list */
@@ -144,15 +144,12 @@ struct fuse_req {
         /*
          * The following bitfields are either set once before the
          * request is queued or setting/clearing them is protected by
-         * fuse_lock
+         * fuse_conn->lock
          */
 
         /** True if the request has reply */
         unsigned isreply:1;
 
-        /** The request is preallocated */
-        unsigned preallocated:1;
-
         /** The request was interrupted */
         unsigned interrupted:1;
 
@@ -213,6 +210,9 @@ struct fuse_req {
  * unmounted.
  */
 struct fuse_conn {
+        /** Lock protecting accessess to  members of this structure */
+        spinlock_t lock;
+
         /** The user id for this mount */
         uid_t user_id;
 
@@ -244,19 +244,20 @@ struct fuse_conn {
             interrupted request) */
         struct list_head background;
 
-        /** Controls the maximum number of outstanding requests */
-        struct semaphore outstanding_sem;
+        /** Number of requests currently in the background */
+        unsigned num_background;
+
+        /** Flag indicating if connection is blocked.  This will be
+            the case before the INIT reply is received, and if there
+            are too many outstading backgrounds requests */
+        int blocked;
 
-        /** This counts the number of outstanding requests if
-            outstanding_sem would go negative */
-        unsigned outstanding_debt;
+        /** waitq for blocked connection */
+        wait_queue_head_t blocked_waitq;
 
         /** RW semaphore for exclusion with fuse_put_super() */
         struct rw_semaphore sbput_sem;
 
-        /** The list of unused requests */
-        struct list_head unused_list;
-
         /** The next unique request id */
         u64 reqctr;
 
@@ -318,6 +319,9 @@ struct fuse_conn {
 
         /** kobject */
         struct kobject kobj;
+
+        /** O_ASYNC requests */
+        struct fasync_struct *fasync;
 };
 
 static inline struct fuse_conn *get_fuse_conn_super(struct super_block *sb)
@@ -349,21 +353,6 @@ static inline u64 get_node_id(struct inode *inode)
 extern const struct file_operations fuse_dev_operations;
 
 /**
- * This is the single global spinlock which protects FUSE's structures
- *
- * The following data is protected by this lock:
- *
- *  - the private_data field of the device file
- *  - the s_fs_info field of the super block
- *  - unused_list, pending, processing lists in fuse_conn
- *  - background list in fuse_conn
- *  - the unique request ID counter reqctr in fuse_conn
- *  - the sb (super_block) field in fuse_conn
- *  - the file (device file) field in fuse_conn
- */
-extern spinlock_t fuse_lock;
-
-/**
  * Get a filled in inode
  */
 struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
@@ -461,11 +450,11 @@ void fuse_reset_request(struct fuse_req *req);
 /**
  * Reserve a preallocated request
  */
-struct fuse_req *fuse_get_request(struct fuse_conn *fc);
+struct fuse_req *fuse_get_req(struct fuse_conn *fc);
 
 /**
- * Decrement reference count of a request.  If count goes to zero put
- * on unused list (preallocated) or free request (not preallocated).
+ * Decrement reference count of a request.  If count goes to zero free
+ * the request.
  */
 void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req);
 
@@ -487,7 +476,7 @@ void request_send_background(struct fuse_conn *fc, struct fuse_req *req);
 /**
  * Release inodes and file associated with background request
  */
-void fuse_release_background(struct fuse_req *req);
+void fuse_release_background(struct fuse_conn *fc, struct fuse_req *req);
 
 /* Abort all requests */
 void fuse_abort_conn(struct fuse_conn *fc);
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 879e6fba9480..fd34037b0588 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -1,6 +1,6 @@
 /*
   FUSE: Filesystem in Userspace
-  Copyright (C) 2001-2005  Miklos Szeredi <miklos@szeredi.hu>
+  Copyright (C) 2001-2006  Miklos Szeredi <miklos@szeredi.hu>
 
   This program can be distributed under the terms of the GNU GPL.
   See the file COPYING.
@@ -22,7 +22,6 @@ MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>");
 MODULE_DESCRIPTION("Filesystem in Userspace");
 MODULE_LICENSE("GPL");
 
-spinlock_t fuse_lock;
 static kmem_cache_t *fuse_inode_cachep;
 static struct subsystem connections_subsys;
 
@@ -207,15 +206,17 @@ static void fuse_put_super(struct super_block *sb)
 
         down_write(&fc->sbput_sem);
         while (!list_empty(&fc->background))
-                fuse_release_background(list_entry(fc->background.next,
+                fuse_release_background(fc,
+                                        list_entry(fc->background.next,
                                                    struct fuse_req, bg_entry));
 
-        spin_lock(&fuse_lock);
+        spin_lock(&fc->lock);
         fc->mounted = 0;
         fc->connected = 0;
-        spin_unlock(&fuse_lock);
+        spin_unlock(&fc->lock);
         up_write(&fc->sbput_sem);
         /* Flush all readers on this fs */
+        kill_fasync(&fc->fasync, SIGIO, POLL_IN);
         wake_up_all(&fc->waitq);
         kobject_del(&fc->kobj);
         kobject_put(&fc->kobj);
@@ -242,9 +243,9 @@ static int fuse_statfs(struct super_block *sb, struct kstatfs *buf)
         struct fuse_statfs_out outarg;
         int err;
 
-        req = fuse_get_request(fc);
-        if (!req)
-                return -EINTR;
+        req = fuse_get_req(fc);
+        if (IS_ERR(req))
+                return PTR_ERR(req);
 
         memset(&outarg, 0, sizeof(outarg));
         req->in.numargs = 0;
@@ -369,15 +370,7 @@ static int fuse_show_options(struct seq_file *m, struct vfsmount *mnt)
 
 static void fuse_conn_release(struct kobject *kobj)
 {
-        struct fuse_conn *fc = get_fuse_conn_kobj(kobj);
-
-        while (!list_empty(&fc->unused_list)) {
-                struct fuse_req *req;
-                req = list_entry(fc->unused_list.next, struct fuse_req, list);
-                list_del(&req->list);
-                fuse_request_free(req);
-        }
-        kfree(fc);
+        kfree(get_fuse_conn_kobj(kobj));
 }
 
 static struct fuse_conn *new_conn(void)
@@ -386,64 +379,25 @@ static struct fuse_conn *new_conn(void)
 
         fc = kzalloc(sizeof(*fc), GFP_KERNEL);
         if (fc) {
-                int i;
+                spin_lock_init(&fc->lock);
                 init_waitqueue_head(&fc->waitq);
+                init_waitqueue_head(&fc->blocked_waitq);
                 INIT_LIST_HEAD(&fc->pending);
                 INIT_LIST_HEAD(&fc->processing);
                 INIT_LIST_HEAD(&fc->io);
-                INIT_LIST_HEAD(&fc->unused_list);
                 INIT_LIST_HEAD(&fc->background);
-                sema_init(&fc->outstanding_sem, 1); /* One for INIT */
                 init_rwsem(&fc->sbput_sem);
                 kobj_set_kset_s(fc, connections_subsys);
                 kobject_init(&fc->kobj);
                 atomic_set(&fc->num_waiting, 0);
-                for (i = 0; i < FUSE_MAX_OUTSTANDING; i++) {
-                        struct fuse_req *req = fuse_request_alloc();
-                        if (!req) {
-                                kobject_put(&fc->kobj);
-                                return NULL;
-                        }
-                        list_add(&req->list, &fc->unused_list);
-                }
                 fc->bdi.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;
                 fc->bdi.unplug_io_fn = default_unplug_io_fn;
                 fc->reqctr = 0;
+                fc->blocked = 1;
         }
         return fc;
 }
 
-static struct fuse_conn *get_conn(struct file *file, struct super_block *sb)
-{
-        struct fuse_conn *fc;
-        int err;
-
-        err = -EINVAL;
-        if (file->f_op != &fuse_dev_operations)
-                goto out_err;
-
-        err = -ENOMEM;
-        fc = new_conn();
-        if (!fc)
-                goto out_err;
-
-        spin_lock(&fuse_lock);
-        err = -EINVAL;
-        if (file->private_data)
-                goto out_unlock;
-
-        kobject_get(&fc->kobj);
-        file->private_data = fc;
-        spin_unlock(&fuse_lock);
-        return fc;
-
- out_unlock:
-        spin_unlock(&fuse_lock);
-        kobject_put(&fc->kobj);
- out_err:
-        return ERR_PTR(err);
-}
-
 static struct inode *get_root_inode(struct super_block *sb, unsigned mode)
 {
         struct fuse_attr attr;
@@ -467,7 +421,6 @@ static struct super_operations fuse_super_operations = {
 
 static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req)
 {
-        int i;
         struct fuse_init_out *arg = &req->misc.init_out;
 
         if (req->out.h.error || arg->major != FUSE_KERNEL_VERSION)
@@ -486,22 +439,13 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req)
                 fc->minor = arg->minor;
                 fc->max_write = arg->minor < 5 ? 4096 : arg->max_write;
         }
-
-        /* After INIT reply is received other requests can go
-           out.  So do (FUSE_MAX_OUTSTANDING - 1) number of
-           up()s on outstanding_sem.  The last up() is done in
-           fuse_putback_request() */
-        for (i = 1; i < FUSE_MAX_OUTSTANDING; i++)
-                up(&fc->outstanding_sem);
-
         fuse_put_request(fc, req);
+        fc->blocked = 0;
+        wake_up_all(&fc->blocked_waitq);
 }
 
-static void fuse_send_init(struct fuse_conn *fc)
+static void fuse_send_init(struct fuse_conn *fc, struct fuse_req *req)
 {
-        /* This is called from fuse_read_super() so there's guaranteed
-           to be exactly one request available */
-        struct fuse_req *req = fuse_get_request(fc);
         struct fuse_init_in *arg = &req->misc.init_in;
 
         arg->major = FUSE_KERNEL_VERSION;
@@ -525,12 +469,9 @@ static void fuse_send_init(struct fuse_conn *fc)
 
 static unsigned long long conn_id(void)
 {
+        /* BKL is held for ->get_sb() */
         static unsigned long long ctr = 1;
-        unsigned long long val;
-        spin_lock(&fuse_lock);
-        val = ctr++;
-        spin_unlock(&fuse_lock);
-        return val;
+        return ctr++;
 }
 
 static int fuse_fill_super(struct super_block *sb, void *data, int silent)
@@ -540,6 +481,7 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
         struct fuse_mount_data d;
         struct file *file;
         struct dentry *root_dentry;
+        struct fuse_req *init_req;
         int err;
 
         if (!parse_fuse_opt((char *) data, &d))
@@ -555,10 +497,17 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
         if (!file)
                 return -EINVAL;
 
-        fc = get_conn(file, sb);
-        fput(file);
-        if (IS_ERR(fc))
-                return PTR_ERR(fc);
+        if (file->f_op != &fuse_dev_operations)
+                return -EINVAL;
+
+        /* Setting file->private_data can't race with other mount()
+           instances, since BKL is held for ->get_sb() */
+        if (file->private_data)
+                return -EINVAL;
+
+        fc = new_conn();
+        if (!fc)
+                return -ENOMEM;
 
         fc->flags = d.flags;
         fc->user_id = d.user_id;
@@ -579,27 +528,40 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
                 goto err;
         }
 
+        init_req = fuse_request_alloc();
+        if (!init_req)
+                goto err_put_root;
+
         err = kobject_set_name(&fc->kobj, "%llu", conn_id());
         if (err)
-                goto err_put_root;
+                goto err_free_req;
 
         err = kobject_add(&fc->kobj);
         if (err)
-                goto err_put_root;
+                goto err_free_req;
 
         sb->s_root = root_dentry;
-        spin_lock(&fuse_lock);
         fc->mounted = 1;
         fc->connected = 1;
-        spin_unlock(&fuse_lock);
+        kobject_get(&fc->kobj);
+        file->private_data = fc;
+        /*
+         * atomic_dec_and_test() in fput() provides the necessary
+         * memory barrier for file->private_data to be visible on all
+         * CPUs after this
+         */
+        fput(file);
 
-        fuse_send_init(fc);
+        fuse_send_init(fc, init_req);
 
         return 0;
 
+ err_free_req:
+        fuse_request_free(init_req);
  err_put_root:
         dput(root_dentry);
  err:
+        fput(file);
         kobject_put(&fc->kobj);
         return err;
 }
@@ -753,7 +715,6 @@ static int __init fuse_init(void)
         printk("fuse init (API version %i.%i)\n",
                FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION);
 
-        spin_lock_init(&fuse_lock);
         res = fuse_fs_init();
         if (res)
                 goto err;
diff --git a/fs/inotify.c b/fs/inotify.c
index 367c487c014b..1f50302849c5 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -538,7 +538,7 @@ void inotify_d_instantiate(struct dentry *entry, struct inode *inode)
         WARN_ON(entry->d_flags & DCACHE_INOTIFY_PARENT_WATCHED);
         spin_lock(&entry->d_lock);
         parent = entry->d_parent;
-        if (inotify_inode_watched(parent->d_inode))
+        if (parent->d_inode && inotify_inode_watched(parent->d_inode))
                 entry->d_flags |= DCACHE_INOTIFY_PARENT_WATCHED;
         spin_unlock(&entry->d_lock);
 }
diff --git a/fs/namespace.c b/fs/namespace.c
index bf478addb852..2c5f1f80bdc2 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -899,11 +899,13 @@ static int do_change_type(struct nameidata *nd, int flag)
 /*
  * do loopback mount.
  */
-static int do_loopback(struct nameidata *nd, char *old_name, int recurse)
+static int do_loopback(struct nameidata *nd, char *old_name, unsigned long flags, int mnt_flags)
 {
         struct nameidata old_nd;
         struct vfsmount *mnt = NULL;
+        int recurse = flags & MS_REC;
         int err = mount_is_safe(nd);
+
         if (err)
                 return err;
         if (!old_name || !*old_name)
@@ -937,6 +939,7 @@ static int do_loopback(struct nameidata *nd, char *old_name, int recurse)
                 spin_unlock(&vfsmount_lock);
                 release_mounts(&umount_list);
         }
+        mnt->mnt_flags = mnt_flags;
 
 out:
         up_write(&namespace_sem);
@@ -1350,7 +1353,7 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
                 retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
                                     data_page);
         else if (flags & MS_BIND)
-                retval = do_loopback(&nd, dev_name, flags & MS_REC);
+                retval = do_loopback(&nd, dev_name, flags, mnt_flags);
         else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
                 retval = do_change_type(&nd, flags);
         else if (flags & MS_MOVE)
diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c
index cfe9ce881613..6e92b0fe5323 100644
--- a/fs/nfsd/auth.c
+++ b/fs/nfsd/auth.c
@@ -14,46 +14,46 @@
 
 int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
 {
-        struct svc_cred *cred = &rqstp->rq_cred;
+        struct svc_cred cred = rqstp->rq_cred;
         int i;
         int ret;
 
         if (exp->ex_flags & NFSEXP_ALLSQUASH) {
-                cred->cr_uid = exp->ex_anon_uid;
-                cred->cr_gid = exp->ex_anon_gid;
-                put_group_info(cred->cr_group_info);
-                cred->cr_group_info = groups_alloc(0);
+                cred.cr_uid = exp->ex_anon_uid;
+                cred.cr_gid = exp->ex_anon_gid;
+                cred.cr_group_info = groups_alloc(0);
         } else if (exp->ex_flags & NFSEXP_ROOTSQUASH) {
                 struct group_info *gi;
-                if (!cred->cr_uid)
-                        cred->cr_uid = exp->ex_anon_uid;
-                if (!cred->cr_gid)
-                        cred->cr_gid = exp->ex_anon_gid;
-                gi = groups_alloc(cred->cr_group_info->ngroups);
+                if (!cred.cr_uid)
+                        cred.cr_uid = exp->ex_anon_uid;
+                if (!cred.cr_gid)
+                        cred.cr_gid = exp->ex_anon_gid;
+                gi = groups_alloc(cred.cr_group_info->ngroups);
                 if (gi)
-                        for (i = 0; i < cred->cr_group_info->ngroups; i++) {
-                                if (!GROUP_AT(cred->cr_group_info, i))
+                        for (i = 0; i < cred.cr_group_info->ngroups; i++) {
+                                if (!GROUP_AT(cred.cr_group_info, i))
                                         GROUP_AT(gi, i) = exp->ex_anon_gid;
                                 else
-                                        GROUP_AT(gi, i) = GROUP_AT(cred->cr_group_info, i);
+                                        GROUP_AT(gi, i) = GROUP_AT(cred.cr_group_info, i);
                         }
-                put_group_info(cred->cr_group_info);
-                cred->cr_group_info = gi;
-        }
+                cred.cr_group_info = gi;
+        } else
+                get_group_info(cred.cr_group_info);
 
-        if (cred->cr_uid != (uid_t) -1)
-                current->fsuid = cred->cr_uid;
+        if (cred.cr_uid != (uid_t) -1)
+                current->fsuid = cred.cr_uid;
         else
                 current->fsuid = exp->ex_anon_uid;
-        if (cred->cr_gid != (gid_t) -1)
-                current->fsgid = cred->cr_gid;
+        if (cred.cr_gid != (gid_t) -1)
+                current->fsgid = cred.cr_gid;
         else
                 current->fsgid = exp->ex_anon_gid;
 
-        if (!cred->cr_group_info)
+        if (!cred.cr_group_info)
                 return -ENOMEM;
-        ret = set_current_groups(cred->cr_group_info);
-        if ((cred->cr_uid)) {
+        ret = set_current_groups(cred.cr_group_info);
+        put_group_info(cred.cr_group_info);
+        if ((cred.cr_uid)) {
                 cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
         } else {
                 cap_t(current->cap_effective) |= (CAP_NFSD_MASK &
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index c340be0a3f59..4e0578121d9a 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -422,7 +422,7 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
         if ((len=qword_get(&mesg, buf, PAGE_SIZE)) <= 0)
                 goto out;
         err = path_lookup(buf, 0, &nd);
-        if (err) goto out;
+        if (err) goto out_no_path;
 
         exp.h.flags = 0;
         exp.ex_client = dom;
@@ -475,6 +475,7 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
  out:
         if (nd.dentry)
                 path_release(&nd);
+ out_no_path:
         if (dom)
                 auth_domain_put(dom);
         kfree(buf);
diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
index 6d2dfed1de08..f61142afea44 100644
--- a/fs/nfsd/nfs3proc.c
+++ b/fs/nfsd/nfs3proc.c
@@ -682,7 +682,7 @@ static struct svc_procedure		nfsd_procedures3[22] = {
   PROC(lookup,   dirop,         dirop,          fhandle2, RC_NOCACHE, ST+FH+pAT+pAT),
   PROC(access,   access,        access,         fhandle,  RC_NOCACHE, ST+pAT+1),
   PROC(readlink, readlink,      readlink,       fhandle,  RC_NOCACHE, ST+pAT+1+NFS3_MAXPATHLEN/4),
-  PROC(read,     read,          read,           fhandle,  RC_NOCACHE, ST+pAT+4+NFSSVC_MAXBLKSIZE),
+  PROC(read,     read,          read,           fhandle,  RC_NOCACHE, ST+pAT+4+NFSSVC_MAXBLKSIZE/4),
   PROC(write,    write,         write,          fhandle,  RC_REPLBUFF, ST+WC+4),
   PROC(create,   create,        create,         fhandle2, RC_REPLBUFF, ST+(1+FH+pAT)+WC),
   PROC(mkdir,    mkdir,         create,         fhandle2, RC_REPLBUFF, ST+(1+FH+pAT)+WC),
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index 7391f4aabedb..edb107e61b91 100644
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -710,9 +710,9 @@ calculate_posix_ace_count(struct nfs4_acl *n4acl)
                 /* Also, the remaining entries are for named users and
                  * groups, and come in threes (mask, allow, deny): */
                 if (n4acl->naces < 7)
-                        return -1;
+                        return -EINVAL;
                 if ((n4acl->naces - 7) % 3)
-                        return -1;
+                        return -EINVAL;
                 return 4 + (n4acl->naces - 7)/3;
         }
 }
@@ -790,7 +790,7 @@ nfs4_acl_split(struct nfs4_acl *acl, struct nfs4_acl *dacl)
                         continue;
 
                 error = nfs4_acl_add_ace(dacl, ace->type, ace->flag,
-                                ace->access_mask, ace->whotype, ace->who) == -1;
+                                ace->access_mask, ace->whotype, ace->who);
                 if (error < 0)
                         goto out;
 
@@ -866,7 +866,7 @@ nfs4_acl_add_ace(struct nfs4_acl *acl, u32 type, u32 flag, u32 access_mask,
         struct nfs4_ace *ace;
 
         if ((ace = kmalloc(sizeof(*ace), GFP_KERNEL)) == NULL)
-                return -1;
+                return -ENOMEM;
 
         ace->type = type;
         ace->flag = flag;
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index c872bd07fc10..dbaf3f93f328 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -441,8 +441,9 @@ nfsd4_probe_callback(struct nfs4_client *clp)
                 goto out_clnt;
         }
 
-        /* the task holds a reference to the nfs4_client struct */
         cb->cb_client = clnt;
+
+        /* the task holds a reference to the nfs4_client struct */
         atomic_inc(&clp->cl_count);
 
         msg.rpc_cred = nfsd4_lookupcred(clp,0);
@@ -460,13 +461,12 @@ nfsd4_probe_callback(struct nfs4_client *clp)
 out_rpciod:
         atomic_dec(&clp->cl_count);
         rpciod_down();
+        cb->cb_client = NULL;
 out_clnt:
         rpc_shutdown_client(clnt);
-        goto out_err;
 out_err:
         dprintk("NFSD: warning: no callback path to client %.*s\n",
                 (int)clp->cl_name.len, clp->cl_name.data);
-        cb->cb_client = NULL;
 }
 
 static void
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 6d63f1d9e5f5..b0e095ea0c03 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -288,8 +288,6 @@ nfsd4_putrootfh(struct svc_rqst *rqstp, struct svc_fh *current_fh)
         fh_put(current_fh);
         status = exp_pseudoroot(rqstp->rq_client, current_fh,
                               &rqstp->rq_chandle);
-        if (!status)
-                status = nfserrno(nfsd_setuser(rqstp, current_fh->fh_export));
         return status;
 }
 
@@ -975,7 +973,7 @@ struct nfsd4_voidargs { int dummy; };
  */
 static struct svc_procedure             nfsd_procedures4[2] = {
   PROC(null,     void,          void,           void,     RC_NOCACHE, 1),
-  PROC(compound, compound,      compound,       compound, RC_NOCACHE, NFSD_BUFSIZE)
+  PROC(compound, compound,      compound,       compound, RC_NOCACHE, NFSD_BUFSIZE/4)
 };
 
 struct svc_version      nfsd_version4 = {
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 47ec112b266c..96c7578cbe1e 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -147,6 +147,42 @@ get_nfs4_file(struct nfs4_file *fi)
         kref_get(&fi->fi_ref);
 }
 
+static int num_delegations;
+
+/*
+ * Open owner state (share locks)
+ */
+
+/* hash tables for nfs4_stateowner */
+#define OWNER_HASH_BITS              8
+#define OWNER_HASH_SIZE             (1 << OWNER_HASH_BITS)
+#define OWNER_HASH_MASK             (OWNER_HASH_SIZE - 1)
+
+#define ownerid_hashval(id) \
+        ((id) & OWNER_HASH_MASK)
+#define ownerstr_hashval(clientid, ownername) \
+        (((clientid) + opaque_hashval((ownername.data), (ownername.len))) & OWNER_HASH_MASK)
+
+static struct list_head ownerid_hashtbl[OWNER_HASH_SIZE];
+static struct list_head ownerstr_hashtbl[OWNER_HASH_SIZE];
+
+/* hash table for nfs4_file */
+#define FILE_HASH_BITS                   8
+#define FILE_HASH_SIZE                  (1 << FILE_HASH_BITS)
+#define FILE_HASH_MASK                  (FILE_HASH_SIZE - 1)
+/* hash table for (open)nfs4_stateid */
+#define STATEID_HASH_BITS              10
+#define STATEID_HASH_SIZE              (1 << STATEID_HASH_BITS)
+#define STATEID_HASH_MASK              (STATEID_HASH_SIZE - 1)
+
+#define file_hashval(x) \
+        hash_ptr(x, FILE_HASH_BITS)
+#define stateid_hashval(owner_id, file_id)  \
+        (((owner_id) + (file_id)) & STATEID_HASH_MASK)
+
+static struct list_head file_hashtbl[FILE_HASH_SIZE];
+static struct list_head stateid_hashtbl[STATEID_HASH_SIZE];
+
 static struct nfs4_delegation *
 alloc_init_deleg(struct nfs4_client *clp, struct nfs4_stateid *stp, struct svc_fh *current_fh, u32 type)
 {
@@ -155,9 +191,12 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_stateid *stp, struct svc_f
         struct nfs4_callback *cb = &stp->st_stateowner->so_client->cl_callback;
 
         dprintk("NFSD alloc_init_deleg\n");
+        if (num_delegations > STATEID_HASH_SIZE * 4)
+                return NULL;
         dp = kmem_cache_alloc(deleg_slab, GFP_KERNEL);
         if (dp == NULL)
                 return dp;
+        num_delegations++;
         INIT_LIST_HEAD(&dp->dl_perfile);
         INIT_LIST_HEAD(&dp->dl_perclnt);
         INIT_LIST_HEAD(&dp->dl_recall_lru);
@@ -192,6 +231,7 @@ nfs4_put_delegation(struct nfs4_delegation *dp)
                 dprintk("NFSD: freeing dp %p\n",dp);
                 put_nfs4_file(dp->dl_file);
                 kmem_cache_free(deleg_slab, dp);
+                num_delegations--;
         }
 }
 
@@ -330,22 +370,29 @@ put_nfs4_client(struct nfs4_client *clp)
 }
 
 static void
+shutdown_callback_client(struct nfs4_client *clp)
+{
+        struct rpc_clnt *clnt = clp->cl_callback.cb_client;
+
+        /* shutdown rpc client, ending any outstanding recall rpcs */
+        if (clnt) {
+                clp->cl_callback.cb_client = NULL;
+                rpc_shutdown_client(clnt);
+                rpciod_down();
+        }
+}
+
+static void
 expire_client(struct nfs4_client *clp)
 {
         struct nfs4_stateowner *sop;
         struct nfs4_delegation *dp;
-        struct nfs4_callback *cb = &clp->cl_callback;
-        struct rpc_clnt *clnt = clp->cl_callback.cb_client;
         struct list_head reaplist;
 
         dprintk("NFSD: expire_client cl_count %d\n",
                             atomic_read(&clp->cl_count));
 
-        /* shutdown rpc client, ending any outstanding recall rpcs */
-        if (atomic_read(&cb->cb_set) == 1 && clnt) {
-                rpc_shutdown_client(clnt);
-                clnt = clp->cl_callback.cb_client = NULL;
-        }
+        shutdown_callback_client(clp);
 
         INIT_LIST_HEAD(&reaplist);
         spin_lock(&recall_lock);
@@ -936,40 +983,6 @@ out:
         return status;
 }
 
-/* 
- * Open owner state (share locks)
- */
-
-/* hash tables for nfs4_stateowner */
-#define OWNER_HASH_BITS              8
-#define OWNER_HASH_SIZE             (1 << OWNER_HASH_BITS)
-#define OWNER_HASH_MASK             (OWNER_HASH_SIZE - 1)
-
-#define ownerid_hashval(id) \
-        ((id) & OWNER_HASH_MASK)
-#define ownerstr_hashval(clientid, ownername) \
-        (((clientid) + opaque_hashval((ownername.data), (ownername.len))) & OWNER_HASH_MASK)
-
-static struct list_head ownerid_hashtbl[OWNER_HASH_SIZE];
-static struct list_head ownerstr_hashtbl[OWNER_HASH_SIZE];
-
-/* hash table for nfs4_file */
-#define FILE_HASH_BITS                   8
-#define FILE_HASH_SIZE                  (1 << FILE_HASH_BITS)
-#define FILE_HASH_MASK                  (FILE_HASH_SIZE - 1)
-/* hash table for (open)nfs4_stateid */
-#define STATEID_HASH_BITS              10
-#define STATEID_HASH_SIZE              (1 << STATEID_HASH_BITS)
-#define STATEID_HASH_MASK              (STATEID_HASH_SIZE - 1)
-
-#define file_hashval(x) \
-        hash_ptr(x, FILE_HASH_BITS)
-#define stateid_hashval(owner_id, file_id)  \
-        (((owner_id) + (file_id)) & STATEID_HASH_MASK)
-
-static struct list_head file_hashtbl[FILE_HASH_SIZE];
-static struct list_head stateid_hashtbl[STATEID_HASH_SIZE];
-
 /* OPEN Share state helper functions */
 static inline struct nfs4_file *
 alloc_init_file(struct inode *ino)
@@ -1186,8 +1199,7 @@ move_to_close_lru(struct nfs4_stateowner *sop)
 {
         dprintk("NFSD: move_to_close_lru nfs4_stateowner %p\n", sop);
 
-        unhash_stateowner(sop);
-        list_add_tail(&sop->so_close_lru, &close_lru);
+        list_move_tail(&sop->so_close_lru, &close_lru);
         sop->so_time = get_seconds();
 }
 
@@ -1916,8 +1928,7 @@ nfs4_laundromat(void)
                 }
                 dprintk("NFSD: purging unused open stateowner (so_id %d)\n",
                         sop->so_id);
-                list_del(&sop->so_close_lru);
-                nfs4_put_stateowner(sop);
+                release_stateowner(sop);
         }
         if (clientid_val < NFSD_LAUNDROMAT_MINTIMEOUT)
                 clientid_val = NFSD_LAUNDROMAT_MINTIMEOUT;
@@ -2495,36 +2506,27 @@ nfs4_transform_lock_offset(struct file_lock *lock)
                 lock->fl_end = OFFSET_MAX;
 }
 
-static int
-nfs4_verify_lock_stateowner(struct nfs4_stateowner *sop, unsigned int hashval)
-{
-        struct nfs4_stateowner *local = NULL;
-        int status = 0;
-                                
-        if (hashval >= LOCK_HASH_SIZE)
-                goto out;
-        list_for_each_entry(local, &lock_ownerid_hashtbl[hashval], so_idhash) {
-                if (local == sop) {
-                        status = 1;
-                        goto out;
-                }
-        }
-out:
-        return status;
-}
-
+/* Hack!: For now, we're defining this just so we can use a pointer to it
+ * as a unique cookie to identify our (NFSv4's) posix locks. */
+static struct lock_manager_operations nfsd_posix_mng_ops  = {
+};
 
 static inline void
 nfs4_set_lock_denied(struct file_lock *fl, struct nfsd4_lock_denied *deny)
 {
-        struct nfs4_stateowner *sop = (struct nfs4_stateowner *) fl->fl_owner;
-        unsigned int hval = lockownerid_hashval(sop->so_id);
+        struct nfs4_stateowner *sop;
+        unsigned int hval;
 
-        deny->ld_sop = NULL;
-        if (nfs4_verify_lock_stateowner(sop, hval)) {
+        if (fl->fl_lmops == &nfsd_posix_mng_ops) {
+                sop = (struct nfs4_stateowner *) fl->fl_owner;
+                hval = lockownerid_hashval(sop->so_id);
                 kref_get(&sop->so_ref);
                 deny->ld_sop = sop;
                 deny->ld_clientid = sop->so_client->cl_clientid;
+        } else {
+                deny->ld_sop = NULL;
+                deny->ld_clientid.cl_boot = 0;
+                deny->ld_clientid.cl_id = 0;
         }
         deny->ld_start = fl->fl_start;
         deny->ld_length = ~(u64)0;
@@ -2736,6 +2738,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
         file_lock.fl_pid = current->tgid;
         file_lock.fl_file = filp;
         file_lock.fl_flags = FL_POSIX;
+        file_lock.fl_lmops = &nfsd_posix_mng_ops;
 
         file_lock.fl_start = lock->lk_offset;
         if ((lock->lk_length == ~(u64)0) || 
@@ -2841,6 +2844,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
                 file_lock.fl_owner = (fl_owner_t)lockt->lt_stateowner;
         file_lock.fl_pid = current->tgid;
         file_lock.fl_flags = FL_POSIX;
+        file_lock.fl_lmops = &nfsd_posix_mng_ops;
 
         file_lock.fl_start = lockt->lt_offset;
         if ((lockt->lt_length == ~(u64)0) || LOFF_OVERFLOW(lockt->lt_offset, lockt->lt_length))
@@ -2900,6 +2904,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
         file_lock.fl_pid = current->tgid;
         file_lock.fl_file = filp;
         file_lock.fl_flags = FL_POSIX; 
+        file_lock.fl_lmops = &nfsd_posix_mng_ops;
         file_lock.fl_start = locku->lu_offset;
 
         if ((locku->lu_length == ~(u64)0) || LOFF_OVERFLOW(locku->lu_offset, locku->lu_length))
@@ -3211,15 +3216,8 @@ __nfs4_state_shutdown(void)
         int i;
         struct nfs4_client *clp = NULL;
         struct nfs4_delegation *dp = NULL;
-        struct nfs4_stateowner *sop = NULL;
         struct list_head *pos, *next, reaplist;
 
-        list_for_each_safe(pos, next, &close_lru) {
-                sop = list_entry(pos, struct nfs4_stateowner, so_close_lru);
-                list_del(&sop->so_close_lru);
-                nfs4_put_stateowner(sop);
-        }
-
         for (i = 0; i < CLIENT_HASH_SIZE; i++) {
                 while (!list_empty(&conf_id_hashtbl[i])) {
                         clp = list_entry(conf_id_hashtbl[i].next, struct nfs4_client, cl_idhash);
@@ -3244,8 +3242,6 @@ __nfs4_state_shutdown(void)
         }
 
         cancel_delayed_work(&laundromat_work);
-        flush_workqueue(laundry_wq);
-        destroy_workqueue(laundry_wq);
         nfsd4_shutdown_recdir();
         nfs4_init = 0;
 }
@@ -3253,6 +3249,8 @@ __nfs4_state_shutdown(void)
 void
 nfs4_state_shutdown(void)
 {
+        cancel_rearming_delayed_workqueue(laundry_wq, &laundromat_work);
+        destroy_workqueue(laundry_wq);
         nfs4_lock_state();
         nfs4_release_reclaim();
         __nfs4_state_shutdown();
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 03857fd81126..de3998f15f10 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -299,11 +299,10 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *ia
                                                 buf, dummy32, &ace.who);
                         if (status)
                                 goto out_nfserr;
-                        if (nfs4_acl_add_ace(*acl, ace.type, ace.flag,
-                                 ace.access_mask, ace.whotype, ace.who) != 0) {
-                                status = -ENOMEM;
+                        status = nfs4_acl_add_ace(*acl, ace.type, ace.flag,
+                                 ace.access_mask, ace.whotype, ace.who);
+                        if (status)
                                 goto out_nfserr;
-                        }
                 }
         } else
                 *acl = NULL;
@@ -2085,27 +2084,20 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_read
         WRITE32(eof);
         WRITE32(maxcount);
         ADJUST_ARGS();
-        resp->xbuf->head[0].iov_len = ((char*)resp->p) - (char*)resp->xbuf->head[0].iov_base;
-
+        resp->xbuf->head[0].iov_len = (char*)p
+                                        - (char*)resp->xbuf->head[0].iov_base;
         resp->xbuf->page_len = maxcount;
 
-        /* read zero bytes -> don't set up tail */
-        if(!maxcount)
-                return 0;        
-
-        /* set up page for remaining responses */
-        svc_take_page(resp->rqstp);
-        resp->xbuf->tail[0].iov_base = 
-                page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused-1]);
-        resp->rqstp->rq_restailpage = resp->rqstp->rq_resused-1;
+        /* Use rest of head for padding and remaining ops: */
+        resp->rqstp->rq_restailpage = 0;
+        resp->xbuf->tail[0].iov_base = p;
         resp->xbuf->tail[0].iov_len = 0;
-        resp->p = resp->xbuf->tail[0].iov_base;
-        resp->end = resp->p + PAGE_SIZE/4;
-
         if (maxcount&3) {
-                *(resp->p)++ = 0;
+                RESERVE_SPACE(4);
+                WRITE32(0);
                 resp->xbuf->tail[0].iov_base += maxcount&3;
                 resp->xbuf->tail[0].iov_len = 4 - (maxcount&3);
+                ADJUST_ARGS();
         }
         return 0;
 }
@@ -2142,21 +2134,20 @@ nfsd4_encode_readlink(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_r
 
         WRITE32(maxcount);
         ADJUST_ARGS();
-        resp->xbuf->head[0].iov_len = ((char*)resp->p) - (char*)resp->xbuf->head[0].iov_base;
+        resp->xbuf->head[0].iov_len = (char*)p
+                                - (char*)resp->xbuf->head[0].iov_base;
+        resp->xbuf->page_len = maxcount;
 
-        svc_take_page(resp->rqstp);
-        resp->xbuf->tail[0].iov_base = 
-                page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused-1]);
-        resp->rqstp->rq_restailpage = resp->rqstp->rq_resused-1;
+        /* Use rest of head for padding and remaining ops: */
+        resp->rqstp->rq_restailpage = 0;
+        resp->xbuf->tail[0].iov_base = p;
         resp->xbuf->tail[0].iov_len = 0;
-        resp->p = resp->xbuf->tail[0].iov_base;
-        resp->end = resp->p + PAGE_SIZE/4;
-
-        resp->xbuf->page_len = maxcount;
         if (maxcount&3) {
-                *(resp->p)++ = 0;
+                RESERVE_SPACE(4);
+                WRITE32(0);
                 resp->xbuf->tail[0].iov_base += maxcount&3;
                 resp->xbuf->tail[0].iov_len = 4 - (maxcount&3);
+                ADJUST_ARGS();
         }
         return 0;
 }
@@ -2166,7 +2157,7 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_re
 {
         int maxcount;
         loff_t offset;
-        u32 *page, *savep;
+        u32 *page, *savep, *tailbase;
         ENCODE_HEAD;
 
         if (nfserr)
@@ -2182,6 +2173,7 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_re
         WRITE32(0);
         ADJUST_ARGS();
         resp->xbuf->head[0].iov_len = ((char*)resp->p) - (char*)resp->xbuf->head[0].iov_base;
+        tailbase = p;
 
         maxcount = PAGE_SIZE;
         if (maxcount > readdir->rd_maxcount)
@@ -2226,14 +2218,12 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_re
         *p++ = htonl(readdir->common.err == nfserr_eof);
         resp->xbuf->page_len = ((char*)p) - (char*)page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused-1]);
 
-        /* allocate a page for the tail */
-        svc_take_page(resp->rqstp);
-        resp->xbuf->tail[0].iov_base = 
-                page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused-1]);
-        resp->rqstp->rq_restailpage = resp->rqstp->rq_resused-1;
+        /* Use rest of head for padding and remaining ops: */
+        resp->rqstp->rq_restailpage = 0;
+        resp->xbuf->tail[0].iov_base = tailbase;
         resp->xbuf->tail[0].iov_len = 0;
         resp->p = resp->xbuf->tail[0].iov_base;
-        resp->end = resp->p + PAGE_SIZE/4;
+        resp->end = resp->p + (PAGE_SIZE - resp->xbuf->head[0].iov_len)/4;
 
         return 0;
 err_no_verf:
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index 3e6b75cd90fd..06cd0db0f32b 100644
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -553,7 +553,7 @@ static struct svc_procedure		nfsd_procedures2[18] = {
   PROC(none,     void,          void,           none,           RC_NOCACHE, ST),
   PROC(lookup,   diropargs,     diropres,       fhandle,        RC_NOCACHE, ST+FH+AT),
   PROC(readlink, readlinkargs,  readlinkres,    none,           RC_NOCACHE, ST+1+NFS_MAXPATHLEN/4),
-  PROC(read,     readargs,      readres,        fhandle,        RC_NOCACHE, ST+AT+1+NFSSVC_MAXBLKSIZE),
+  PROC(read,     readargs,      readres,        fhandle,        RC_NOCACHE, ST+AT+1+NFSSVC_MAXBLKSIZE/4),
   PROC(none,     void,          void,           none,           RC_NOCACHE, ST),
   PROC(write,    writeargs,     attrstat,       fhandle,        RC_REPLBUFF, ST+AT),
   PROC(create,   createargs,    diropres,       fhandle,        RC_REPLBUFF, ST+FH+AT),
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 31018333dc38..6aa92d0e6876 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -371,7 +371,6 @@ out_nfserr:
 static ssize_t nfsd_getxattr(struct dentry *dentry, char *key, void **buf)
 {
         ssize_t buflen;
-        int error;
 
         buflen = vfs_getxattr(dentry, key, NULL, 0);
         if (buflen <= 0)
@@ -381,10 +380,7 @@ static ssize_t nfsd_getxattr(struct dentry *dentry, char *key, void **buf)
         if (!*buf)
                 return -ENOMEM;
 
-        error = vfs_getxattr(dentry, key, *buf, buflen);
-        if (error < 0)
-                return error;
-        return buflen;
+        return vfs_getxattr(dentry, key, *buf, buflen);
 }
 #endif
 
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index bff0f0d06867..21f38accd039 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -153,6 +153,7 @@ struct o2hb_region {
 struct o2hb_bio_wait_ctxt {
         atomic_t          wc_num_reqs;
         struct completion wc_io_complete;
+        int               wc_error;
 };
 
 static void o2hb_write_timeout(void *arg)
@@ -186,6 +187,7 @@ static inline void o2hb_bio_wait_init(struct o2hb_bio_wait_ctxt *wc,
 {
         atomic_set(&wc->wc_num_reqs, num_ios);
         init_completion(&wc->wc_io_complete);
+        wc->wc_error = 0;
 }
 
 /* Used in error paths too */
@@ -218,8 +220,10 @@ static int o2hb_bio_end_io(struct bio *bio,
 {
         struct o2hb_bio_wait_ctxt *wc = bio->bi_private;
 
-        if (error)
+        if (error) {
                 mlog(ML_ERROR, "IO Error %d\n", error);
+                wc->wc_error = error;
+        }
 
         if (bio->bi_size)
                 return 1;
@@ -390,6 +394,8 @@ static int o2hb_read_slots(struct o2hb_region *reg,
 
 bail_and_wait:
         o2hb_wait_on_io(reg, &wc);
+        if (wc.wc_error && !status)
+                status = wc.wc_error;
 
         if (bios) {
                 for(i = 0; i < num_bios; i++)
@@ -790,20 +796,24 @@ static int o2hb_highest_node(unsigned long *nodes,
         return highest;
 }
 
-static void o2hb_do_disk_heartbeat(struct o2hb_region *reg)
+static int o2hb_do_disk_heartbeat(struct o2hb_region *reg)
 {
         int i, ret, highest_node, change = 0;
         unsigned long configured_nodes[BITS_TO_LONGS(O2NM_MAX_NODES)];
         struct bio *write_bio;
         struct o2hb_bio_wait_ctxt write_wc;
 
-        if (o2nm_configured_node_map(configured_nodes, sizeof(configured_nodes)))
-                return;
+        ret = o2nm_configured_node_map(configured_nodes,
+                                       sizeof(configured_nodes));
+        if (ret) {
+                mlog_errno(ret);
+                return ret;
+        }
 
         highest_node = o2hb_highest_node(configured_nodes, O2NM_MAX_NODES);
         if (highest_node >= O2NM_MAX_NODES) {
                 mlog(ML_NOTICE, "ocfs2_heartbeat: no configured nodes found!\n");
-                return;
+                return -EINVAL;
         }
 
         /* No sense in reading the slots of nodes that don't exist
@@ -813,7 +823,7 @@ static void o2hb_do_disk_heartbeat(struct o2hb_region *reg)
         ret = o2hb_read_slots(reg, highest_node + 1);
         if (ret < 0) {
                 mlog_errno(ret);
-                return;
+                return ret;
         }
 
         /* With an up to date view of the slots, we can check that no
@@ -831,7 +841,7 @@ static void o2hb_do_disk_heartbeat(struct o2hb_region *reg)
         ret = o2hb_issue_node_write(reg, &write_bio, &write_wc);
         if (ret < 0) {
                 mlog_errno(ret);
-                return;
+                return ret;
         }
 
         i = -1;
@@ -847,6 +857,15 @@ static void o2hb_do_disk_heartbeat(struct o2hb_region *reg)
          */
         o2hb_wait_on_io(reg, &write_wc);
         bio_put(write_bio);
+        if (write_wc.wc_error) {
+                /* Do not re-arm the write timeout on I/O error - we
+                 * can't be sure that the new block ever made it to
+                 * disk */
+                mlog(ML_ERROR, "Write error %d on device \"%s\"\n",
+                     write_wc.wc_error, reg->hr_dev_name);
+                return write_wc.wc_error;
+        }
+
         o2hb_arm_write_timeout(reg);
 
         /* let the person who launched us know when things are steady */
@@ -854,6 +873,8 @@ static void o2hb_do_disk_heartbeat(struct o2hb_region *reg)
                 if (atomic_dec_and_test(&reg->hr_steady_iterations))
                         wake_up(&o2hb_steady_queue);
         }
+
+        return 0;
 }
 
 /* Subtract b from a, storing the result in a. a *must* have a larger
@@ -913,7 +934,10 @@ static int o2hb_thread(void *data)
                  * likely to time itself out. */
                 do_gettimeofday(&before_hb);
 
-                o2hb_do_disk_heartbeat(reg);
+                i = 0;
+                do {
+                        ret = o2hb_do_disk_heartbeat(reg);
+                } while (ret && ++i < 2);
 
                 do_gettimeofday(&after_hb);
                 elapsed_msec = o2hb_elapsed_msecs(&before_hb, &after_hb);
diff --git a/fs/ocfs2/dlm/userdlm.c b/fs/ocfs2/dlm/userdlm.c
index c3764f4744ee..74ca4e5f9765 100644
--- a/fs/ocfs2/dlm/userdlm.c
+++ b/fs/ocfs2/dlm/userdlm.c
@@ -139,6 +139,10 @@ static void user_ast(void *opaque)
                 return;
         }
 
+        mlog_bug_on_msg(lockres->l_requested == LKM_IVMODE,
+                        "Lockres %s, requested ivmode. flags 0x%x\n",
+                        lockres->l_name, lockres->l_flags);
+
         /* we're downconverting. */
         if (lockres->l_requested < lockres->l_level) {
                 if (lockres->l_requested <=
@@ -229,23 +233,42 @@ static void user_unlock_ast(void *opaque, enum dlm_status status)
 
         mlog(0, "UNLOCK AST called on lock %s\n", lockres->l_name);
 
-        if (status != DLM_NORMAL)
+        if (status != DLM_NORMAL && status != DLM_CANCELGRANT)
                 mlog(ML_ERROR, "Dlm returns status %d\n", status);
 
         spin_lock(&lockres->l_lock);
-        if (lockres->l_flags & USER_LOCK_IN_TEARDOWN)
+        /* The teardown flag gets set early during the unlock process,
+         * so test the cancel flag to make sure that this ast isn't
+         * for a concurrent cancel. */
+        if (lockres->l_flags & USER_LOCK_IN_TEARDOWN
+            && !(lockres->l_flags & USER_LOCK_IN_CANCEL)) {
                 lockres->l_level = LKM_IVMODE;
-        else {
+        } else if (status == DLM_CANCELGRANT) {
+                mlog(0, "Lock %s, cancel fails, flags 0x%x\n",
+                     lockres->l_name, lockres->l_flags);
+                /* We tried to cancel a convert request, but it was
+                 * already granted. Don't clear the busy flag - the
+                 * ast should've done this already. */
+                BUG_ON(!(lockres->l_flags & USER_LOCK_IN_CANCEL));
+                lockres->l_flags &= ~USER_LOCK_IN_CANCEL;
+                goto out_noclear;
+        } else {
+                BUG_ON(!(lockres->l_flags & USER_LOCK_IN_CANCEL));
+                /* Cancel succeeded, we want to re-queue */
+                mlog(0, "Lock %s, cancel succeeds, flags 0x%x\n",
+                     lockres->l_name, lockres->l_flags);
                 lockres->l_requested = LKM_IVMODE; /* cancel an
                                                     * upconvert
                                                     * request. */
                 lockres->l_flags &= ~USER_LOCK_IN_CANCEL;
                 /* we want the unblock thread to look at it again
                  * now. */
-                __user_dlm_queue_lockres(lockres);
+                if (lockres->l_flags & USER_LOCK_BLOCKED)
+                        __user_dlm_queue_lockres(lockres);
         }
 
         lockres->l_flags &= ~USER_LOCK_BUSY;
+out_noclear:
         spin_unlock(&lockres->l_lock);
 
         wake_up(&lockres->l_event);
@@ -268,13 +291,26 @@ static void user_dlm_unblock_lock(void *opaque)
 
         spin_lock(&lockres->l_lock);
 
-        BUG_ON(!(lockres->l_flags & USER_LOCK_BLOCKED));
-        BUG_ON(!(lockres->l_flags & USER_LOCK_QUEUED));
+        mlog_bug_on_msg(!(lockres->l_flags & USER_LOCK_QUEUED),
+                        "Lockres %s, flags 0x%x\n",
+                        lockres->l_name, lockres->l_flags);
 
-        /* notice that we don't clear USER_LOCK_BLOCKED here. That's
-         * for user_ast to do. */
+        /* notice that we don't clear USER_LOCK_BLOCKED here. If it's
+         * set, we want user_ast clear it. */
         lockres->l_flags &= ~USER_LOCK_QUEUED;
 
+        /* It's valid to get here and no longer be blocked - if we get
+         * several basts in a row, we might be queued by the first
+         * one, the unblock thread might run and clear the queued
+         * flag, and finally we might get another bast which re-queues
+         * us before our ast for the downconvert is called. */
+        if (!(lockres->l_flags & USER_LOCK_BLOCKED)) {
+                mlog(0, "Lockres %s, flags 0x%x: queued but not blocking\n",
+                        lockres->l_name, lockres->l_flags);
+                spin_unlock(&lockres->l_lock);
+                goto drop_ref;
+        }
+
         if (lockres->l_flags & USER_LOCK_IN_TEARDOWN) {
                 mlog(0, "lock is in teardown so we do nothing\n");
                 spin_unlock(&lockres->l_lock);
@@ -282,7 +318,9 @@ static void user_dlm_unblock_lock(void *opaque)
         }
 
         if (lockres->l_flags & USER_LOCK_BUSY) {
-                mlog(0, "BUSY flag detected...\n");
+                mlog(0, "Cancel lock %s, flags 0x%x\n",
+                     lockres->l_name, lockres->l_flags);
+
                 if (lockres->l_flags & USER_LOCK_IN_CANCEL) {
                         spin_unlock(&lockres->l_lock);
                         goto drop_ref;
@@ -296,14 +334,7 @@ static void user_dlm_unblock_lock(void *opaque)
                                    LKM_CANCEL,
                                    user_unlock_ast,
                                    lockres);
-                if (status == DLM_CANCELGRANT) {
-                        /* If we got this, then the ast was fired
-                         * before we could cancel. We cleanup our
-                         * state, and restart the function. */
-                        spin_lock(&lockres->l_lock);
-                        lockres->l_flags &= ~USER_LOCK_IN_CANCEL;
-                        spin_unlock(&lockres->l_lock);
-                } else if (status != DLM_NORMAL)
+                if (status != DLM_NORMAL)
                         user_log_dlm_error("dlmunlock", status, lockres);
                 goto drop_ref;
         }
@@ -581,6 +612,14 @@ int user_dlm_destroy_lock(struct user_lock_res *lockres)
         mlog(0, "asked to destroy %s\n", lockres->l_name);
 
         spin_lock(&lockres->l_lock);
+        if (lockres->l_flags & USER_LOCK_IN_TEARDOWN) {
+                mlog(0, "Lock is already torn down\n");
+                spin_unlock(&lockres->l_lock);
+                return 0;
+        }
+
+        lockres->l_flags |= USER_LOCK_IN_TEARDOWN;
+
         while (lockres->l_flags & USER_LOCK_BUSY) {
                 spin_unlock(&lockres->l_lock);
 
@@ -606,7 +645,6 @@ int user_dlm_destroy_lock(struct user_lock_res *lockres)
 
         lockres->l_flags &= ~USER_LOCK_ATTACHED;
         lockres->l_flags |= USER_LOCK_BUSY;
-        lockres->l_flags |= USER_LOCK_IN_TEARDOWN;
         spin_unlock(&lockres->l_lock);
 
         mlog(0, "unlocking lockres %s\n", lockres->l_name);
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 34e903a6a46b..581eb451a41a 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -260,6 +260,17 @@ static int ocfs2_truncate_file(struct inode *inode,
         if (new_i_size == le64_to_cpu(fe->i_size))
                 goto bail;
 
+        /* This forces other nodes to sync and drop their pages. Do
+         * this even if we have a truncate without allocation change -
+         * ocfs2 cluster sizes can be much greater than page size, so
+         * we have to truncate them anyway.  */
+        status = ocfs2_data_lock(inode, 1);
+        if (status < 0) {
+                mlog_errno(status);
+                goto bail;
+        }
+        ocfs2_data_unlock(inode, 1);
+
         if (le32_to_cpu(fe->i_clusters) ==
             ocfs2_clusters_for_bytes(osb->sb, new_i_size)) {
                 mlog(0, "fe->i_clusters = %u, so we do a simple truncate\n",
@@ -272,14 +283,6 @@ static int ocfs2_truncate_file(struct inode *inode,
                 goto bail;
         }
 
-        /* This forces other nodes to sync and drop their pages */
-        status = ocfs2_data_lock(inode, 1);
-        if (status < 0) {
-                mlog_errno(status);
-                goto bail;
-        }
-        ocfs2_data_unlock(inode, 1);
-
         /* alright, we're going to need to do a full blown alloc size
          * change. Orphan the inode so that recovery can complete the
          * truncate if necessary. This does the task of marking
diff --git a/fs/pipe.c b/fs/pipe.c
index 795df987cd38..e984beb93a0e 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -36,7 +36,7 @@
  */
 
 /* Drop the inode semaphore and wait for a pipe event, atomically */
-void pipe_wait(struct inode * inode)
+void pipe_wait(struct pipe_inode_info *pipe)
 {
         DEFINE_WAIT(wait);
 
@@ -44,11 +44,14 @@ void pipe_wait(struct inode * inode)
          * Pipes are system-local resources, so sleeping on them
          * is considered a noninteractive wait:
          */
-        prepare_to_wait(PIPE_WAIT(*inode), &wait, TASK_INTERRUPTIBLE|TASK_NONINTERACTIVE);
-        mutex_unlock(PIPE_MUTEX(*inode));
+        prepare_to_wait(&pipe->wait, &wait,
+                        TASK_INTERRUPTIBLE | TASK_NONINTERACTIVE);
+        if (pipe->inode)
+                mutex_unlock(&pipe->inode->i_mutex);
         schedule();
-        finish_wait(PIPE_WAIT(*inode), &wait);
-        mutex_lock(PIPE_MUTEX(*inode));
+        finish_wait(&pipe->wait, &wait);
+        if (pipe->inode)
+                mutex_lock(&pipe->inode->i_mutex);
 }
 
 static int
@@ -91,7 +94,8 @@ pipe_iov_copy_to_user(struct iovec *iov, const void *from, unsigned long len)
         return 0;
 }
 
-static void anon_pipe_buf_release(struct pipe_inode_info *info, struct pipe_buffer *buf)
+static void anon_pipe_buf_release(struct pipe_inode_info *pipe,
+                                  struct pipe_buffer *buf)
 {
         struct page *page = buf->page;
 
@@ -100,30 +104,27 @@ static void anon_pipe_buf_release(struct pipe_inode_info *info, struct pipe_buff
         /*
          * If nobody else uses this page, and we don't already have a
          * temporary page, let's keep track of it as a one-deep
-         * allocation cache
+         * allocation cache. (Otherwise just release our reference to it)
          */
-        if (page_count(page) == 1 && !info->tmp_page) {
-                info->tmp_page = page;
-                return;
-        }
-
-        /*
-         * Otherwise just release our reference to it
-         */
-        page_cache_release(page);
+        if (page_count(page) == 1 && !pipe->tmp_page)
+                pipe->tmp_page = page;
+        else
+                page_cache_release(page);
 }
 
-static void *anon_pipe_buf_map(struct file *file, struct pipe_inode_info *info, struct pipe_buffer *buf)
+static void * anon_pipe_buf_map(struct file *file, struct pipe_inode_info *pipe,
+                                struct pipe_buffer *buf)
 {
         return kmap(buf->page);
 }
 
-static void anon_pipe_buf_unmap(struct pipe_inode_info *info, struct pipe_buffer *buf)
+static void anon_pipe_buf_unmap(struct pipe_inode_info *pipe,
+                                struct pipe_buffer *buf)
 {
         kunmap(buf->page);
 }
 
-static int anon_pipe_buf_steal(struct pipe_inode_info *info,
+static int anon_pipe_buf_steal(struct pipe_inode_info *pipe,
                                struct pipe_buffer *buf)
 {
         buf->flags |= PIPE_BUF_FLAG_STOLEN;
@@ -143,7 +144,7 @@ pipe_readv(struct file *filp, const struct iovec *_iov,
            unsigned long nr_segs, loff_t *ppos)
 {
         struct inode *inode = filp->f_dentry->d_inode;
-        struct pipe_inode_info *info;
+        struct pipe_inode_info *pipe;
         int do_wakeup;
         ssize_t ret;
         struct iovec *iov = (struct iovec *)_iov;
@@ -156,13 +157,13 @@ pipe_readv(struct file *filp, const struct iovec *_iov,
 
         do_wakeup = 0;
         ret = 0;
-        mutex_lock(PIPE_MUTEX(*inode));
-        info = inode->i_pipe;
+        mutex_lock(&inode->i_mutex);
+        pipe = inode->i_pipe;
         for (;;) {
-                int bufs = info->nrbufs;
+                int bufs = pipe->nrbufs;
                 if (bufs) {
-                        int curbuf = info->curbuf;
-                        struct pipe_buffer *buf = info->bufs + curbuf;
+                        int curbuf = pipe->curbuf;
+                        struct pipe_buffer *buf = pipe->bufs + curbuf;
                         struct pipe_buf_operations *ops = buf->ops;
                         void *addr;
                         size_t chars = buf->len;
@@ -171,16 +172,17 @@ pipe_readv(struct file *filp, const struct iovec *_iov,
                         if (chars > total_len)
                                 chars = total_len;
 
-                        addr = ops->map(filp, info, buf);
+                        addr = ops->map(filp, pipe, buf);
                         if (IS_ERR(addr)) {
                                 if (!ret)
                                         ret = PTR_ERR(addr);
                                 break;
                         }
                         error = pipe_iov_copy_to_user(iov, addr + buf->offset, chars);
-                        ops->unmap(info, buf);
+                        ops->unmap(pipe, buf);
                         if (unlikely(error)) {
-                                if (!ret) ret = -EFAULT;
+                                if (!ret)
+                                        ret = -EFAULT;
                                 break;
                         }
                         ret += chars;
@@ -188,10 +190,10 @@ pipe_readv(struct file *filp, const struct iovec *_iov,
                         buf->len -= chars;
                         if (!buf->len) {
                                 buf->ops = NULL;
-                                ops->release(info, buf);
+                                ops->release(pipe, buf);
                                 curbuf = (curbuf + 1) & (PIPE_BUFFERS-1);
-                                info->curbuf = curbuf;
-                                info->nrbufs = --bufs;
+                                pipe->curbuf = curbuf;
+                                pipe->nrbufs = --bufs;
                                 do_wakeup = 1;
                         }
                         total_len -= chars;
@@ -200,9 +202,9 @@ pipe_readv(struct file *filp, const struct iovec *_iov,
                 }
                 if (bufs)       /* More to do? */
                         continue;
-                if (!PIPE_WRITERS(*inode))
+                if (!pipe->writers)
                         break;
-                if (!PIPE_WAITING_WRITERS(*inode)) {
+                if (!pipe->waiting_writers) {
                         /* syscall merging: Usually we must not sleep
                          * if O_NONBLOCK is set, or if we got some data.
                          * But if a writer sleeps in kernel space, then
@@ -216,20 +218,22 @@ pipe_readv(struct file *filp, const struct iovec *_iov,
                         }
                 }
                 if (signal_pending(current)) {
-                        if (!ret) ret = -ERESTARTSYS;
+                        if (!ret)
+                                ret = -ERESTARTSYS;
                         break;
                 }
                 if (do_wakeup) {
-                        wake_up_interruptible_sync(PIPE_WAIT(*inode));
-                        kill_fasync(PIPE_FASYNC_WRITERS(*inode), SIGIO, POLL_OUT);
+                        wake_up_interruptible_sync(&pipe->wait);
+                        kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
                 }
-                pipe_wait(inode);
+                pipe_wait(pipe);
         }
-        mutex_unlock(PIPE_MUTEX(*inode));
-        /* Signal writers asynchronously that there is more room.  */
+        mutex_unlock(&inode->i_mutex);
+
+        /* Signal writers asynchronously that there is more room. */
         if (do_wakeup) {
-                wake_up_interruptible(PIPE_WAIT(*inode));
-                kill_fasync(PIPE_FASYNC_WRITERS(*inode), SIGIO, POLL_OUT);
+                wake_up_interruptible(&pipe->wait);
+                kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
         }
         if (ret > 0)
                 file_accessed(filp);
@@ -240,6 +244,7 @@ static ssize_t
 pipe_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
 {
         struct iovec iov = { .iov_base = buf, .iov_len = count };
+
         return pipe_readv(filp, &iov, 1, ppos);
 }
 
@@ -248,7 +253,7 @@ pipe_writev(struct file *filp, const struct iovec *_iov,
             unsigned long nr_segs, loff_t *ppos)
 {
         struct inode *inode = filp->f_dentry->d_inode;
-        struct pipe_inode_info *info;
+        struct pipe_inode_info *pipe;
         ssize_t ret;
         int do_wakeup;
         struct iovec *iov = (struct iovec *)_iov;
@@ -262,10 +267,10 @@ pipe_writev(struct file *filp, const struct iovec *_iov,
 
         do_wakeup = 0;
         ret = 0;
-        mutex_lock(PIPE_MUTEX(*inode));
-        info = inode->i_pipe;
+        mutex_lock(&inode->i_mutex);
+        pipe = inode->i_pipe;
 
-        if (!PIPE_READERS(*inode)) {
+        if (!pipe->readers) {
                 send_sig(SIGPIPE, current, 0);
                 ret = -EPIPE;
                 goto out;
@@ -273,23 +278,25 @@ pipe_writev(struct file *filp, const struct iovec *_iov,
 
         /* We try to merge small writes */
         chars = total_len & (PAGE_SIZE-1); /* size of the last buffer */
-        if (info->nrbufs && chars != 0) {
-                int lastbuf = (info->curbuf + info->nrbufs - 1) & (PIPE_BUFFERS-1);
-                struct pipe_buffer *buf = info->bufs + lastbuf;
+        if (pipe->nrbufs && chars != 0) {
+                int lastbuf = (pipe->curbuf + pipe->nrbufs - 1) &
+                                                        (PIPE_BUFFERS-1);
+                struct pipe_buffer *buf = pipe->bufs + lastbuf;
                 struct pipe_buf_operations *ops = buf->ops;
                 int offset = buf->offset + buf->len;
+
                 if (ops->can_merge && offset + chars <= PAGE_SIZE) {
                         void *addr;
                         int error;
 
-                        addr = ops->map(filp, info, buf);
+                        addr = ops->map(filp, pipe, buf);
                         if (IS_ERR(addr)) {
                                 error = PTR_ERR(addr);
                                 goto out;
                         }
                         error = pipe_iov_copy_from_user(offset + addr, iov,
                                                         chars);
-                        ops->unmap(info, buf);
+                        ops->unmap(pipe, buf);
                         ret = error;
                         do_wakeup = 1;
                         if (error)
@@ -304,16 +311,18 @@ pipe_writev(struct file *filp, const struct iovec *_iov,
 
         for (;;) {
                 int bufs;
-                if (!PIPE_READERS(*inode)) {
+
+                if (!pipe->readers) {
                         send_sig(SIGPIPE, current, 0);
-                        if (!ret) ret = -EPIPE;
+                        if (!ret)
+                                ret = -EPIPE;
                         break;
                 }
-                bufs = info->nrbufs;
+                bufs = pipe->nrbufs;
                 if (bufs < PIPE_BUFFERS) {
-                        int newbuf = (info->curbuf + bufs) & (PIPE_BUFFERS-1);
-                        struct pipe_buffer *buf = info->bufs + newbuf;
-                        struct page *page = info->tmp_page;
+                        int newbuf = (pipe->curbuf + bufs) & (PIPE_BUFFERS-1);
+                        struct pipe_buffer *buf = pipe->bufs + newbuf;
+                        struct page *page = pipe->tmp_page;
                         int error;
 
                         if (!page) {
@@ -322,9 +331,9 @@ pipe_writev(struct file *filp, const struct iovec *_iov,
                                         ret = ret ? : -ENOMEM;
                                         break;
                                 }
-                                info->tmp_page = page;
+                                pipe->tmp_page = page;
                         }
-                        /* Always wakeup, even if the copy fails. Otherwise
+                        /* Always wake up, even if the copy fails. Otherwise
                          * we lock up (O_NONBLOCK-)readers that sleep due to
                          * syscall merging.
                          * FIXME! Is this really true?
@@ -337,7 +346,8 @@ pipe_writev(struct file *filp, const struct iovec *_iov,
                         error = pipe_iov_copy_from_user(kmap(page), iov, chars);
                         kunmap(page);
                         if (unlikely(error)) {
-                                if (!ret) ret = -EFAULT;
+                                if (!ret)
+                                        ret = -EFAULT;
                                 break;
                         }
                         ret += chars;
@@ -347,8 +357,8 @@ pipe_writev(struct file *filp, const struct iovec *_iov,
                         buf->ops = &anon_pipe_buf_ops;
                         buf->offset = 0;
                         buf->len = chars;
-                        info->nrbufs = ++bufs;
-                        info->tmp_page = NULL;
+                        pipe->nrbufs = ++bufs;
+                        pipe->tmp_page = NULL;
 
                         total_len -= chars;
                         if (!total_len)
@@ -357,27 +367,29 @@ pipe_writev(struct file *filp, const struct iovec *_iov,
                 if (bufs < PIPE_BUFFERS)
                         continue;
                 if (filp->f_flags & O_NONBLOCK) {
-                        if (!ret) ret = -EAGAIN;
+                        if (!ret)
+                                ret = -EAGAIN;
                         break;
                 }
                 if (signal_pending(current)) {
-                        if (!ret) ret = -ERESTARTSYS;
+                        if (!ret)
+                                ret = -ERESTARTSYS;
                         break;
                 }
                 if (do_wakeup) {
-                        wake_up_interruptible_sync(PIPE_WAIT(*inode));
-                        kill_fasync(PIPE_FASYNC_READERS(*inode), SIGIO, POLL_IN);
+                        wake_up_interruptible_sync(&pipe->wait);
+                        kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
                         do_wakeup = 0;
                 }
-                PIPE_WAITING_WRITERS(*inode)++;
-                pipe_wait(inode);
-                PIPE_WAITING_WRITERS(*inode)--;
+                pipe->waiting_writers++;
+                pipe_wait(pipe);
+                pipe->waiting_writers--;
         }
 out:
-        mutex_unlock(PIPE_MUTEX(*inode));
+        mutex_unlock(&inode->i_mutex);
         if (do_wakeup) {
-                wake_up_interruptible(PIPE_WAIT(*inode));
-                kill_fasync(PIPE_FASYNC_READERS(*inode), SIGIO, POLL_IN);
+                wake_up_interruptible(&pipe->wait);
+                kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
         }
         if (ret > 0)
                 file_update_time(filp);
@@ -389,6 +401,7 @@ pipe_write(struct file *filp, const char __user *buf,
            size_t count, loff_t *ppos)
 {
         struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = count };
+
         return pipe_writev(filp, &iov, 1, ppos);
 }
 
@@ -399,7 +412,8 @@ bad_pipe_r(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
 }
 
 static ssize_t
-bad_pipe_w(struct file *filp, const char __user *buf, size_t count, loff_t *ppos)
+bad_pipe_w(struct file *filp, const char __user *buf, size_t count,
+           loff_t *ppos)
 {
         return -EBADF;
 }
@@ -409,21 +423,22 @@ pipe_ioctl(struct inode *pino, struct file *filp,
            unsigned int cmd, unsigned long arg)
 {
         struct inode *inode = filp->f_dentry->d_inode;
-        struct pipe_inode_info *info;
+        struct pipe_inode_info *pipe;
         int count, buf, nrbufs;
 
         switch (cmd) {
                 case FIONREAD:
-                        mutex_lock(PIPE_MUTEX(*inode));
-                        info =  inode->i_pipe;
+                        mutex_lock(&inode->i_mutex);
+                        pipe = inode->i_pipe;
                         count = 0;
-                        buf = info->curbuf;
-                        nrbufs = info->nrbufs;
+                        buf = pipe->curbuf;
+                        nrbufs = pipe->nrbufs;
                         while (--nrbufs >= 0) {
-                                count += info->bufs[buf].len;
+                                count += pipe->bufs[buf].len;
                                 buf = (buf+1) & (PIPE_BUFFERS-1);
                         }
-                        mutex_unlock(PIPE_MUTEX(*inode));
+                        mutex_unlock(&inode->i_mutex);
+
                         return put_user(count, (int __user *)arg);
                 default:
                         return -EINVAL;
@@ -436,17 +451,17 @@ pipe_poll(struct file *filp, poll_table *wait)
 {
         unsigned int mask;
         struct inode *inode = filp->f_dentry->d_inode;
-        struct pipe_inode_info *info = inode->i_pipe;
+        struct pipe_inode_info *pipe = inode->i_pipe;
         int nrbufs;
 
-        poll_wait(filp, PIPE_WAIT(*inode), wait);
+        poll_wait(filp, &pipe->wait, wait);
 
         /* Reading only -- no need for acquiring the semaphore.  */
-        nrbufs = info->nrbufs;
+        nrbufs = pipe->nrbufs;
         mask = 0;
         if (filp->f_mode & FMODE_READ) {
                 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
-                if (!PIPE_WRITERS(*inode) && filp->f_version != PIPE_WCOUNTER(*inode))
+                if (!pipe->writers && filp->f_version != pipe->w_counter)
                         mask |= POLLHUP;
         }
 
@@ -456,7 +471,7 @@ pipe_poll(struct file *filp, poll_table *wait)
                  * Most Unices do not set POLLERR for FIFOs but on Linux they
                  * behave exactly like pipes for poll().
                  */
-                if (!PIPE_READERS(*inode))
+                if (!pipe->readers)
                         mask |= POLLERR;
         }
 
@@ -466,17 +481,21 @@ pipe_poll(struct file *filp, poll_table *wait)
 static int
 pipe_release(struct inode *inode, int decr, int decw)
 {
-        mutex_lock(PIPE_MUTEX(*inode));
-        PIPE_READERS(*inode) -= decr;
-        PIPE_WRITERS(*inode) -= decw;
-        if (!PIPE_READERS(*inode) && !PIPE_WRITERS(*inode)) {
+        struct pipe_inode_info *pipe;
+
+        mutex_lock(&inode->i_mutex);
+        pipe = inode->i_pipe;
+        pipe->readers -= decr;
+        pipe->writers -= decw;
+
+        if (!pipe->readers && !pipe->writers) {
                 free_pipe_info(inode);
         } else {
-                wake_up_interruptible(PIPE_WAIT(*inode));
-                kill_fasync(PIPE_FASYNC_READERS(*inode), SIGIO, POLL_IN);
-                kill_fasync(PIPE_FASYNC_WRITERS(*inode), SIGIO, POLL_OUT);
+                wake_up_interruptible(&pipe->wait);
+                kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
+                kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
         }
-        mutex_unlock(PIPE_MUTEX(*inode));
+        mutex_unlock(&inode->i_mutex);
 
         return 0;
 }
@@ -487,9 +506,9 @@ pipe_read_fasync(int fd, struct file *filp, int on)
         struct inode *inode = filp->f_dentry->d_inode;
         int retval;
 
-        mutex_lock(PIPE_MUTEX(*inode));
-        retval = fasync_helper(fd, filp, on, PIPE_FASYNC_READERS(*inode));
-        mutex_unlock(PIPE_MUTEX(*inode));
+        mutex_lock(&inode->i_mutex);
+        retval = fasync_helper(fd, filp, on, &inode->i_pipe->fasync_readers);
+        mutex_unlock(&inode->i_mutex);
 
         if (retval < 0)
                 return retval;
@@ -504,9 +523,9 @@ pipe_write_fasync(int fd, struct file *filp, int on)
         struct inode *inode = filp->f_dentry->d_inode;
         int retval;
 
-        mutex_lock(PIPE_MUTEX(*inode));
-        retval = fasync_helper(fd, filp, on, PIPE_FASYNC_WRITERS(*inode));
-        mutex_unlock(PIPE_MUTEX(*inode));
+        mutex_lock(&inode->i_mutex);
+        retval = fasync_helper(fd, filp, on, &inode->i_pipe->fasync_writers);
+        mutex_unlock(&inode->i_mutex);
 
         if (retval < 0)
                 return retval;
@@ -519,16 +538,17 @@ static int
 pipe_rdwr_fasync(int fd, struct file *filp, int on)
 {
         struct inode *inode = filp->f_dentry->d_inode;
+        struct pipe_inode_info *pipe = inode->i_pipe;
         int retval;
 
-        mutex_lock(PIPE_MUTEX(*inode));
+        mutex_lock(&inode->i_mutex);
 
-        retval = fasync_helper(fd, filp, on, PIPE_FASYNC_READERS(*inode));
+        retval = fasync_helper(fd, filp, on, &pipe->fasync_readers);
 
         if (retval >= 0)
-                retval = fasync_helper(fd, filp, on, PIPE_FASYNC_WRITERS(*inode));
+                retval = fasync_helper(fd, filp, on, &pipe->fasync_writers);
 
-        mutex_unlock(PIPE_MUTEX(*inode));
+        mutex_unlock(&inode->i_mutex);
 
         if (retval < 0)
                 return retval;
@@ -567,9 +587,9 @@ pipe_read_open(struct inode *inode, struct file *filp)
 {
         /* We could have perhaps used atomic_t, but this and friends
            below are the only places.  So it doesn't seem worthwhile.  */
-        mutex_lock(PIPE_MUTEX(*inode));
-        PIPE_READERS(*inode)++;
-        mutex_unlock(PIPE_MUTEX(*inode));
+        mutex_lock(&inode->i_mutex);
+        inode->i_pipe->readers++;
+        mutex_unlock(&inode->i_mutex);
 
         return 0;
 }
@@ -577,9 +597,9 @@ pipe_read_open(struct inode *inode, struct file *filp)
 static int
 pipe_write_open(struct inode *inode, struct file *filp)
 {
-        mutex_lock(PIPE_MUTEX(*inode));
-        PIPE_WRITERS(*inode)++;
-        mutex_unlock(PIPE_MUTEX(*inode));
+        mutex_lock(&inode->i_mutex);
+        inode->i_pipe->writers++;
+        mutex_unlock(&inode->i_mutex);
 
         return 0;
 }
@@ -587,12 +607,12 @@ pipe_write_open(struct inode *inode, struct file *filp)
 static int
 pipe_rdwr_open(struct inode *inode, struct file *filp)
 {
-        mutex_lock(PIPE_MUTEX(*inode));
+        mutex_lock(&inode->i_mutex);
         if (filp->f_mode & FMODE_READ)
-                PIPE_READERS(*inode)++;
+                inode->i_pipe->readers++;
         if (filp->f_mode & FMODE_WRITE)
-                PIPE_WRITERS(*inode)++;
-        mutex_unlock(PIPE_MUTEX(*inode));
+                inode->i_pipe->writers++;
+        mutex_unlock(&inode->i_mutex);
 
         return 0;
 }
@@ -675,37 +695,38 @@ static struct file_operations rdwr_pipe_fops = {
         .fasync         = pipe_rdwr_fasync,
 };
 
-void free_pipe_info(struct inode *inode)
+struct pipe_inode_info * alloc_pipe_info(struct inode *inode)
+{
+        struct pipe_inode_info *pipe;
+
+        pipe = kzalloc(sizeof(struct pipe_inode_info), GFP_KERNEL);
+        if (pipe) {
+                init_waitqueue_head(&pipe->wait);
+                pipe->r_counter = pipe->w_counter = 1;
+                pipe->inode = inode;
+        }
+
+        return pipe;
+}
+
+void __free_pipe_info(struct pipe_inode_info *pipe)
 {
         int i;
-        struct pipe_inode_info *info = inode->i_pipe;
 
-        inode->i_pipe = NULL;
         for (i = 0; i < PIPE_BUFFERS; i++) {
-                struct pipe_buffer *buf = info->bufs + i;
+                struct pipe_buffer *buf = pipe->bufs + i;
                 if (buf->ops)
-                        buf->ops->release(info, buf);
+                        buf->ops->release(pipe, buf);
         }
-        if (info->tmp_page)
-                __free_page(info->tmp_page);
-        kfree(info);
+        if (pipe->tmp_page)
+                __free_page(pipe->tmp_page);
+        kfree(pipe);
 }
 
-struct inode* pipe_new(struct inode* inode)
+void free_pipe_info(struct inode *inode)
 {
-        struct pipe_inode_info *info;
-
-        info = kzalloc(sizeof(struct pipe_inode_info), GFP_KERNEL);
-        if (!info)
-                goto fail_page;
-        inode->i_pipe = info;
-
-        init_waitqueue_head(PIPE_WAIT(*inode));
-        PIPE_RCOUNTER(*inode) = PIPE_WCOUNTER(*inode) = 1;
-
-        return inode;
-fail_page:
-        return NULL;
+        __free_pipe_info(inode->i_pipe);
+        inode->i_pipe = NULL;
 }
 
 static struct vfsmount *pipe_mnt __read_mostly;
@@ -713,6 +734,7 @@ static int pipefs_delete_dentry(struct dentry *dentry)
 {
         return 1;
 }
+
 static struct dentry_operations pipefs_dentry_operations = {
         .d_delete       = pipefs_delete_dentry,
 };
@@ -720,13 +742,17 @@ static struct dentry_operations pipefs_dentry_operations = {
 static struct inode * get_pipe_inode(void)
 {
         struct inode *inode = new_inode(pipe_mnt->mnt_sb);
+        struct pipe_inode_info *pipe;
 
         if (!inode)
                 goto fail_inode;
 
-        if(!pipe_new(inode))
+        pipe = alloc_pipe_info(inode);
+        if (!pipe)
                 goto fail_iput;
-        PIPE_READERS(*inode) = PIPE_WRITERS(*inode) = 1;
+        inode->i_pipe = pipe;
+
+        pipe->readers = pipe->writers = 1;
         inode->i_fop = &rdwr_pipe_fops;
 
         /*
@@ -741,10 +767,12 @@ static struct inode * get_pipe_inode(void)
         inode->i_gid = current->fsgid;
         inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
         inode->i_blksize = PAGE_SIZE;
+
         return inode;
 
 fail_iput:
         iput(inode);
+
 fail_inode:
         return NULL;
 }
@@ -757,7 +785,7 @@ int do_pipe(int *fd)
         struct inode * inode;
         struct file *f1, *f2;
         int error;
-        int i,j;
+        int i, j;
 
         error = -ENFILE;
         f1 = get_empty_filp();
@@ -790,6 +818,7 @@ int do_pipe(int *fd)
         dentry = d_alloc(pipe_mnt->mnt_sb->s_root, &this);
         if (!dentry)
                 goto close_f12_inode_i_j;
+
         dentry->d_op = &pipefs_dentry_operations;
         d_add(dentry, inode);
         f1->f_vfsmnt = f2->f_vfsmnt = mntget(mntget(pipe_mnt));
@@ -813,6 +842,7 @@ int do_pipe(int *fd)
         fd_install(j, f2);
         fd[0] = i;
         fd[1] = j;
+
         return 0;
 
 close_f12_inode_i_j:
@@ -837,8 +867,9 @@ no_files:
  * d_name - pipe: will go nicely and kill the special-casing in procfs.
  */
 
-static struct super_block *pipefs_get_sb(struct file_system_type *fs_type,
-        int flags, const char *dev_name, void *data)
+static struct super_block *
+pipefs_get_sb(struct file_system_type *fs_type, int flags,
+              const char *dev_name, void *data)
 {
         return get_sb_pseudo(fs_type, "pipe:", NULL, PIPEFS_MAGIC);
 }
@@ -852,6 +883,7 @@ static struct file_system_type pipe_fs_type = {
 static int __init init_pipe_fs(void)
 {
         int err = register_filesystem(&pipe_fs_type);
+
         if (!err) {
                 pipe_mnt = kern_mount(&pipe_fs_type);
                 if (IS_ERR(pipe_mnt)) {
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index 7efa73d44c9a..20d4b2237fce 100644
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -103,8 +103,8 @@ static ssize_t read_vmcore(struct file *file, char __user *buffer,
                                 size_t buflen, loff_t *fpos)
 {
         ssize_t acc = 0, tmp;
-        size_t tsz, nr_bytes;
-        u64 start;
+        size_t tsz;
+        u64 start, nr_bytes;
         struct vmcore *curr_m = NULL;
 
         if (buflen == 0 || *fpos >= vmcore_size)
diff --git a/fs/read_write.c b/fs/read_write.c
index 6256ca81a718..5bc0e9234f9d 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -202,7 +202,7 @@ int rw_verify_area(int read_write, struct file *file, loff_t *ppos, size_t count
                 goto Einval;
 
         inode = file->f_dentry->d_inode;
-        if (inode->i_flock && MANDATORY_LOCK(inode)) {
+        if (unlikely(inode->i_flock && MANDATORY_LOCK(inode))) {
                 int retval = locks_mandatory_area(
                         read_write == READ ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE,
                         inode, file, pos, count);
diff --git a/fs/select.c b/fs/select.c
index 071660fa7b01..a8109baa5e46 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -310,8 +310,9 @@ static int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp,
                            fd_set __user *exp, s64 *timeout)
 {
         fd_set_bits fds;
-        char *bits;
-        int ret, size, max_fdset;
+        void *bits;
+        int ret, max_fdset;
+        unsigned int size;
         struct fdtable *fdt;
         /* Allocate small arguments on the stack to save memory and be faster */
         long stack_fds[SELECT_STACK_ALLOC/sizeof(long)];
@@ -333,20 +334,21 @@ static int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp,
          * since we used fdset we need to allocate memory in units of
          * long-words. 
          */
-        ret = -ENOMEM;
         size = FDS_BYTES(n);
-        if (6*size < SELECT_STACK_ALLOC)
-                bits = stack_fds;
-        else
+        bits = stack_fds;
+        if (size > sizeof(stack_fds) / 6) {
+                /* Not enough space in on-stack array; must use kmalloc */
+                ret = -ENOMEM;
                 bits = kmalloc(6 * size, GFP_KERNEL);
-        if (!bits)
-                goto out_nofds;
-        fds.in      = (unsigned long *)  bits;
-        fds.out     = (unsigned long *) (bits +   size);
-        fds.ex      = (unsigned long *) (bits + 2*size);
-        fds.res_in  = (unsigned long *) (bits + 3*size);
-        fds.res_out = (unsigned long *) (bits + 4*size);
-        fds.res_ex  = (unsigned long *) (bits + 5*size);
+                if (!bits)
+                        goto out_nofds;
+        }
+        fds.in      = bits;
+        fds.out     = bits +   size;
+        fds.ex      = bits + 2*size;
+        fds.res_in  = bits + 3*size;
+        fds.res_out = bits + 4*size;
+        fds.res_ex  = bits + 5*size;
 
         if ((ret = get_fd_set(n, inp, fds.in)) ||
             (ret = get_fd_set(n, outp, fds.out)) ||
diff --git a/fs/splice.c b/fs/splice.c
index bfa42a277bb8..e50a460239dd 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -9,11 +9,12 @@
  * that transfers data buffers to or from a pipe buffer.
  *
  * Named by Larry McVoy, original implementation from Linus, extended by
- * Jens to support splicing to files and fixing the initial implementation
- * bugs.
+ * Jens to support splicing to files, network, direct splicing, etc and
+ * fixing lots of bugs.
  *
- * Copyright (C) 2005 Jens Axboe <axboe@suse.de>
- * Copyright (C) 2005 Linus Torvalds <torvalds@osdl.org>
+ * Copyright (C) 2005-2006 Jens Axboe <axboe@suse.de>
+ * Copyright (C) 2005-2006 Linus Torvalds <torvalds@osdl.org>
+ * Copyright (C) 2006 Ingo Molnar <mingo@elte.hu>
  *
  */
 #include <linux/fs.h>
@@ -84,26 +85,43 @@ static void *page_cache_pipe_buf_map(struct file *file,
                                      struct pipe_buffer *buf)
 {
         struct page *page = buf->page;
-
-        lock_page(page);
+        int err;
 
         if (!PageUptodate(page)) {
-                unlock_page(page);
-                return ERR_PTR(-EIO);
-        }
+                lock_page(page);
+
+                /*
+                 * Page got truncated/unhashed. This will cause a 0-byte
+                 * splice, if this is the first page.
+                 */
+                if (!page->mapping) {
+                        err = -ENODATA;
+                        goto error;
+                }
 
-        if (!page->mapping) {
+                /*
+                 * Uh oh, read-error from disk.
+                 */
+                if (!PageUptodate(page)) {
+                        err = -EIO;
+                        goto error;
+                }
+
+                /*
+                 * Page is ok afterall, fall through to mapping.
+                 */
                 unlock_page(page);
-                return ERR_PTR(-ENODATA);
         }
 
-        return kmap(buf->page);
+        return kmap(page);
+error:
+        unlock_page(page);
+        return ERR_PTR(err);
 }
 
 static void page_cache_pipe_buf_unmap(struct pipe_inode_info *info,
                                       struct pipe_buffer *buf)
 {
-        unlock_page(buf->page);
         kunmap(buf->page);
 }
 
@@ -119,34 +137,30 @@ static struct pipe_buf_operations page_cache_pipe_buf_ops = {
  * Pipe output worker. This sets up our pipe format with the page cache
  * pipe buffer operations. Otherwise very similar to the regular pipe_writev().
  */
-static ssize_t move_to_pipe(struct inode *inode, struct page **pages,
+static ssize_t move_to_pipe(struct pipe_inode_info *pipe, struct page **pages,
                             int nr_pages, unsigned long offset,
                             unsigned long len, unsigned int flags)
 {
-        struct pipe_inode_info *info;
         int ret, do_wakeup, i;
 
         ret = 0;
         do_wakeup = 0;
         i = 0;
 
-        mutex_lock(PIPE_MUTEX(*inode));
+        if (pipe->inode)
+                mutex_lock(&pipe->inode->i_mutex);
 
-        info = inode->i_pipe;
         for (;;) {
-                int bufs;
-
-                if (!PIPE_READERS(*inode)) {
+                if (!pipe->readers) {
                         send_sig(SIGPIPE, current, 0);
                         if (!ret)
                                 ret = -EPIPE;
                         break;
                 }
 
-                bufs = info->nrbufs;
-                if (bufs < PIPE_BUFFERS) {
-                        int newbuf = (info->curbuf + bufs) & (PIPE_BUFFERS - 1);
-                        struct pipe_buffer *buf = info->bufs + newbuf;
+                if (pipe->nrbufs < PIPE_BUFFERS) {
+                        int newbuf = (pipe->curbuf + pipe->nrbufs) & (PIPE_BUFFERS - 1);
+                        struct pipe_buffer *buf = pipe->bufs + newbuf;
                         struct page *page = pages[i++];
                         unsigned long this_len;
 
@@ -158,8 +172,9 @@ static ssize_t move_to_pipe(struct inode *inode, struct page **pages,
                         buf->offset = offset;
                         buf->len = this_len;
                         buf->ops = &page_cache_pipe_buf_ops;
-                        info->nrbufs = ++bufs;
-                        do_wakeup = 1;
+                        pipe->nrbufs++;
+                        if (pipe->inode)
+                                do_wakeup = 1;
 
                         ret += this_len;
                         len -= this_len;
@@ -168,7 +183,7 @@ static ssize_t move_to_pipe(struct inode *inode, struct page **pages,
                                 break;
                         if (!len)
                                 break;
-                        if (bufs < PIPE_BUFFERS)
+                        if (pipe->nrbufs < PIPE_BUFFERS)
                                 continue;
 
                         break;
@@ -187,22 +202,26 @@ static ssize_t move_to_pipe(struct inode *inode, struct page **pages,
                 }
 
                 if (do_wakeup) {
-                        wake_up_interruptible_sync(PIPE_WAIT(*inode));
-                        kill_fasync(PIPE_FASYNC_READERS(*inode), SIGIO,
-                                    POLL_IN);
+                        smp_mb();
+                        if (waitqueue_active(&pipe->wait))
+                                wake_up_interruptible_sync(&pipe->wait);
+                        kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
                         do_wakeup = 0;
                 }
 
-                PIPE_WAITING_WRITERS(*inode)++;
-                pipe_wait(inode);
-                PIPE_WAITING_WRITERS(*inode)--;
+                pipe->waiting_writers++;
+                pipe_wait(pipe);
+                pipe->waiting_writers--;
         }
 
-        mutex_unlock(PIPE_MUTEX(*inode));
+        if (pipe->inode)
+                mutex_unlock(&pipe->inode->i_mutex);
 
         if (do_wakeup) {
-                wake_up_interruptible(PIPE_WAIT(*inode));
-                kill_fasync(PIPE_FASYNC_READERS(*inode), SIGIO, POLL_IN);
+                smp_mb();
+                if (waitqueue_active(&pipe->wait))
+                        wake_up_interruptible(&pipe->wait);
+                kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
         }
 
         while (i < nr_pages)
@@ -211,15 +230,16 @@ static ssize_t move_to_pipe(struct inode *inode, struct page **pages,
         return ret;
 }
 
-static int __generic_file_splice_read(struct file *in, struct inode *pipe,
-                                      size_t len, unsigned int flags)
+static int
+__generic_file_splice_read(struct file *in, struct pipe_inode_info *pipe,
+                           size_t len, unsigned int flags)
 {
         struct address_space *mapping = in->f_mapping;
         unsigned int offset, nr_pages;
-        struct page *pages[PIPE_BUFFERS], *shadow[PIPE_BUFFERS];
+        struct page *pages[PIPE_BUFFERS];
         struct page *page;
-        pgoff_t index, pidx;
-        int i, j;
+        pgoff_t index;
+        int i, error;
 
         index = in->f_pos >> PAGE_CACHE_SHIFT;
         offset = in->f_pos & ~PAGE_CACHE_MASK;
@@ -229,78 +249,94 @@ static int __generic_file_splice_read(struct file *in, struct inode *pipe,
                 nr_pages = PIPE_BUFFERS;
 
         /*
-         * initiate read-ahead on this page range
-         */
-        do_page_cache_readahead(mapping, in, index, nr_pages);
-
-        /*
-         * Get as many pages from the page cache as possible..
-         * Start IO on the page cache entries we create (we
-         * can assume that any pre-existing ones we find have
-         * already had IO started on them).
+         * Initiate read-ahead on this page range. however, don't call into
+         * read-ahead if this is a non-zero offset (we are likely doing small
+         * chunk splice and the page is already there) for a single page.
          */
-        i = find_get_pages(mapping, index, nr_pages, pages);
+        if (!offset || nr_pages > 1)
+                do_page_cache_readahead(mapping, in, index, nr_pages);
 
         /*
-         * common case - we found all pages and they are contiguous,
-         * kick them off
+         * Now fill in the holes:
          */
-        if (i && (pages[i - 1]->index == index + i - 1))
-                goto splice_them;
+        error = 0;
+        for (i = 0; i < nr_pages; i++, index++) {
+find_page:
+                /*
+                 * lookup the page for this index
+                 */
+                page = find_get_page(mapping, index);
+                if (!page) {
+                        /*
+                         * If in nonblock mode then dont block on
+                         * readpage (we've kicked readahead so there
+                         * will be asynchronous progress):
+                         */
+                        if (flags & SPLICE_F_NONBLOCK)
+                                break;
 
-        /*
-         * fill shadow[] with pages at the right locations, so we only
-         * have to fill holes
-         */
-        memset(shadow, 0, nr_pages * sizeof(struct page *));
-        for (j = 0; j < i; j++)
-                shadow[pages[j]->index - index] = pages[j];
+                        /*
+                         * page didn't exist, allocate one
+                         */
+                        page = page_cache_alloc_cold(mapping);
+                        if (!page)
+                                break;
 
-        /*
-         * now fill in the holes
-         */
-        for (i = 0, pidx = index; i < nr_pages; pidx++, i++) {
-                int error;
+                        error = add_to_page_cache_lru(page, mapping, index,
+                                                mapping_gfp_mask(mapping));
+                        if (unlikely(error)) {
+                                page_cache_release(page);
+                                break;
+                        }
 
-                if (shadow[i])
-                        continue;
+                        goto readpage;
+                }
 
                 /*
-                 * no page there, look one up / create it
+                 * If the page isn't uptodate, we may need to start io on it
                  */
-                page = find_or_create_page(mapping, pidx,
-                                                   mapping_gfp_mask(mapping));
-                if (!page)
-                        break;
+                if (!PageUptodate(page)) {
+                        lock_page(page);
+
+                        /*
+                         * page was truncated, stop here. if this isn't the
+                         * first page, we'll just complete what we already
+                         * added
+                         */
+                        if (!page->mapping) {
+                                unlock_page(page);
+                                page_cache_release(page);
+                                break;
+                        }
+                        /*
+                         * page was already under io and is now done, great
+                         */
+                        if (PageUptodate(page)) {
+                                unlock_page(page);
+                                goto fill_it;
+                        }
 
-                if (PageUptodate(page))
-                        unlock_page(page);
-                else {
+readpage:
+                        /*
+                         * need to read in the page
+                         */
                         error = mapping->a_ops->readpage(in, page);
 
                         if (unlikely(error)) {
                                 page_cache_release(page);
+                                if (error == AOP_TRUNCATED_PAGE)
+                                        goto find_page;
                                 break;
                         }
                 }
-                shadow[i] = page;
+fill_it:
+                pages[i] = page;
         }
 
-        if (!i) {
-                for (i = 0; i < nr_pages; i++) {
-                         if (shadow[i])
-                                page_cache_release(shadow[i]);
-                }
-                return 0;
-        }
+        if (i)
+                return move_to_pipe(pipe, pages, i, offset, len, flags);
 
-        memcpy(pages, shadow, i * sizeof(struct page *));
-
-        /*
-         * Now we splice them into the pipe..
-         */
-splice_them:
-        return move_to_pipe(pipe, pages, i, offset, len, flags);
+        return error;
 }
 
 /**
@@ -311,9 +347,8 @@ splice_them:
  * @flags:      splice modifier flags
  *
  * Will read pages from given file and fill them into a pipe.
- *
  */
-ssize_t generic_file_splice_read(struct file *in, struct inode *pipe,
+ssize_t generic_file_splice_read(struct file *in, struct pipe_inode_info *pipe,
                                  size_t len, unsigned int flags)
 {
         ssize_t spliced;
@@ -321,6 +356,7 @@ ssize_t generic_file_splice_read(struct file *in, struct inode *pipe,
 
         ret = 0;
         spliced = 0;
+
         while (len) {
                 ret = __generic_file_splice_read(in, pipe, len, flags);
 
@@ -360,10 +396,10 @@ static int pipe_to_sendpage(struct pipe_inode_info *info,
         int more;
 
         /*
-         * sub-optimal, but we are limited by the pipe ->map. we don't
+         * Sub-optimal, but we are limited by the pipe ->map. We don't
          * need a kmap'ed buffer here, we just want to make sure we
          * have the page pinned if the pipe page originates from the
-         * page cache
+         * page cache.
          */
         ptr = buf->ops->map(file, info, buf);
         if (IS_ERR(ptr))
@@ -414,7 +450,7 @@ static int pipe_to_file(struct pipe_inode_info *info, struct pipe_buffer *buf,
         int ret;
 
         /*
-         * after this, page will be locked and unmapped
+         * make sure the data in this buffer is uptodate
          */
         src = buf->ops->map(file, info, buf);
         if (IS_ERR(src))
@@ -424,7 +460,7 @@ static int pipe_to_file(struct pipe_inode_info *info, struct pipe_buffer *buf,
         offset = sd->pos & ~PAGE_CACHE_MASK;
 
         /*
-         * reuse buf page, if SPLICE_F_MOVE is set
+         * Reuse buf page, if SPLICE_F_MOVE is set.
          */
         if (sd->flags & SPLICE_F_MOVE) {
                 /*
@@ -434,6 +470,9 @@ static int pipe_to_file(struct pipe_inode_info *info, struct pipe_buffer *buf,
                 if (buf->ops->steal(info, buf))
                         goto find_page;
 
+                /*
+                 * this will also set the page locked
+                 */
                 page = buf->page;
                 if (add_to_page_cache(page, mapping, index, gfp_mask))
                         goto find_page;
@@ -445,7 +484,7 @@ find_page:
                 ret = -ENOMEM;
                 page = find_or_create_page(mapping, index, gfp_mask);
                 if (!page)
-                        goto out;
+                        goto out_nomem;
 
                 /*
                  * If the page is uptodate, it is also locked. If it isn't
@@ -462,7 +501,7 @@ find_page:
 
                                 if (!PageUptodate(page)) {
                                         /*
-                                         * page got invalidated, repeat
+                                         * Page got invalidated, repeat.
                                          */
                                         if (!page->mapping) {
                                                 unlock_page(page);
@@ -501,12 +540,14 @@ find_page:
         } else if (ret)
                 goto out;
 
+        mark_page_accessed(page);
         balance_dirty_pages_ratelimited(mapping);
 out:
         if (!(buf->flags & PIPE_BUF_FLAG_STOLEN)) {
                 page_cache_release(page);
                 unlock_page(page);
         }
+out_nomem:
         buf->ops->unmap(info, buf);
         return ret;
 }
@@ -519,11 +560,10 @@ typedef int (splice_actor)(struct pipe_inode_info *, struct pipe_buffer *,
  * key here is the 'actor' worker passed in that actually moves the data
  * to the wanted destination. See pipe_to_file/pipe_to_sendpage above.
  */
-static ssize_t move_from_pipe(struct inode *inode, struct file *out,
+static ssize_t move_from_pipe(struct pipe_inode_info *pipe, struct file *out,
                               size_t len, unsigned int flags,
                               splice_actor *actor)
 {
-        struct pipe_inode_info *info;
         int ret, do_wakeup, err;
         struct splice_desc sd;
 
@@ -535,22 +575,19 @@ static ssize_t move_from_pipe(struct inode *inode, struct file *out,
         sd.file = out;
         sd.pos = out->f_pos;
 
-        mutex_lock(PIPE_MUTEX(*inode));
+        if (pipe->inode)
+                mutex_lock(&pipe->inode->i_mutex);
 
-        info = inode->i_pipe;
         for (;;) {
-                int bufs = info->nrbufs;
-
-                if (bufs) {
-                        int curbuf = info->curbuf;
-                        struct pipe_buffer *buf = info->bufs + curbuf;
+                if (pipe->nrbufs) {
+                        struct pipe_buffer *buf = pipe->bufs + pipe->curbuf;
                         struct pipe_buf_operations *ops = buf->ops;
 
                         sd.len = buf->len;
                         if (sd.len > sd.total_len)
                                 sd.len = sd.total_len;
 
-                        err = actor(info, buf, &sd);
+                        err = actor(pipe, buf, &sd);
                         if (err) {
                                 if (!ret && err != -ENODATA)
                                         ret = err;
@@ -561,13 +598,14 @@ static ssize_t move_from_pipe(struct inode *inode, struct file *out,
                         ret += sd.len;
                         buf->offset += sd.len;
                         buf->len -= sd.len;
+
                         if (!buf->len) {
                                 buf->ops = NULL;
-                                ops->release(info, buf);
-                                curbuf = (curbuf + 1) & (PIPE_BUFFERS - 1);
-                                info->curbuf = curbuf;
-                                info->nrbufs = --bufs;
-                                do_wakeup = 1;
+                                ops->release(pipe, buf);
+                                pipe->curbuf = (pipe->curbuf + 1) & (PIPE_BUFFERS - 1);
+                                pipe->nrbufs--;
+                                if (pipe->inode)
+                                        do_wakeup = 1;
                         }
 
                         sd.pos += sd.len;
@@ -576,11 +614,11 @@ static ssize_t move_from_pipe(struct inode *inode, struct file *out,
                                 break;
                 }
 
-                if (bufs)
+                if (pipe->nrbufs)
                         continue;
-                if (!PIPE_WRITERS(*inode))
+                if (!pipe->writers)
                         break;
-                if (!PIPE_WAITING_WRITERS(*inode)) {
+                if (!pipe->waiting_writers) {
                         if (ret)
                                 break;
                 }
@@ -598,31 +636,34 @@ static ssize_t move_from_pipe(struct inode *inode, struct file *out,
                 }
 
                 if (do_wakeup) {
-                        wake_up_interruptible_sync(PIPE_WAIT(*inode));
-                        kill_fasync(PIPE_FASYNC_WRITERS(*inode),SIGIO,POLL_OUT);
+                        smp_mb();
+                        if (waitqueue_active(&pipe->wait))
+                                wake_up_interruptible_sync(&pipe->wait);
+                        kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
                         do_wakeup = 0;
                 }
 
-                pipe_wait(inode);
+                pipe_wait(pipe);
         }
 
-        mutex_unlock(PIPE_MUTEX(*inode));
+        if (pipe->inode)
+                mutex_unlock(&pipe->inode->i_mutex);
 
         if (do_wakeup) {
-                wake_up_interruptible(PIPE_WAIT(*inode));
-                kill_fasync(PIPE_FASYNC_WRITERS(*inode), SIGIO, POLL_OUT);
+                smp_mb();
+                if (waitqueue_active(&pipe->wait))
+                        wake_up_interruptible(&pipe->wait);
+                kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
         }
 
-        mutex_lock(&out->f_mapping->host->i_mutex);
         out->f_pos = sd.pos;
-        mutex_unlock(&out->f_mapping->host->i_mutex);
         return ret;
 
 }
 
 /**
  * generic_file_splice_write - splice data from a pipe to a file
- * @inode:      pipe inode
+ * @pipe:       pipe info
  * @out:        file to write to
  * @len:        number of bytes to splice
  * @flags:      splice modifier flags
@@ -631,14 +672,17 @@ static ssize_t move_from_pipe(struct inode *inode, struct file *out,
  * the given pipe inode to the given file.
  *
  */
-ssize_t generic_file_splice_write(struct inode *inode, struct file *out,
-                                  size_t len, unsigned int flags)
+ssize_t
+generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
+                          size_t len, unsigned int flags)
 {
         struct address_space *mapping = out->f_mapping;
-        ssize_t ret = move_from_pipe(inode, out, len, flags, pipe_to_file);
+        ssize_t ret;
+
+        ret = move_from_pipe(pipe, out, len, flags, pipe_to_file);
 
         /*
-         * if file or inode is SYNC and we actually wrote some data, sync it
+         * If file or inode is SYNC and we actually wrote some data, sync it.
          */
         if (unlikely((out->f_flags & O_SYNC) || IS_SYNC(mapping->host))
             && ret > 0) {
@@ -647,7 +691,7 @@ ssize_t generic_file_splice_write(struct inode *inode, struct file *out,
 
                 mutex_lock(&inode->i_mutex);
                 err = generic_osync_inode(mapping->host, mapping,
-                                                OSYNC_METADATA|OSYNC_DATA);
+                                          OSYNC_METADATA|OSYNC_DATA);
                 mutex_unlock(&inode->i_mutex);
 
                 if (err)
@@ -670,10 +714,10 @@ EXPORT_SYMBOL(generic_file_splice_write);
  * is involved.
  *
  */
-ssize_t generic_splice_sendpage(struct inode *inode, struct file *out,
+ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe, struct file *out,
                                 size_t len, unsigned int flags)
 {
-        return move_from_pipe(inode, out, len, flags, pipe_to_sendpage);
+        return move_from_pipe(pipe, out, len, flags, pipe_to_sendpage);
 }
 
 EXPORT_SYMBOL(generic_splice_sendpage);
@@ -681,19 +725,20 @@ EXPORT_SYMBOL(generic_splice_sendpage);
 /*
  * Attempt to initiate a splice from pipe to file.
  */
-static long do_splice_from(struct inode *pipe, struct file *out, size_t len,
-                           unsigned int flags)
+static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+                           size_t len, unsigned int flags)
 {
         loff_t pos;
         int ret;
 
-        if (!out->f_op || !out->f_op->splice_write)
+        if (unlikely(!out->f_op || !out->f_op->splice_write))
                 return -EINVAL;
 
-        if (!(out->f_mode & FMODE_WRITE))
+        if (unlikely(!(out->f_mode & FMODE_WRITE)))
                 return -EBADF;
 
         pos = out->f_pos;
+
         ret = rw_verify_area(WRITE, out, &pos, len);
         if (unlikely(ret < 0))
                 return ret;
@@ -704,19 +749,20 @@ static long do_splice_from(struct inode *pipe, struct file *out, size_t len,
 /*
  * Attempt to initiate a splice from a file to a pipe.
  */
-static long do_splice_to(struct file *in, struct inode *pipe, size_t len,
-                         unsigned int flags)
+static long do_splice_to(struct file *in, struct pipe_inode_info *pipe,
+                         size_t len, unsigned int flags)
 {
         loff_t pos, isize, left;
         int ret;
 
-        if (!in->f_op || !in->f_op->splice_read)
+        if (unlikely(!in->f_op || !in->f_op->splice_read))
                 return -EINVAL;
 
-        if (!(in->f_mode & FMODE_READ))
+        if (unlikely(!(in->f_mode & FMODE_READ)))
                 return -EBADF;
 
         pos = in->f_pos;
+
         ret = rw_verify_area(READ, in, &pos, len);
         if (unlikely(ret < 0))
                 return ret;
@@ -726,32 +772,168 @@ static long do_splice_to(struct file *in, struct inode *pipe, size_t len,
                 return 0;
         
         left = isize - in->f_pos;
-        if (left < len)
+        if (unlikely(left < len))
                 len = left;
 
         return in->f_op->splice_read(in, pipe, len, flags);
 }
 
+long do_splice_direct(struct file *in, struct file *out, size_t len,
+                      unsigned int flags)
+{
+        struct pipe_inode_info *pipe;
+        long ret, bytes;
+        umode_t i_mode;
+        int i;
+
+        /*
+         * We require the input being a regular file, as we don't want to
+         * randomly drop data for eg socket -> socket splicing. Use the
+         * piped splicing for that!
+         */
+        i_mode = in->f_dentry->d_inode->i_mode;
+        if (unlikely(!S_ISREG(i_mode) && !S_ISBLK(i_mode)))
+                return -EINVAL;
+
+        /*
+         * neither in nor out is a pipe, setup an internal pipe attached to
+         * 'out' and transfer the wanted data from 'in' to 'out' through that
+         */
+        pipe = current->splice_pipe;
+        if (unlikely(!pipe)) {
+                pipe = alloc_pipe_info(NULL);
+                if (!pipe)
+                        return -ENOMEM;
+
+                /*
+                 * We don't have an immediate reader, but we'll read the stuff
+                 * out of the pipe right after the move_to_pipe(). So set
+                 * PIPE_READERS appropriately.
+                 */
+                pipe->readers = 1;
+
+                current->splice_pipe = pipe;
+        }
+
+        /*
+         * Do the splice.
+         */
+        ret = 0;
+        bytes = 0;
+
+        while (len) {
+                size_t read_len, max_read_len;
+
+                /*
+                 * Do at most PIPE_BUFFERS pages worth of transfer:
+                 */
+                max_read_len = min(len, (size_t)(PIPE_BUFFERS*PAGE_SIZE));
+
+                ret = do_splice_to(in, pipe, max_read_len, flags);
+                if (unlikely(ret < 0))
+                        goto out_release;
+
+                read_len = ret;
+
+                /*
+                 * NOTE: nonblocking mode only applies to the input. We
+                 * must not do the output in nonblocking mode as then we
+                 * could get stuck data in the internal pipe:
+                 */
+                ret = do_splice_from(pipe, out, read_len,
+                                     flags & ~SPLICE_F_NONBLOCK);
+                if (unlikely(ret < 0))
+                        goto out_release;
+
+                bytes += ret;
+                len -= ret;
+
+                /*
+                 * In nonblocking mode, if we got back a short read then
+                 * that was due to either an IO error or due to the
+                 * pagecache entry not being there. In the IO error case
+                 * the _next_ splice attempt will produce a clean IO error
+                 * return value (not a short read), so in both cases it's
+                 * correct to break out of the loop here:
+                 */
+                if ((flags & SPLICE_F_NONBLOCK) && (read_len < max_read_len))
+                        break;
+        }
+
+        pipe->nrbufs = pipe->curbuf = 0;
+
+        return bytes;
+
+out_release:
+        /*
+         * If we did an incomplete transfer we must release
+         * the pipe buffers in question:
+         */
+        for (i = 0; i < PIPE_BUFFERS; i++) {
+                struct pipe_buffer *buf = pipe->bufs + i;
+
+                if (buf->ops) {
+                        buf->ops->release(pipe, buf);
+                        buf->ops = NULL;
+                }
+        }
+        pipe->nrbufs = pipe->curbuf = 0;
+
+        /*
+         * If we transferred some data, return the number of bytes:
+         */
+        if (bytes > 0)
+                return bytes;
+
+        return ret;
+}
+
+EXPORT_SYMBOL(do_splice_direct);
+
 /*
  * Determine where to splice to/from.
  */
-static long do_splice(struct file *in, struct file *out, size_t len,
-                      unsigned int flags)
+static long do_splice(struct file *in, loff_t __user *off_in,
+                      struct file *out, loff_t __user *off_out,
+                      size_t len, unsigned int flags)
 {
-        struct inode *pipe;
+        struct pipe_inode_info *pipe;
+
+        pipe = in->f_dentry->d_inode->i_pipe;
+        if (pipe) {
+                if (off_in)
+                        return -ESPIPE;
+                if (off_out) {
+                        if (out->f_op->llseek == no_llseek)
+                                return -EINVAL;
+                        if (copy_from_user(&out->f_pos, off_out,
+                                           sizeof(loff_t)))
+                                return -EFAULT;
+                }
 
-        pipe = in->f_dentry->d_inode;
-        if (pipe->i_pipe)
                 return do_splice_from(pipe, out, len, flags);
+        }
+
+        pipe = out->f_dentry->d_inode->i_pipe;
+        if (pipe) {
+                if (off_out)
+                        return -ESPIPE;
+                if (off_in) {
+                        if (in->f_op->llseek == no_llseek)
+                                return -EINVAL;
+                        if (copy_from_user(&in->f_pos, off_in, sizeof(loff_t)))
+                                return -EFAULT;
+                }
 
-        pipe = out->f_dentry->d_inode;
-        if (pipe->i_pipe)
                 return do_splice_to(in, pipe, len, flags);
+        }
 
         return -EINVAL;
 }
 
-asmlinkage long sys_splice(int fdin, int fdout, size_t len, unsigned int flags)
+asmlinkage long sys_splice(int fd_in, loff_t __user *off_in,
+                           int fd_out, loff_t __user *off_out,
+                           size_t len, unsigned int flags)
 {
         long error;
         struct file *in, *out;
@@ -761,13 +943,15 @@ asmlinkage long sys_splice(int fdin, int fdout, size_t len, unsigned int flags)
                 return 0;
 
         error = -EBADF;
-        in = fget_light(fdin, &fput_in);
+        in = fget_light(fd_in, &fput_in);
         if (in) {
                 if (in->f_mode & FMODE_READ) {
-                        out = fget_light(fdout, &fput_out);
+                        out = fget_light(fd_out, &fput_out);
                         if (out) {
                                 if (out->f_mode & FMODE_WRITE)
-                                        error = do_splice(in, out, len, flags);
+                                        error = do_splice(in, off_in,
+                                                          out, off_out,
+                                                          len, flags);
                                 fput_light(out, fput_out);
                         }
                 }
diff --git a/fs/sync.c b/fs/sync.c
index 8616006d2094..aab5ffe77e9f 100644
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -61,7 +61,7 @@
  * will be available after a crash.
  */
 asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes,
-                                        int flags)
+                                        unsigned int flags)
 {
         int ret;
         struct file *file;
@@ -126,7 +126,7 @@ out:
  * `endbyte' is inclusive
  */
 int do_sync_file_range(struct file *file, loff_t offset, loff_t endbyte,
-                        int flags)
+                        unsigned int flags)
 {
         int ret;
         struct address_space *mapping;
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index 6cbbd165c60d..4d191ef39b67 100644
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -870,12 +870,14 @@ xfs_page_state_convert(
         pgoff_t                 end_index, last_index, tlast;
         ssize_t                 size, len;
         int                     flags, err, iomap_valid = 0, uptodate = 1;
-        int                     page_dirty, count = 0, trylock_flag = 0;
+        int                     page_dirty, count = 0;
+        int                     trylock = 0;
         int                     all_bh = unmapped;
 
-        /* wait for other IO threads? */
-        if (startio && (wbc->sync_mode == WB_SYNC_NONE && wbc->nonblocking))
-                trylock_flag |= BMAPI_TRYLOCK;
+        if (startio) {
+                if (wbc->sync_mode == WB_SYNC_NONE && wbc->nonblocking)
+                        trylock |= BMAPI_TRYLOCK;
+        }
 
         /* Is this page beyond the end of the file? */
         offset = i_size_read(inode);
@@ -956,15 +958,13 @@ xfs_page_state_convert(
 
                         if (buffer_unwritten(bh)) {
                                 type = IOMAP_UNWRITTEN;
-                                flags = BMAPI_WRITE|BMAPI_IGNSTATE;
+                                flags = BMAPI_WRITE | BMAPI_IGNSTATE;
                         } else if (buffer_delay(bh)) {
                                 type = IOMAP_DELAY;
-                                flags = BMAPI_ALLOCATE;
-                                if (!startio)
-                                        flags |= trylock_flag;
+                                flags = BMAPI_ALLOCATE | trylock;
                         } else {
                                 type = IOMAP_NEW;
-                                flags = BMAPI_WRITE|BMAPI_MMAP;
+                                flags = BMAPI_WRITE | BMAPI_MMAP;
                         }
 
                         if (!iomap_valid) {
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index 9fb0312665ca..26fed0756f01 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -182,7 +182,7 @@ free_address(
 {
         a_list_t        *aentry;
 
-        aentry = kmalloc(sizeof(a_list_t), GFP_ATOMIC & ~__GFP_HIGH);
+        aentry = kmalloc(sizeof(a_list_t), GFP_NOWAIT);
         if (likely(aentry)) {
                 spin_lock(&as_lock);
                 aentry->next = as_free_head;
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
index ae4c4754ed31..269721af02f3 100644
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@ -252,7 +252,7 @@ xfs_file_sendfile_invis(
 STATIC ssize_t
 xfs_file_splice_read(
         struct file             *infilp,
-        struct inode            *pipe,
+        struct pipe_inode_info  *pipe,
         size_t                  len,
         unsigned int            flags)
 {
@@ -266,7 +266,7 @@ xfs_file_splice_read(
 STATIC ssize_t
 xfs_file_splice_read_invis(
         struct file             *infilp,
-        struct inode            *pipe,
+        struct pipe_inode_info  *pipe,
         size_t                  len,
         unsigned int            flags)
 {
@@ -279,7 +279,7 @@ xfs_file_splice_read_invis(
 
 STATIC ssize_t
 xfs_file_splice_write(
-        struct inode            *pipe,
+        struct pipe_inode_info  *pipe,
         struct file             *outfilp,
         size_t                  len,
         unsigned int            flags)
@@ -293,7 +293,7 @@ xfs_file_splice_write(
 
 STATIC ssize_t
 xfs_file_splice_write_invis(
-        struct inode            *pipe,
+        struct pipe_inode_info  *pipe,
         struct file             *outfilp,
         size_t                  len,
         unsigned int            flags)
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 149237304fb6..2e2e275c786f 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -673,8 +673,7 @@ xfs_vn_setattr(
         if (ia_valid & ATTR_ATIME) {
                 vattr.va_mask |= XFS_AT_ATIME;
                 vattr.va_atime = attr->ia_atime;
-                if (ia_valid & ATTR_ATIME_SET)
-                        inode->i_atime = attr->ia_atime;
+                inode->i_atime = attr->ia_atime;
         }
         if (ia_valid & ATTR_MTIME) {
                 vattr.va_mask |= XFS_AT_MTIME;
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c
index 90cd314acbaa..74a52937f208 100644
--- a/fs/xfs/linux-2.6/xfs_lrw.c
+++ b/fs/xfs/linux-2.6/xfs_lrw.c
@@ -338,7 +338,7 @@ ssize_t
 xfs_splice_read(
         bhv_desc_t              *bdp,
         struct file             *infilp,
-        struct inode            *pipe,
+        struct pipe_inode_info  *pipe,
         size_t                  count,
         int                     flags,
         int                     ioflags,
@@ -380,7 +380,7 @@ xfs_splice_read(
 ssize_t
 xfs_splice_write(
         bhv_desc_t              *bdp,
-        struct inode            *pipe,
+        struct pipe_inode_info  *pipe,
         struct file             *outfilp,
         size_t                  count,
         int                     flags,
diff --git a/fs/xfs/linux-2.6/xfs_lrw.h b/fs/xfs/linux-2.6/xfs_lrw.h
index eaa5659713fb..55c689a86ad2 100644
--- a/fs/xfs/linux-2.6/xfs_lrw.h
+++ b/fs/xfs/linux-2.6/xfs_lrw.h
@@ -94,9 +94,9 @@ extern ssize_t xfs_sendfile(struct bhv_desc *, struct file *,
                                 loff_t *, int, size_t, read_actor_t,
                                 void *, struct cred *);
 extern ssize_t xfs_splice_read(struct bhv_desc *, struct file *,
-                                struct inode *, size_t, int, int,
+                                struct pipe_inode_info *, size_t, int, int,
                                 struct cred *);
-extern ssize_t xfs_splice_write(struct bhv_desc *, struct inode *,
+extern ssize_t xfs_splice_write(struct bhv_desc *, struct pipe_inode_info *,
                                 struct file *, size_t, int, int,
                                 struct cred *);
 
diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h
index 6f1c79a28f8b..88b09f186289 100644
--- a/fs/xfs/linux-2.6/xfs_vnode.h
+++ b/fs/xfs/linux-2.6/xfs_vnode.h
@@ -174,9 +174,9 @@ typedef ssize_t (*vop_sendfile_t)(bhv_desc_t *, struct file *,
                                 loff_t *, int, size_t, read_actor_t,
                                 void *, struct cred *);
 typedef ssize_t (*vop_splice_read_t)(bhv_desc_t *, struct file *,
-                                struct inode *, size_t, int, int,
+                                struct pipe_inode_info *, size_t, int, int,
                                 struct cred *);
-typedef ssize_t (*vop_splice_write_t)(bhv_desc_t *, struct inode *,
+typedef ssize_t (*vop_splice_write_t)(bhv_desc_t *, struct pipe_inode_info *,
                                 struct file *, size_t, int, int,
                                 struct cred *);
 typedef int     (*vop_ioctl_t)(bhv_desc_t *, struct inode *, struct file *,
diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
index 4eeb856183b1..deddbd03c166 100644
--- a/fs/xfs/xfs_ialloc.c
+++ b/fs/xfs/xfs_ialloc.c
@@ -158,9 +158,10 @@ xfs_ialloc_ag_alloc(
          */
         agi = XFS_BUF_TO_AGI(agbp);
         newino = be32_to_cpu(agi->agi_newino);
-        if(likely(newino != NULLAGINO)) {
-                args.agbno = XFS_AGINO_TO_AGBNO(args.mp, newino) +
-                                XFS_IALLOC_BLOCKS(args.mp);
+        args.agbno = XFS_AGINO_TO_AGBNO(args.mp, newino) +
+                        XFS_IALLOC_BLOCKS(args.mp);
+        if (likely(newino != NULLAGINO &&
+                  (args.agbno < be32_to_cpu(agi->agi_length)))) {
                 args.fsbno = XFS_AGB_TO_FSB(args.mp,
                                 be32_to_cpu(agi->agi_seqno), args.agbno);
                 args.type = XFS_ALLOCTYPE_THIS_BNO;
@@ -182,8 +183,8 @@ xfs_ialloc_ag_alloc(
                  * Set the alignment for the allocation.
                  * If stripe alignment is turned on then align at stripe unit
                  * boundary.
-                 * If the cluster size is smaller than a filesystem block 
-                 * then we're doing I/O for inodes in filesystem block size 
+                 * If the cluster size is smaller than a filesystem block
+                 * then we're doing I/O for inodes in filesystem block size
                  * pieces, so don't need alignment anyway.
                  */
                 isaligned = 0;
@@ -192,7 +193,7 @@ xfs_ialloc_ag_alloc(
                         args.alignment = args.mp->m_dalign;
                         isaligned = 1;
                 } else if (XFS_SB_VERSION_HASALIGN(&args.mp->m_sb) &&
-                           args.mp->m_sb.sb_inoalignmt >= 
+                           args.mp->m_sb.sb_inoalignmt >=
                            XFS_B_TO_FSBT(args.mp,
                                 XFS_INODE_CLUSTER_SIZE(args.mp)))
                                 args.alignment = args.mp->m_sb.sb_inoalignmt;
@@ -220,7 +221,7 @@ xfs_ialloc_ag_alloc(
                 if ((error = xfs_alloc_vextent(&args)))
                         return error;
         }
- 
+
         /*
          * If stripe alignment is turned on, then try again with cluster
          * alignment.
diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c
index bb33113eef9f..b53854325266 100644
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/xfs_iget.c
@@ -421,7 +421,10 @@ finish_inode:
                         ip->i_chash = chlnew;
                         chlnew->chl_ip = ip;
                         chlnew->chl_blkno = ip->i_blkno;
+                        if (ch->ch_list)
+                                ch->ch_list->chl_prev = chlnew;
                         chlnew->chl_next = ch->ch_list;
+                        chlnew->chl_prev = NULL;
                         ch->ch_list = chlnew;
                         chlnew = NULL;
                 }
@@ -723,23 +726,15 @@ xfs_iextract(
                 ASSERT(ip->i_cnext == ip && ip->i_cprev == ip);
                 ASSERT(ip->i_chash != NULL);
                 chm=NULL;
-                for (chl = ch->ch_list; chl != NULL; chl = chl->chl_next) {
-                        if (chl->chl_blkno == ip->i_blkno) {
-                                if (chm == NULL) {
-                                        /* first item on the list */
-                                        ch->ch_list = chl->chl_next;
-                                } else {
-                                        chm->chl_next = chl->chl_next;
-                                }
-                                kmem_zone_free(xfs_chashlist_zone, chl);
-                                break;
-                        } else {
-                                ASSERT(chl->chl_ip != ip);
-                                chm = chl;
-                        }
-                }
-                ASSERT_ALWAYS(chl != NULL);
-       } else {
+                chl = ip->i_chash;
+                if (chl->chl_prev)
+                        chl->chl_prev->chl_next = chl->chl_next;
+                else
+                        ch->ch_list = chl->chl_next;
+                if (chl->chl_next)
+                        chl->chl_next->chl_prev = chl->chl_prev;
+                kmem_zone_free(xfs_chashlist_zone, chl);
+        } else {
                 /* delete one inode from a non-empty list */
                 iq = ip->i_cnext;
                 iq->i_cprev = ip->i_cprev;
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 48146bdc6bdd..94b60dd03801 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2732,16 +2732,29 @@ xfs_iunpin(
         ASSERT(atomic_read(&ip->i_pincount) > 0);
 
         if (atomic_dec_and_test(&ip->i_pincount)) {
-                vnode_t *vp = XFS_ITOV_NULL(ip);
+                /*
+                 * If the inode is currently being reclaimed, the
+                 * linux inode _and_ the xfs vnode may have been
+                 * freed so we cannot reference either of them safely.
+                 * Hence we should not try to do anything to them
+                 * if the xfs inode is currently in the reclaim
+                 * path.
+                 *
+                 * However, we still need to issue the unpin wakeup
+                 * call as the inode reclaim may be blocked waiting for
+                 * the inode to become unpinned.
+                 */
+                if (!(ip->i_flags & (XFS_IRECLAIM|XFS_IRECLAIMABLE))) {
+                        vnode_t *vp = XFS_ITOV_NULL(ip);
 
-                /* make sync come back and flush this inode */
-                if (vp) {
-                        struct inode    *inode = vn_to_inode(vp);
+                        /* make sync come back and flush this inode */
+                        if (vp) {
+                                struct inode    *inode = vn_to_inode(vp);
 
-                        if (!(inode->i_state & I_NEW))
-                                mark_inode_dirty_sync(inode);
+                                if (!(inode->i_state & I_NEW))
+                                        mark_inode_dirty_sync(inode);
+                        }
                 }
-
                 wake_up(&ip->i_ipin_wait);
         }
 }
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 39ef9c36ea55..3b544db1790b 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -189,6 +189,7 @@ typedef struct xfs_ihash {
  */
 typedef struct xfs_chashlist {
         struct xfs_chashlist    *chl_next;
+        struct xfs_chashlist    *chl_prev;
         struct xfs_inode        *chl_ip;
         xfs_daddr_t             chl_blkno;      /* starting block number of
                                                  * the cluster */
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 049fabb7f7e0..c0b1c2906880 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -270,7 +270,7 @@ xfs_mount_validate_sb(
             (sbp->sb_blocklog - sbp->sb_inodelog != sbp->sb_inopblog)   ||
             (sbp->sb_rextsize * sbp->sb_blocksize > XFS_MAX_RTEXTSIZE)  ||
             (sbp->sb_rextsize * sbp->sb_blocksize < XFS_MIN_RTEXTSIZE)  ||
-            (sbp->sb_imax_pct > 100 || sbp->sb_imax_pct < 1))) {
+            (sbp->sb_imax_pct > 100 /* zero sb_imax_pct is valid */))) {
                 xfs_fs_mount_cmn_err(flags, "SB sanity check 1 failed");
                 return XFS_ERROR(EFSCORRUPTED);
         }
diff --git a/include/asm-alpha/numnodes.h b/include/asm-alpha/numnodes.h
deleted file mode 100644
index cd425827e4f3..000000000000
--- a/include/asm-alpha/numnodes.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_MAX_NUMNODES_H
-#define _ASM_MAX_NUMNODES_H
-
-/* Max 128 Nodes - Marvel */
-#define NODES_SHIFT     7
-
-#endif /* _ASM_MAX_NUMNODES_H */
diff --git a/include/asm-arm/arch-cl7500/hardware.h b/include/asm-arm/arch-cl7500/hardware.h
index 2339b764f69f..1adfd18e6154 100644
--- a/include/asm-arm/arch-cl7500/hardware.h
+++ b/include/asm-arm/arch-cl7500/hardware.h
@@ -53,16 +53,12 @@
 #define SCREEN_END              0xdfc00000
 #define SCREEN_BASE             0xdf800000
 
-#define FLUSH_BASE              0xdf000000
-
 #define VIDC_BASE               (void __iomem *)0xe0400000
 #define IOMD_BASE               IOMEM(0xe0200000)
 #define IOC_BASE                IOMEM(0xe0200000)
 #define FLOPPYDMA_BASE          IOMEM(0xe002a000)
 #define PCIO_BASE               IOMEM(0xe0010000)
 
-#define FLUSH_BASE_PHYS         0x00000000      /* ROM */
-
 #define vidc_writel(val)        __raw_writel(val, VIDC_BASE)
 
 /* in/out bias for the ISA slot region */
diff --git a/include/asm-arm/arch-cl7500/memory.h b/include/asm-arm/arch-cl7500/memory.h
index 34f40a6cec30..3178140e24ca 100644
--- a/include/asm-arm/arch-cl7500/memory.h
+++ b/include/asm-arm/arch-cl7500/memory.h
@@ -26,4 +26,10 @@
 #define __virt_to_bus(x) __virt_to_phys(x)
 #define __bus_to_virt(x) __phys_to_virt(x)
 
+/*
+ * Cache flushing area - ROM
+ */
+#define FLUSH_BASE_PHYS         0x00000000
+#define FLUSH_BASE              0xdf000000
+
 #endif
diff --git a/include/asm-arm/arch-ebsa110/debug-macro.S b/include/asm-arm/arch-ebsa110/debug-macro.S
index f61cadabe0ec..9213bfe4831d 100644
--- a/include/asm-arm/arch-ebsa110/debug-macro.S
+++ b/include/asm-arm/arch-ebsa110/debug-macro.S
@@ -18,4 +18,4 @@
 
 #define UART_SHIFT      2
 #define FLOW_CONTROL
-#include <asm/hardware/debug-8250.h>
+#include <asm/hardware/debug-8250.S>
diff --git a/include/asm-arm/arch-ebsa110/hardware.h b/include/asm-arm/arch-ebsa110/hardware.h
index 4e41c2358f4e..3ce864def41e 100644
--- a/include/asm-arm/arch-ebsa110/hardware.h
+++ b/include/asm-arm/arch-ebsa110/hardware.h
@@ -57,9 +57,6 @@
 /*
  * RAM definitions
  */
-#define FLUSH_BASE_PHYS         0x40000000
-#define FLUSH_BASE              0xdf000000
-
 #define UNCACHEABLE_ADDR        0xff000000      /* IRQ_STAT */
 
 #endif
diff --git a/include/asm-arm/arch-ebsa110/memory.h b/include/asm-arm/arch-ebsa110/memory.h
index 02f144520c10..c7c500e176d0 100644
--- a/include/asm-arm/arch-ebsa110/memory.h
+++ b/include/asm-arm/arch-ebsa110/memory.h
@@ -28,4 +28,10 @@
 #define __virt_to_bus(x)        (x)
 #define __bus_to_virt(x)        (x)
 
+/*
+ * Cache flushing area - SRAM
+ */
+#define FLUSH_BASE_PHYS         0x40000000
+#define FLUSH_BASE              0xdf000000
+
 #endif
diff --git a/include/asm-arm/arch-ebsa110/uncompress.h b/include/asm-arm/arch-ebsa110/uncompress.h
index 66b19c7fd908..ae5b775eb0b7 100644
--- a/include/asm-arm/arch-ebsa110/uncompress.h
+++ b/include/asm-arm/arch-ebsa110/uncompress.h
@@ -10,7 +10,7 @@
 
 #include <linux/serial_reg.h>
 
-#define SERIAL_BASE     ((unsigned char *)0xfe000be0)
+#define SERIAL_BASE     ((unsigned char *)0xf0000be0)
 
 /*
  * This does not append a newline
diff --git a/include/asm-arm/arch-ebsa285/hardware.h b/include/asm-arm/arch-ebsa285/hardware.h
index 2ef2200f108c..ec51fe92483b 100644
--- a/include/asm-arm/arch-ebsa285/hardware.h
+++ b/include/asm-arm/arch-ebsa285/hardware.h
@@ -48,9 +48,6 @@
 #define PCICFG0_SIZE            0x01000000
 #define PCICFG0_BASE            0xfa000000
 
-#define FLUSH_SIZE              0x00100000
-#define FLUSH_BASE              0xf9000000
-
 #define PCIMEM_SIZE             0x01000000
 #define PCIMEM_BASE             0xf0000000
 
@@ -61,9 +58,6 @@
 #define PCIMEM_SIZE             0x80000000
 #define PCIMEM_BASE             0x80000000
 
-#define FLUSH_SIZE              0x00100000
-#define FLUSH_BASE              0x7e000000
-
 #define WFLUSH_SIZE             0x01000000
 #define WFLUSH_BASE             0x7d000000
 
@@ -94,7 +88,6 @@
 #define XBUS_SWITCH_J17_11      ((*XBUS_SWITCH) & (1 << 5))
 #define XBUS_SWITCH_J17_9       ((*XBUS_SWITCH) & (1 << 6))
 
-#define FLUSH_BASE_PHYS         0x50000000
 #define UNCACHEABLE_ADDR        (ARMCSR_BASE + 0x108)
 
 
diff --git a/include/asm-arm/arch-ebsa285/memory.h b/include/asm-arm/arch-ebsa285/memory.h
index 09e335cd687d..99181ffc7e27 100644
--- a/include/asm-arm/arch-ebsa285/memory.h
+++ b/include/asm-arm/arch-ebsa285/memory.h
@@ -49,12 +49,22 @@ extern unsigned long __bus_to_virt(unsigned long);
 #define TASK_SIZE               UL(0xbf000000)
 #define PAGE_OFFSET             UL(0xc0000000)
 
+/*
+ * Cache flushing area.
+ */
+#define FLUSH_BASE              0xf9000000
+
 #elif defined(CONFIG_ARCH_CO285)
 
 /* Task size and page offset at 1.5GB */
 #define TASK_SIZE               UL(0x5f000000)
 #define PAGE_OFFSET             UL(0x60000000)
 
+/*
+ * Cache flushing area.
+ */
+#define FLUSH_BASE              0x7e000000
+
 #else
 
 #error "Undefined footbridge architecture"
@@ -72,4 +82,6 @@ extern unsigned long __bus_to_virt(unsigned long);
  */
 #define TASK_UNMAPPED_BASE ((TASK_SIZE + 0x01000000) / 3)
 
+#define FLUSH_BASE_PHYS         0x50000000
+
 #endif
diff --git a/include/asm-arm/arch-ixp23xx/debug-macro.S b/include/asm-arm/arch-ixp23xx/debug-macro.S
index eb99fd69fd24..2b25e640247d 100644
--- a/include/asm-arm/arch-ixp23xx/debug-macro.S
+++ b/include/asm-arm/arch-ixp23xx/debug-macro.S
@@ -17,6 +17,9 @@
                 tst     \rx, #1                         @ mmu enabled?
                 ldreq   \rx, =IXP23XX_PERIPHERAL_PHYS   @ physical
                 ldrne   \rx, =IXP23XX_PERIPHERAL_VIRT   @ virtual
+#ifdef __ARMEB__
+                orr     \rx, \rx, #0x00000003
+#endif
                 .endm
 
 #define UART_SHIFT      2
diff --git a/include/asm-arm/arch-l7200/hardware.h b/include/asm-arm/arch-l7200/hardware.h
index b755079befab..2ab43f3a4a8d 100644
--- a/include/asm-arm/arch-l7200/hardware.h
+++ b/include/asm-arm/arch-l7200/hardware.h
@@ -52,9 +52,6 @@
 #define ISA_SIZE                0x20000000
 #define ISA_BASE                0xe0000000
 
-#define FLUSH_BASE_PHYS         0x40000000      /* ROM */
-#define FLUSH_BASE              0xdf000000
-
 #define PCIO_BASE               IO_BASE
 
 #endif
diff --git a/include/asm-arm/arch-l7200/memory.h b/include/asm-arm/arch-l7200/memory.h
index 9e50a171f78a..402df637e740 100644
--- a/include/asm-arm/arch-l7200/memory.h
+++ b/include/asm-arm/arch-l7200/memory.h
@@ -20,4 +20,10 @@
 #define __virt_to_bus(x) __virt_to_phys(x)
 #define __bus_to_virt(x) __phys_to_virt(x)
 
+/*
+ * Cache flushing area - ROM
+ */
+#define FLUSH_BASE_PHYS         0x40000000
+#define FLUSH_BASE              0xdf000000
+
 #endif
diff --git a/include/asm-arm/arch-lh7a40x/memory.h b/include/asm-arm/arch-lh7a40x/memory.h
index c92bcb837629..9f1a58cbf407 100644
--- a/include/asm-arm/arch-lh7a40x/memory.h
+++ b/include/asm-arm/arch-lh7a40x/memory.h
@@ -31,8 +31,6 @@
 
 #ifdef CONFIG_DISCONTIGMEM
 
-#define NODES_SHIFT     4       /* Up to 16 nodes */
-
 /*
  * Given a kernel address, find the home node of the underlying memory.
  */
diff --git a/include/asm-arm/arch-rpc/hardware.h b/include/asm-arm/arch-rpc/hardware.h
index 9d7f87375aa7..7480f4e8d974 100644
--- a/include/asm-arm/arch-rpc/hardware.h
+++ b/include/asm-arm/arch-rpc/hardware.h
@@ -46,7 +46,6 @@
 #define SCREEN_END              0xdfc00000
 #define SCREEN_BASE             0xdf800000
 
-#define FLUSH_BASE              0xdf000000
 #define UNCACHEABLE_ADDR        0xdf010000
 
 /*
@@ -59,8 +58,6 @@
 #define PCIO_BASE               IOMEM(0xe0010000)
 #define FLOPPYDMA_BASE          IOMEM(0xe002a000)
 
-#define FLUSH_BASE_PHYS         0x00000000      /* ROM */
-
 #define vidc_writel(val)        __raw_writel(val, VIDC_BASE)
 
 #define IO_EC_EASI_BASE         0x81400000
diff --git a/include/asm-arm/arch-rpc/memory.h b/include/asm-arm/arch-rpc/memory.h
index 0592cb3f0c74..303c424ce673 100644
--- a/include/asm-arm/arch-rpc/memory.h
+++ b/include/asm-arm/arch-rpc/memory.h
@@ -30,4 +30,10 @@
 #define __virt_to_bus(x) __virt_to_phys(x)
 #define __bus_to_virt(x) __phys_to_virt(x)
 
+/*
+ * Cache flushing area - ROM
+ */
+#define FLUSH_BASE_PHYS         0x00000000
+#define FLUSH_BASE              0xdf000000
+
 #endif
diff --git a/include/asm-arm/arch-s3c2410/leds-gpio.h b/include/asm-arm/arch-s3c2410/leds-gpio.h
new file mode 100644
index 000000000000..f07ed040622b
--- /dev/null
+++ b/include/asm-arm/arch-s3c2410/leds-gpio.h
@@ -0,0 +1,28 @@
+/* linux/include/asm-arm/arch-s3c2410/leds-gpio.h
+ *
+ * (c) 2006 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C24XX - LEDs GPIO connector
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __ASM_ARCH_LEDSGPIO_H
+#define __ASM_ARCH_LEDSGPIO_H "leds-gpio.h"
+
+#define S3C24XX_LEDF_ACTLOW     (1<<0)          /* LED is on when GPIO low */
+#define S3C24XX_LEDF_TRISTATE   (1<<1)          /* tristate to turn off */
+
+struct s3c24xx_led_platdata {
+        unsigned int             gpio;
+        unsigned int             flags;
+
+        char                    *name;
+        char                    *def_trigger;
+};
+
+#endif /* __ASM_ARCH_LEDSGPIO_H */
diff --git a/include/asm-arm/arch-sa1100/hardware.h b/include/asm-arm/arch-sa1100/hardware.h
index 28711aaa4968..ee008a5484f3 100644
--- a/include/asm-arm/arch-sa1100/hardware.h
+++ b/include/asm-arm/arch-sa1100/hardware.h
@@ -14,10 +14,6 @@
 
 #include <linux/config.h>
 
-/* Flushing areas */
-#define FLUSH_BASE_PHYS         0xe0000000      /* SA1100 zero bank */
-#define FLUSH_BASE              0xf5000000
-#define FLUSH_BASE_MINICACHE    0xf5800000
 #define UNCACHEABLE_ADDR        0xfa050000
 
 
diff --git a/include/asm-arm/arch-sa1100/memory.h b/include/asm-arm/arch-sa1100/memory.h
index 018a9f0e3986..a29fac1387ca 100644
--- a/include/asm-arm/arch-sa1100/memory.h
+++ b/include/asm-arm/arch-sa1100/memory.h
@@ -91,4 +91,11 @@ void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes);
 
 #endif
 
+/*
+ * Cache flushing area - SA1100 zero bank
+ */
+#define FLUSH_BASE_PHYS         0xe0000000
+#define FLUSH_BASE              0xf5000000
+#define FLUSH_BASE_MINICACHE    0xf5100000
+
 #endif
diff --git a/include/asm-arm/arch-shark/hardware.h b/include/asm-arm/arch-shark/hardware.h
index 4d35f8c154c3..ecba45260898 100644
--- a/include/asm-arm/arch-shark/hardware.h
+++ b/include/asm-arm/arch-shark/hardware.h
@@ -17,11 +17,6 @@
  */
 #define IO_BASE                 0xe0000000
 
-/*
- * RAM definitions
- */
-#define FLUSH_BASE_PHYS         0x80000000
-
 #else
 
 #define IO_BASE                 0
@@ -33,7 +28,6 @@
 #define ROMCARD_SIZE            0x08000000
 #define ROMCARD_START           0x10000000
 
-#define FLUSH_BASE              0xdf000000
 #define PCIO_BASE               0xe0000000
 
 
diff --git a/include/asm-arm/arch-shark/memory.h b/include/asm-arm/arch-shark/memory.h
index 95a29b4bc5d0..6968d6103ea0 100644
--- a/include/asm-arm/arch-shark/memory.h
+++ b/include/asm-arm/arch-shark/memory.h
@@ -39,4 +39,10 @@ static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsig
 #define __virt_to_bus(x)        __virt_to_phys(x)
 #define __bus_to_virt(x)        __phys_to_virt(x)
 
+/*
+ * Cache flushing area
+ */
+#define FLUSH_BASE_PHYS         0x80000000
+#define FLUSH_BASE              0xdf000000
+
 #endif
diff --git a/include/asm-arm/fpstate.h b/include/asm-arm/fpstate.h
index 6246bf83627d..52bae088a185 100644
--- a/include/asm-arm/fpstate.h
+++ b/include/asm-arm/fpstate.h
@@ -26,7 +26,9 @@
 
 struct vfp_hard_struct {
         __u64 fpregs[16];
+#if __LINUX_ARM_ARCH__ < 6
         __u32 fpmx_state;
+#endif
         __u32 fpexc;
         __u32 fpscr;
         /*
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h
index 2b3cf69b3ed9..209289407595 100644
--- a/include/asm-arm/memory.h
+++ b/include/asm-arm/memory.h
@@ -172,10 +172,10 @@ static inline __deprecated void *bus_to_virt(unsigned long x)
  *  virt_addr_valid(k)  indicates whether a virtual address is valid
  */
 #ifndef CONFIG_DISCONTIGMEM
-#define ARCH_PFN_OFFSET         (PHYS_PFN_OFFSET)
+#define ARCH_PFN_OFFSET         PHYS_PFN_OFFSET
 #define pfn_valid(pfn)          ((pfn) >= PHYS_PFN_OFFSET && (pfn) < (PHYS_PFN_OFFSET + max_mapnr))
 
-#define virt_to_page(kaddr)     (pfn_to_page(__pa(kaddr) >> PAGE_SHIFT))
+#define virt_to_page(kaddr)     pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
 #define virt_addr_valid(kaddr)  ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory)
 
 #define PHYS_TO_NID(addr)       (0)
@@ -187,8 +187,8 @@ static inline __deprecated void *bus_to_virt(unsigned long x)
  * around in memory.
  */
 #include <linux/numa.h>
-#define arch_pfn_to_nid(pfn)    (PFN_TO_NID(pfn))
-#define arch_local_page_offset(pfn, nid) (LOCAL_MAP_NR((pfn) << PAGE_OFFSET))
+#define arch_pfn_to_nid(pfn)    PFN_TO_NID(pfn)
+#define arch_local_page_offset(pfn, nid) LOCAL_MAP_NR((pfn) << PAGE_SHIFT)
 
 #define pfn_valid(pfn)                                          \
         ({                                                      \
diff --git a/include/asm-arm/numnodes.h b/include/asm-arm/numnodes.h
deleted file mode 100644
index 8df36818ebc9..000000000000
--- a/include/asm-arm/numnodes.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  linux/include/asm-arm/numnodes.h
- *
- *  Copyright (C) 2002 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-/* This declaration for the size of the NUMA (CONFIG_DISCONTIGMEM)
- * memory node table is the default.
- *
- * A good place to override this value is include/asm/arch/memory.h.
- */
-
-#ifndef __ASM_ARM_NUMNODES_H
-#define __ASM_ARM_NUMNODES_H
-
-#include <asm/memory.h>
-
-#ifndef NODES_SHIFT
-# define NODES_SHIFT    2       /* Normally, Max 4 Nodes */
-#endif
-
-#endif
diff --git a/include/asm-arm/vfpmacros.h b/include/asm-arm/vfpmacros.h
index 15bd6e74c9cf..27fe028b4e72 100644
--- a/include/asm-arm/vfpmacros.h
+++ b/include/asm-arm/vfpmacros.h
@@ -16,10 +16,18 @@
 
         @ read all the working registers back into the VFP
         .macro  VFPFLDMIA, base
+#if __LINUX_ARM_ARCH__ < 6
         LDC     p11, cr0, [\base],#33*4             @ FLDMIAX \base!, {d0-d15}
+#else
+        LDC     p11, cr0, [\base],#32*4             @ FLDMIAD \base!, {d0-d15}
+#endif
         .endm
 
         @ write all the working registers out of the VFP
         .macro  VFPFSTMIA, base
+#if __LINUX_ARM_ARCH__ < 6
         STC     p11, cr0, [\base],#33*4             @ FSTMIAX \base!, {d0-d15}
+#else
+        STC     p11, cr0, [\base],#32*4             @ FSTMIAD \base!, {d0-d15}
+#endif
         .endm
diff --git a/include/asm-cris/system.h b/include/asm-cris/system.h
index 1d63c2aa8ec2..b1c593b6dbff 100644
--- a/include/asm-cris/system.h
+++ b/include/asm-cris/system.h
@@ -8,7 +8,6 @@
  */
 
 extern struct task_struct *resume(struct task_struct *prev, struct task_struct *next, int);
-#define prepare_to_switch()     do { } while(0)
 #define switch_to(prev,next,last) last = resume(prev,next, \
                                          (int)&((struct task_struct *)0)->thread)
 
diff --git a/include/asm-cris/unistd.h b/include/asm-cris/unistd.h
index 2627bbdf8a11..bb2dfe480213 100644
--- a/include/asm-cris/unistd.h
+++ b/include/asm-cris/unistd.h
@@ -288,7 +288,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_sys_kexec_load     283
+#define __NR_kexec_load         283
 #define __NR_waitid             284
 /* #define __NR_sys_setaltroot  285 */
 #define __NR_add_key            286
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h
index f72ff0c4dc0b..1734ed91bcdc 100644
--- a/include/asm-frv/system.h
+++ b/include/asm-frv/system.h
@@ -18,8 +18,6 @@
 
 struct thread_struct;
 
-#define prepare_to_switch()    do { } while(0)
-
 /*
  * switch_to(prev, next) should switch from task `prev' to `next'
  * `prev' will never be the same as `next'.
diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h
index 322531caa484..2662a3e12dc4 100644
--- a/include/asm-frv/unistd.h
+++ b/include/asm-frv/unistd.h
@@ -289,7 +289,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_sys_kexec_load     283
+#define __NR_kexec_load         283
 #define __NR_waitid             284
 /* #define __NR_sys_setaltroot  285 */
 #define __NR_add_key            286
diff --git a/include/asm-h8300/system.h b/include/asm-h8300/system.h
index dfe96c7121cf..8e81cf665e75 100644
--- a/include/asm-h8300/system.h
+++ b/include/asm-h8300/system.h
@@ -4,8 +4,6 @@
 #include <linux/config.h> /* get configuration macros */
 #include <linux/linkage.h>
 
-#define prepare_to_switch()     do { } while(0)
-
 /*
  * switch_to(n) should switch tasks to task ptr, first checking that
  * ptr isn't the current task, in which case it does nothing.  This
diff --git a/include/asm-h8300/unistd.h b/include/asm-h8300/unistd.h
index 56a4a5686c88..adb05159379b 100644
--- a/include/asm-h8300/unistd.h
+++ b/include/asm-h8300/unistd.h
@@ -285,7 +285,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_sys_kexec_load     283
+#define __NR_kexec_load         283
 #define __NR_waitid             284
 /* #define __NR_sys_setaltroot  285 */
 #define __NR_add_key            286
diff --git a/include/asm-i386/apic.h b/include/asm-i386/apic.h
index ff9ac8d19eb2..288233fd77d7 100644
--- a/include/asm-i386/apic.h
+++ b/include/asm-i386/apic.h
@@ -139,6 +139,8 @@ void switch_ipi_to_APIC_timer(void *cpumask);
 
 extern int timer_over_8254;
 
+extern int modern_apic(void);
+
 #else /* !CONFIG_X86_LOCAL_APIC */
 static inline void lapic_shutdown(void) { }
 
diff --git a/include/asm-i386/e820.h b/include/asm-i386/e820.h
index edf65be21a92..ca82acb8cb1f 100644
--- a/include/asm-i386/e820.h
+++ b/include/asm-i386/e820.h
@@ -35,6 +35,10 @@ struct e820map {
 };
 
 extern struct e820map e820;
+
+extern int e820_all_mapped(unsigned long start, unsigned long end,
+                           unsigned type);
+
 #endif/*!__ASSEMBLY__*/
 
 #endif/*__E820_HEADER*/
diff --git a/include/asm-i386/hpet.h b/include/asm-i386/hpet.h
index 16ef9f996e3f..7f1a8a6ee32f 100644
--- a/include/asm-i386/hpet.h
+++ b/include/asm-i386/hpet.h
@@ -89,6 +89,7 @@
  * then 32 bit HPET counter wrapsaround in less than 0.5 sec.
  */
 #define HPET_MIN_PERIOD (100000UL)
+#define HPET_TICK_RATE  (HZ * 100000UL)
 
 extern unsigned long hpet_tick;         /* hpet clks count per tick */
 extern unsigned long hpet_address;      /* hpet memory map physical address */
diff --git a/include/asm-i386/mpspec.h b/include/asm-i386/mpspec.h
index 62113d3bfdc2..770bf6da8c3d 100644
--- a/include/asm-i386/mpspec.h
+++ b/include/asm-i386/mpspec.h
@@ -18,7 +18,6 @@ extern void find_smp_config (void);
 extern void get_smp_config (void);
 extern int nr_ioapics;
 extern int apic_version [MAX_APICS];
-extern int mp_bus_id_to_type [MAX_MP_BUSSES];
 extern int mp_irq_entries;
 extern struct mpc_config_intsrc mp_irqs [MAX_IRQ_SOURCES];
 extern int mpc_default_type;
diff --git a/include/asm-i386/numnodes.h b/include/asm-i386/numnodes.h
deleted file mode 100644
index a61f38c8176f..000000000000
--- a/include/asm-i386/numnodes.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _ASM_MAX_NUMNODES_H
-#define _ASM_MAX_NUMNODES_H
-
-#include <linux/config.h>
-
-#ifdef CONFIG_X86_NUMAQ
-
-/* Max 16 Nodes */
-#define NODES_SHIFT     4
-
-#elif defined(CONFIG_ACPI_SRAT)
-
-/* Max 8 Nodes */
-#define NODES_SHIFT     3
-
-#endif /* CONFIG_X86_NUMAQ */
-
-#endif /* _ASM_MAX_NUMNODES_H */
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index 2e7f3e257fdd..6a8dd83c350f 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -288,7 +288,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_sys_kexec_load     283
+#define __NR_kexec_load         283
 #define __NR_waitid             284
 /* #define __NR_sys_setaltroot  285 */
 #define __NR_add_key            286
@@ -318,8 +318,8 @@
 #define __NR_unshare            310
 #define __NR_set_robust_list    311
 #define __NR_get_robust_list    312
-#define __NR_sys_splice         313
-#define __NR_sys_sync_file_range 314
+#define __NR_splice             313
+#define __NR_sync_file_range    314
 
 #define NR_syscalls 315
 
diff --git a/include/asm-ia64/acpi-ext.h b/include/asm-ia64/acpi-ext.h
index 56d2ddc97b30..734d137dda6e 100644
--- a/include/asm-ia64/acpi-ext.h
+++ b/include/asm-ia64/acpi-ext.h
@@ -1,12 +1,15 @@
 /*
- * ia64/platform/hp/common/hp_acpi.h
+ * (c) Copyright 2003, 2006 Hewlett-Packard Development Company, L.P.
+ *      Alex Williamson <alex.williamson@hp.com>
+ *      Bjorn Helgaas <bjorn.helgaas@hp.com>
  *
- * Copyright (C) 2003 Hewlett-Packard
- * Copyright (C) Alex Williamson
- * Copyright (C) Bjorn Helgaas
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * Vendor specific extensions to ACPI.
  */
+
 #ifndef _ASM_IA64_ACPI_EXT_H
 #define _ASM_IA64_ACPI_EXT_H
 
diff --git a/include/asm-ia64/kdebug.h b/include/asm-ia64/kdebug.h
index 218c458ab60c..c195a9ad1255 100644
--- a/include/asm-ia64/kdebug.h
+++ b/include/asm-ia64/kdebug.h
@@ -58,6 +58,8 @@ enum die_val {
         DIE_MCA_RENDZVOUS_ENTER,
         DIE_MCA_RENDZVOUS_PROCESS,
         DIE_MCA_RENDZVOUS_LEAVE,
+        DIE_MCA_NEW_TIMEOUT,
+        DIE_INIT_ENTER,
         DIE_INIT_MONARCH_ENTER,
         DIE_INIT_MONARCH_PROCESS,
         DIE_INIT_MONARCH_LEAVE,
diff --git a/include/asm-ia64/mca.h b/include/asm-ia64/mca.h
index bfbbb8da79c7..9c5389b7e623 100644
--- a/include/asm-ia64/mca.h
+++ b/include/asm-ia64/mca.h
@@ -148,6 +148,11 @@ extern int  ia64_reg_MCA_extension(int (*fn)(void *, struct ia64_sal_os_state *)
 extern void ia64_unreg_MCA_extension(void);
 extern u64 ia64_get_rnat(u64 *);
 
+struct ia64_mca_notify_die {
+        struct ia64_sal_os_state *sos;
+        int *monarch_cpu;
+};
+
 #else   /* __ASSEMBLY__ */
 
 #define IA64_MCA_CORRECTED      0x0     /* Error has been corrected by OS_MCA */
diff --git a/include/asm-ia64/mutex.h b/include/asm-ia64/mutex.h
index 5a3224f6af38..bed73a643a56 100644
--- a/include/asm-ia64/mutex.h
+++ b/include/asm-ia64/mutex.h
@@ -84,7 +84,7 @@ __mutex_fastpath_unlock(atomic_t *count, void (*fail_fn)(atomic_t *))
 static inline int
 __mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *))
 {
-        if (likely(cmpxchg_acq(count, 1, 0)) == 1)
+        if (cmpxchg_acq(count, 1, 0) == 1)
                 return 1;
         return 0;
 }
diff --git a/include/asm-ia64/numnodes.h b/include/asm-ia64/numnodes.h
deleted file mode 100644
index e9d356f549d9..000000000000
--- a/include/asm-ia64/numnodes.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _ASM_MAX_NUMNODES_H
-#define _ASM_MAX_NUMNODES_H
-
-#ifdef CONFIG_IA64_DIG
-/* Max 8 Nodes */
-#  define NODES_SHIFT   3
-#elif defined(CONFIG_IA64_HP_ZX1) || defined(CONFIG_IA64_HP_ZX1_SWIOTLB)
-/* Max 32 Nodes */
-#  define NODES_SHIFT   5
-#elif defined(CONFIG_IA64_SGI_SN2) || defined(CONFIG_IA64_GENERIC)
-#  if CONFIG_IA64_NR_NODES == 256
-#    define NODES_SHIFT 8
-#  elif CONFIG_IA64_NR_NODES <= 512
-#    define NODES_SHIFT    9
-#  elif CONFIG_IA64_NR_NODES <= 1024
-#    define NODES_SHIFT    10
-#  endif
-#endif
-
-#endif /* _ASM_MAX_NUMNODES_H */
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
index 36070c1014d8..1c749acca021 100644
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -286,12 +286,15 @@
 /* 1294, 1295 reserved for pselect/ppoll */
 #define __NR_unshare                    1296
 #define __NR_splice                     1297
+#define __NR_set_robust_list            1298
+#define __NR_get_robust_list            1299
+#define __NR_sync_file_range            1300
 
 #ifdef __KERNEL__
 
 #include <linux/config.h>
 
-#define NR_syscalls                     274 /* length of syscall table */
+#define NR_syscalls                     277 /* length of syscall table */
 
 #define __ARCH_WANT_SYS_RT_SIGACTION
 
diff --git a/include/asm-ia64/vga.h b/include/asm-ia64/vga.h
index bc3349ffc505..091177cda223 100644
--- a/include/asm-ia64/vga.h
+++ b/include/asm-ia64/vga.h
@@ -17,7 +17,7 @@
 extern unsigned long vga_console_iobase;
 extern unsigned long vga_console_membase;
 
-#define VGA_MAP_MEM(x)  ((unsigned long) ioremap(vga_console_membase + (x), 0))
+#define VGA_MAP_MEM(x)  ((unsigned long) ioremap_nocache(vga_console_membase + (x), 0))
 
 #define vga_readb(x)    (*(x))
 #define vga_writeb(x,y) (*(y) = (x))
diff --git a/include/asm-m32r/numnodes.h b/include/asm-m32r/numnodes.h
deleted file mode 100644
index 479a39d49f83..000000000000
--- a/include/asm-m32r/numnodes.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _ASM_NUMNODES_H_
-#define _ASM_NUMNODES_H_
-
-#include <linux/config.h>
-
-#ifdef CONFIG_DISCONTIGMEM
-
-#if defined(CONFIG_CHIP_M32700)
-#define NODES_SHIFT     1       /* Max 2 Nodes */
-#endif  /* CONFIG_CHIP_M32700 */
-
-#endif  /* CONFIG_DISCONTIGMEM */
-
-#endif  /* _ASM_NUMNODES_H_ */
-
diff --git a/include/asm-m32r/smp.h b/include/asm-m32r/smp.h
index 7885b7df84a2..1184293e5712 100644
--- a/include/asm-m32r/smp.h
+++ b/include/asm-m32r/smp.h
@@ -67,7 +67,8 @@ extern volatile int cpu_2_physid[NR_CPUS];
 #define raw_smp_processor_id()  (current_thread_info()->cpu)
 
 extern cpumask_t cpu_callout_map;
-#define cpu_possible_map cpu_callout_map
+extern cpumask_t cpu_possible_map;
+extern cpumask_t cpu_present_map;
 
 static __inline__ int hard_smp_processor_id(void)
 {
diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h
index d6a2c613be68..c5ab5da56d21 100644
--- a/include/asm-m32r/system.h
+++ b/include/asm-m32r/system.h
@@ -22,10 +22,6 @@
  * `next' and `prev' should be struct task_struct, but it isn't always defined
  */
 
-#ifndef CONFIG_SMP
-#define prepare_to_switch()  do { } while(0)
-#endif  /* not CONFIG_SMP */
-
 #define switch_to(prev, next, last)  do { \
         register unsigned long  arg0 __asm__ ("r0") = (unsigned long)prev; \
         register unsigned long  arg1 __asm__ ("r1") = (unsigned long)next; \
diff --git a/include/asm-m32r/uaccess.h b/include/asm-m32r/uaccess.h
index e8ae61956a51..819cc28a94f7 100644
--- a/include/asm-m32r/uaccess.h
+++ b/include/asm-m32r/uaccess.h
@@ -5,17 +5,9 @@
  *  linux/include/asm-m32r/uaccess.h
  *
  *  M32R version.
- *    Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
+ *    Copyright (C) 2004, 2006  Hirokazu Takata <takata at linux-m32r.org>
  */
 
-#undef UACCESS_DEBUG
-
-#ifdef UACCESS_DEBUG
-#define UAPRINTK(args...) printk(args)
-#else
-#define UAPRINTK(args...)
-#endif /* UACCESS_DEBUG */
-
 /*
  * User space memory access functions
  */
@@ -38,27 +30,29 @@
 #define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
 
 #ifdef CONFIG_MMU
+
 #define KERNEL_DS       MAKE_MM_SEG(0xFFFFFFFF)
 #define USER_DS         MAKE_MM_SEG(PAGE_OFFSET)
-#else
-#define KERNEL_DS       MAKE_MM_SEG(0xFFFFFFFF)
-#define USER_DS         MAKE_MM_SEG(0xFFFFFFFF)
-#endif /* CONFIG_MMU */
-
 #define get_ds()        (KERNEL_DS)
-#ifdef CONFIG_MMU
 #define get_fs()        (current_thread_info()->addr_limit)
 #define set_fs(x)       (current_thread_info()->addr_limit = (x))
-#else
+
+#else /* not CONFIG_MMU */
+
+#define KERNEL_DS       MAKE_MM_SEG(0xFFFFFFFF)
+#define USER_DS         MAKE_MM_SEG(0xFFFFFFFF)
+#define get_ds()        (KERNEL_DS)
+
 static inline mm_segment_t get_fs(void)
 {
-  return USER_DS;
+        return USER_DS;
 }
 
 static inline void set_fs(mm_segment_t s)
 {
 }
-#endif /* CONFIG_MMU */
+
+#endif /* not CONFIG_MMU */
 
 #define segment_eq(a,b) ((a).seg == (b).seg)
 
@@ -83,9 +77,9 @@ static inline void set_fs(mm_segment_t s)
                 "       subx    %0, %0\n"                               \
                 "       cmpu    %4, %1\n"                               \
                 "       subx    %0, %5\n"                               \
-                : "=&r"(flag), "=r"(sum)                                \
-                : "1"(addr), "r"((int)(size)),                          \
-                  "r"(current_thread_info()->addr_limit.seg), "r"(0)    \
+                : "=&r" (flag), "=r" (sum)                              \
+                : "1" (addr), "r" ((int)(size)),                        \
+                  "r" (current_thread_info()->addr_limit.seg), "r" (0)  \
                 : "cbit" );                                             \
         flag; })
 
@@ -113,10 +107,10 @@ static inline void set_fs(mm_segment_t s)
 #else
 static inline int access_ok(int type, const void *addr, unsigned long size)
 {
-  extern unsigned long memory_start, memory_end;
-  unsigned long val = (unsigned long)addr;
+        extern unsigned long memory_start, memory_end;
+        unsigned long val = (unsigned long)addr;
 
-  return ((val >= memory_start) && ((val + size) < memory_end));
+        return ((val >= memory_start) && ((val + size) < memory_end));
 }
 #endif /* CONFIG_MMU */
 
@@ -155,39 +149,6 @@ extern int fixup_exception(struct pt_regs *regs);
  * accesses to the same area of user memory).
  */
 
-extern void __get_user_1(void);
-extern void __get_user_2(void);
-extern void __get_user_4(void);
-
-#ifndef MODULE
-#define __get_user_x(size,ret,x,ptr)                                    \
-        __asm__ __volatile__(                                           \
-                "       mv      r0, %0\n"                               \
-                "       mv      r1, %1\n"                               \
-                "       bl __get_user_" #size "\n"                      \
-                "       mv      %0, r0\n"                               \
-                "       mv      %1, r1\n"                               \
-                : "=r"(ret), "=r"(x)                                    \
-                : "0"(ptr)                                              \
-                : "r0", "r1", "r14" )
-#else /* MODULE */
-/*
- * Use "jl" instead of "bl" for MODULE
- */
-#define __get_user_x(size,ret,x,ptr)                                    \
-        __asm__ __volatile__(                                           \
-                "       mv      r0, %0\n"                               \
-                "       mv      r1, %1\n"                               \
-                "       seth    lr, #high(__get_user_" #size ")\n"      \
-                "       or3     lr, lr, #low(__get_user_" #size ")\n"   \
-                "       jl      lr\n"                                   \
-                "       mv      %0, r0\n"                               \
-                "       mv      %1, r1\n"                               \
-                : "=r"(ret), "=r"(x)                                    \
-                : "0"(ptr)                                              \
-                : "r0", "r1", "r14" )
-#endif
-
 /* Careful: we have to cast the result to the type of the pointer for sign
    reasons */
 /**
@@ -208,20 +169,7 @@ extern void __get_user_4(void);
  * On error, the variable @x is set to zero.
  */
 #define get_user(x,ptr)                                                 \
-({      int __ret_gu;                                                   \
-        unsigned long __val_gu;                                         \
-        __chk_user_ptr(ptr);                                            \
-        switch(sizeof (*(ptr))) {                                       \
-        case 1:  __get_user_x(1,__ret_gu,__val_gu,ptr); break;          \
-        case 2:  __get_user_x(2,__ret_gu,__val_gu,ptr); break;          \
-        case 4:  __get_user_x(4,__ret_gu,__val_gu,ptr); break;          \
-        default: __get_user_x(X,__ret_gu,__val_gu,ptr); break;          \
-        }                                                               \
-        (x) = (__typeof__(*(ptr)))__val_gu;                             \
-        __ret_gu;                                                       \
-})
-
-extern void __put_user_bad(void);
+        __get_user_check((x),(ptr),sizeof(*(ptr)))
 
 /**
  * put_user: - Write a simple value into user space.
@@ -240,8 +188,7 @@ extern void __put_user_bad(void);
  * Returns zero on success, or -EFAULT on error.
  */
 #define put_user(x,ptr)                                                 \
-  __put_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
-
+        __put_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
 
 /**
  * __get_user: - Get a simple variable from user space, with less checking.
@@ -264,8 +211,64 @@ extern void __put_user_bad(void);
  * On error, the variable @x is set to zero.
  */
 #define __get_user(x,ptr) \
-  __get_user_nocheck((x),(ptr),sizeof(*(ptr)))
+        __get_user_nocheck((x),(ptr),sizeof(*(ptr)))
 
+#define __get_user_nocheck(x,ptr,size)                                  \
+({                                                                      \
+        long __gu_err = 0;                                              \
+        unsigned long __gu_val;                                         \
+        might_sleep();                                                  \
+        __get_user_size(__gu_val,(ptr),(size),__gu_err);                \
+        (x) = (__typeof__(*(ptr)))__gu_val;                             \
+        __gu_err;                                                       \
+})
+
+#define __get_user_check(x,ptr,size)                                    \
+({                                                                      \
+        long __gu_err = -EFAULT;                                        \
+        unsigned long __gu_val = 0;                                     \
+        const __typeof__(*(ptr)) __user *__gu_addr = (ptr);             \
+        might_sleep();                                                  \
+        if (access_ok(VERIFY_READ,__gu_addr,size))                      \
+                __get_user_size(__gu_val,__gu_addr,(size),__gu_err);    \
+        (x) = (__typeof__(*(ptr)))__gu_val;                             \
+        __gu_err;                                                       \
+})
+
+extern long __get_user_bad(void);
+
+#define __get_user_size(x,ptr,size,retval)                              \
+do {                                                                    \
+        retval = 0;                                                     \
+        __chk_user_ptr(ptr);                                            \
+        switch (size) {                                                 \
+          case 1: __get_user_asm(x,ptr,retval,"ub"); break;             \
+          case 2: __get_user_asm(x,ptr,retval,"uh"); break;             \
+          case 4: __get_user_asm(x,ptr,retval,""); break;               \
+          default: (x) = __get_user_bad();                              \
+        }                                                               \
+} while (0)
+
+#define __get_user_asm(x, addr, err, itype)                             \
+        __asm__ __volatile__(                                           \
+                "       .fillinsn\n"                                    \
+                "1:     ld"itype" %1,@%2\n"                             \
+                "       .fillinsn\n"                                    \
+                "2:\n"                                                  \
+                ".section .fixup,\"ax\"\n"                              \
+                "       .balign 4\n"                                    \
+                "3:     ldi %0,%3\n"                                    \
+                "       seth r14,#high(2b)\n"                           \
+                "       or3 r14,r14,#low(2b)\n"                         \
+                "       jmp r14\n"                                      \
+                ".previous\n"                                           \
+                ".section __ex_table,\"a\"\n"                           \
+                "       .balign 4\n"                                    \
+                "       .long 1b,3b\n"                                  \
+                ".previous"                                             \
+                : "=&r" (err), "=&r" (x)                                \
+                : "r" (addr), "i" (-EFAULT), "0" (err)                  \
+                : "r14", "memory")
 
 /**
  * __put_user: - Write a simple value into user space, with less checking.
@@ -287,11 +290,13 @@ extern void __put_user_bad(void);
  * Returns zero on success, or -EFAULT on error.
  */
 #define __put_user(x,ptr) \
-  __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
+        __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
+
 
 #define __put_user_nocheck(x,ptr,size)                                  \
 ({                                                                      \
         long __pu_err;                                                  \
+        might_sleep();                                                  \
         __put_user_size((x),(ptr),(size),__pu_err);                     \
         __pu_err;                                                       \
 })
@@ -308,28 +313,28 @@ extern void __put_user_bad(void);
 })
 
 #if defined(__LITTLE_ENDIAN__)
-#define __put_user_u64(x, addr, err)                                    \
-        __asm__ __volatile__(                                           \
-                "       .fillinsn\n"                                    \
-                "1:     st %L1,@%2\n"                                    \
-                "       .fillinsn\n"                                    \
-                "2:     st %H1,@(4,%2)\n"                                \
-                "       .fillinsn\n"                                    \
-                "3:\n"                                                  \
-                ".section .fixup,\"ax\"\n"                              \
-                "       .balign 4\n"                                    \
-                "4:     ldi %0,%3\n"                                    \
-                "       seth r14,#high(3b)\n"                           \
-                "       or3 r14,r14,#low(3b)\n"                         \
-                "       jmp r14\n"                                      \
-                ".previous\n"                                           \
-                ".section __ex_table,\"a\"\n"                           \
-                "       .balign 4\n"                                    \
-                "       .long 1b,4b\n"                                  \
-                "       .long 2b,4b\n"                                  \
-                ".previous"                                             \
-                : "=&r"(err)                                             \
-                : "r"(x), "r"(addr), "i"(-EFAULT), "0"(err)             \
+#define __put_user_u64(x, addr, err)                                    \
+        __asm__ __volatile__(                                           \
+                "       .fillinsn\n"                                    \
+                "1:     st %L1,@%2\n"                                   \
+                "       .fillinsn\n"                                    \
+                "2:     st %H1,@(4,%2)\n"                               \
+                "       .fillinsn\n"                                    \
+                "3:\n"                                                  \
+                ".section .fixup,\"ax\"\n"                              \
+                "       .balign 4\n"                                    \
+                "4:     ldi %0,%3\n"                                    \
+                "       seth r14,#high(3b)\n"                           \
+                "       or3 r14,r14,#low(3b)\n"                         \
+                "       jmp r14\n"                                      \
+                ".previous\n"                                           \
+                ".section __ex_table,\"a\"\n"                           \
+                "       .balign 4\n"                                    \
+                "       .long 1b,4b\n"                                  \
+                "       .long 2b,4b\n"                                  \
+                ".previous"                                             \
+                : "=&r" (err)                                           \
+                : "r" (x), "r" (addr), "i" (-EFAULT), "0" (err)         \
                 : "r14", "memory")
 
 #elif defined(__BIG_ENDIAN__)
@@ -353,13 +358,15 @@ extern void __put_user_bad(void);
                 "       .long 1b,4b\n"                                  \
                 "       .long 2b,4b\n"                                  \
                 ".previous"                                             \
-                : "=&r"(err)                                            \
-                : "r"(x), "r"(addr), "i"(-EFAULT), "0"(err)             \
+                : "=&r" (err)                                           \
+                : "r" (x), "r" (addr), "i" (-EFAULT), "0" (err)         \
                 : "r14", "memory")
 #else
 #error no endian defined
 #endif
 
+extern void __put_user_bad(void);
+
 #define __put_user_size(x,ptr,size,retval)                              \
 do {                                                                    \
         retval = 0;                                                     \
@@ -398,52 +405,8 @@ struct __large_struct { unsigned long buf[100]; };
                 "       .balign 4\n"                                    \
                 "       .long 1b,3b\n"                                  \
                 ".previous"                                             \
-                : "=&r"(err)                                            \
-                : "r"(x), "r"(addr), "i"(-EFAULT), "0"(err)             \
-                : "r14", "memory")
-
-#define __get_user_nocheck(x,ptr,size)                                  \
-({                                                                      \
-        long __gu_err;                                                  \
-        unsigned long __gu_val;                                         \
-        __get_user_size(__gu_val,(ptr),(size),__gu_err);                \
-        (x) = (__typeof__(*(ptr)))__gu_val;                             \
-        __gu_err;                                                       \
-})
-
-extern long __get_user_bad(void);
-
-#define __get_user_size(x,ptr,size,retval)                              \
-do {                                                                    \
-        retval = 0;                                                     \
-        __chk_user_ptr(ptr);                                            \
-        switch (size) {                                                 \
-          case 1: __get_user_asm(x,ptr,retval,"ub"); break;             \
-          case 2: __get_user_asm(x,ptr,retval,"uh"); break;             \
-          case 4: __get_user_asm(x,ptr,retval,""); break;               \
-          default: (x) = __get_user_bad();                              \
-        }                                                               \
-} while (0)
-
-#define __get_user_asm(x, addr, err, itype)                             \
-        __asm__ __volatile__(                                           \
-                "       .fillinsn\n"                                    \
-                "1:     ld"itype" %1,@%2\n"                             \
-                "       .fillinsn\n"                                    \
-                "2:\n"                                                  \
-                ".section .fixup,\"ax\"\n"                              \
-                "       .balign 4\n"                                    \
-                "3:     ldi %0,%3\n"                                    \
-                "       seth r14,#high(2b)\n"                           \
-                "       or3 r14,r14,#low(2b)\n"                         \
-                "       jmp r14\n"                                      \
-                ".previous\n"                                           \
-                ".section __ex_table,\"a\"\n"                           \
-                "       .balign 4\n"                                    \
-                "       .long 1b,3b\n"                                  \
-                ".previous"                                             \
-                : "=&r"(err), "=&r"(x)                                  \
-                : "r"(addr), "i"(-EFAULT), "0"(err)                     \
+                : "=&r" (err)                                           \
+                : "r" (x), "r" (addr), "i" (-EFAULT), "0" (err)         \
                 : "r14", "memory")
 
 /*
@@ -453,7 +416,6 @@ do {									\
  * anything, so this is accurate.
  */
 
-
 /*
  * Copy To/From Userspace
  */
@@ -511,8 +473,9 @@ do {									\
                 "       .long 2b,9b\n"                                  \
                 "       .long 3b,9b\n"                                  \
                 ".previous\n"                                           \
-                : "=&r"(__dst), "=&r"(__src), "=&r"(size), "=&r"(__c)   \
-                : "0"(to), "1"(from), "2"(size), "3"(size / 4)          \
+                : "=&r" (__dst), "=&r" (__src), "=&r" (size),           \
+                  "=&r" (__c)                                           \
+                : "0" (to), "1" (from), "2" (size), "3" (size / 4)      \
                 : "r14", "memory");                                     \
 } while (0)
 
@@ -573,8 +536,9 @@ do {									\
                 "       .long 2b,7b\n"                                  \
                 "       .long 3b,7b\n"                                  \
                 ".previous\n"                                           \
-                : "=&r"(__dst), "=&r"(__src), "=&r"(size), "=&r"(__c)   \
-                : "0"(to), "1"(from), "2"(size), "3"(size / 4)          \
+                : "=&r" (__dst), "=&r" (__src), "=&r" (size),           \
+                  "=&r" (__c)                                           \
+                : "0" (to), "1" (from), "2" (size), "3" (size / 4)      \
                 : "r14", "memory");                                     \
 } while (0)
 
@@ -676,7 +640,7 @@ unsigned long __generic_copy_from_user(void *, const void __user *, unsigned lon
 #define copy_from_user(to,from,n)                       \
 ({                                                      \
         might_sleep();                                  \
-__generic_copy_from_user((to),(from),(n));      \
+        __generic_copy_from_user((to),(from),(n));      \
 })
 
 long __must_check strncpy_from_user(char *dst, const char __user *src,
diff --git a/include/asm-m32r/unistd.h b/include/asm-m32r/unistd.h
index 39be87ca2a5a..be0eb014c3b0 100644
--- a/include/asm-m32r/unistd.h
+++ b/include/asm-m32r/unistd.h
@@ -292,7 +292,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_sys_kexec_load     283
+#define __NR_kexec_load         283
 #define __NR_waitid             284
 
 #define NR_syscalls 285
diff --git a/include/asm-mips/numnodes.h b/include/asm-mips/numnodes.h
deleted file mode 100644
index 4f00c16ceeb0..000000000000
--- a/include/asm-mips/numnodes.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_MAX_NUMNODES_H
-#define _ASM_MAX_NUMNODES_H
-
-/* Max 128 Nodes */
-#define NODES_SHIFT     6
-
-#endif /* _ASM_MAX_NUMNODES_H */
diff --git a/include/asm-parisc/numnodes.h b/include/asm-parisc/numnodes.h
deleted file mode 100644
index 6c67651efd1c..000000000000
--- a/include/asm-parisc/numnodes.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_MAX_NUMNODES_H
-#define _ASM_MAX_NUMNODES_H
-
-/* Max 8 Nodes */
-#define NODES_SHIFT     3
-
-#endif /* _ASM_MAX_NUMNODES_H */
diff --git a/include/asm-powerpc/numnodes.h b/include/asm-powerpc/numnodes.h
deleted file mode 100644
index e138edae09dd..000000000000
--- a/include/asm-powerpc/numnodes.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _ASM_POWERPC_MAX_NUMNODES_H
-#define _ASM_POWERPC_MAX_NUMNODES_H
-#ifdef __KERNEL__
-
-/* Max 16 Nodes */
-#define NODES_SHIFT     4
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_POWERPC_MAX_NUMNODES_H */
diff --git a/include/asm-s390/atomic.h b/include/asm-s390/atomic.h
index de1d9926aa60..399bf02894dd 100644
--- a/include/asm-s390/atomic.h
+++ b/include/asm-s390/atomic.h
@@ -1,6 +1,8 @@
 #ifndef __ARCH_S390_ATOMIC__
 #define __ARCH_S390_ATOMIC__
 
+#include <linux/compiler.h>
+
 /*
  *  include/asm-s390/atomic.h
  *
diff --git a/include/asm-s390/ebcdic.h b/include/asm-s390/ebcdic.h
index 4cbc336e4d60..15fd2eda6c90 100644
--- a/include/asm-s390/ebcdic.h
+++ b/include/asm-s390/ebcdic.h
@@ -14,12 +14,12 @@
 #include <types.h>
 #endif
 
-extern __u8 _ascebc_500[];   /* ASCII -> EBCDIC 500 conversion table */
-extern __u8 _ebcasc_500[];   /* EBCDIC 500 -> ASCII conversion table */
-extern __u8 _ascebc[];   /* ASCII -> EBCDIC conversion table */
-extern __u8 _ebcasc[];   /* EBCDIC -> ASCII conversion table */
-extern __u8 _ebc_tolower[]; /* EBCDIC -> lowercase */
-extern __u8 _ebc_toupper[]; /* EBCDIC -> uppercase */
+extern __u8 _ascebc_500[256];   /* ASCII -> EBCDIC 500 conversion table */
+extern __u8 _ebcasc_500[256];   /* EBCDIC 500 -> ASCII conversion table */
+extern __u8 _ascebc[256];   /* ASCII -> EBCDIC conversion table */
+extern __u8 _ebcasc[256];   /* EBCDIC -> ASCII conversion table */
+extern __u8 _ebc_tolower[256]; /* EBCDIC -> lowercase */
+extern __u8 _ebc_toupper[256]; /* EBCDIC -> uppercase */
 
 static inline void
 codepage_convert(const __u8 *codepage, volatile __u8 * addr, unsigned long nr)
diff --git a/include/asm-sh/numnodes.h b/include/asm-sh/numnodes.h
deleted file mode 100644
index f73e85b72ecb..000000000000
--- a/include/asm-sh/numnodes.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_MAX_NUMNODES_H
-#define _ASM_MAX_NUMNODES_H
-
-/* Max 2 Nodes */
-#define NODES_SHIFT     1
-
-#endif /* _ASM_MAX_NUMNODES_H */
diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h
index f2c8e14d1fd9..05520cebda12 100644
--- a/include/asm-sh/unistd.h
+++ b/include/asm-sh/unistd.h
@@ -290,7 +290,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_sys_kexec_load     283
+#define __NR_kexec_load         283
 #define __NR_waitid             284
 #define __NR_add_key            285
 #define __NR_request_key        286
diff --git a/include/asm-sh64/unistd.h b/include/asm-sh64/unistd.h
index 2a1cfa404ea4..1f8f394ae371 100644
--- a/include/asm-sh64/unistd.h
+++ b/include/asm-sh64/unistd.h
@@ -333,7 +333,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_sys_kexec_load     311
+#define __NR_kexec_load         311
 #define __NR_waitid             312
 #define __NR_add_key            313
 #define __NR_request_key        314
diff --git a/include/asm-sparc/vga.h b/include/asm-sparc/vga.h
new file mode 100644
index 000000000000..c69d5b2ba19a
--- /dev/null
+++ b/include/asm-sparc/vga.h
@@ -0,0 +1,33 @@
+/*
+ *      Access to VGA videoram
+ *
+ *      (c) 1998 Martin Mares <mj@ucw.cz>
+ */
+
+#ifndef _LINUX_ASM_VGA_H_
+#define _LINUX_ASM_VGA_H_
+
+#include <asm/types.h>
+
+#define VT_BUF_HAVE_RW
+
+#undef scr_writew
+#undef scr_readw
+
+static inline void scr_writew(u16 val, u16 *addr)
+{
+        BUG_ON((long) addr >= 0);
+
+        *addr = val;
+}
+
+static inline u16 scr_readw(const u16 *addr)
+{
+        BUG_ON((long) addr >= 0);
+
+        return *addr;
+}
+
+#define VGA_MAP_MEM(x,s) (x)
+
+#endif
diff --git a/include/asm-sparc64/percpu.h b/include/asm-sparc64/percpu.h
index 82032e159a76..baef13b58952 100644
--- a/include/asm-sparc64/percpu.h
+++ b/include/asm-sparc64/percpu.h
@@ -26,7 +26,7 @@ register unsigned long __local_per_cpu_offset asm("g5");
 #define percpu_modcopy(pcpudst, src, size)                      \
 do {                                                            \
         unsigned int __i;                                       \
-        for_each_cpu(__i)                                       \
+        for_each_possible_cpu(__i)                              \
                 memcpy((pcpudst)+__per_cpu_offset(__i),         \
                        (src), (size));                          \
 } while (0)
diff --git a/include/asm-um/ptrace-i386.h b/include/asm-um/ptrace-i386.h
index 30656c962d74..6e2528bb0083 100644
--- a/include/asm-um/ptrace-i386.h
+++ b/include/asm-um/ptrace-i386.h
@@ -56,6 +56,9 @@ extern int do_get_thread_area_tt(struct user_desc *info);
 extern int arch_switch_tls_skas(struct task_struct *from, struct task_struct *to);
 extern int arch_switch_tls_tt(struct task_struct *from, struct task_struct *to);
 
+extern void arch_switch_to_tt(struct task_struct *from, struct task_struct *to);
+extern void arch_switch_to_skas(struct task_struct *from, struct task_struct *to);
+
 static inline int do_get_thread_area(struct user_desc *info)
 {
         return CHOOSE_MODE_PROC(do_get_thread_area_tt, do_get_thread_area_skas, info);
diff --git a/include/asm-v850/system.h b/include/asm-v850/system.h
index 107decbd6e6c..7091af4b7866 100644
--- a/include/asm-v850/system.h
+++ b/include/asm-v850/system.h
@@ -18,8 +18,6 @@
 #include <asm/ptrace.h>
 
 
-#define prepare_to_switch()     do { } while (0)
-
 /*
  * switch_to(n) should switch tasks to task ptr, first checking that
  * ptr isn't the current task, in which case it does nothing.
diff --git a/include/asm-x86_64/e820.h b/include/asm-x86_64/e820.h
index 8dcc32665240..93b51df51687 100644
--- a/include/asm-x86_64/e820.h
+++ b/include/asm-x86_64/e820.h
@@ -47,7 +47,8 @@ extern void contig_e820_setup(void);
 extern unsigned long e820_end_of_ram(void);
 extern void e820_reserve_resources(void);
 extern void e820_print_map(char *who);
-extern int e820_mapped(unsigned long start, unsigned long end, unsigned type);
+extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type);
+extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type);
 
 extern void e820_bootmem_free(pg_data_t *pgdat, unsigned long start,unsigned long end);
 extern void e820_setup_gap(void);
diff --git a/include/asm-x86_64/hpet.h b/include/asm-x86_64/hpet.h
index 08b75c15269a..18ff7ee9e774 100644
--- a/include/asm-x86_64/hpet.h
+++ b/include/asm-x86_64/hpet.h
@@ -51,6 +51,8 @@
 
 #define HPET_TN_ROUTE_SHIFT     9
 
+#define HPET_TICK_RATE (HZ * 100000UL)
+
 extern int is_hpet_enabled(void);
 extern int hpet_rtc_timer_init(void);
 extern int oem_force_hpet_timer(void);
diff --git a/include/asm-x86_64/ia32_unistd.h b/include/asm-x86_64/ia32_unistd.h
index eeb2bcd635de..b4f4b172b15a 100644
--- a/include/asm-x86_64/ia32_unistd.h
+++ b/include/asm-x86_64/ia32_unistd.h
@@ -317,6 +317,4 @@
 #define __NR_ia32_ppoll                 309
 #define __NR_ia32_unshare               310
 
-#define IA32_NR_syscalls 315    /* must be > than biggest syscall! */
-
 #endif /* _ASM_X86_64_IA32_UNISTD_H_ */
diff --git a/include/asm-x86_64/io.h b/include/asm-x86_64/io.h
index cafdfb37f0d8..a05da8a50bfd 100644
--- a/include/asm-x86_64/io.h
+++ b/include/asm-x86_64/io.h
@@ -177,7 +177,7 @@ static inline __u16 __readw(const volatile void __iomem *addr)
 {
         return *(__force volatile __u16 *)addr;
 }
-static inline __u32 __readl(const volatile void __iomem *addr)
+static __always_inline __u32 __readl(const volatile void __iomem *addr)
 {
         return *(__force volatile __u32 *)addr;
 }
diff --git a/include/asm-x86_64/mce.h b/include/asm-x86_64/mce.h
index 5d298b799a9f..7229785094e3 100644
--- a/include/asm-x86_64/mce.h
+++ b/include/asm-x86_64/mce.h
@@ -70,6 +70,9 @@ struct mce_log {
 #define MCE_THRESHOLD_BASE      MCE_EXTENDED_BANK + 1 /* MCE_AMD */
 #define MCE_THRESHOLD_DRAM_ECC  MCE_THRESHOLD_BASE + 4
 
+#ifdef __KERNEL__
+#include <asm/atomic.h>
+
 void mce_log(struct mce *m);
 #ifdef CONFIG_X86_MCE_INTEL
 void mce_intel_feature_init(struct cpuinfo_x86 *c);
@@ -87,4 +90,8 @@ static inline void mce_amd_feature_init(struct cpuinfo_x86 *c)
 }
 #endif
 
+extern atomic_t mce_entry;
+
+#endif
+
 #endif
diff --git a/include/asm-x86_64/numa.h b/include/asm-x86_64/numa.h
index f6cbb4cbb5a3..1cc92fe02503 100644
--- a/include/asm-x86_64/numa.h
+++ b/include/asm-x86_64/numa.h
@@ -2,7 +2,6 @@
 #define _ASM_X8664_NUMA_H 1
 
 #include <linux/nodemask.h>
-#include <asm/numnodes.h>
 
 struct bootnode {
         u64 start,end; 
@@ -18,6 +17,8 @@ extern void numa_init_array(void);
 extern int numa_off;
 
 extern void numa_set_node(int cpu, int node);
+extern void srat_reserve_add_area(int nodeid);
+extern int hotadd_percent;
 
 extern unsigned char apicid_to_node[256];
 #ifdef CONFIG_NUMA
diff --git a/include/asm-x86_64/numnodes.h b/include/asm-x86_64/numnodes.h
deleted file mode 100644
index 32be16b8ae96..000000000000
--- a/include/asm-x86_64/numnodes.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_X8664_NUMNODES_H
-#define _ASM_X8664_NUMNODES_H 1
-
-#include <linux/config.h>
-
-#ifdef CONFIG_NUMA
-#define NODES_SHIFT     6
-#else
-#define NODES_SHIFT     0
-#endif
-
-#endif
diff --git a/include/asm-x86_64/timex.h b/include/asm-x86_64/timex.h
index f18443fcdf04..b9e5320b7625 100644
--- a/include/asm-x86_64/timex.h
+++ b/include/asm-x86_64/timex.h
@@ -33,7 +33,7 @@ static __always_inline cycles_t get_cycles_sync(void)
         unsigned eax;
         /* Don't do an additional sync on CPUs where we know
            RDTSC is already synchronous. */
-        alternative_io(ASM_NOP2, "cpuid", X86_FEATURE_SYNC_RDTSC,
+        alternative_io("cpuid", ASM_NOP2, X86_FEATURE_SYNC_RDTSC,
                           "=a" (eax), "0" (1) : "ebx","ecx","edx","memory");
         rdtscll(ret);
         return ret;
diff --git a/include/asm-xtensa/system.h b/include/asm-xtensa/system.h
index 9284867f1cb9..b29f7ae6a08a 100644
--- a/include/asm-xtensa/system.h
+++ b/include/asm-xtensa/system.h
@@ -111,8 +111,6 @@ extern void *_switch_to(void *last, void *next);
 
 #endif  /* __ASSEMBLY__ */
 
-#define prepare_to_switch()     do { } while(0)
-
 #define switch_to(prev,next,last)               \
 do {                                            \
         clear_cpenable();                       \
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index de3eb8d8ae26..da2d107fe2cf 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -45,6 +45,7 @@ extern unsigned long __init bootmem_bootmap_pages (unsigned long);
 extern unsigned long __init init_bootmem (unsigned long addr, unsigned long memend);
 extern void __init free_bootmem (unsigned long addr, unsigned long size);
 extern void * __init __alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal);
+extern void * __init __alloc_bootmem_nopanic (unsigned long size, unsigned long align, unsigned long goal);
 extern void * __init __alloc_bootmem_low(unsigned long size,
                                          unsigned long align,
                                          unsigned long goal);
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 9b4751aecc23..ff61817082fa 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -21,7 +21,7 @@ enum dma_data_direction {
 #define DMA_30BIT_MASK  0x000000003fffffffULL
 #define DMA_29BIT_MASK  0x000000001fffffffULL
 #define DMA_28BIT_MASK  0x000000000fffffffULL
-#define DMA_24BIT_MASK 0x0000000000ffffffULL
+#define DMA_24BIT_MASK  0x0000000000ffffffULL
 
 #include <asm/dma-mapping.h>
 
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 1e9ebaba07b7..162c6e57307a 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -762,7 +762,7 @@ extern int fcntl_getlease(struct file *filp);
 #define SYNC_FILE_RANGE_WRITE           2
 #define SYNC_FILE_RANGE_WAIT_AFTER      4
 extern int do_sync_file_range(struct file *file, loff_t offset, loff_t endbyte,
-                        int flags);
+                        unsigned int flags);
 
 /* fs/locks.c */
 extern void locks_init_lock(struct file_lock *);
@@ -1039,8 +1039,8 @@ struct file_operations {
         int (*check_flags)(int);
         int (*dir_notify)(struct file *filp, unsigned long arg);
         int (*flock) (struct file *, int, struct file_lock *);
-        ssize_t (*splice_write)(struct inode *, struct file *, size_t, unsigned int);
-        ssize_t (*splice_read)(struct file *, struct inode *, size_t, unsigned int);
+        ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, size_t, unsigned int);
+        ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned int);
 };
 
 struct inode_operations {
@@ -1611,8 +1611,17 @@ extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor
 extern void do_generic_mapping_read(struct address_space *mapping,
                                     struct file_ra_state *, struct file *,
                                     loff_t *, read_descriptor_t *, read_actor_t);
-extern ssize_t generic_file_splice_read(struct file *, struct inode *, size_t, unsigned int);
-extern ssize_t generic_file_splice_write(struct inode *, struct file *, size_t, unsigned int);
+
+/* fs/splice.c */
+extern ssize_t generic_file_splice_read(struct file *,
+                struct pipe_inode_info *, size_t, unsigned int);
+extern ssize_t generic_file_splice_write(struct pipe_inode_info *,
+                struct file *, size_t, unsigned int);
+extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe,
+                struct file *out, size_t len, unsigned int flags);
+extern long do_splice_direct(struct file *in, struct file *out,
+                size_t len, unsigned int flags);
+
 extern void
 file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);
 extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, 
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 7851e6b520cf..3ac452945a7d 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -57,6 +57,8 @@ struct vm_area_struct;
                         __GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP| \
                         __GFP_NOMEMALLOC|__GFP_HARDWALL)
 
+/* This equals 0, but use constants in case they ever change */
+#define GFP_NOWAIT      (GFP_ATOMIC & ~__GFP_HIGH)
 /* GFP_ATOMIC means both !wait (__GFP_WAIT not set) and use emergency pool */
 #define GFP_ATOMIC      (__GFP_HIGH)
 #define GFP_NOIO        (__GFP_WAIT)
diff --git a/include/linux/init.h b/include/linux/init.h
index ed0ac7c39fdc..93dcbe1abb4c 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -245,7 +245,8 @@ void __init parse_early_param(void);
 #define __cpuexitdata   __exitdata
 #endif
 
-#ifdef CONFIG_MEMORY_HOTPLUG
+#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \
+        || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
 #define __meminit
 #define __meminitdata
 #define __memexit
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index 99905e180532..043376920f51 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -36,6 +36,8 @@
 /* LATCH is used in the interval timer and ftape setup. */
 #define LATCH  ((CLOCK_TICK_RATE + HZ/2) / HZ)  /* For divider */
 
+#define LATCH_HPET ((HPET_TICK_RATE + HZ/2) / HZ)
+
 /* Suppose we want to devide two numbers NOM and DEN: NOM/DEN, the we can
  * improve accuracy by shifting LSH bits, hence calculating:
  *     (NOM << LSH) / DEN
@@ -51,9 +53,13 @@
 /* HZ is the requested value. ACTHZ is actual HZ ("<< 8" is for accuracy) */
 #define ACTHZ (SH_DIV (CLOCK_TICK_RATE, LATCH, 8))
 
+#define ACTHZ_HPET (SH_DIV (HPET_TICK_RATE, LATCH_HPET, 8))
+
 /* TICK_NSEC is the time between ticks in nsec assuming real ACTHZ */
 #define TICK_NSEC (SH_DIV (1000000UL * 1000, ACTHZ, 8))
 
+#define TICK_NSEC_HPET (SH_DIV(1000000UL * 1000, ACTHZ_HPET, 8))
+
 /* TICK_USEC is the time between ticks in usec assuming fake USER_HZ */
 #define TICK_USEC ((1000000UL + USER_HZ/2) / USER_HZ)
 
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index a3720f973ea5..e1bd0842f6a1 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -176,7 +176,7 @@ static inline void console_verbose(void)
 
 extern void bust_spinlocks(int yes);
 extern int oops_in_progress;            /* If set, an oops, panic(), BUG() or die() is in progress */
-extern __deprecated_for_modules int panic_timeout;
+extern int panic_timeout;
 extern int panic_on_oops;
 extern int tainted;
 extern const char *print_tainted(void);
diff --git a/include/linux/leds.h b/include/linux/leds.h
index 4617e75903b0..dc23c7c639f3 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -19,39 +19,38 @@ struct class_device;
  */
 
 enum led_brightness {
-        LED_OFF = 0,
-        LED_HALF = 127,
-        LED_FULL = 255,
+        LED_OFF         = 0,
+        LED_HALF        = 127,
+        LED_FULL        = 255,
 };
 
 struct led_classdev {
-        const char *name;
-        int brightness;
-        int flags;
-#define LED_SUSPENDED       (1 << 0)
+        const char              *name;
+        int                      brightness;
+        int                      flags;
 
-        /* A function to set the brightness of the led */
-        void (*brightness_set)(struct led_classdev *led_cdev,
-                                enum led_brightness brightness);
+#define LED_SUSPENDED           (1 << 0)
 
-        struct class_device *class_dev;
-        /* LED Device linked list */
-        struct list_head node;
+        /* Set LED brightness level */
+        void            (*brightness_set)(struct led_classdev *led_cdev,
+                                          enum led_brightness brightness);
+
+        struct class_device     *class_dev;
+        struct list_head         node;                  /* LED Device list */
+        char                    *default_trigger;       /* Trigger to use */
 
-        /* Trigger data */
-        char *default_trigger;
 #ifdef CONFIG_LEDS_TRIGGERS
-        rwlock_t trigger_lock;
         /* Protects the trigger data below */
+        rwlock_t                 trigger_lock;
 
-        struct led_trigger *trigger;
-        struct list_head trig_list;
-        void *trigger_data;
+        struct led_trigger      *trigger;
+        struct list_head         trig_list;
+        void                    *trigger_data;
 #endif
 };
 
 extern int led_classdev_register(struct device *parent,
-                                struct led_classdev *led_cdev);
+                                 struct led_classdev *led_cdev);
 extern void led_classdev_unregister(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
@@ -65,16 +64,16 @@ extern void led_classdev_resume(struct led_classdev *led_cdev);
 
 struct led_trigger {
         /* Trigger Properties */
-        const char *name;
-        void (*activate)(struct led_classdev *led_cdev);
-        void (*deactivate)(struct led_classdev *led_cdev);
+        const char       *name;
+        void            (*activate)(struct led_classdev *led_cdev);
+        void            (*deactivate)(struct led_classdev *led_cdev);
 
         /* LEDs under control by this trigger (for simple triggers) */
-        rwlock_t leddev_list_lock;
-        struct list_head led_cdevs;
+        rwlock_t          leddev_list_lock;
+        struct list_head  led_cdevs;
 
         /* Link to next registered trigger */
-        struct list_head next_trig;
+        struct list_head  next_trig;
 };
 
 /* Registration functions for complex triggers */
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 44d074ff7789..bf86ee474533 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -33,6 +33,7 @@
 #include <asm/io.h>
 #include <linux/ata.h>
 #include <linux/workqueue.h>
+#include <scsi/scsi_host.h>
 
 /*
  * compile-time options: to be removed as soon as all the drivers are
@@ -248,7 +249,7 @@ struct ata_queued_cmd;
 /* typedefs */
 typedef void (*ata_qc_cb_t) (struct ata_queued_cmd *qc);
 typedef void (*ata_probeinit_fn_t)(struct ata_port *);
-typedef int (*ata_reset_fn_t)(struct ata_port *, int, unsigned int *);
+typedef int (*ata_reset_fn_t)(struct ata_port *, unsigned int *);
 typedef void (*ata_postreset_fn_t)(struct ata_port *ap, unsigned int *);
 
 struct ata_ioports {
@@ -499,15 +500,14 @@ extern void ata_port_probe(struct ata_port *);
 extern void __sata_phy_reset(struct ata_port *ap);
 extern void sata_phy_reset(struct ata_port *ap);
 extern void ata_bus_reset(struct ata_port *ap);
+extern int ata_set_sata_spd(struct ata_port *ap);
 extern int ata_drive_probe_reset(struct ata_port *ap,
                         ata_probeinit_fn_t probeinit,
                         ata_reset_fn_t softreset, ata_reset_fn_t hardreset,
                         ata_postreset_fn_t postreset, unsigned int *classes);
 extern void ata_std_probeinit(struct ata_port *ap);
-extern int ata_std_softreset(struct ata_port *ap, int verbose,
-                             unsigned int *classes);
-extern int sata_std_hardreset(struct ata_port *ap, int verbose,
-                              unsigned int *class);
+extern int ata_std_softreset(struct ata_port *ap, unsigned int *classes);
+extern int sata_std_hardreset(struct ata_port *ap, unsigned int *class);
 extern void ata_std_postreset(struct ata_port *ap, unsigned int *classes);
 extern int ata_dev_revalidate(struct ata_port *ap, struct ata_device *dev,
                               int post_reset);
@@ -526,6 +526,8 @@ extern void ata_host_set_remove(struct ata_host_set *host_set);
 extern int ata_scsi_detect(struct scsi_host_template *sht);
 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
+extern void ata_eh_qc_complete(struct ata_queued_cmd *qc);
+extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);
 extern int ata_scsi_release(struct Scsi_Host *host);
 extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
 extern int ata_scsi_device_resume(struct scsi_device *);
@@ -538,6 +540,9 @@ extern unsigned int ata_busy_sleep(struct ata_port *ap,
                                    unsigned long timeout);
 extern void ata_port_queue_task(struct ata_port *ap, void (*fn)(void *),
                                 void *data, unsigned long delay);
+extern u32 ata_wait_register(void __iomem *reg, u32 mask, u32 val,
+                             unsigned long interval_msec,
+                             unsigned long timeout_msec);
 
 /*
  * Default driver ops implementations
@@ -631,7 +636,6 @@ extern unsigned long ata_pci_default_filter(const struct ata_port *, struct ata_
 /*
  * EH
  */
-extern int ata_scsi_error(struct Scsi_Host *host);
 extern void ata_eng_timeout(struct ata_port *ap);
 extern void ata_eh_qc_complete(struct ata_queued_cmd *qc);
 extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);
@@ -972,4 +976,9 @@ static inline void ata_pad_free(struct ata_port *ap, struct device *dev)
         dma_free_coherent(dev, ATA_DMA_PAD_BUF_SZ, ap->pad, ap->pad_dma);
 }
 
+static inline struct ata_port *ata_shost_to_port(struct Scsi_Host *host)
+{
+        return (struct ata_port *) &host->hostdata[0];
+}
+
 #endif /* __LINUX_LIBATA_H__ */
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 968b1aa3732c..4ca3e6ad03ec 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -58,8 +58,6 @@ extern int add_one_highpage(struct page *page, int pfn, int bad_ppro);
 /* need some defines for these for archs that don't support it */
 extern void online_page(struct page *page);
 /* VM interface that may be used by firmware interface */
-extern int add_memory(u64 start, u64 size);
-extern int remove_memory(u64 start, u64 size);
 extern int online_pages(unsigned long, unsigned long);
 
 /* reasonably generic interface to expand the physical pages in a zone  */
@@ -92,11 +90,6 @@ static inline int mhp_notimplemented(const char *func)
         return -ENOSYS;
 }
 
-static inline int __add_pages(struct zone *zone, unsigned long start_pfn,
-        unsigned long nr_pages)
-{
-        return mhp_notimplemented(__FUNCTION__);
-}
 #endif /* ! CONFIG_MEMORY_HOTPLUG */
 static inline int __remove_pages(struct zone *zone, unsigned long start_pfn,
         unsigned long nr_pages)
@@ -105,4 +98,11 @@ static inline int __remove_pages(struct zone *zone, unsigned long start_pfn,
         dump_stack();
         return -ENOSYS;
 }
+
+#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \
+        || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
+extern int add_memory(u64 start, u64 size);
+extern int remove_memory(u64 start, u64 size);
+#endif
+
 #endif /* __LINUX_MEMORY_HOTPLUG_H */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 6aa016f1d3ae..1154684209a4 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -229,10 +229,9 @@ struct page {
                 unsigned long private;          /* Mapping-private opaque data:
                                                  * usually used for buffer_heads
                                                  * if PagePrivate set; used for
-                                                 * swp_entry_t if PageSwapCache.
-                                                 * When page is free, this
+                                                 * swp_entry_t if PageSwapCache;
                                                  * indicates order in the buddy
-                                                 * system.
+                                                 * system if PG_buddy is set.
                                                  */
                 struct address_space *mapping;  /* If low bit clear, points to
                                                  * inode address_space, or NULL.
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 412e52ca9720..b31a9bca9361 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -110,6 +110,8 @@ struct nf_info
 /* Function to register/unregister hook points. */
 int nf_register_hook(struct nf_hook_ops *reg);
 void nf_unregister_hook(struct nf_hook_ops *reg);
+int nf_register_hooks(struct nf_hook_ops *reg, unsigned int n);
+void nf_unregister_hooks(struct nf_hook_ops *reg, unsigned int n);
 
 /* Functions to register get/setsockopt ranges (non-inclusive).  You
    need to check permissions yourself! */
@@ -281,16 +283,42 @@ extern void nf_invalidate_cache(int pf);
    Returns true or false. */
 extern int skb_make_writable(struct sk_buff **pskb, unsigned int writable_len);
 
-struct nf_queue_rerouter {
-        void (*save)(const struct sk_buff *skb, struct nf_info *info);
-        int (*reroute)(struct sk_buff **skb, const struct nf_info *info);
-        int rer_size;
+struct nf_afinfo {
+        unsigned short  family;
+        unsigned int    (*checksum)(struct sk_buff *skb, unsigned int hook,
+                                    unsigned int dataoff, u_int8_t protocol);
+        void            (*saveroute)(const struct sk_buff *skb,
+                                     struct nf_info *info);
+        int             (*reroute)(struct sk_buff **skb,
+                                   const struct nf_info *info);
+        int             route_key_size;
 };
 
-#define nf_info_reroute(x) ((void *)x + sizeof(struct nf_info))
+extern struct nf_afinfo *nf_afinfo[];
+static inline struct nf_afinfo *nf_get_afinfo(unsigned short family)
+{
+        return rcu_dereference(nf_afinfo[family]);
+}
+
+static inline unsigned int
+nf_checksum(struct sk_buff *skb, unsigned int hook, unsigned int dataoff,
+            u_int8_t protocol, unsigned short family)
+{
+        struct nf_afinfo *afinfo;
+        unsigned int csum = 0;
+
+        rcu_read_lock();
+        afinfo = nf_get_afinfo(family);
+        if (afinfo)
+                csum = afinfo->checksum(skb, hook, dataoff, protocol);
+        rcu_read_unlock();
+        return csum;
+}
 
-extern int nf_register_queue_rerouter(int pf, struct nf_queue_rerouter *rer);
-extern int nf_unregister_queue_rerouter(int pf);
+extern int nf_register_afinfo(struct nf_afinfo *afinfo);
+extern void nf_unregister_afinfo(struct nf_afinfo *afinfo);
+
+#define nf_info_reroute(x) ((void *)x + sizeof(struct nf_info))
 
 #include <net/flow.h>
 extern void (*ip_nat_decode_session)(struct sk_buff *, struct flowi *);
diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h
index 43c09d790b83..85301c5e8d24 100644
--- a/include/linux/netfilter_ipv4.h
+++ b/include/linux/netfilter_ipv4.h
@@ -80,6 +80,8 @@ enum nf_ip_hook_priorities {
 #ifdef __KERNEL__
 extern int ip_route_me_harder(struct sk_buff **pskb);
 extern int ip_xfrm_me_harder(struct sk_buff **pskb);
+extern unsigned int nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
+                                   unsigned int dataoff, u_int8_t protocol);
 #endif /*__KERNEL__*/
 
 #endif /*__LINUX_IP_NETFILTER_H*/
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_h323.h b/include/linux/netfilter_ipv4/ip_conntrack_h323.h
index 0987cea53840..eace86bd2adb 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_h323.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_h323.h
@@ -3,6 +3,8 @@
 
 #ifdef __KERNEL__
 
+#include <linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h>
+
 #define RAS_PORT 1719
 #define Q931_PORT 1720
 #define H323_RTP_CHANNEL_MAX 4  /* Audio, video, FAX and other */
@@ -25,6 +27,56 @@ struct ip_ct_h323_master {
         };
 };
 
+struct ip_conntrack_expect;
+
+extern int get_h225_addr(unsigned char *data, TransportAddress * addr,
+                         u_int32_t * ip, u_int16_t * port);
+extern void ip_conntrack_h245_expect(struct ip_conntrack *new,
+                                     struct ip_conntrack_expect *this);
+extern void ip_conntrack_q931_expect(struct ip_conntrack *new,
+                                     struct ip_conntrack_expect *this);
+extern int (*set_h245_addr_hook) (struct sk_buff ** pskb,
+                                  unsigned char **data, int dataoff,
+                                  H245_TransportAddress * addr,
+                                  u_int32_t ip, u_int16_t port);
+extern int (*set_h225_addr_hook) (struct sk_buff ** pskb,
+                                  unsigned char **data, int dataoff,
+                                  TransportAddress * addr,
+                                  u_int32_t ip, u_int16_t port);
+extern int (*set_sig_addr_hook) (struct sk_buff ** pskb,
+                                 struct ip_conntrack * ct,
+                                 enum ip_conntrack_info ctinfo,
+                                 unsigned char **data,
+                                 TransportAddress * addr, int count);
+extern int (*set_ras_addr_hook) (struct sk_buff ** pskb,
+                                 struct ip_conntrack * ct,
+                                 enum ip_conntrack_info ctinfo,
+                                 unsigned char **data,
+                                 TransportAddress * addr, int count);
+extern int (*nat_rtp_rtcp_hook) (struct sk_buff ** pskb,
+                                 struct ip_conntrack * ct,
+                                 enum ip_conntrack_info ctinfo,
+                                 unsigned char **data, int dataoff,
+                                 H245_TransportAddress * addr,
+                                 u_int16_t port, u_int16_t rtp_port,
+                                 struct ip_conntrack_expect * rtp_exp,
+                                 struct ip_conntrack_expect * rtcp_exp);
+extern int (*nat_t120_hook) (struct sk_buff ** pskb, struct ip_conntrack * ct,
+                             enum ip_conntrack_info ctinfo,
+                             unsigned char **data, int dataoff,
+                             H245_TransportAddress * addr, u_int16_t port,
+                             struct ip_conntrack_expect * exp);
+extern int (*nat_h245_hook) (struct sk_buff ** pskb, struct ip_conntrack * ct,
+                             enum ip_conntrack_info ctinfo,
+                             unsigned char **data, int dataoff,
+                             TransportAddress * addr, u_int16_t port,
+                             struct ip_conntrack_expect * exp);
+extern int (*nat_q931_hook) (struct sk_buff ** pskb, struct ip_conntrack * ct,
+                             enum ip_conntrack_info ctinfo,
+                             unsigned char **data, TransportAddress * addr,
+                             int idx, u_int16_t port,
+                             struct ip_conntrack_expect * exp);
+
 #endif
 
 #endif
diff --git a/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.h b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h
index 0bd828081c0c..0bd828081c0c 100644
--- a/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h
diff --git a/net/ipv4/netfilter/ip_conntrack_helper_h323_types.h b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h
index cc98f7aa5abe..cc98f7aa5abe 100644
--- a/net/ipv4/netfilter/ip_conntrack_helper_h323_types.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h
diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
index 14f2bd010884..52a7b9e76428 100644
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
@@ -73,6 +73,9 @@ enum nf_ip6_hook_priorities {
 };
 
 #ifdef CONFIG_NETFILTER
+extern unsigned int nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
+                                    unsigned int dataoff, u_int8_t protocol);
+
 extern int ipv6_netfilter_init(void);
 extern void ipv6_netfilter_fini(void);
 #else /* CONFIG_NETFILTER */
diff --git a/include/linux/numa.h b/include/linux/numa.h
index f0c539bd3cfc..e481feb1bfd8 100644
--- a/include/linux/numa.h
+++ b/include/linux/numa.h
@@ -3,11 +3,9 @@
 
 #include <linux/config.h>
 
-#ifndef CONFIG_FLATMEM
-#include <asm/numnodes.h>
-#endif
-
-#ifndef NODES_SHIFT
+#ifdef CONFIG_NODES_SHIFT
+#define NODES_SHIFT     CONFIG_NODES_SHIFT
+#else
 #define NODES_SHIFT     0
 #endif
 
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 9ea629c02a4b..d276a4e2f825 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -48,8 +48,20 @@
 
 /*
  * Don't use the *_dontuse flags.  Use the macros.  Otherwise you'll break
- * locked- and dirty-page accounting.  The top eight bits of page->flags are
- * used for page->zone, so putting flag bits there doesn't work.
+ * locked- and dirty-page accounting.
+ *
+ * The page flags field is split into two parts, the main flags area
+ * which extends from the low bits upwards, and the fields area which
+ * extends from the high bits downwards.
+ *
+ *  | FIELD | ... | FLAGS |
+ *  N-1     ^             0
+ *          (N-FLAGS_RESERVED)
+ *
+ * The fields area is reserved for fields mapping zone, node and SPARSEMEM
+ * section.  The boundry between these two areas is defined by
+ * FLAGS_RESERVED which defines the width of the fields section
+ * (see linux/mmzone.h).  New flags must _not_ overlap with this area.
  */
 #define PG_locked                0      /* Page is locked. Don't touch. */
 #define PG_error                 1
@@ -74,7 +86,9 @@
 #define PG_mappedtodisk         16      /* Has blocks allocated on-disk */
 #define PG_reclaim              17      /* To be reclaimed asap */
 #define PG_nosave_free          18      /* Free, should not be written */
-#define PG_uncached             19      /* Page has been mapped as uncached */
+#define PG_buddy                19      /* Page is free, on buddy lists */
+
+#define PG_uncached             20      /* Page has been mapped as uncached */
 
 /*
  * Global page accounting.  One instance per CPU.  Only unsigned longs are
@@ -317,6 +331,10 @@ extern void __mod_page_state_offset(unsigned long offset, unsigned long delta);
 #define SetPageNosaveFree(page) set_bit(PG_nosave_free, &(page)->flags)
 #define ClearPageNosaveFree(page)               clear_bit(PG_nosave_free, &(page)->flags)
 
+#define PageBuddy(page)         test_bit(PG_buddy, &(page)->flags)
+#define __SetPageBuddy(page)    __set_bit(PG_buddy, &(page)->flags)
+#define __ClearPageBuddy(page)  __clear_bit(PG_buddy, &(page)->flags)
+
 #define PageMappedToDisk(page)  test_bit(PG_mappedtodisk, &(page)->flags)
 #define SetPageMappedToDisk(page) set_bit(PG_mappedtodisk, &(page)->flags)
 #define ClearPageMappedToDisk(page) clear_bit(PG_mappedtodisk, &(page)->flags)
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index ec384958d509..123a7c24bc72 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -36,27 +36,19 @@ struct pipe_inode_info {
         unsigned int w_counter;
         struct fasync_struct *fasync_readers;
         struct fasync_struct *fasync_writers;
+        struct inode *inode;
 };
 
 /* Differs from PIPE_BUF in that PIPE_SIZE is the length of the actual
    memory allocation, whereas PIPE_BUF makes atomicity guarantees.  */
 #define PIPE_SIZE               PAGE_SIZE
 
-#define PIPE_MUTEX(inode)       (&(inode).i_mutex)
-#define PIPE_WAIT(inode)        (&(inode).i_pipe->wait)
-#define PIPE_READERS(inode)     ((inode).i_pipe->readers)
-#define PIPE_WRITERS(inode)     ((inode).i_pipe->writers)
-#define PIPE_WAITING_WRITERS(inode)     ((inode).i_pipe->waiting_writers)
-#define PIPE_RCOUNTER(inode)    ((inode).i_pipe->r_counter)
-#define PIPE_WCOUNTER(inode)    ((inode).i_pipe->w_counter)
-#define PIPE_FASYNC_READERS(inode)     (&((inode).i_pipe->fasync_readers))
-#define PIPE_FASYNC_WRITERS(inode)     (&((inode).i_pipe->fasync_writers))
-
 /* Drop the inode semaphore and wait for a pipe event, atomically */
-void pipe_wait(struct inode * inode);
+void pipe_wait(struct pipe_inode_info *pipe);
 
-struct inode* pipe_new(struct inode* inode);
-void free_pipe_info(struct inode* inode);
+struct pipe_inode_info * alloc_pipe_info(struct inode * inode);
+void free_pipe_info(struct inode * inode);
+void __free_pipe_info(struct pipe_inode_info *);
 
 /*
  * splice is tied to pipes as a transport (at least for now), so we'll just
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 135871df9911..4b47a0253425 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -79,7 +79,7 @@ struct kcore_list {
 struct vmcore {
         struct list_head list;
         unsigned long long paddr;
-        unsigned long size;
+        unsigned long long size;
         loff_t offset;
 };
 
diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h
index 774e1acfb8c4..f1fbae7e390e 100644
--- a/include/linux/raid/md_p.h
+++ b/include/linux/raid/md_p.h
@@ -227,8 +227,8 @@ struct mdp_superblock_1 {
                                  */
 
         /* These are only valid with feature bit '4' */
-        __u64   reshape_position;       /* next address in array-space for reshape */
         __u32   new_level;      /* new level we are reshaping to                */
+        __u64   reshape_position;       /* next address in array-space for reshape */
         __u32   delta_disks;    /* change in number of raid_disks               */
         __u32   new_layout;     /* new layout                                   */
         __u32   new_chunk;      /* new chunk size (bytes)                       */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 541f4828f5e7..e3539c14e47e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -684,6 +684,7 @@ static inline void prefetch_stack(struct task_struct *t) { }
 
 struct audit_context;           /* See audit.c */
 struct mempolicy;
+struct pipe_inode_info;
 
 enum sleep_type {
         SLEEP_NORMAL,
@@ -882,6 +883,11 @@ struct task_struct {
 
         atomic_t fs_excl;       /* holding fs exclusive resources */
         struct rcu_head rcu;
+
+        /*
+         * cache last used pipe for splice
+         */
+        struct pipe_inode_info *splice_pipe;
 };
 
 static inline pid_t process_group(struct task_struct *tsk)
@@ -1203,9 +1209,10 @@ extern void wait_task_inactive(task_t * p);
 #define while_each_thread(g, t) \
         while ((t = next_thread(t)) != g)
 
-#define thread_group_leader(p)  (p->pid == p->tgid)
+/* de_thread depends on thread_group_leader not being a pid based check */
+#define thread_group_leader(p)  (p == p->group_leader)
 
-static inline task_t *next_thread(task_t *p)
+static inline task_t *next_thread(const task_t *p)
 {
         return list_entry(rcu_dereference(p->thread_group.next),
                                 task_t, thread_group);
diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
index 6336987dae62..2925e66a6732 100644
--- a/include/linux/screen_info.h
+++ b/include/linux/screen_info.h
@@ -41,7 +41,8 @@ struct screen_info {
         u16 vesapm_off;         /* 0x30 */
         u16 pages;              /* 0x32 */
         u16 vesa_attributes;    /* 0x34 */
-                                /* 0x36 -- 0x3f reserved for future expansion */
+        u32 capabilities;       /* 0x36 */
+                                /* 0x3a -- 0x3f reserved for future expansion */
 };
 
 extern struct screen_info screen_info;
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
index fca9b0fb5b4e..5a095572881d 100644
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
@@ -73,7 +73,7 @@ static inline int write_tryseqlock(seqlock_t *sl)
 }
 
 /* Start of read calculation -- fetch last complete writer token */
-static inline unsigned read_seqbegin(const seqlock_t *sl)
+static __always_inline unsigned read_seqbegin(const seqlock_t *sl)
 {
         unsigned ret = sl->sequence;
         smp_rmb();
@@ -88,7 +88,7 @@ static inline unsigned read_seqbegin(const seqlock_t *sl)
  *    
  * Using xor saves one conditional branch.
  */
-static inline int read_seqretry(const seqlock_t *sl, unsigned iv)
+static __always_inline int read_seqretry(const seqlock_t *sl, unsigned iv)
 {
         smp_rmb();
         return (iv & 1) | (sl->sequence ^ iv);
diff --git a/include/linux/string.h b/include/linux/string.h
index dee221429ad0..c61306da8c52 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -13,11 +13,6 @@
 extern "C" {
 #endif
 
-extern char * strpbrk(const char *,const char *);
-extern char * strsep(char **,const char *);
-extern __kernel_size_t strspn(const char *,const char *);
-extern __kernel_size_t strcspn(const char *,const char *);
-
 extern char *strndup_user(const char __user *, long);
 
 /*
@@ -70,6 +65,18 @@ extern __kernel_size_t strlen(const char *);
 #ifndef __HAVE_ARCH_STRNLEN
 extern __kernel_size_t strnlen(const char *,__kernel_size_t);
 #endif
+#ifndef __HAVE_ARCH_STRPBRK
+extern char * strpbrk(const char *,const char *);
+#endif
+#ifndef __HAVE_ARCH_STRSEP
+extern char * strsep(char **,const char *);
+#endif
+#ifndef __HAVE_ARCH_STRSPN
+extern __kernel_size_t strspn(const char *,const char *);
+#endif
+#ifndef __HAVE_ARCH_STRCSPN
+extern __kernel_size_t strcspn(const char *,const char *);
+#endif
 
 #ifndef __HAVE_ARCH_MEMSET
 extern void * memset(void *,int,__kernel_size_t);
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 50cab2a09f28..503564384545 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -197,15 +197,16 @@ svc_take_res_page(struct svc_rqst *rqstp)
         return rqstp->rq_respages[rqstp->rq_resused++];
 }
 
-static inline int svc_take_page(struct svc_rqst *rqstp)
+static inline void svc_take_page(struct svc_rqst *rqstp)
 {
-        if (rqstp->rq_arghi <= rqstp->rq_argused)
-                return -ENOMEM;
+        if (rqstp->rq_arghi <= rqstp->rq_argused) {
+                WARN_ON(1);
+                return;
+        }
         rqstp->rq_arghi--;
         rqstp->rq_respages[rqstp->rq_resused] =
                 rqstp->rq_argpages[rqstp->rq_arghi];
         rqstp->rq_resused++;
-        return 0;
 }
 
 static inline void svc_pushback_allpages(struct svc_rqst *rqstp)
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 54eac8a39a4c..5b1fdf1cff4f 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -155,6 +155,7 @@ extern void swapin_readahead(swp_entry_t, unsigned long, struct vm_area_struct *
 /* linux/mm/page_alloc.c */
 extern unsigned long totalram_pages;
 extern unsigned long totalhigh_pages;
+extern unsigned long totalreserve_pages;
 extern long nr_swap_pages;
 extern unsigned int nr_free_pages(void);
 extern unsigned int nr_free_pages_pgdat(pg_data_t *pgdat);
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 5717147596b6..f001bad28d9a 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -569,9 +569,12 @@ asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * filename,
 asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename,
                                    int flags, int mode);
 asmlinkage long sys_unshare(unsigned long unshare_flags);
-asmlinkage long sys_splice(int fdin, int fdout, size_t len,
-                                unsigned int flags);
+
+asmlinkage long sys_splice(int fd_in, loff_t __user *off_in,
+                           int fd_out, loff_t __user *off_out,
+                           size_t len, unsigned int flags);
+
 asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes,
-                                        int flags);
+                                        unsigned int flags);
 
 #endif
diff --git a/include/linux/tty_flip.h b/include/linux/tty_flip.h
index 0976a163b459..31548303ee37 100644
--- a/include/linux/tty_flip.h
+++ b/include/linux/tty_flip.h
@@ -6,9 +6,10 @@ extern int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *c
 extern int tty_insert_flip_string_flags(struct tty_struct *tty, const unsigned char *chars, const char *flags, size_t size);
 extern int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars, size_t size);
 extern int tty_prepare_flip_string_flags(struct tty_struct *tty, unsigned char **chars, char **flags, size_t size);
+void tty_schedule_flip(struct tty_struct *tty);
 
 static inline int tty_insert_flip_char(struct tty_struct *tty,
-                                       unsigned char ch, char flag)
+                                        unsigned char ch, char flag)
 {
         struct tty_buffer *tb = tty->buf.tail;
         if (tb && tb->active && tb->used < tb->size) {
@@ -19,26 +20,4 @@ static inline int tty_insert_flip_char(struct tty_struct *tty,
         return tty_insert_flip_string_flags(tty, &ch, &flag, 1);
 }
 
-static inline void tty_schedule_flip(struct tty_struct *tty)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&tty->buf.lock, flags);
-        if (tty->buf.tail != NULL) {
-                tty->buf.tail->active = 0;
-                tty->buf.tail->commit = tty->buf.tail->used;
-        }
-        spin_unlock_irqrestore(&tty->buf.lock, flags);
-        schedule_delayed_work(&tty->buf.work, 1);
-}
-
-#undef _INLINE_
-
-
 #endif /* _LINUX_TTY_FLIP_H */
-
-
-
-
-
-
-
diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
index fadc535e2925..dc7c621e4647 100644
--- a/include/linux/vermagic.h
+++ b/include/linux/vermagic.h
@@ -12,6 +12,11 @@
 #else
 #define MODULE_VERMAGIC_PREEMPT ""
 #endif
+#ifdef CONFIG_MODULE_UNLOAD
+#define MODULE_VERMAGIC_MODULE_UNLOAD "mod_unload "
+#else
+#define MODULE_VERMAGIC_MODULE_UNLOAD ""
+#endif
 #ifndef MODULE_ARCH_VERMAGIC
 #define MODULE_ARCH_VERMAGIC ""
 #endif
@@ -19,5 +24,5 @@
 #define VERMAGIC_STRING                                                 \
         UTS_RELEASE " "                                                 \
         MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT                     \
-        MODULE_ARCH_VERMAGIC                                            \
+        MODULE_VERMAGIC_MODULE_UNLOAD MODULE_ARCH_VERMAGIC              \
         "gcc-" __stringify(__GNUC__) "." __stringify(__GNUC_MINOR__)
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
index 25f708ff020e..59f0c83d55a2 100644
--- a/include/net/inet6_hashtables.h
+++ b/include/net/inet6_hashtables.h
@@ -48,31 +48,7 @@ static inline int inet6_sk_ehashfn(const struct sock *sk)
         return inet6_ehashfn(laddr, lport, faddr, fport);
 }
 
-static inline void __inet6_hash(struct inet_hashinfo *hashinfo,
-                                struct sock *sk)
-{
-        struct hlist_head *list;
-        rwlock_t *lock;
-
-        BUG_TRAP(sk_unhashed(sk));
-
-        if (sk->sk_state == TCP_LISTEN) {
-                list = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];
-                lock = &hashinfo->lhash_lock;
-                inet_listen_wlock(hashinfo);
-        } else {
-                unsigned int hash;
-                sk->sk_hash = hash = inet6_sk_ehashfn(sk);
-                hash &= (hashinfo->ehash_size - 1);
-                list = &hashinfo->ehash[hash].chain;
-                lock = &hashinfo->ehash[hash].lock;
-                write_lock(lock);
-        }
-
-        __sk_add_node(sk, list);
-        sock_prot_inc_use(sk->sk_prot);
-        write_unlock(lock);
-}
+extern void __inet6_hash(struct inet_hashinfo *hashinfo, struct sock *sk);
 
 /*
  * Sockets in TCP_CLOSE state are _always_ taken out of the hash, so
@@ -80,52 +56,12 @@ static inline void __inet6_hash(struct inet_hashinfo *hashinfo,
  *
  * The sockhash lock must be held as a reader here.
  */
-static inline struct sock *
-                __inet6_lookup_established(struct inet_hashinfo *hashinfo,
+extern struct sock *__inet6_lookup_established(struct inet_hashinfo *hashinfo,
                                            const struct in6_addr *saddr,
                                            const u16 sport,
                                            const struct in6_addr *daddr,
                                            const u16 hnum,
-                                           const int dif)
-{
-        struct sock *sk;
-        const struct hlist_node *node;
-        const __u32 ports = INET_COMBINED_PORTS(sport, hnum);
-        /* Optimize here for direct hit, only listening connections can
-         * have wildcards anyways.
-         */
-        unsigned int hash = inet6_ehashfn(daddr, hnum, saddr, sport);
-        struct inet_ehash_bucket *head = inet_ehash_bucket(hashinfo, hash);
-
-        prefetch(head->chain.first);
-        read_lock(&head->lock);
-        sk_for_each(sk, node, &head->chain) {
-                /* For IPV6 do the cheaper port and family tests first. */
-                if (INET6_MATCH(sk, hash, saddr, daddr, ports, dif))
-                        goto hit; /* You sunk my battleship! */
-        }
-        /* Must check for a TIME_WAIT'er before going to listener hash. */
-        sk_for_each(sk, node, &(head + hashinfo->ehash_size)->chain) {
-                const struct inet_timewait_sock *tw = inet_twsk(sk);
-
-                if(*((__u32 *)&(tw->tw_dport))  == ports        &&
-                   sk->sk_family                == PF_INET6) {
-                        const struct inet6_timewait_sock *tw6 = inet6_twsk(sk);
-
-                        if (ipv6_addr_equal(&tw6->tw_v6_daddr, saddr)   &&
-                            ipv6_addr_equal(&tw6->tw_v6_rcv_saddr, daddr)       &&
-                            (!sk->sk_bound_dev_if || sk->sk_bound_dev_if == dif))
-                                goto hit;
-                }
-        }
-        read_unlock(&head->lock);
-        return NULL;
-
-hit:
-        sock_hold(sk);
-        read_unlock(&head->lock);
-        return sk;
-}
+                                           const int dif);
 
 extern struct sock *inet6_lookup_listener(struct inet_hashinfo *hashinfo,
                                           const struct in6_addr *daddr,
diff --git a/include/net/ip.h b/include/net/ip.h
index 8fe6156ca9b0..3d2e5ca62a5a 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -95,6 +95,7 @@ extern int		ip_local_deliver(struct sk_buff *skb);
 extern int              ip_mr_input(struct sk_buff *skb);
 extern int              ip_output(struct sk_buff *skb);
 extern int              ip_mc_output(struct sk_buff *skb);
+extern int              ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *));
 extern int              ip_do_nat(struct sk_buff *skb);
 extern void             ip_send_check(struct iphdr *ip);
 extern int              ip_queue_xmit(struct sk_buff *skb, int ipfragok);
diff --git a/include/net/x25device.h b/include/net/x25device.h
index 1a318374faef..1d10c879f7e2 100644
--- a/include/net/x25device.h
+++ b/include/net/x25device.h
@@ -8,6 +8,7 @@
 static inline __be16 x25_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
         skb->mac.raw = skb->data;
+        skb->dev = dev;
         skb->pkt_type = PACKET_HOST;
         
         return htons(ETH_P_X25);
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index dc6862d09e53..de6ce541a046 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -140,7 +140,6 @@ struct scsi_host_template {
          *
          * Status: REQUIRED     (at least one of them)
          */
-        int (* eh_strategy_handler)(struct Scsi_Host *);
         int (* eh_abort_handler)(struct scsi_cmnd *);
         int (* eh_device_reset_handler)(struct scsi_cmnd *);
         int (* eh_bus_reset_handler)(struct scsi_cmnd *);
diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h
index b3657f111937..cca1d4926d2a 100644
--- a/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@ -50,6 +50,11 @@ struct scsi_transport_template {
         unsigned int create_work_queue : 1;
 
         /*
+         * Allows a transport to override the default error handler.
+         */
+        void (* eh_strategy_handler)(struct Scsi_Host *);
+
+        /*
          * This is an optional routine that allows the transport to become
          * involved when a scsi io timer fires. The return value tells the
          * timer routine how to finish the io timeout handling:
diff --git a/init/Kconfig b/init/Kconfig
index 3b36a1d53656..f1bc2f0e94e5 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -374,6 +374,15 @@ config SLAB
           SLOB is more space efficient but does not scale well and is
           more susceptible to fragmentation.
 
+config DOUBLEFAULT
+        default y
+        bool "Enable doublefault exception handler" if EMBEDDED && X86_32
+        help
+          This option allows trapping of rare doublefault exceptions that
+          would otherwise cause a system to silently reboot. Disabling this
+          option saves about 4k and might cause you much additional grey
+          hair.
+
 endmenu         # General setup
 
 config TINY_SHMEM
diff --git a/kernel/exit.c b/kernel/exit.c
index 6c2eeb8f6390..1a9787ac6173 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -34,6 +34,7 @@
 #include <linux/mutex.h>
 #include <linux/futex.h>
 #include <linux/compat.h>
+#include <linux/pipe_fs_i.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -941,6 +942,9 @@ fastcall NORET_TYPE void do_exit(long code)
         if (tsk->io_context)
                 exit_io_context();
 
+        if (tsk->splice_pipe)
+                __free_pipe_info(tsk->splice_pipe);
+
         /* PF_DEAD causes final put_task_struct after we schedule. */
         preempt_disable();
         BUG_ON(tsk->flags & PF_DEAD);
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index f181ff4dd32e..d2a7296c8251 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -501,6 +501,7 @@ int hrtimer_cancel(struct hrtimer *timer)
 
                 if (ret >= 0)
                         return ret;
+                cpu_relax();
         }
 }
 
diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile
index 2b33f852be3e..9f77f50d8143 100644
--- a/kernel/irq/Makefile
+++ b/kernel/irq/Makefile
@@ -1,4 +1,5 @@
 
-obj-y := handle.o manage.o spurious.o migration.o
+obj-y := handle.o manage.o spurious.o
 obj-$(CONFIG_GENERIC_IRQ_PROBE) += autoprobe.o
 obj-$(CONFIG_PROC_FS) += proc.o
+obj-$(CONFIG_GENERIC_PENDING_IRQ) += migration.o
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 52a8655fa080..134f9f2e0e39 100644
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -1,6 +1,5 @@
-#include <linux/irq.h>
 
-#if defined(CONFIG_GENERIC_PENDING_IRQ)
+#include <linux/irq.h>
 
 void set_pending_irq(unsigned int irq, cpumask_t mask)
 {
@@ -61,5 +60,3 @@ void move_native_irq(int irq)
         }
         cpus_clear(pending_irq_cpumask[irq]);
 }
-
-#endif
diff --git a/kernel/panic.c b/kernel/panic.c
index f895c7c01d5b..cc2a4c9c36ac 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -27,7 +27,6 @@ static int pause_on_oops_flag;
 static DEFINE_SPINLOCK(pause_on_oops_lock);
 
 int panic_timeout;
-EXPORT_SYMBOL(panic_timeout);
 
 ATOMIC_NOTIFIER_HEAD(panic_notifier_list);
 
diff --git a/kernel/sched.c b/kernel/sched.c
index dd153d6f8a04..365f0b90b4de 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -665,13 +665,55 @@ static int effective_prio(task_t *p)
 }
 
 /*
+ * We place interactive tasks back into the active array, if possible.
+ *
+ * To guarantee that this does not starve expired tasks we ignore the
+ * interactivity of a task if the first expired task had to wait more
+ * than a 'reasonable' amount of time. This deadline timeout is
+ * load-dependent, as the frequency of array switched decreases with
+ * increasing number of running tasks. We also ignore the interactivity
+ * if a better static_prio task has expired, and switch periodically
+ * regardless, to ensure that highly interactive tasks do not starve
+ * the less fortunate for unreasonably long periods.
+ */
+static inline int expired_starving(runqueue_t *rq)
+{
+        int limit;
+
+        /*
+         * Arrays were recently switched, all is well
+         */
+        if (!rq->expired_timestamp)
+                return 0;
+
+        limit = STARVATION_LIMIT * rq->nr_running;
+
+        /*
+         * It's time to switch arrays
+         */
+        if (jiffies - rq->expired_timestamp >= limit)
+                return 1;
+
+        /*
+         * There's a better selection in the expired array
+         */
+        if (rq->curr->static_prio > rq->best_expired_prio)
+                return 1;
+
+        /*
+         * All is well
+         */
+        return 0;
+}
+
+/*
  * __activate_task - move a task to the runqueue.
  */
 static void __activate_task(task_t *p, runqueue_t *rq)
 {
         prio_array_t *target = rq->active;
 
-        if (batch_task(p))
+        if (unlikely(batch_task(p) || (expired_starving(rq) && !rt_task(p))))
                 target = rq->expired;
         enqueue_task(p, target);
         rq->nr_running++;
@@ -2490,22 +2532,6 @@ unsigned long long current_sched_time(const task_t *tsk)
 }
 
 /*
- * We place interactive tasks back into the active array, if possible.
- *
- * To guarantee that this does not starve expired tasks we ignore the
- * interactivity of a task if the first expired task had to wait more
- * than a 'reasonable' amount of time. This deadline timeout is
- * load-dependent, as the frequency of array switched decreases with
- * increasing number of running tasks. We also ignore the interactivity
- * if a better static_prio task has expired:
- */
-#define EXPIRED_STARVING(rq) \
-        ((STARVATION_LIMIT && ((rq)->expired_timestamp && \
-                (jiffies - (rq)->expired_timestamp >= \
-                        STARVATION_LIMIT * ((rq)->nr_running) + 1))) || \
-                        ((rq)->curr->static_prio > (rq)->best_expired_prio))
-
-/*
  * Account user cpu time to a process.
  * @p: the process that the cpu time gets accounted to
  * @hardirq_offset: the offset to subtract from hardirq_count()
@@ -2640,7 +2666,7 @@ void scheduler_tick(void)
 
                 if (!rq->expired_timestamp)
                         rq->expired_timestamp = jiffies;
-                if (!TASK_INTERACTIVE(p) || EXPIRED_STARVING(rq)) {
+                if (!TASK_INTERACTIVE(p) || expired_starving(rq)) {
                         enqueue_task(p, rq->expired);
                         if (p->static_prio < rq->best_expired_prio)
                                 rq->best_expired_prio = p->static_prio;
diff --git a/kernel/signal.c b/kernel/signal.c
index 5ccaac505e8d..b14f895027c3 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -868,7 +868,6 @@ __group_complete_signal(int sig, struct task_struct *p)
                 if (t == NULL)
                         /* restart balancing at this thread */
                         t = p->signal->curr_target = p;
-                BUG_ON(t->tgid != p->tgid);
 
                 while (!wants_signal(sig, t)) {
                         t = next_thread(t);
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index d82864c4a617..5433195040f1 100644
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -120,3 +120,15 @@ cond_syscall(sys32_sysctl);
 cond_syscall(ppc_rtas);
 cond_syscall(sys_spu_run);
 cond_syscall(sys_spu_create);
+
+/* mmu depending weak syscall entries */
+cond_syscall(sys_mprotect);
+cond_syscall(sys_msync);
+cond_syscall(sys_mlock);
+cond_syscall(sys_munlock);
+cond_syscall(sys_mlockall);
+cond_syscall(sys_munlockall);
+cond_syscall(sys_mincore);
+cond_syscall(sys_madvise);
+cond_syscall(sys_mremap);
+cond_syscall(sys_remap_file_pages);
diff --git a/kernel/timer.c b/kernel/timer.c
index c3a874f1393c..883773788836 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -81,9 +81,10 @@ struct tvec_t_base_s {
 } ____cacheline_aligned_in_smp;
 
 typedef struct tvec_t_base_s tvec_base_t;
-static DEFINE_PER_CPU(tvec_base_t *, tvec_bases);
+
 tvec_base_t boot_tvec_bases;
 EXPORT_SYMBOL(boot_tvec_bases);
+static DEFINE_PER_CPU(tvec_base_t *, tvec_bases) = { &boot_tvec_bases };
 
 static inline void set_running_timer(tvec_base_t *base,
                                         struct timer_list *timer)
@@ -1224,28 +1225,36 @@ static int __devinit init_timers_cpu(int cpu)
 {
         int j;
         tvec_base_t *base;
+        static char __devinitdata tvec_base_done[NR_CPUS];
 
-        base = per_cpu(tvec_bases, cpu);
-        if (!base) {
+        if (!tvec_base_done[cpu]) {
                 static char boot_done;
 
-                /*
-                 * Cannot do allocation in init_timers as that runs before the
-                 * allocator initializes (and would waste memory if there are
-                 * more possible CPUs than will ever be installed/brought up).
-                 */
                 if (boot_done) {
+                        /*
+                         * The APs use this path later in boot
+                         */
                         base = kmalloc_node(sizeof(*base), GFP_KERNEL,
                                                 cpu_to_node(cpu));
                         if (!base)
                                 return -ENOMEM;
                         memset(base, 0, sizeof(*base));
+                        per_cpu(tvec_bases, cpu) = base;
                 } else {
-                        base = &boot_tvec_bases;
+                        /*
+                         * This is for the boot CPU - we use compile-time
+                         * static initialisation because per-cpu memory isn't
+                         * ready yet and because the memory allocators are not
+                         * initialised either.
+                         */
                         boot_done = 1;
+                        base = &boot_tvec_bases;
                 }
-                per_cpu(tvec_bases, cpu) = base;
+                tvec_base_done[cpu] = 1;
+        } else {
+                base = per_cpu(tvec_bases, cpu);
         }
+
         spin_lock_init(&base->lock);
         for (j = 0; j < TVN_SIZE; j++) {
                 INIT_LIST_HEAD(base->tv5.vec + j);
@@ -1455,7 +1464,7 @@ static void time_interpolator_update(long delta_nsec)
          */
         if (jiffies % INTERPOLATOR_ADJUST == 0)
         {
-                if (time_interpolator->skips == 0 && time_interpolator->offset > TICK_NSEC)
+                if (time_interpolator->skips == 0 && time_interpolator->offset > tick_nsec)
                         time_interpolator->nsec_per_cyc--;
                 if (time_interpolator->ns_skipped > INTERPOLATOR_MAX_SKIP && time_interpolator->offset == 0)
                         time_interpolator->nsec_per_cyc++;
diff --git a/lib/string.c b/lib/string.c
index b3c28a3f6332..064f6315b1c3 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -362,6 +362,7 @@ size_t strspn(const char *s, const char *accept)
 EXPORT_SYMBOL(strspn);
 #endif
 
+#ifndef __HAVE_ARCH_STRCSPN
 /**
  * strcspn - Calculate the length of the initial substring of @s which does
  *      not contain letters in @reject
@@ -384,6 +385,7 @@ size_t strcspn(const char *s, const char *reject)
         return count;
 }
 EXPORT_SYMBOL(strcspn);
+#endif
 
 #ifndef __HAVE_ARCH_STRPBRK
 /**
@@ -403,6 +405,7 @@ char *strpbrk(const char *cs, const char *ct)
         }
         return NULL;
 }
+EXPORT_SYMBOL(strpbrk);
 #endif
 
 #ifndef __HAVE_ARCH_STRSEP
@@ -467,7 +470,7 @@ EXPORT_SYMBOL(memset);
 void *memcpy(void *dest, const void *src, size_t count)
 {
         char *tmp = dest;
-        char *s = src;
+        const char *s = src;
 
         while (count--)
                 *tmp++ = *s++;
diff --git a/mm/bootmem.c b/mm/bootmem.c
index d3e3bd2ffcea..d213feded10d 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -401,7 +401,7 @@ unsigned long __init free_all_bootmem (void)
         return(free_all_bootmem_core(NODE_DATA(0)));
 }
 
-void * __init __alloc_bootmem(unsigned long size, unsigned long align, unsigned long goal)
+void * __init __alloc_bootmem_nopanic(unsigned long size, unsigned long align, unsigned long goal)
 {
         bootmem_data_t *bdata;
         void *ptr;
@@ -409,7 +409,14 @@ void * __init __alloc_bootmem(unsigned long size, unsigned long align, unsigned
         list_for_each_entry(bdata, &bdata_list, list)
                 if ((ptr = __alloc_bootmem_core(bdata, size, align, goal, 0)))
                         return(ptr);
+        return NULL;
+}
 
+void * __init __alloc_bootmem(unsigned long size, unsigned long align, unsigned long goal)
+{
+        void *mem = __alloc_bootmem_nopanic(size,align,goal);
+        if (mem)
+                return mem;
         /*
          * Whoops, we cannot satisfy the allocation request.
          */
diff --git a/mm/migrate.c b/mm/migrate.c
index 09f6e4aa87fc..d444229f2599 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -16,8 +16,7 @@
 #include <linux/module.h>
 #include <linux/swap.h>
 #include <linux/pagemap.h>
-#include <linux/buffer_head.h>  /* for try_to_release_page(),
-                                        buffer_heads_over_limit */
+#include <linux/buffer_head.h>
 #include <linux/mm_inline.h>
 #include <linux/pagevec.h>
 #include <linux/rmap.h>
@@ -28,8 +27,6 @@
 
 #include "internal.h"
 
-#include "internal.h"
-
 /* The maximum number of pages to take off the LRU for migration */
 #define MIGRATE_CHUNK_SIZE 256
 
@@ -176,7 +173,6 @@ unlock_retry:
 retry:
         return -EAGAIN;
 }
-EXPORT_SYMBOL(swap_page);
 
 /*
  * Remove references for a page and establish the new page with the correct
@@ -234,7 +230,7 @@ int migrate_page_remove_references(struct page *newpage,
         if (!page_mapping(page) || page_count(page) != nr_refs ||
                         *radix_pointer != page) {
                 write_unlock_irq(&mapping->tree_lock);
-                return 1;
+                return -EAGAIN;
         }
 
         /*
diff --git a/mm/mmap.c b/mm/mmap.c
index e780d19aa214..e6ee12344b13 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -121,14 +121,26 @@ int __vm_enough_memory(long pages, int cap_sys_admin)
                  * only call if we're about to fail.
                  */
                 n = nr_free_pages();
+
+                /*
+                 * Leave reserved pages. The pages are not for anonymous pages.
+                 */
+                if (n <= totalreserve_pages)
+                        goto error;
+                else
+                        n -= totalreserve_pages;
+
+                /*
+                 * Leave the last 3% for root
+                 */
                 if (!cap_sys_admin)
                         n -= n / 32;
                 free += n;
 
                 if (free > pages)
                         return 0;
-                vm_unacct_memory(pages);
-                return -ENOMEM;
+
+                goto error;
         }
 
         allowed = (totalram_pages - hugetlb_total_pages())
@@ -150,7 +162,7 @@ int __vm_enough_memory(long pages, int cap_sys_admin)
          */
         if (atomic_read(&vm_committed_space) < (long)allowed)
                 return 0;
-
+error:
         vm_unacct_memory(pages);
 
         return -ENOMEM;
@@ -220,6 +232,17 @@ asmlinkage unsigned long sys_brk(unsigned long brk)
 
         if (brk < mm->end_code)
                 goto out;
+
+        /*
+         * Check against rlimit here. If this check is done later after the test
+         * of oldbrk with newbrk then it can escape the test and let the data
+         * segment grow beyond its set limit the in case where the limit is
+         * not page aligned -Ram Gupta
+         */
+        rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
+        if (rlim < RLIM_INFINITY && brk - mm->start_data > rlim)
+                goto out;
+
         newbrk = PAGE_ALIGN(brk);
         oldbrk = PAGE_ALIGN(mm->brk);
         if (oldbrk == newbrk)
@@ -232,11 +255,6 @@ asmlinkage unsigned long sys_brk(unsigned long brk)
                 goto out;
         }
 
-        /* Check against rlimit.. */
-        rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
-        if (rlim < RLIM_INFINITY && brk - mm->start_data > rlim)
-                goto out;
-
         /* Check against existing mmap mappings. */
         if (find_vma_intersection(mm, oldbrk, newbrk+PAGE_SIZE))
                 goto out;
diff --git a/mm/nommu.c b/mm/nommu.c
index db45efac17cc..029fadac0fb5 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1147,14 +1147,26 @@ int __vm_enough_memory(long pages, int cap_sys_admin)
                  * only call if we're about to fail.
                  */
                 n = nr_free_pages();
+
+                /*
+                 * Leave reserved pages. The pages are not for anonymous pages.
+                 */
+                if (n <= totalreserve_pages)
+                        goto error;
+                else
+                        n -= totalreserve_pages;
+
+                /*
+                 * Leave the last 3% for root
+                 */
                 if (!cap_sys_admin)
                         n -= n / 32;
                 free += n;
 
                 if (free > pages)
                         return 0;
-                vm_unacct_memory(pages);
-                return -ENOMEM;
+
+                goto error;
         }
 
         allowed = totalram_pages * sysctl_overcommit_ratio / 100;
@@ -1175,7 +1187,7 @@ int __vm_enough_memory(long pages, int cap_sys_admin)
          */
         if (atomic_read(&vm_committed_space) < (long)allowed)
                 return 0;
-
+error:
         vm_unacct_memory(pages);
 
         return -ENOMEM;
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 6dcce3a4bbdc..75d7f48b79bb 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -72,13 +72,12 @@ int dirty_background_ratio = 10;
 int vm_dirty_ratio = 40;
 
 /*
- * The interval between `kupdate'-style writebacks, in centiseconds
- * (hundredths of a second)
+ * The interval between `kupdate'-style writebacks, in jiffies
  */
 int dirty_writeback_interval = 5 * HZ;
 
 /*
- * The longest number of centiseconds for which data is allowed to remain dirty
+ * The longest number of jiffies for which data is allowed to remain dirty
  */
 int dirty_expire_interval = 30 * HZ;
 
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index dc523a1f270d..97d6827c7d66 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -51,6 +51,7 @@ nodemask_t node_possible_map __read_mostly = NODE_MASK_ALL;
 EXPORT_SYMBOL(node_possible_map);
 unsigned long totalram_pages __read_mostly;
 unsigned long totalhigh_pages __read_mostly;
+unsigned long totalreserve_pages __read_mostly;
 long nr_swap_pages;
 int percpu_pagelist_fraction;
 
@@ -151,7 +152,8 @@ static void bad_page(struct page *page)
                         1 << PG_reclaim |
                         1 << PG_slab    |
                         1 << PG_swapcache |
-                        1 << PG_writeback );
+                        1 << PG_writeback |
+                        1 << PG_buddy );
         set_page_count(page, 0);
         reset_page_mapcount(page);
         page->mapping = NULL;
@@ -236,12 +238,12 @@ static inline unsigned long page_order(struct page *page) {
 
 static inline void set_page_order(struct page *page, int order) {
         set_page_private(page, order);
-        __SetPagePrivate(page);
+        __SetPageBuddy(page);
 }
 
 static inline void rmv_page_order(struct page *page)
 {
-        __ClearPagePrivate(page);
+        __ClearPageBuddy(page);
         set_page_private(page, 0);
 }
 
@@ -280,11 +282,13 @@ __find_combined_index(unsigned long page_idx, unsigned int order)
  * This function checks whether a page is free && is the buddy
  * we can do coalesce a page and its buddy if
  * (a) the buddy is not in a hole &&
- * (b) the buddy is free &&
- * (c) the buddy is on the buddy system &&
- * (d) a page and its buddy have the same order.
- * for recording page's order, we use page_private(page) and PG_private.
+ * (b) the buddy is in the buddy system &&
+ * (c) a page and its buddy have the same order.
+ *
+ * For recording whether a page is in the buddy system, we use PG_buddy.
+ * Setting, clearing, and testing PG_buddy is serialized by zone->lock.
  *
+ * For recording page's order, we use page_private(page).
  */
 static inline int page_is_buddy(struct page *page, int order)
 {
@@ -293,10 +297,10 @@ static inline int page_is_buddy(struct page *page, int order)
                 return 0;
 #endif
 
-       if (PagePrivate(page)           &&
-           (page_order(page) == order) &&
-            page_count(page) == 0)
+        if (PageBuddy(page) && page_order(page) == order) {
+                BUG_ON(page_count(page) != 0);
                return 1;
+        }
        return 0;
 }
 
@@ -313,7 +317,7 @@ static inline int page_is_buddy(struct page *page, int order)
  * as necessary, plus some accounting needed to play nicely with other
  * parts of the VM system.
  * At each level, we keep a list of pages, which are heads of continuous
- * free pages of length of (1 << order) and marked with PG_Private.Page's
+ * free pages of length of (1 << order) and marked with PG_buddy. Page's
  * order is recorded in page_private(page) field.
  * So when we are allocating or freeing one, we can derive the state of the
  * other.  That is, if we allocate a small block, and both were   
@@ -376,7 +380,8 @@ static inline int free_pages_check(struct page *page)
                         1 << PG_slab    |
                         1 << PG_swapcache |
                         1 << PG_writeback |
-                        1 << PG_reserved ))))
+                        1 << PG_reserved |
+                        1 << PG_buddy ))))
                 bad_page(page);
         if (PageDirty(page))
                 __ClearPageDirty(page);
@@ -524,7 +529,8 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
                         1 << PG_slab    |
                         1 << PG_swapcache |
                         1 << PG_writeback |
-                        1 << PG_reserved ))))
+                        1 << PG_reserved |
+                        1 << PG_buddy ))))
                 bad_page(page);
 
         /*
@@ -2472,6 +2478,38 @@ void __init page_alloc_init(void)
 }
 
 /*
+ * calculate_totalreserve_pages - called when sysctl_lower_zone_reserve_ratio
+ *      or min_free_kbytes changes.
+ */
+static void calculate_totalreserve_pages(void)
+{
+        struct pglist_data *pgdat;
+        unsigned long reserve_pages = 0;
+        int i, j;
+
+        for_each_online_pgdat(pgdat) {
+                for (i = 0; i < MAX_NR_ZONES; i++) {
+                        struct zone *zone = pgdat->node_zones + i;
+                        unsigned long max = 0;
+
+                        /* Find valid and maximum lowmem_reserve in the zone */
+                        for (j = i; j < MAX_NR_ZONES; j++) {
+                                if (zone->lowmem_reserve[j] > max)
+                                        max = zone->lowmem_reserve[j];
+                        }
+
+                        /* we treat pages_high as reserved pages. */
+                        max += zone->pages_high;
+
+                        if (max > zone->present_pages)
+                                max = zone->present_pages;
+                        reserve_pages += max;
+                }
+        }
+        totalreserve_pages = reserve_pages;
+}
+
+/*
  * setup_per_zone_lowmem_reserve - called whenever
  *      sysctl_lower_zone_reserve_ratio changes.  Ensures that each zone
  *      has a correct pages reserved value, so an adequate number of
@@ -2502,6 +2540,9 @@ static void setup_per_zone_lowmem_reserve(void)
                         }
                 }
         }
+
+        /* update totalreserve_pages */
+        calculate_totalreserve_pages();
 }
 
 /*
@@ -2556,6 +2597,9 @@ void setup_per_zone_pages_min(void)
                 zone->pages_high  = zone->pages_min + tmp / 2;
                 spin_unlock_irqrestore(&zone->lru_lock, flags);
         }
+
+        /* update totalreserve_pages */
+        calculate_totalreserve_pages();
 }
 
 /*
diff --git a/mm/slab.c b/mm/slab.c
index f055c1420216..e6ef9bd52335 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -420,6 +420,7 @@ struct kmem_cache {
         unsigned long max_freeable;
         unsigned long node_allocs;
         unsigned long node_frees;
+        unsigned long node_overflow;
         atomic_t allochit;
         atomic_t allocmiss;
         atomic_t freehit;
@@ -465,6 +466,7 @@ struct kmem_cache {
 #define STATS_INC_ERR(x)        ((x)->errors++)
 #define STATS_INC_NODEALLOCS(x) ((x)->node_allocs++)
 #define STATS_INC_NODEFREES(x)  ((x)->node_frees++)
+#define STATS_INC_ACOVERFLOW(x)   ((x)->node_overflow++)
 #define STATS_SET_FREEABLE(x, i)                                        \
         do {                                                            \
                 if ((x)->max_freeable < i)                              \
@@ -484,6 +486,7 @@ struct kmem_cache {
 #define STATS_INC_ERR(x)        do { } while (0)
 #define STATS_INC_NODEALLOCS(x) do { } while (0)
 #define STATS_INC_NODEFREES(x)  do { } while (0)
+#define STATS_INC_ACOVERFLOW(x)   do { } while (0)
 #define STATS_SET_FREEABLE(x, i) do { } while (0)
 #define STATS_INC_ALLOCHIT(x)   do { } while (0)
 #define STATS_INC_ALLOCMISS(x)  do { } while (0)
@@ -1453,7 +1456,14 @@ static void *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, int nodeid)
         int i;
 
         flags |= cachep->gfpflags;
+#ifndef CONFIG_MMU
+        /* nommu uses slab's for process anonymous memory allocations, so
+         * requires __GFP_COMP to properly refcount higher order allocations"
+         */
+        page = alloc_pages_node(nodeid, (flags | __GFP_COMP), cachep->gfporder);
+#else
         page = alloc_pages_node(nodeid, flags, cachep->gfporder);
+#endif
         if (!page)
                 return NULL;
         addr = page_address(page);
@@ -2318,13 +2328,15 @@ EXPORT_SYMBOL(kmem_cache_destroy);
 
 /* Get the memory for a slab management obj. */
 static struct slab *alloc_slabmgmt(struct kmem_cache *cachep, void *objp,
-                                   int colour_off, gfp_t local_flags)
+                                   int colour_off, gfp_t local_flags,
+                                   int nodeid)
 {
         struct slab *slabp;
 
         if (OFF_SLAB(cachep)) {
                 /* Slab management obj is off-slab. */
-                slabp = kmem_cache_alloc(cachep->slabp_cache, local_flags);
+                slabp = kmem_cache_alloc_node(cachep->slabp_cache,
+                                              local_flags, nodeid);
                 if (!slabp)
                         return NULL;
         } else {
@@ -2334,6 +2346,7 @@ static struct slab *alloc_slabmgmt(struct kmem_cache *cachep, void *objp,
         slabp->inuse = 0;
         slabp->colouroff = colour_off;
         slabp->s_mem = objp + colour_off;
+        slabp->nodeid = nodeid;
         return slabp;
 }
 
@@ -2519,7 +2532,7 @@ static int cache_grow(struct kmem_cache *cachep, gfp_t flags, int nodeid)
                 goto failed;
 
         /* Get slab management. */
-        slabp = alloc_slabmgmt(cachep, objp, offset, local_flags);
+        slabp = alloc_slabmgmt(cachep, objp, offset, local_flags, nodeid);
         if (!slabp)
                 goto opps1;
 
@@ -3080,9 +3093,11 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp)
                         if (l3->alien && l3->alien[nodeid]) {
                                 alien = l3->alien[nodeid];
                                 spin_lock(&alien->lock);
-                                if (unlikely(alien->avail == alien->limit))
+                                if (unlikely(alien->avail == alien->limit)) {
+                                        STATS_INC_ACOVERFLOW(cachep);
                                         __drain_alien_cache(cachep,
                                                             alien, nodeid);
+                                }
                                 alien->entry[alien->avail++] = objp;
                                 spin_unlock(&alien->lock);
                         } else {
@@ -3760,7 +3775,7 @@ static void print_slabinfo_header(struct seq_file *m)
         seq_puts(m, " : slabdata <active_slabs> <num_slabs> <sharedavail>");
 #if STATS
         seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
-                 "<error> <maxfreeable> <nodeallocs> <remotefrees>");
+                 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
         seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
 #endif
         seq_putc(m, '\n');
@@ -3874,11 +3889,12 @@ static int s_show(struct seq_file *m, void *p)
                 unsigned long max_freeable = cachep->max_freeable;
                 unsigned long node_allocs = cachep->node_allocs;
                 unsigned long node_frees = cachep->node_frees;
+                unsigned long overflows = cachep->node_overflow;
 
                 seq_printf(m, " : globalstat %7lu %6lu %5lu %4lu \
-                                %4lu %4lu %4lu %4lu", allocs, high, grown,
+                                %4lu %4lu %4lu %4lu %4lu", allocs, high, grown,
                                 reaped, errors, max_freeable, node_allocs,
-                                node_frees);
+                                node_frees, overflows);
         }
         /* cpu stats */
         {
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 6b61323ce23c..0c2d13ad69bb 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -255,7 +255,7 @@ static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
         }
 
         if ((err = hci_send_sco(conn->hcon, skb)) < 0)
-                goto fail;
+                return err;
 
         return count;
 
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index f29450b788be..3da9264449f7 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -765,6 +765,15 @@ out:
         return NF_STOLEN;
 }
 
+static int br_nf_dev_queue_xmit(struct sk_buff *skb)
+{
+        if (skb->protocol == htons(ETH_P_IP) &&
+            skb->len > skb->dev->mtu &&
+            !(skb_shinfo(skb)->ufo_size || skb_shinfo(skb)->tso_size))
+                return ip_fragment(skb, br_dev_queue_push_xmit);
+        else
+                return br_dev_queue_push_xmit(skb);
+}
 
 /* PF_BRIDGE/POST_ROUTING ********************************************/
 static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
@@ -824,7 +833,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
                 realoutdev = nf_bridge->netoutdev;
 #endif
         NF_HOOK(pf, NF_IP_POST_ROUTING, skb, NULL, realoutdev,
-                br_dev_queue_push_xmit);
+                br_nf_dev_queue_xmit);
 
         return NF_STOLEN;
 
@@ -869,7 +878,7 @@ static unsigned int ip_sabotage_out(unsigned int hook, struct sk_buff **pskb,
 
         if ((out->hard_start_xmit == br_dev_xmit &&
              okfn != br_nf_forward_finish &&
-             okfn != br_nf_local_out_finish && okfn != br_dev_queue_push_xmit)
+             okfn != br_nf_local_out_finish && okfn != br_nf_dev_queue_xmit)
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
             || ((out->priv_flags & IFF_802_1Q_VLAN) &&
                 VLAN_DEV_INFO(out)->real_dev->hard_start_xmit == br_dev_xmit)
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 01eae97c53d9..66bd93252c4e 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -829,7 +829,7 @@ static int translate_table(struct ebt_replace *repl,
                                                 * sizeof(struct ebt_chainstack));
                 if (!newinfo->chainstack)
                         return -ENOMEM;
-                for_each_cpu(i) {
+                for_each_possible_cpu(i) {
                         newinfo->chainstack[i] =
                            vmalloc(udc_cnt * sizeof(struct ebt_chainstack));
                         if (!newinfo->chainstack[i]) {
@@ -901,7 +901,7 @@ static void get_counters(struct ebt_counter *oldcounters,
                sizeof(struct ebt_counter) * nentries);
 
         /* add other counters to those of cpu 0 */
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 if (cpu == 0)
                         continue;
                 counter_base = COUNTER_BASE(oldcounters, nentries, cpu);
@@ -1036,7 +1036,7 @@ static int do_replace(void __user *user, unsigned int len)
 
         vfree(table->entries);
         if (table->chainstack) {
-                for_each_cpu(i)
+                for_each_possible_cpu(i)
                         vfree(table->chainstack[i]);
                 vfree(table->chainstack);
         }
@@ -1054,7 +1054,7 @@ free_counterstmp:
         vfree(counterstmp);
         /* can be initialized in translate_table() */
         if (newinfo->chainstack) {
-                for_each_cpu(i)
+                for_each_possible_cpu(i)
                         vfree(newinfo->chainstack[i]);
                 vfree(newinfo->chainstack);
         }
@@ -1201,7 +1201,7 @@ free_unlock:
         mutex_unlock(&ebt_mutex);
 free_chainstack:
         if (newinfo->chainstack) {
-                for_each_cpu(i)
+                for_each_possible_cpu(i)
                         vfree(newinfo->chainstack[i]);
                 vfree(newinfo->chainstack);
         }
@@ -1224,7 +1224,7 @@ void ebt_unregister_table(struct ebt_table *table)
         mutex_unlock(&ebt_mutex);
         vfree(table->private->entries);
         if (table->private->chainstack) {
-                for_each_cpu(i)
+                for_each_possible_cpu(i)
                         vfree(table->private->chainstack[i]);
                 vfree(table->private->chainstack);
         }
diff --git a/net/core/dev.c b/net/core/dev.c
index 434220d093aa..83231a27ae02 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3042,11 +3042,11 @@ void netdev_run_todo(void)
 
                 switch(dev->reg_state) {
                 case NETREG_REGISTERING:
+                        dev->reg_state = NETREG_REGISTERED;
                         err = netdev_register_sysfs(dev);
                         if (err)
                                 printk(KERN_ERR "%s: failed sysfs registration (%d)\n",
                                        dev->name, err);
-                        dev->reg_state = NETREG_REGISTERED;
                         break;
 
                 case NETREG_UNREGISTERING:
@@ -3100,12 +3100,11 @@ struct net_device *alloc_netdev(int sizeof_priv, const char *name,
         alloc_size = (sizeof(*dev) + NETDEV_ALIGN_CONST) & ~NETDEV_ALIGN_CONST;
         alloc_size += sizeof_priv + NETDEV_ALIGN_CONST;
 
-        p = kmalloc(alloc_size, GFP_KERNEL);
+        p = kzalloc(alloc_size, GFP_KERNEL);
         if (!p) {
                 printk(KERN_ERR "alloc_dev: Unable to allocate device.\n");
                 return NULL;
         }
-        memset(p, 0, alloc_size);
 
         dev = (struct net_device *)
                 (((long)p + NETDEV_ALIGN_CONST) & ~NETDEV_ALIGN_CONST);
@@ -3347,7 +3346,7 @@ static int __init net_dev_init(void)
          *      Initialise the packet receive queues.
          */
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 struct softnet_data *queue;
 
                 queue = &per_cpu(softnet_data, i);
diff --git a/net/core/dv.c b/net/core/dv.c
index cf581407538c..29ee77f15932 100644
--- a/net/core/dv.c
+++ b/net/core/dv.c
@@ -55,15 +55,12 @@ int alloc_divert_blk(struct net_device *dev)
 
         dev->divert = NULL;
         if (dev->type == ARPHRD_ETHER) {
-                dev->divert = (struct divert_blk *)
-                        kmalloc(alloc_size, GFP_KERNEL);
+                dev->divert = kzalloc(alloc_size, GFP_KERNEL);
                 if (dev->divert == NULL) {
                         printk(KERN_INFO "divert: unable to allocate divert_blk for %s\n",
                                dev->name);
                         return -ENOMEM;
                 }
-
-                memset(dev->divert, 0, sizeof(struct divert_blk));
                 dev_hold(dev);
         }
 
diff --git a/net/core/flow.c b/net/core/flow.c
index 55789f832eda..2191af5f26ac 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -79,7 +79,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
 {
         int i;
 
-        for_each_cpu(i)
+        for_each_possible_cpu(i)
                 flow_hash_rnd_recalc(i) = 1;
 
         flow_hash_rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD;
@@ -318,12 +318,10 @@ static void __devinit flow_cache_cpu_prepare(int cpu)
                 /* NOTHING */;
 
         flow_table(cpu) = (struct flow_cache_entry **)
-                __get_free_pages(GFP_KERNEL, order);
+                __get_free_pages(GFP_KERNEL|__GFP_ZERO, order);
         if (!flow_table(cpu))
                 panic("NET: failed to allocate flow cache order %lu\n", order);
 
-        memset(flow_table(cpu), 0, PAGE_SIZE << order);
-
         flow_hash_rnd_recalc(cpu) = 1;
         flow_count(cpu) = 0;
 
@@ -363,7 +361,7 @@ static int __init flow_cache_init(void)
         flow_hash_rnd_timer.expires = jiffies + FLOW_HASH_RND_PERIOD;
         add_timer(&flow_hash_rnd_timer);
 
-        for_each_cpu(i)
+        for_each_possible_cpu(i)
                 flow_cache_cpu_prepare(i);
 
         hotcpu_notifier(flow_cache_cpu, 0);
diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c
index b07c029e8219..3cad026764f0 100644
--- a/net/core/gen_estimator.c
+++ b/net/core/gen_estimator.c
@@ -159,11 +159,10 @@ int gen_new_estimator(struct gnet_stats_basic *bstats,
         if (parm->interval < -2 || parm->interval > 3)
                 return -EINVAL;
 
-        est = kmalloc(sizeof(*est), GFP_KERNEL);
+        est = kzalloc(sizeof(*est), GFP_KERNEL);
         if (est == NULL)
                 return -ENOBUFS;
 
-        memset(est, 0, sizeof(*est));
         est->interval = parm->interval + 2;
         est->bstats = bstats;
         est->rate_est = rate_est;
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 0c8666872d10..4cf878efdb49 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -284,14 +284,11 @@ static struct neighbour **neigh_hash_alloc(unsigned int entries)
         struct neighbour **ret;
 
         if (size <= PAGE_SIZE) {
-                ret = kmalloc(size, GFP_ATOMIC);
+                ret = kzalloc(size, GFP_ATOMIC);
         } else {
                 ret = (struct neighbour **)
-                        __get_free_pages(GFP_ATOMIC, get_order(size));
+                      __get_free_pages(GFP_ATOMIC|__GFP_ZERO, get_order(size));
         }
-        if (ret)
-                memset(ret, 0, size);
-
         return ret;
 }
 
@@ -1089,8 +1086,7 @@ static void neigh_hh_init(struct neighbour *n, struct dst_entry *dst,
                 if (hh->hh_type == protocol)
                         break;
 
-        if (!hh && (hh = kmalloc(sizeof(*hh), GFP_ATOMIC)) != NULL) {
-                memset(hh, 0, sizeof(struct hh_cache));
+        if (!hh && (hh = kzalloc(sizeof(*hh), GFP_ATOMIC)) != NULL) {
                 rwlock_init(&hh->hh_lock);
                 hh->hh_type = protocol;
                 atomic_set(&hh->hh_refcnt, 0);
@@ -1366,13 +1362,11 @@ void neigh_table_init(struct neigh_table *tbl)
         tbl->hash_buckets = neigh_hash_alloc(tbl->hash_mask + 1);
 
         phsize = (PNEIGH_HASHMASK + 1) * sizeof(struct pneigh_entry *);
-        tbl->phash_buckets = kmalloc(phsize, GFP_KERNEL);
+        tbl->phash_buckets = kzalloc(phsize, GFP_KERNEL);
 
         if (!tbl->hash_buckets || !tbl->phash_buckets)
                 panic("cannot allocate neighbour cache hashes");
 
-        memset(tbl->phash_buckets, 0, phsize);
-
         get_random_bytes(&tbl->hash_rnd, sizeof(tbl->hash_rnd));
 
         rwlock_init(&tbl->lock);
@@ -1633,7 +1627,7 @@ static int neightbl_fill_info(struct neigh_table *tbl, struct sk_buff *skb,
 
                 memset(&ndst, 0, sizeof(ndst));
 
-                for_each_cpu(cpu) {
+                for_each_possible_cpu(cpu) {
                         struct neigh_statistics *st;
 
                         st = per_cpu_ptr(tbl->stats, cpu);
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 21b68464cabb..c12990c9c603 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -165,7 +165,7 @@ static ssize_t show_operstate(struct class_device *dev, char *buf)
                 operstate = IF_OPER_DOWN;
         read_unlock(&dev_base_lock);
 
-        if (operstate >= sizeof(operstates))
+        if (operstate >= ARRAY_SIZE(operstates))
                 return -EINVAL; /* should not happen */
 
         return sprintf(buf, "%s\n", operstates[operstate]);
diff --git a/net/core/request_sock.c b/net/core/request_sock.c
index 1e44eda1fda9..79ebd75fbe4d 100644
--- a/net/core/request_sock.c
+++ b/net/core/request_sock.c
@@ -38,13 +38,11 @@ int reqsk_queue_alloc(struct request_sock_queue *queue,
 {
         const int lopt_size = sizeof(struct listen_sock) +
                               nr_table_entries * sizeof(struct request_sock *);
-        struct listen_sock *lopt = kmalloc(lopt_size, GFP_KERNEL);
+        struct listen_sock *lopt = kzalloc(lopt_size, GFP_KERNEL);
 
         if (lopt == NULL)
                 return -ENOMEM;
 
-        memset(lopt, 0, lopt_size);
-
         for (lopt->max_qlen_log = 6;
              (1 << lopt->max_qlen_log) < sysctl_max_syn_backlog;
              lopt->max_qlen_log++);
diff --git a/net/core/utils.c b/net/core/utils.c
index fdc4f38bc46c..4f96f389243d 100644
--- a/net/core/utils.c
+++ b/net/core/utils.c
@@ -121,7 +121,7 @@ void __init net_random_init(void)
 {
         int i;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 struct nrnd_state *state = &per_cpu(net_rand_state,i);
                 __net_srandom(state, i+jiffies);
         }
@@ -133,7 +133,7 @@ static int net_random_reseed(void)
         unsigned long seed[NR_CPUS];
 
         get_random_bytes(seed, sizeof(seed));
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 struct nrnd_state *state = &per_cpu(net_rand_state,i);
                 __net_srandom(state, seed[i]);
         }
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index ccd3efc6a173..95a639f2e3db 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -50,7 +50,7 @@
  *              Patrick McHardy <kaber@trash.net>
  */
 
-#define VERSION "0.406"
+#define VERSION "0.407"
 
 #include <linux/config.h>
 #include <asm/uaccess.h>
@@ -314,11 +314,6 @@ static void __leaf_free_rcu(struct rcu_head *head)
         kfree(container_of(head, struct leaf, rcu));
 }
 
-static inline void free_leaf(struct leaf *leaf)
-{
-        call_rcu(&leaf->rcu, __leaf_free_rcu);
-}
-
 static void __leaf_info_free_rcu(struct rcu_head *head)
 {
         kfree(container_of(head, struct leaf_info, rcu));
@@ -357,7 +352,12 @@ static void __tnode_free_rcu(struct rcu_head *head)
 
 static inline void tnode_free(struct tnode *tn)
 {
-        call_rcu(&tn->rcu, __tnode_free_rcu);
+        if(IS_LEAF(tn)) {
+                struct leaf *l = (struct leaf *) tn;
+                call_rcu_bh(&l->rcu, __leaf_free_rcu);
+        }
+        else
+                call_rcu(&tn->rcu, __tnode_free_rcu);
 }
 
 static struct leaf *leaf_new(void)
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 9831fd2c73a0..2a0455911ee0 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -1107,7 +1107,7 @@ void __init icmp_init(struct net_proto_family *ops)
         struct inet_sock *inet;
         int i;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 int err;
 
                 err = sock_create_kern(PF_INET, SOCK_RAW, IPPROTO_ICMP,
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 2a8adda15e11..da734c439179 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -304,13 +304,17 @@ out:
 
 /* Creation primitives. */
 
-static struct ipq *ip_frag_intern(unsigned int hash, struct ipq *qp_in)
+static struct ipq *ip_frag_intern(struct ipq *qp_in)
 {
         struct ipq *qp;
 #ifdef CONFIG_SMP
         struct hlist_node *n;
 #endif
+        unsigned int hash;
+
         write_lock(&ipfrag_lock);
+        hash = ipqhashfn(qp_in->id, qp_in->saddr, qp_in->daddr,
+                         qp_in->protocol);
 #ifdef CONFIG_SMP
         /* With SMP race we have to recheck hash table, because
          * such entry could be created on other cpu, while we
@@ -345,7 +349,7 @@ static struct ipq *ip_frag_intern(unsigned int hash, struct ipq *qp_in)
 }
 
 /* Add an entry to the 'ipq' queue for a newly received IP datagram. */
-static struct ipq *ip_frag_create(unsigned hash, struct iphdr *iph, u32 user)
+static struct ipq *ip_frag_create(struct iphdr *iph, u32 user)
 {
         struct ipq *qp;
 
@@ -371,7 +375,7 @@ static struct ipq *ip_frag_create(unsigned hash, struct iphdr *iph, u32 user)
         spin_lock_init(&qp->lock);
         atomic_set(&qp->refcnt, 1);
 
-        return ip_frag_intern(hash, qp);
+        return ip_frag_intern(qp);
 
 out_nomem:
         LIMIT_NETDEBUG(KERN_ERR "ip_frag_create: no memory left !\n");
@@ -387,11 +391,12 @@ static inline struct ipq *ip_find(struct iphdr *iph, u32 user)
         __u32 saddr = iph->saddr;
         __u32 daddr = iph->daddr;
         __u8 protocol = iph->protocol;
-        unsigned int hash = ipqhashfn(id, saddr, daddr, protocol);
+        unsigned int hash;
         struct ipq *qp;
         struct hlist_node *n;
 
         read_lock(&ipfrag_lock);
+        hash = ipqhashfn(id, saddr, daddr, protocol);
         hlist_for_each_entry(qp, n, &ipq_hash[hash], list) {
                 if(qp->id == id         &&
                    qp->saddr == saddr   &&
@@ -405,7 +410,7 @@ static inline struct ipq *ip_find(struct iphdr *iph, u32 user)
         }
         read_unlock(&ipfrag_lock);
 
-        return ip_frag_create(hash, iph, user);
+        return ip_frag_create(iph, user);
 }
 
 /* Is the fragment too far ahead to be part of ipq? */
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 9981dcd68f11..ab99bebdcdc8 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -656,7 +656,7 @@ static int ipgre_rcv(struct sk_buff *skb)
                 read_unlock(&ipgre_lock);
                 return(0);
         }
-        icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PROT_UNREACH, 0);
+        icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
 
 drop:
         read_unlock(&ipgre_lock);
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index f75ff1d96551..8dcba3887f04 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -86,8 +86,6 @@
 
 int sysctl_ip_default_ttl = IPDEFTTL;
 
-static int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*));
-
 /* Generate a checksum for an outgoing IP datagram. */
 __inline__ void ip_send_check(struct iphdr *iph)
 {
@@ -421,7 +419,7 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)
  *      single device frame, and queue such a frame for sending.
  */
 
-static int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
+int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
 {
         struct iphdr *iph;
         int raw = 0;
@@ -673,6 +671,8 @@ fail:
         return err;
 }
 
+EXPORT_SYMBOL(ip_fragment);
+
 int
 ip_generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb)
 {
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index 0a1d86a0f632..04a429465665 100644
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -290,7 +290,7 @@ static void ipcomp_free_scratches(void)
         if (!scratches)
                 return;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 void *scratch = *per_cpu_ptr(scratches, i);
                 if (scratch)
                         vfree(scratch);
@@ -313,7 +313,7 @@ static void **ipcomp_alloc_scratches(void)
 
         ipcomp_scratches = scratches;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 void *scratch = vmalloc(IPCOMP_SCRATCH_SIZE);
                 if (!scratch)
                         return NULL;
@@ -344,7 +344,7 @@ static void ipcomp_free_tfms(struct crypto_tfm **tfms)
         if (!tfms)
                 return;
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 struct crypto_tfm *tfm = *per_cpu_ptr(tfms, cpu);
                 crypto_free_tfm(tfm);
         }
@@ -384,7 +384,7 @@ static struct crypto_tfm **ipcomp_alloc_tfms(const char *alg_name)
         if (!tfms)
                 goto error;
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 struct crypto_tfm *tfm = crypto_alloc_tfm(alg_name, 0);
                 if (!tfm)
                         goto error;
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index eef07b0916a3..ea398ee43f28 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -474,9 +474,6 @@ static int ipip_rcv(struct sk_buff *skb)
         struct iphdr *iph;
         struct ip_tunnel *tunnel;
 
-        if (!pskb_may_pull(skb, sizeof(struct iphdr)))
-                goto out;
-
         iph = skb->nh.iph;
 
         read_lock(&ipip_lock);
@@ -508,7 +505,6 @@ static int ipip_rcv(struct sk_buff *skb)
         }
         read_unlock(&ipip_lock);
 
-out:
         return -1;
 }
 
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index b5ad9ac2fbcc..6a9e34b794bc 100644
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -133,7 +133,7 @@ struct ip_rt_info {
         u_int8_t tos;
 };
 
-static void queue_save(const struct sk_buff *skb, struct nf_info *info)
+static void nf_ip_saveroute(const struct sk_buff *skb, struct nf_info *info)
 {
         struct ip_rt_info *rt_info = nf_info_reroute(info);
 
@@ -146,7 +146,7 @@ static void queue_save(const struct sk_buff *skb, struct nf_info *info)
         }
 }
 
-static int queue_reroute(struct sk_buff **pskb, const struct nf_info *info)
+static int nf_ip_reroute(struct sk_buff **pskb, const struct nf_info *info)
 {
         const struct ip_rt_info *rt_info = nf_info_reroute(info);
 
@@ -161,20 +161,54 @@ static int queue_reroute(struct sk_buff **pskb, const struct nf_info *info)
         return 0;
 }
 
-static struct nf_queue_rerouter ip_reroute = {
-        .rer_size       = sizeof(struct ip_rt_info),
-        .save           = queue_save,
-        .reroute        = queue_reroute,
+unsigned int nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
+                            unsigned int dataoff, u_int8_t protocol)
+{
+        struct iphdr *iph = skb->nh.iph;
+        unsigned int csum = 0;
+
+        switch (skb->ip_summed) {
+        case CHECKSUM_HW:
+                if (hook != NF_IP_PRE_ROUTING && hook != NF_IP_LOCAL_IN)
+                        break;
+                if ((protocol == 0 && !(u16)csum_fold(skb->csum)) ||
+                    !csum_tcpudp_magic(iph->saddr, iph->daddr,
+                                       skb->len - dataoff, protocol,
+                                       skb->csum)) {
+                        skb->ip_summed = CHECKSUM_UNNECESSARY;
+                        break;
+                }
+                /* fall through */
+        case CHECKSUM_NONE:
+                if (protocol == 0)
+                        skb->csum = 0;
+                else
+                        skb->csum = csum_tcpudp_nofold(iph->saddr, iph->daddr,
+                                                       skb->len - dataoff,
+                                                       protocol, 0);
+                csum = __skb_checksum_complete(skb);
+        }
+        return csum;
+}
+
+EXPORT_SYMBOL(nf_ip_checksum);
+
+static struct nf_afinfo nf_ip_afinfo = {
+        .family         = AF_INET,
+        .checksum       = nf_ip_checksum,
+        .saveroute      = nf_ip_saveroute,
+        .reroute        = nf_ip_reroute,
+        .route_key_size = sizeof(struct ip_rt_info),
 };
 
 static int ipv4_netfilter_init(void)
 {
-        return nf_register_queue_rerouter(PF_INET, &ip_reroute);
+        return nf_register_afinfo(&nf_ip_afinfo);
 }
 
 static void ipv4_netfilter_fini(void)
 {
-        nf_unregister_queue_rerouter(PF_INET);
+        nf_unregister_afinfo(&nf_ip_afinfo);
 }
 
 module_init(ipv4_netfilter_init);
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 77855ccd6b43..c60fd5c4ea1e 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -69,6 +69,7 @@ config IP_NF_CONNTRACK_NETLINK
         tristate 'Connection tracking netlink interface (EXPERIMENTAL)'
         depends on EXPERIMENTAL && IP_NF_CONNTRACK && NETFILTER_NETLINK
         depends on IP_NF_CONNTRACK!=y || NETFILTER_NETLINK!=m
+        depends on IP_NF_NAT=n || IP_NF_NAT
         help
           This option enables support for a netlink-based userspace interface
 
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index a44a5d73457d..c2d92f99a2b8 100644
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -646,7 +646,7 @@ static int translate_table(const char *name,
         }
 
         /* And one copy for every other CPU */
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 if (newinfo->entries[i] && newinfo->entries[i] != entry0)
                         memcpy(newinfo->entries[i], entry0, newinfo->size);
         }
@@ -696,7 +696,7 @@ static void get_counters(const struct xt_table_info *t,
                            counters,
                            &i);
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 if (cpu == curcpu)
                         continue;
                 i = 0;
diff --git a/net/ipv4/netfilter/arptable_filter.c b/net/ipv4/netfilter/arptable_filter.c
index d0d379c7df9a..d7c472faa53b 100644
--- a/net/ipv4/netfilter/arptable_filter.c
+++ b/net/ipv4/netfilter/arptable_filter.c
@@ -181,33 +181,26 @@ static struct nf_hook_ops arpt_ops[] = {
 
 static int __init arptable_filter_init(void)
 {
-        int ret, i;
+        int ret;
 
         /* Register table */
         ret = arpt_register_table(&packet_filter, &initial_table.repl);
         if (ret < 0)
                 return ret;
 
-        for (i = 0; i < ARRAY_SIZE(arpt_ops); i++)
-                if ((ret = nf_register_hook(&arpt_ops[i])) < 0)
-                        goto cleanup_hooks;
+        ret = nf_register_hooks(arpt_ops, ARRAY_SIZE(arpt_ops));
+        if (ret < 0)
+                goto cleanup_table;
         return ret;
 
-cleanup_hooks:
-        while (--i >= 0)
-                nf_unregister_hook(&arpt_ops[i]);
-
+cleanup_table:
         arpt_unregister_table(&packet_filter);
         return ret;
 }
 
 static void __exit arptable_filter_fini(void)
 {
-        unsigned int i;
-
-        for (i = 0; i < ARRAY_SIZE(arpt_ops); i++)
-                nf_unregister_hook(&arpt_ops[i]);
-
+        nf_unregister_hooks(arpt_ops, ARRAY_SIZE(arpt_ops));
         arpt_unregister_table(&packet_filter);
 }
 
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
index ceaabc18202b..979a2eac6f00 100644
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -133,7 +133,7 @@ static void ip_ct_event_cache_flush(void)
         struct ip_conntrack_ecache *ecache;
         int cpu;
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 ecache = &per_cpu(ip_conntrack_ecache, cpu);
                 if (ecache->ct)
                         ip_conntrack_put(ecache->ct);
diff --git a/net/ipv4/netfilter/ip_conntrack_helper_h323.c b/net/ipv4/netfilter/ip_conntrack_helper_h323.c
index daeb1395faa4..2c2fb700d835 100644
--- a/net/ipv4/netfilter/ip_conntrack_helper_h323.c
+++ b/net/ipv4/netfilter/ip_conntrack_helper_h323.c
@@ -9,37 +9,6 @@
  * Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
  *
  * For more information, please see http://nath323.sourceforge.net/
- *
- * Changes:
- *      2006-02-01 - initial version 0.1
- *
- *      2006-02-20 - version 0.2
- *        1. Changed source format to follow kernel conventions
- *        2. Deleted some unnecessary structures
- *        3. Minor fixes
- *
- *      2006-03-10 - version 0.3
- *        1. Added support for multiple TPKTs in one packet (suggested by
- *           Patrick McHardy)
- *        2. Avoid excessive stack usage (based on Patrick McHardy's patch)
- *        3. Added support for non-linear skb (based on Patrick McHardy's patch)
- *        4. Fixed missing H.245 module owner (Patrick McHardy)
- *        5. Avoid long RAS expectation chains (Patrick McHardy)
- *        6. Fixed incorrect __exit attribute (Patrick McHardy)
- *        7. Eliminated unnecessary return code
- *        8. Fixed incorrect use of NAT data from conntrack code (suggested by
- *           Patrick McHardy)
- *        9. Fixed TTL calculation error in RCF
- *        10. Added TTL support in RRQ
- *        11. Better support for separate TPKT header and data
- *
- *      2006-03-15 - version 0.4
- *        1. Added support for T.120 channels
- *        2. Added parameter gkrouted_only (suggested by Patrick McHardy)
- *        3. Splitted ASN.1 code and data (suggested by Patrick McHardy)
- *        4. Sort ASN.1 data to avoid forwarding declarations (suggested by
- *           Patrick McHardy)
- *        5. Reset next TPKT data length in get_tpkt_data()
  */
 
 #include <linux/config.h>
@@ -54,8 +23,6 @@
 #include <linux/netfilter_ipv4/ip_conntrack_h323.h>
 #include <linux/moduleparam.h>
 
-#include "ip_conntrack_helper_h323_asn1.h"
-
 #if 0
 #define DEBUGP printk
 #else
@@ -63,6 +30,10 @@
 #endif
 
 /* Parameters */
+static unsigned int default_rrq_ttl = 300;
+module_param(default_rrq_ttl, uint, 0600);
+MODULE_PARM_DESC(default_rrq_ttl, "use this TTL if it's missing in RRQ");
+
 static int gkrouted_only = 1;
 module_param(gkrouted_only, int, 0600);
 MODULE_PARM_DESC(gkrouted_only, "only accept calls from gatekeeper");
@@ -222,8 +193,8 @@ static int get_tpkt_data(struct sk_buff **pskb, struct ip_conntrack *ct,
 }
 
 /****************************************************************************/
-int get_h245_addr(unsigned char *data, H245_TransportAddress * addr,
-                  u_int32_t * ip, u_int16_t * port)
+static int get_h245_addr(unsigned char *data, H245_TransportAddress * addr,
+                         u_int32_t * ip, u_int16_t * port)
 {
         unsigned char *p;
 
@@ -1302,7 +1273,7 @@ static int process_rrq(struct sk_buff **pskb, struct ip_conntrack *ct,
                 DEBUGP("ip_ct_ras: RRQ TTL = %u seconds\n", rrq->timeToLive);
                 info->timeout = rrq->timeToLive;
         } else
-                info->timeout = 0;
+                info->timeout = default_rrq_ttl;
 
         return 0;
 }
@@ -1713,18 +1684,17 @@ static int __init init(void)
 module_init(init);
 module_exit(fini);
 
-EXPORT_SYMBOL(get_h245_addr);
-EXPORT_SYMBOL(get_h225_addr);
-EXPORT_SYMBOL(ip_conntrack_h245_expect);
-EXPORT_SYMBOL(ip_conntrack_q931_expect);
-EXPORT_SYMBOL(set_h245_addr_hook);
-EXPORT_SYMBOL(set_h225_addr_hook);
-EXPORT_SYMBOL(set_sig_addr_hook);
-EXPORT_SYMBOL(set_ras_addr_hook);
-EXPORT_SYMBOL(nat_rtp_rtcp_hook);
-EXPORT_SYMBOL(nat_t120_hook);
-EXPORT_SYMBOL(nat_h245_hook);
-EXPORT_SYMBOL(nat_q931_hook);
+EXPORT_SYMBOL_GPL(get_h225_addr);
+EXPORT_SYMBOL_GPL(ip_conntrack_h245_expect);
+EXPORT_SYMBOL_GPL(ip_conntrack_q931_expect);
+EXPORT_SYMBOL_GPL(set_h245_addr_hook);
+EXPORT_SYMBOL_GPL(set_h225_addr_hook);
+EXPORT_SYMBOL_GPL(set_sig_addr_hook);
+EXPORT_SYMBOL_GPL(set_ras_addr_hook);
+EXPORT_SYMBOL_GPL(nat_rtp_rtcp_hook);
+EXPORT_SYMBOL_GPL(nat_t120_hook);
+EXPORT_SYMBOL_GPL(nat_h245_hook);
+EXPORT_SYMBOL_GPL(nat_q931_hook);
 
 MODULE_AUTHOR("Jing Min Zhao <zhaojingmin@users.sourceforge.net>");
 MODULE_DESCRIPTION("H.323 connection tracking helper");
diff --git a/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c b/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c
index afa525129b51..48078002e450 100644
--- a/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c
+++ b/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c
@@ -15,7 +15,7 @@
 #else
 #include <stdio.h>
 #endif
-#include "ip_conntrack_helper_h323_asn1.h"
+#include <linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h>
 
 /* Trace Flag */
 #ifndef H323_TRACE
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
index 3021af0910f1..d8b14a9010a6 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
@@ -224,25 +224,14 @@ icmp_error(struct sk_buff *skb, enum ip_conntrack_info *ctinfo,
         }
 
         /* See ip_conntrack_proto_tcp.c */
-        if (hooknum != NF_IP_PRE_ROUTING)
-                goto checksum_skipped;
-
-        switch (skb->ip_summed) {
-        case CHECKSUM_HW:
-                if (!(u16)csum_fold(skb->csum)) 
-                        break;
-                /* fall through */
-        case CHECKSUM_NONE:
-                skb->csum = 0;
-                if (__skb_checksum_complete(skb)) {
-                        if (LOG_INVALID(IPPROTO_ICMP))
-                                nf_log_packet(PF_INET, 0, skb, NULL, NULL, NULL,
-                                              "ip_ct_icmp: bad ICMP checksum ");
-                        return -NF_ACCEPT;
-                }
+        if (hooknum == NF_IP_PRE_ROUTING &&
+            nf_ip_checksum(skb, hooknum, skb->nh.iph->ihl * 4, 0)) {
+                if (LOG_INVALID(IPPROTO_ICMP))
+                        nf_log_packet(PF_INET, 0, skb, NULL, NULL, NULL,
+                                      "ip_ct_icmp: bad ICMP checksum ");
+                return -NF_ACCEPT;
         }
 
-checksum_skipped:
         /*
          *      18 is the highest 'known' ICMP type. Anything else is a mystery
          *
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
index e0dc37063545..062b252b58ad 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -870,11 +870,8 @@ static int tcp_error(struct sk_buff *skb,
          * and moreover root might send raw packets.
          */
         /* FIXME: Source route IP option packets --RR */
-        if (hooknum == NF_IP_PRE_ROUTING
-            && skb->ip_summed != CHECKSUM_UNNECESSARY
-            && csum_tcpudp_magic(iph->saddr, iph->daddr, tcplen, IPPROTO_TCP,
-                                 skb->ip_summed == CHECKSUM_HW ? skb->csum
-                                 : skb_checksum(skb, iph->ihl*4, tcplen, 0))) {
+        if (hooknum == NF_IP_PRE_ROUTING &&
+            nf_ip_checksum(skb, hooknum, iph->ihl * 4, IPPROTO_TCP)) {
                 if (LOG_INVALID(IPPROTO_TCP))
                         nf_log_packet(PF_INET, 0, skb, NULL, NULL, NULL,
                                   "ip_ct_tcp: bad TCP checksum ");
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_udp.c b/net/ipv4/netfilter/ip_conntrack_proto_udp.c
index 55b7d3210adf..70899868783b 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_udp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_udp.c
@@ -120,11 +120,8 @@ static int udp_error(struct sk_buff *skb, enum ip_conntrack_info *ctinfo,
          * because the semantic of CHECKSUM_HW is different there 
          * and moreover root might send raw packets.
          * FIXME: Source route IP option packets --RR */
-        if (hooknum == NF_IP_PRE_ROUTING
-            && skb->ip_summed != CHECKSUM_UNNECESSARY
-            && csum_tcpudp_magic(iph->saddr, iph->daddr, udplen, IPPROTO_UDP,
-                                 skb->ip_summed == CHECKSUM_HW ? skb->csum
-                                 : skb_checksum(skb, iph->ihl*4, udplen, 0))) {
+        if (hooknum == NF_IP_PRE_ROUTING &&
+            nf_ip_checksum(skb, hooknum, iph->ihl * 4, IPPROTO_UDP)) {
                 if (LOG_INVALID(IPPROTO_UDP))
                         nf_log_packet(PF_INET, 0, skb, NULL, NULL, NULL,
                                   "ip_ct_udp: bad UDP checksum ");
diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
index 52076026db36..929d61f7be91 100644
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -469,70 +469,63 @@ static unsigned int ip_conntrack_local(unsigned int hooknum,
 
 /* Connection tracking may drop packets, but never alters them, so
    make it the first hook. */
-static struct nf_hook_ops ip_conntrack_defrag_ops = {
-        .hook           = ip_conntrack_defrag,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_PRE_ROUTING,
-        .priority       = NF_IP_PRI_CONNTRACK_DEFRAG,
-};
-
-static struct nf_hook_ops ip_conntrack_in_ops = {
-        .hook           = ip_conntrack_in,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_PRE_ROUTING,
-        .priority       = NF_IP_PRI_CONNTRACK,
-};
-
-static struct nf_hook_ops ip_conntrack_defrag_local_out_ops = {
-        .hook           = ip_conntrack_defrag,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_LOCAL_OUT,
-        .priority       = NF_IP_PRI_CONNTRACK_DEFRAG,
-};
-
-static struct nf_hook_ops ip_conntrack_local_out_ops = {
-        .hook           = ip_conntrack_local,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_LOCAL_OUT,
-        .priority       = NF_IP_PRI_CONNTRACK,
-};
-
-/* helpers */
-static struct nf_hook_ops ip_conntrack_helper_out_ops = {
-        .hook           = ip_conntrack_help,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_POST_ROUTING,
-        .priority       = NF_IP_PRI_CONNTRACK_HELPER,
-};
-
-static struct nf_hook_ops ip_conntrack_helper_in_ops = {
-        .hook           = ip_conntrack_help,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_LOCAL_IN,
-        .priority       = NF_IP_PRI_CONNTRACK_HELPER,
-};
-
-/* Refragmenter; last chance. */
-static struct nf_hook_ops ip_conntrack_out_ops = {
-        .hook           = ip_confirm,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_POST_ROUTING,
-        .priority       = NF_IP_PRI_CONNTRACK_CONFIRM,
-};
-
-static struct nf_hook_ops ip_conntrack_local_in_ops = {
-        .hook           = ip_confirm,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_LOCAL_IN,
-        .priority       = NF_IP_PRI_CONNTRACK_CONFIRM,
+static struct nf_hook_ops ip_conntrack_ops[] = {
+        {
+                .hook           = ip_conntrack_defrag,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_PRE_ROUTING,
+                .priority       = NF_IP_PRI_CONNTRACK_DEFRAG,
+        },
+        {
+                .hook           = ip_conntrack_in,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_PRE_ROUTING,
+                .priority       = NF_IP_PRI_CONNTRACK,
+        },
+        {
+                .hook           = ip_conntrack_defrag,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_LOCAL_OUT,
+                .priority       = NF_IP_PRI_CONNTRACK_DEFRAG,
+        },
+        {
+                .hook           = ip_conntrack_local,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_LOCAL_OUT,
+                .priority       = NF_IP_PRI_CONNTRACK,
+        },
+        {
+                .hook           = ip_conntrack_help,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_POST_ROUTING,
+                .priority       = NF_IP_PRI_CONNTRACK_HELPER,
+        },
+        {
+                .hook           = ip_conntrack_help,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_LOCAL_IN,
+                .priority       = NF_IP_PRI_CONNTRACK_HELPER,
+        },
+        {
+                .hook           = ip_confirm,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_POST_ROUTING,
+                .priority       = NF_IP_PRI_CONNTRACK_CONFIRM,
+        },
+        {
+                .hook           = ip_confirm,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_LOCAL_IN,
+                .priority       = NF_IP_PRI_CONNTRACK_CONFIRM,
+        },
 };
 
 /* Sysctl support */
@@ -783,18 +776,46 @@ static ctl_table ip_ct_net_table[] = {
 EXPORT_SYMBOL(ip_ct_log_invalid);
 #endif /* CONFIG_SYSCTL */
 
-static int init_or_cleanup(int init)
+/* FIXME: Allow NULL functions and sub in pointers to generic for
+   them. --RR */
+int ip_conntrack_protocol_register(struct ip_conntrack_protocol *proto)
+{
+        int ret = 0;
+
+        write_lock_bh(&ip_conntrack_lock);
+        if (ip_ct_protos[proto->proto] != &ip_conntrack_generic_protocol) {
+                ret = -EBUSY;
+                goto out;
+        }
+        ip_ct_protos[proto->proto] = proto;
+ out:
+        write_unlock_bh(&ip_conntrack_lock);
+        return ret;
+}
+
+void ip_conntrack_protocol_unregister(struct ip_conntrack_protocol *proto)
+{
+        write_lock_bh(&ip_conntrack_lock);
+        ip_ct_protos[proto->proto] = &ip_conntrack_generic_protocol;
+        write_unlock_bh(&ip_conntrack_lock);
+
+        /* Somebody could be still looking at the proto in bh. */
+        synchronize_net();
+
+        /* Remove all contrack entries for this protocol */
+        ip_ct_iterate_cleanup(kill_proto, &proto->proto);
+}
+
+static int __init ip_conntrack_standalone_init(void)
 {
 #ifdef CONFIG_PROC_FS
         struct proc_dir_entry *proc, *proc_exp, *proc_stat;
 #endif
         int ret = 0;
 
-        if (!init) goto cleanup;
-
         ret = ip_conntrack_init();
         if (ret < 0)
-                goto cleanup_nothing;
+                return ret;
 
 #ifdef CONFIG_PROC_FS
         ret = -ENOMEM;
@@ -813,78 +834,25 @@ static int init_or_cleanup(int init)
         proc_stat->owner = THIS_MODULE;
 #endif
 
-        ret = nf_register_hook(&ip_conntrack_defrag_ops);
+        ret = nf_register_hooks(ip_conntrack_ops, ARRAY_SIZE(ip_conntrack_ops));
         if (ret < 0) {
-                printk("ip_conntrack: can't register pre-routing defrag hook.\n");
+                printk("ip_conntrack: can't register hooks.\n");
                 goto cleanup_proc_stat;
         }
-        ret = nf_register_hook(&ip_conntrack_defrag_local_out_ops);
-        if (ret < 0) {
-                printk("ip_conntrack: can't register local_out defrag hook.\n");
-                goto cleanup_defragops;
-        }
-        ret = nf_register_hook(&ip_conntrack_in_ops);
-        if (ret < 0) {
-                printk("ip_conntrack: can't register pre-routing hook.\n");
-                goto cleanup_defraglocalops;
-        }
-        ret = nf_register_hook(&ip_conntrack_local_out_ops);
-        if (ret < 0) {
-                printk("ip_conntrack: can't register local out hook.\n");
-                goto cleanup_inops;
-        }
-        ret = nf_register_hook(&ip_conntrack_helper_in_ops);
-        if (ret < 0) {
-                printk("ip_conntrack: can't register local in helper hook.\n");
-                goto cleanup_inandlocalops;
-        }
-        ret = nf_register_hook(&ip_conntrack_helper_out_ops);
-        if (ret < 0) {
-                printk("ip_conntrack: can't register postrouting helper hook.\n");
-                goto cleanup_helperinops;
-        }
-        ret = nf_register_hook(&ip_conntrack_out_ops);
-        if (ret < 0) {
-                printk("ip_conntrack: can't register post-routing hook.\n");
-                goto cleanup_helperoutops;
-        }
-        ret = nf_register_hook(&ip_conntrack_local_in_ops);
-        if (ret < 0) {
-                printk("ip_conntrack: can't register local in hook.\n");
-                goto cleanup_inoutandlocalops;
-        }
 #ifdef CONFIG_SYSCTL
         ip_ct_sysctl_header = register_sysctl_table(ip_ct_net_table, 0);
         if (ip_ct_sysctl_header == NULL) {
                 printk("ip_conntrack: can't register to sysctl.\n");
                 ret = -ENOMEM;
-                goto cleanup_localinops;
+                goto cleanup_hooks;
         }
 #endif
-
         return ret;
 
- cleanup:
-        synchronize_net();
 #ifdef CONFIG_SYSCTL
-        unregister_sysctl_table(ip_ct_sysctl_header);
- cleanup_localinops:
+ cleanup_hooks:
+        nf_unregister_hooks(ip_conntrack_ops, ARRAY_SIZE(ip_conntrack_ops));
 #endif
-        nf_unregister_hook(&ip_conntrack_local_in_ops);
- cleanup_inoutandlocalops:
-        nf_unregister_hook(&ip_conntrack_out_ops);
- cleanup_helperoutops:
-        nf_unregister_hook(&ip_conntrack_helper_out_ops);
- cleanup_helperinops:
-        nf_unregister_hook(&ip_conntrack_helper_in_ops);
- cleanup_inandlocalops:
-        nf_unregister_hook(&ip_conntrack_local_out_ops);
- cleanup_inops:
-        nf_unregister_hook(&ip_conntrack_in_ops);
- cleanup_defraglocalops:
-        nf_unregister_hook(&ip_conntrack_defrag_local_out_ops);
- cleanup_defragops:
-        nf_unregister_hook(&ip_conntrack_defrag_ops);
  cleanup_proc_stat:
 #ifdef CONFIG_PROC_FS
         remove_proc_entry("ip_conntrack", proc_net_stat);
@@ -895,48 +863,22 @@ static int init_or_cleanup(int init)
  cleanup_init:
 #endif /* CONFIG_PROC_FS */
         ip_conntrack_cleanup();
- cleanup_nothing:
-        return ret;
-}
-
-/* FIXME: Allow NULL functions and sub in pointers to generic for
-   them. --RR */
-int ip_conntrack_protocol_register(struct ip_conntrack_protocol *proto)
-{
-        int ret = 0;
-
-        write_lock_bh(&ip_conntrack_lock);
-        if (ip_ct_protos[proto->proto] != &ip_conntrack_generic_protocol) {
-                ret = -EBUSY;
-                goto out;
-        }
-        ip_ct_protos[proto->proto] = proto;
- out:
-        write_unlock_bh(&ip_conntrack_lock);
         return ret;
 }
 
-void ip_conntrack_protocol_unregister(struct ip_conntrack_protocol *proto)
-{
-        write_lock_bh(&ip_conntrack_lock);
-        ip_ct_protos[proto->proto] = &ip_conntrack_generic_protocol;
-        write_unlock_bh(&ip_conntrack_lock);
-        
-        /* Somebody could be still looking at the proto in bh. */
-        synchronize_net();
-
-        /* Remove all contrack entries for this protocol */
-        ip_ct_iterate_cleanup(kill_proto, &proto->proto);
-}
-
-static int __init ip_conntrack_standalone_init(void)
-{
-        return init_or_cleanup(1);
-}
-
 static void __exit ip_conntrack_standalone_fini(void)
 {
-        init_or_cleanup(0);
+        synchronize_net();
+#ifdef CONFIG_SYSCTL
+        unregister_sysctl_table(ip_ct_sysctl_header);
+#endif
+        nf_unregister_hooks(ip_conntrack_ops, ARRAY_SIZE(ip_conntrack_ops));
+#ifdef CONFIG_PROC_FS
+        remove_proc_entry("ip_conntrack", proc_net_stat);
+        proc_net_remove("ip_conntrack_expect");
+        proc_net_remove("ip_conntrack");
+#endif /* CONFIG_PROC_FS */
+        ip_conntrack_cleanup();
 }
 
 module_init(ip_conntrack_standalone_init);
diff --git a/net/ipv4/netfilter/ip_nat_helper_h323.c b/net/ipv4/netfilter/ip_nat_helper_h323.c
index a0bc883928c0..d45663d137a7 100644
--- a/net/ipv4/netfilter/ip_nat_helper_h323.c
+++ b/net/ipv4/netfilter/ip_nat_helper_h323.c
@@ -7,24 +7,6 @@
  *
  * Based on the 'brute force' H.323 NAT module by
  * Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
- *
- * Changes:
- *      2006-02-01 - initial version 0.1
- *
- *      2006-02-20 - version 0.2
- *        1. Changed source format to follow kernel conventions
- *        2. Deleted some unnecessary structures
- *        3. Minor fixes
- *
- *      2006-03-10 - version 0.3
- *        1. Added support for multiple TPKTs in one packet (suggested by
- *           Patrick McHardy)
- *        2. Added support for non-linear skb (based on Patrick McHardy's patch)
- *        3. Eliminated unnecessary return code
- *
- *      2006-03-15 - version 0.4
- *        1. Added support for T.120 channels
- *        2. Added parameter gkrouted_only (suggested by Patrick McHardy)
  */
 
 #include <linux/module.h>
@@ -41,65 +23,12 @@
 #include <linux/netfilter_ipv4/ip_conntrack_h323.h>
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
 
-#include "ip_conntrack_helper_h323_asn1.h"
-
 #if 0
 #define DEBUGP printk
 #else
 #define DEBUGP(format, args...)
 #endif
 
-extern int get_h245_addr(unsigned char *data, H245_TransportAddress * addr,
-                         u_int32_t * ip, u_int16_t * port);
-extern int get_h225_addr(unsigned char *data, TransportAddress * addr,
-                         u_int32_t * ip, u_int16_t * port);
-extern void ip_conntrack_h245_expect(struct ip_conntrack *new,
-                                     struct ip_conntrack_expect *this);
-extern void ip_conntrack_q931_expect(struct ip_conntrack *new,
-                                     struct ip_conntrack_expect *this);
-extern int (*set_h245_addr_hook) (struct sk_buff ** pskb,
-                                  unsigned char **data, int dataoff,
-                                  H245_TransportAddress * addr,
-                                  u_int32_t ip, u_int16_t port);
-extern int (*set_h225_addr_hook) (struct sk_buff ** pskb,
-                                  unsigned char **data, int dataoff,
-                                  TransportAddress * addr,
-                                  u_int32_t ip, u_int16_t port);
-extern int (*set_sig_addr_hook) (struct sk_buff ** pskb,
-                                 struct ip_conntrack * ct,
-                                 enum ip_conntrack_info ctinfo,
-                                 unsigned char **data,
-                                 TransportAddress * addr, int count);
-extern int (*set_ras_addr_hook) (struct sk_buff ** pskb,
-                                 struct ip_conntrack * ct,
-                                 enum ip_conntrack_info ctinfo,
-                                 unsigned char **data,
-                                 TransportAddress * addr, int count);
-extern int (*nat_rtp_rtcp_hook) (struct sk_buff ** pskb,
-                                 struct ip_conntrack * ct,
-                                 enum ip_conntrack_info ctinfo,
-                                 unsigned char **data, int dataoff,
-                                 H245_TransportAddress * addr,
-                                 u_int16_t port, u_int16_t rtp_port,
-                                 struct ip_conntrack_expect * rtp_exp,
-                                 struct ip_conntrack_expect * rtcp_exp);
-extern int (*nat_t120_hook) (struct sk_buff ** pskb, struct ip_conntrack * ct,
-                             enum ip_conntrack_info ctinfo,
-                             unsigned char **data, int dataoff,
-                             H245_TransportAddress * addr, u_int16_t port,
-                             struct ip_conntrack_expect * exp);
-extern int (*nat_h245_hook) (struct sk_buff ** pskb, struct ip_conntrack * ct,
-                             enum ip_conntrack_info ctinfo,
-                             unsigned char **data, int dataoff,
-                             TransportAddress * addr, u_int16_t port,
-                             struct ip_conntrack_expect * exp);
-extern int (*nat_q931_hook) (struct sk_buff ** pskb, struct ip_conntrack * ct,
-                             enum ip_conntrack_info ctinfo,
-                             unsigned char **data, TransportAddress * addr,
-                             int idx, u_int16_t port,
-                             struct ip_conntrack_expect * exp);
-
-
 /****************************************************************************/
 static int set_addr(struct sk_buff **pskb,
                     unsigned char **data, int dataoff,
diff --git a/net/ipv4/netfilter/ip_nat_rule.c b/net/ipv4/netfilter/ip_nat_rule.c
index efba8c4e42e0..1aba926c1cb0 100644
--- a/net/ipv4/netfilter/ip_nat_rule.c
+++ b/net/ipv4/netfilter/ip_nat_rule.c
@@ -279,7 +279,7 @@ static struct ipt_target ipt_dnat_reg = {
         .target         = ipt_dnat_target,
         .targetsize     = sizeof(struct ip_nat_multi_range_compat),
         .table          = "nat",
-        .hooks          = 1 << NF_IP_PRE_ROUTING,
+        .hooks          = (1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_LOCAL_OUT),
         .checkentry     = ipt_dnat_checkentry,
 };
 
diff --git a/net/ipv4/netfilter/ip_nat_standalone.c b/net/ipv4/netfilter/ip_nat_standalone.c
index 3505b0de2e04..8f760b28617e 100644
--- a/net/ipv4/netfilter/ip_nat_standalone.c
+++ b/net/ipv4/netfilter/ip_nat_standalone.c
@@ -299,69 +299,63 @@ ip_nat_adjust(unsigned int hooknum,
 
 /* We must be after connection tracking and before packet filtering. */
 
-/* Before packet filtering, change destination */
-static struct nf_hook_ops ip_nat_in_ops = {
-        .hook           = ip_nat_in,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_PRE_ROUTING,
-        .priority       = NF_IP_PRI_NAT_DST,
+static struct nf_hook_ops ip_nat_ops[] = {
+        /* Before packet filtering, change destination */
+        {
+                .hook           = ip_nat_in,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_PRE_ROUTING,
+                .priority       = NF_IP_PRI_NAT_DST,
+        },
+        /* After packet filtering, change source */
+        {
+                .hook           = ip_nat_out,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_POST_ROUTING,
+                .priority       = NF_IP_PRI_NAT_SRC,
+        },
+        /* After conntrack, adjust sequence number */
+        {
+                .hook           = ip_nat_adjust,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_POST_ROUTING,
+                .priority       = NF_IP_PRI_NAT_SEQ_ADJUST,
+        },
+        /* Before packet filtering, change destination */
+        {
+                .hook           = ip_nat_local_fn,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_LOCAL_OUT,
+                .priority       = NF_IP_PRI_NAT_DST,
+        },
+        /* After packet filtering, change source */
+        {
+                .hook           = ip_nat_fn,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_LOCAL_IN,
+                .priority       = NF_IP_PRI_NAT_SRC,
+        },
+        /* After conntrack, adjust sequence number */
+        {
+                .hook           = ip_nat_adjust,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_LOCAL_IN,
+                .priority       = NF_IP_PRI_NAT_SEQ_ADJUST,
+        },
 };
 
-/* After packet filtering, change source */
-static struct nf_hook_ops ip_nat_out_ops = {
-        .hook           = ip_nat_out,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_POST_ROUTING,
-        .priority       = NF_IP_PRI_NAT_SRC,
-};
-
-/* After conntrack, adjust sequence number */
-static struct nf_hook_ops ip_nat_adjust_out_ops = {
-        .hook           = ip_nat_adjust,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_POST_ROUTING,
-        .priority       = NF_IP_PRI_NAT_SEQ_ADJUST,
-};
-
-/* Before packet filtering, change destination */
-static struct nf_hook_ops ip_nat_local_out_ops = {
-        .hook           = ip_nat_local_fn,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_LOCAL_OUT,
-        .priority       = NF_IP_PRI_NAT_DST,
-};
-
-/* After packet filtering, change source for reply packets of LOCAL_OUT DNAT */
-static struct nf_hook_ops ip_nat_local_in_ops = {
-        .hook           = ip_nat_fn,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_LOCAL_IN,
-        .priority       = NF_IP_PRI_NAT_SRC,
-};
-
-/* After conntrack, adjust sequence number */
-static struct nf_hook_ops ip_nat_adjust_in_ops = {
-        .hook           = ip_nat_adjust,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_LOCAL_IN,
-        .priority       = NF_IP_PRI_NAT_SEQ_ADJUST,
-};
-
-
-static int init_or_cleanup(int init)
+static int __init ip_nat_standalone_init(void)
 {
         int ret = 0;
 
         need_conntrack();
 
-        if (!init) goto cleanup;
-
 #ifdef CONFIG_XFRM
         BUG_ON(ip_nat_decode_session != NULL);
         ip_nat_decode_session = nat_decode_session;
@@ -371,50 +365,13 @@ static int init_or_cleanup(int init)
                 printk("ip_nat_init: can't setup rules.\n");
                 goto cleanup_decode_session;
         }
-        ret = nf_register_hook(&ip_nat_in_ops);
+        ret = nf_register_hooks(ip_nat_ops, ARRAY_SIZE(ip_nat_ops));
         if (ret < 0) {
-                printk("ip_nat_init: can't register in hook.\n");
+                printk("ip_nat_init: can't register hooks.\n");
                 goto cleanup_rule_init;
         }
-        ret = nf_register_hook(&ip_nat_out_ops);
-        if (ret < 0) {
-                printk("ip_nat_init: can't register out hook.\n");
-                goto cleanup_inops;
-        }
-        ret = nf_register_hook(&ip_nat_adjust_in_ops);
-        if (ret < 0) {
-                printk("ip_nat_init: can't register adjust in hook.\n");
-                goto cleanup_outops;
-        }
-        ret = nf_register_hook(&ip_nat_adjust_out_ops);
-        if (ret < 0) {
-                printk("ip_nat_init: can't register adjust out hook.\n");
-                goto cleanup_adjustin_ops;
-        }
-        ret = nf_register_hook(&ip_nat_local_out_ops);
-        if (ret < 0) {
-                printk("ip_nat_init: can't register local out hook.\n");
-                goto cleanup_adjustout_ops;
-        }
-        ret = nf_register_hook(&ip_nat_local_in_ops);
-        if (ret < 0) {
-                printk("ip_nat_init: can't register local in hook.\n");
-                goto cleanup_localoutops;
-        }
         return ret;
 
- cleanup:
-        nf_unregister_hook(&ip_nat_local_in_ops);
- cleanup_localoutops:
-        nf_unregister_hook(&ip_nat_local_out_ops);
- cleanup_adjustout_ops:
-        nf_unregister_hook(&ip_nat_adjust_out_ops);
- cleanup_adjustin_ops:
-        nf_unregister_hook(&ip_nat_adjust_in_ops);
- cleanup_outops:
-        nf_unregister_hook(&ip_nat_out_ops);
- cleanup_inops:
-        nf_unregister_hook(&ip_nat_in_ops);
  cleanup_rule_init:
         ip_nat_rule_cleanup();
  cleanup_decode_session:
@@ -425,14 +382,14 @@ static int init_or_cleanup(int init)
         return ret;
 }
 
-static int __init ip_nat_standalone_init(void)
-{
-        return init_or_cleanup(1);
-}
-
 static void __exit ip_nat_standalone_fini(void)
 {
-        init_or_cleanup(0);
+        nf_unregister_hooks(ip_nat_ops, ARRAY_SIZE(ip_nat_ops));
+        ip_nat_rule_cleanup();
+#ifdef CONFIG_XFRM
+        ip_nat_decode_session = NULL;
+        synchronize_net();
+#endif
 }
 
 module_init(ip_nat_standalone_init);
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index 896a244f8f91..b93f0494362f 100644
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -662,15 +662,11 @@ static struct nf_queue_handler nfqh = {
         .outfn  = &ipq_enqueue_packet,
 };
 
-static int
-init_or_cleanup(int init)
+static int __init ip_queue_init(void)
 {
         int status = -ENOMEM;
         struct proc_dir_entry *proc;
         
-        if (!init)
-                goto cleanup;
-
         netlink_register_notifier(&ipq_nl_notifier);
         ipqnl = netlink_kernel_create(NETLINK_FIREWALL, 0, ipq_rcv_sk,
                                       THIS_MODULE);
@@ -697,11 +693,6 @@ init_or_cleanup(int init)
         }
         return status;
 
-cleanup:
-        nf_unregister_queue_handlers(&nfqh);
-        synchronize_net();
-        ipq_flush(NF_DROP);
-        
 cleanup_sysctl:
         unregister_sysctl_table(ipq_sysctl_header);
         unregister_netdevice_notifier(&ipq_dev_notifier);
@@ -717,15 +708,21 @@ cleanup_netlink_notifier:
         return status;
 }
 
-static int __init ip_queue_init(void)
-{
-        
-        return init_or_cleanup(1);
-}
-
 static void __exit ip_queue_fini(void)
 {
-        init_or_cleanup(0);
+        nf_unregister_queue_handlers(&nfqh);
+        synchronize_net();
+        ipq_flush(NF_DROP);
+
+        unregister_sysctl_table(ipq_sysctl_header);
+        unregister_netdevice_notifier(&ipq_dev_notifier);
+        proc_net_remove(IPQ_PROC_FS_NAME);
+
+        sock_release(ipqnl->sk_socket);
+        mutex_lock(&ipqnl_mutex);
+        mutex_unlock(&ipqnl_mutex);
+
+        netlink_unregister_notifier(&ipq_nl_notifier);
 }
 
 MODULE_DESCRIPTION("IPv4 packet queue handler");
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index d5b8cdd361ce..d25ac8ba6eba 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -735,7 +735,7 @@ translate_table(const char *name,
         }
 
         /* And one copy for every other CPU */
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 if (newinfo->entries[i] && newinfo->entries[i] != entry0)
                         memcpy(newinfo->entries[i], entry0, newinfo->size);
         }
@@ -788,7 +788,7 @@ get_counters(const struct xt_table_info *t,
                           counters,
                           &i);
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 if (cpu == curcpu)
                         continue;
                 i = 0;
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index e4768a31718b..aad9d28c8d71 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -725,22 +725,17 @@ static struct file_operations clusterip_proc_fops = {
 
 #endif /* CONFIG_PROC_FS */
 
-static int init_or_cleanup(int fini)
+static int __init ipt_clusterip_init(void)
 {
         int ret;
 
-        if (fini)
-                goto cleanup;
-
-        if (ipt_register_target(&clusterip_tgt)) {
-                ret = -EINVAL;
-                goto cleanup_none;
-        }
+        ret = ipt_register_target(&clusterip_tgt);
+        if (ret < 0)
+                return ret;
 
-        if (nf_register_hook(&cip_arp_ops) < 0) {
-                ret = -EINVAL;
+        ret = nf_register_hook(&cip_arp_ops);
+        if (ret < 0)
                 goto cleanup_target;
-        }
 
 #ifdef CONFIG_PROC_FS
         clusterip_procdir = proc_mkdir("ipt_CLUSTERIP", proc_net);
@@ -753,31 +748,24 @@ static int init_or_cleanup(int fini)
 
         printk(KERN_NOTICE "ClusterIP Version %s loaded successfully\n",
                 CLUSTERIP_VERSION);
-
         return 0;
 
-cleanup:
-        printk(KERN_NOTICE "ClusterIP Version %s unloading\n",
-                CLUSTERIP_VERSION);
-#ifdef CONFIG_PROC_FS
-        remove_proc_entry(clusterip_procdir->name, clusterip_procdir->parent);
-#endif
 cleanup_hook:
         nf_unregister_hook(&cip_arp_ops);
 cleanup_target:
         ipt_unregister_target(&clusterip_tgt);
-cleanup_none:
-        return -EINVAL;
-}
-
-static int __init ipt_clusterip_init(void)
-{
-        return init_or_cleanup(0);
+        return ret;
 }
 
 static void __exit ipt_clusterip_fini(void)
 {
-        init_or_cleanup(1);
+        printk(KERN_NOTICE "ClusterIP Version %s unloading\n",
+                CLUSTERIP_VERSION);
+#ifdef CONFIG_PROC_FS
+        remove_proc_entry(clusterip_procdir->name, clusterip_procdir->parent);
+#endif
+        nf_unregister_hook(&cip_arp_ops);
+        ipt_unregister_target(&clusterip_tgt);
 }
 
 module_init(ipt_clusterip_init);
diff --git a/net/ipv4/netfilter/ipt_REJECT.c b/net/ipv4/netfilter/ipt_REJECT.c
index 4269a5440d43..0bba3c2bb786 100644
--- a/net/ipv4/netfilter/ipt_REJECT.c
+++ b/net/ipv4/netfilter/ipt_REJECT.c
@@ -106,7 +106,6 @@ static void send_reset(struct sk_buff *oldskb, int hook)
         struct rtable *rt;
         u_int16_t tmp_port;
         u_int32_t tmp_addr;
-        unsigned int tcplen;
         int needs_ack;
         int hh_len;
 
@@ -124,13 +123,7 @@ static void send_reset(struct sk_buff *oldskb, int hook)
                 return;
 
         /* Check checksum */
-        tcplen = oldskb->len - iph->ihl * 4;
-        if (((hook != NF_IP_LOCAL_IN && oldskb->ip_summed != CHECKSUM_HW) ||
-             (hook == NF_IP_LOCAL_IN &&
-              oldskb->ip_summed != CHECKSUM_UNNECESSARY)) &&
-            csum_tcpudp_magic(iph->saddr, iph->daddr, tcplen, IPPROTO_TCP,
-                              oldskb->ip_summed == CHECKSUM_HW ? oldskb->csum :
-                              skb_checksum(oldskb, iph->ihl * 4, tcplen, 0)))
+        if (nf_ip_checksum(oldskb, hook, iph->ihl * 4, IPPROTO_TCP))
                 return;
 
         if ((rt = route_reverse(oldskb, oth, hook)) == NULL)
diff --git a/net/ipv4/netfilter/iptable_filter.c b/net/ipv4/netfilter/iptable_filter.c
index 3d80aefe9cfa..7f417484bfbf 100644
--- a/net/ipv4/netfilter/iptable_filter.c
+++ b/net/ipv4/netfilter/iptable_filter.c
@@ -157,37 +157,20 @@ static int __init iptable_filter_init(void)
                 return ret;
 
         /* Register hooks */
-        ret = nf_register_hook(&ipt_ops[0]);
+        ret = nf_register_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
         if (ret < 0)
                 goto cleanup_table;
 
-        ret = nf_register_hook(&ipt_ops[1]);
-        if (ret < 0)
-                goto cleanup_hook0;
-
-        ret = nf_register_hook(&ipt_ops[2]);
-        if (ret < 0)
-                goto cleanup_hook1;
-
         return ret;
 
- cleanup_hook1:
-        nf_unregister_hook(&ipt_ops[1]);
- cleanup_hook0:
-        nf_unregister_hook(&ipt_ops[0]);
  cleanup_table:
         ipt_unregister_table(&packet_filter);
-
         return ret;
 }
 
 static void __exit iptable_filter_fini(void)
 {
-        unsigned int i;
-
-        for (i = 0; i < sizeof(ipt_ops)/sizeof(struct nf_hook_ops); i++)
-                nf_unregister_hook(&ipt_ops[i]);
-
+        nf_unregister_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
         ipt_unregister_table(&packet_filter);
 }
 
diff --git a/net/ipv4/netfilter/iptable_mangle.c b/net/ipv4/netfilter/iptable_mangle.c
index 412fc96cc896..397b95cc026b 100644
--- a/net/ipv4/netfilter/iptable_mangle.c
+++ b/net/ipv4/netfilter/iptable_mangle.c
@@ -211,49 +211,20 @@ static int __init iptable_mangle_init(void)
                 return ret;
 
         /* Register hooks */
-        ret = nf_register_hook(&ipt_ops[0]);
+        ret = nf_register_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
         if (ret < 0)
                 goto cleanup_table;
 
-        ret = nf_register_hook(&ipt_ops[1]);
-        if (ret < 0)
-                goto cleanup_hook0;
-
-        ret = nf_register_hook(&ipt_ops[2]);
-        if (ret < 0)
-                goto cleanup_hook1;
-
-        ret = nf_register_hook(&ipt_ops[3]);
-        if (ret < 0)
-                goto cleanup_hook2;
-
-        ret = nf_register_hook(&ipt_ops[4]);
-        if (ret < 0)
-                goto cleanup_hook3;
-
         return ret;
 
- cleanup_hook3:
-        nf_unregister_hook(&ipt_ops[3]);
- cleanup_hook2:
-        nf_unregister_hook(&ipt_ops[2]);
- cleanup_hook1:
-        nf_unregister_hook(&ipt_ops[1]);
- cleanup_hook0:
-        nf_unregister_hook(&ipt_ops[0]);
  cleanup_table:
         ipt_unregister_table(&packet_mangler);
-
         return ret;
 }
 
 static void __exit iptable_mangle_fini(void)
 {
-        unsigned int i;
-
-        for (i = 0; i < sizeof(ipt_ops)/sizeof(struct nf_hook_ops); i++)
-                nf_unregister_hook(&ipt_ops[i]);
-
+        nf_unregister_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
         ipt_unregister_table(&packet_mangler);
 }
 
diff --git a/net/ipv4/netfilter/iptable_raw.c b/net/ipv4/netfilter/iptable_raw.c
index 03cc79a6160a..7912cce1e1b8 100644
--- a/net/ipv4/netfilter/iptable_raw.c
+++ b/net/ipv4/netfilter/iptable_raw.c
@@ -101,18 +101,18 @@ ipt_hook(unsigned int hook,
 /* 'raw' is the very first table. */
 static struct nf_hook_ops ipt_ops[] = {
         {
-          .hook = ipt_hook, 
-          .pf = PF_INET, 
-          .hooknum = NF_IP_PRE_ROUTING, 
-          .priority = NF_IP_PRI_RAW,
-          .owner = THIS_MODULE,
+                .hook = ipt_hook,
+                .pf = PF_INET,
+                .hooknum = NF_IP_PRE_ROUTING,
+                .priority = NF_IP_PRI_RAW,
+                .owner = THIS_MODULE,
         },
         {
-          .hook = ipt_hook, 
-          .pf = PF_INET, 
-          .hooknum = NF_IP_LOCAL_OUT, 
-          .priority = NF_IP_PRI_RAW,
-          .owner = THIS_MODULE,
+                .hook = ipt_hook,
+                .pf = PF_INET,
+                .hooknum = NF_IP_LOCAL_OUT,
+                .priority = NF_IP_PRI_RAW,
+                .owner = THIS_MODULE,
         },
 };
 
@@ -126,31 +126,20 @@ static int __init iptable_raw_init(void)
                 return ret;
 
         /* Register hooks */
-        ret = nf_register_hook(&ipt_ops[0]);
+        ret = nf_register_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
         if (ret < 0)
                 goto cleanup_table;
 
-        ret = nf_register_hook(&ipt_ops[1]);
-        if (ret < 0)
-                goto cleanup_hook0;
-
         return ret;
 
- cleanup_hook0:
-        nf_unregister_hook(&ipt_ops[0]);
  cleanup_table:
         ipt_unregister_table(&packet_raw);
-
         return ret;
 }
 
 static void __exit iptable_raw_fini(void)
 {
-        unsigned int i;
-
-        for (i = 0; i < sizeof(ipt_ops)/sizeof(struct nf_hook_ops); i++)
-                nf_unregister_hook(&ipt_ops[i]);
-
+        nf_unregister_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
         ipt_unregister_table(&packet_raw);
 }
 
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index 4afbc699d3ba..5bc9f64d7b5b 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -210,71 +210,63 @@ static unsigned int ipv4_conntrack_local(unsigned int hooknum,
 
 /* Connection tracking may drop packets, but never alters them, so
    make it the first hook. */
-static struct nf_hook_ops ipv4_conntrack_defrag_ops = {
-        .hook           = ipv4_conntrack_defrag,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_PRE_ROUTING,
-        .priority       = NF_IP_PRI_CONNTRACK_DEFRAG,
-};
-
-static struct nf_hook_ops ipv4_conntrack_in_ops = {
-        .hook           = ipv4_conntrack_in,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_PRE_ROUTING,
-        .priority       = NF_IP_PRI_CONNTRACK,
-};
-
-static struct nf_hook_ops ipv4_conntrack_defrag_local_out_ops = {
-        .hook           = ipv4_conntrack_defrag,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_LOCAL_OUT,
-        .priority       = NF_IP_PRI_CONNTRACK_DEFRAG,
-};
-
-static struct nf_hook_ops ipv4_conntrack_local_out_ops = {
-        .hook           = ipv4_conntrack_local,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_LOCAL_OUT,
-        .priority       = NF_IP_PRI_CONNTRACK,
-};
-
-/* helpers */
-static struct nf_hook_ops ipv4_conntrack_helper_out_ops = {
-        .hook           = ipv4_conntrack_help,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_POST_ROUTING,
-        .priority       = NF_IP_PRI_CONNTRACK_HELPER,
-};
-
-static struct nf_hook_ops ipv4_conntrack_helper_in_ops = {
-        .hook           = ipv4_conntrack_help,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_LOCAL_IN,
-        .priority       = NF_IP_PRI_CONNTRACK_HELPER,
-};
-
-
-/* Refragmenter; last chance. */
-static struct nf_hook_ops ipv4_conntrack_out_ops = {
-        .hook           = ipv4_confirm,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_POST_ROUTING,
-        .priority       = NF_IP_PRI_CONNTRACK_CONFIRM,
-};
-
-static struct nf_hook_ops ipv4_conntrack_local_in_ops = {
-        .hook           = ipv4_confirm,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET,
-        .hooknum        = NF_IP_LOCAL_IN,
-        .priority       = NF_IP_PRI_CONNTRACK_CONFIRM,
+static struct nf_hook_ops ipv4_conntrack_ops[] = {
+        {
+                .hook           = ipv4_conntrack_defrag,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_PRE_ROUTING,
+                .priority       = NF_IP_PRI_CONNTRACK_DEFRAG,
+        },
+        {
+                .hook           = ipv4_conntrack_in,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_PRE_ROUTING,
+                .priority       = NF_IP_PRI_CONNTRACK,
+        },
+        {
+                .hook           = ipv4_conntrack_defrag,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_LOCAL_OUT,
+                .priority       = NF_IP_PRI_CONNTRACK_DEFRAG,
+        },
+        {
+                .hook           = ipv4_conntrack_local,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_LOCAL_OUT,
+                .priority       = NF_IP_PRI_CONNTRACK,
+        },
+        {
+                .hook           = ipv4_conntrack_help,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_POST_ROUTING,
+                .priority       = NF_IP_PRI_CONNTRACK_HELPER,
+        },
+        {
+                .hook           = ipv4_conntrack_help,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_LOCAL_IN,
+                .priority       = NF_IP_PRI_CONNTRACK_HELPER,
+        },
+        {
+                .hook           = ipv4_confirm,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_POST_ROUTING,
+                .priority       = NF_IP_PRI_CONNTRACK_CONFIRM,
+        },
+        {
+                .hook           = ipv4_confirm,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET,
+                .hooknum        = NF_IP_LOCAL_IN,
+                .priority       = NF_IP_PRI_CONNTRACK_CONFIRM,
+        },
 };
 
 #ifdef CONFIG_SYSCTL
@@ -440,16 +432,20 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 = {
 extern struct nf_conntrack_protocol nf_conntrack_protocol_tcp4;
 extern struct nf_conntrack_protocol nf_conntrack_protocol_udp4;
 extern struct nf_conntrack_protocol nf_conntrack_protocol_icmp;
-static int init_or_cleanup(int init)
+
+MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET));
+MODULE_LICENSE("GPL");
+
+static int __init nf_conntrack_l3proto_ipv4_init(void)
 {
         int ret = 0;
 
-        if (!init) goto cleanup;
+        need_conntrack();
 
         ret = nf_register_sockopt(&so_getorigdst);
         if (ret < 0) {
                 printk(KERN_ERR "Unable to register netfilter socket option\n");
-                goto cleanup_nothing;
+                return ret;
         }
 
         ret = nf_conntrack_protocol_register(&nf_conntrack_protocol_tcp4);
@@ -476,84 +472,26 @@ static int init_or_cleanup(int init)
                 goto cleanup_icmp;
         }
 
-        ret = nf_register_hook(&ipv4_conntrack_defrag_ops);
+        ret = nf_register_hooks(ipv4_conntrack_ops,
+                                ARRAY_SIZE(ipv4_conntrack_ops));
         if (ret < 0) {
-                printk("nf_conntrack_ipv4: can't register pre-routing defrag hook.\n");
+                printk("nf_conntrack_ipv4: can't register hooks.\n");
                 goto cleanup_ipv4;
         }
-        ret = nf_register_hook(&ipv4_conntrack_defrag_local_out_ops);
-        if (ret < 0) {
-                printk("nf_conntrack_ipv4: can't register local_out defrag hook.\n");
-                goto cleanup_defragops;
-        }
-
-        ret = nf_register_hook(&ipv4_conntrack_in_ops);
-        if (ret < 0) {
-                printk("nf_conntrack_ipv4: can't register pre-routing hook.\n");
-                goto cleanup_defraglocalops;
-        }
-
-        ret = nf_register_hook(&ipv4_conntrack_local_out_ops);
-        if (ret < 0) {
-                printk("nf_conntrack_ipv4: can't register local out hook.\n");
-                goto cleanup_inops;
-        }
-
-        ret = nf_register_hook(&ipv4_conntrack_helper_in_ops);
-        if (ret < 0) {
-                printk("nf_conntrack_ipv4: can't register local helper hook.\n");
-                goto cleanup_inandlocalops;
-        }
-
-        ret = nf_register_hook(&ipv4_conntrack_helper_out_ops);
-        if (ret < 0) {
-                printk("nf_conntrack_ipv4: can't register postrouting helper hook.\n");
-                goto cleanup_helperinops;
-        }
-
-        ret = nf_register_hook(&ipv4_conntrack_out_ops);
-        if (ret < 0) {
-                printk("nf_conntrack_ipv4: can't register post-routing hook.\n");
-                goto cleanup_helperoutops;
-        }
-
-        ret = nf_register_hook(&ipv4_conntrack_local_in_ops);
-        if (ret < 0) {
-                printk("nf_conntrack_ipv4: can't register local in hook.\n");
-                goto cleanup_inoutandlocalops;
-        }
-
 #ifdef CONFIG_SYSCTL
         nf_ct_ipv4_sysctl_header = register_sysctl_table(nf_ct_net_table, 0);
         if (nf_ct_ipv4_sysctl_header == NULL) {
                 printk("nf_conntrack: can't register to sysctl.\n");
                 ret = -ENOMEM;
-                goto cleanup_localinops;
+                goto cleanup_hooks;
         }
 #endif
         return ret;
 
- cleanup:
-        synchronize_net();
 #ifdef CONFIG_SYSCTL
-        unregister_sysctl_table(nf_ct_ipv4_sysctl_header);
- cleanup_localinops:
+ cleanup_hooks:
+        nf_unregister_hooks(ipv4_conntrack_ops, ARRAY_SIZE(ipv4_conntrack_ops));
 #endif
-        nf_unregister_hook(&ipv4_conntrack_local_in_ops);
- cleanup_inoutandlocalops:
-        nf_unregister_hook(&ipv4_conntrack_out_ops);
- cleanup_helperoutops:
-        nf_unregister_hook(&ipv4_conntrack_helper_out_ops);
- cleanup_helperinops:
-        nf_unregister_hook(&ipv4_conntrack_helper_in_ops);
- cleanup_inandlocalops:
-        nf_unregister_hook(&ipv4_conntrack_local_out_ops);
- cleanup_inops:
-        nf_unregister_hook(&ipv4_conntrack_in_ops);
- cleanup_defraglocalops:
-        nf_unregister_hook(&ipv4_conntrack_defrag_local_out_ops);
- cleanup_defragops:
-        nf_unregister_hook(&ipv4_conntrack_defrag_ops);
  cleanup_ipv4:
         nf_conntrack_l3proto_unregister(&nf_conntrack_l3proto_ipv4);
  cleanup_icmp:
@@ -564,22 +502,21 @@ static int init_or_cleanup(int init)
         nf_conntrack_protocol_unregister(&nf_conntrack_protocol_tcp4);
  cleanup_sockopt:
         nf_unregister_sockopt(&so_getorigdst);
- cleanup_nothing:
         return ret;
 }
 
-MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET));
-MODULE_LICENSE("GPL");
-
-static int __init nf_conntrack_l3proto_ipv4_init(void)
-{
-        need_conntrack();
-        return init_or_cleanup(1);
-}
-
 static void __exit nf_conntrack_l3proto_ipv4_fini(void)
 {
-        init_or_cleanup(0);
+        synchronize_net();
+#ifdef CONFIG_SYSCTL
+        unregister_sysctl_table(nf_ct_ipv4_sysctl_header);
+#endif
+        nf_unregister_hooks(ipv4_conntrack_ops, ARRAY_SIZE(ipv4_conntrack_ops));
+        nf_conntrack_l3proto_unregister(&nf_conntrack_l3proto_ipv4);
+        nf_conntrack_protocol_unregister(&nf_conntrack_protocol_icmp);
+        nf_conntrack_protocol_unregister(&nf_conntrack_protocol_udp4);
+        nf_conntrack_protocol_unregister(&nf_conntrack_protocol_tcp4);
+        nf_unregister_sockopt(&so_getorigdst);
 }
 
 module_init(nf_conntrack_l3proto_ipv4_init);
diff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
index 52dc175be39a..4b0d361cc6e6 100644
--- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
+++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
@@ -235,30 +235,14 @@ icmp_error(struct sk_buff *skb, unsigned int dataoff,
         }
 
         /* See ip_conntrack_proto_tcp.c */
-        if (hooknum != NF_IP_PRE_ROUTING)
-                goto checksum_skipped;
-
-        switch (skb->ip_summed) {
-        case CHECKSUM_HW:
-                if (!(u16)csum_fold(skb->csum))
-                        break;
+        if (hooknum == NF_IP_PRE_ROUTING &&
+            nf_ip_checksum(skb, hooknum, dataoff, 0)) {
                 if (LOG_INVALID(IPPROTO_ICMP))
                         nf_log_packet(PF_INET, 0, skb, NULL, NULL, NULL,
                                       "nf_ct_icmp: bad HW ICMP checksum ");
                 return -NF_ACCEPT;
-        case CHECKSUM_NONE:
-                if ((u16)csum_fold(skb_checksum(skb, 0, skb->len, 0))) {
-                        if (LOG_INVALID(IPPROTO_ICMP))
-                                nf_log_packet(PF_INET, 0, skb, NULL, NULL,
-                                              NULL,
-                                              "nf_ct_icmp: bad ICMP checksum ");
-                        return -NF_ACCEPT;
-                }
-        default:
-                break;
         }
 
-checksum_skipped:
         /*
          *      18 is the highest 'known' ICMP type. Anything else is a mystery
          *
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index 1b167c4bb3be..d61e2a9d394d 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -49,7 +49,7 @@ static int fold_prot_inuse(struct proto *proto)
         int res = 0;
         int cpu;
 
-        for_each_cpu(cpu)
+        for_each_possible_cpu(cpu)
                 res += proto->stats[cpu].inuse;
 
         return res;
@@ -91,7 +91,7 @@ fold_field(void *mib[], int offt)
         unsigned long res = 0;
         int i;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 res += *(((unsigned long *) per_cpu_ptr(mib[0], i)) + offt);
                 res += *(((unsigned long *) per_cpu_ptr(mib[1], i)) + offt);
         }
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 94fcbc5e5a1b..ff434821909f 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -3083,7 +3083,7 @@ static int ip_rt_acct_read(char *buffer, char **start, off_t offset,
                 memcpy(dst, src, length);
 
                 /* Add the other cpus in, one int at a time */
-                for_each_cpu(i) {
+                for_each_possible_cpu(i) {
                         unsigned int j;
 
                         src = ((u32 *) IP_RT_ACCT_CPU(i)) + offset;
diff --git a/net/ipv4/tunnel4.c b/net/ipv4/tunnel4.c
index 0d7d386dac22..8d30c48f090e 100644
--- a/net/ipv4/tunnel4.c
+++ b/net/ipv4/tunnel4.c
@@ -8,6 +8,8 @@
 #include <linux/mutex.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <net/icmp.h>
+#include <net/ip.h>
 #include <net/protocol.h>
 #include <net/xfrm.h>
 
@@ -70,10 +72,16 @@ static int tunnel4_rcv(struct sk_buff *skb)
 {
         struct xfrm_tunnel *handler;
 
+        if (!pskb_may_pull(skb, sizeof(struct iphdr)))
+                goto drop;
+
         for (handler = tunnel4_handlers; handler; handler = handler->next)
                 if (!handler->handler(skb))
                         return 0;
 
+        icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
+
+drop:
         kfree_skb(skb);
         return 0;
 }
diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c
index e1b8f4b90d80..3e174c83bfe7 100644
--- a/net/ipv4/xfrm4_input.c
+++ b/net/ipv4/xfrm4_input.c
@@ -37,8 +37,6 @@ static int xfrm4_parse_spi(struct sk_buff *skb, u8 nexthdr, u32 *spi, u32 *seq)
 {
         switch (nexthdr) {
         case IPPROTO_IPIP:
-                if (!pskb_may_pull(skb, sizeof(struct iphdr)))
-                        return -EINVAL;
                 *spi = skb->nh.iph->saddr;
                 *seq = 0;
                 return 0;
@@ -90,7 +88,7 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
                 if (unlikely(x->km.state != XFRM_STATE_VALID))
                         goto drop_unlock;
 
-                if (x->encap->encap_type != encap_type)
+                if ((x->encap ? x->encap->encap_type : 0) != encap_type)
                         goto drop_unlock;
 
                 if (x->props.replay_window && xfrm_replay_check(x, seq))
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 21eb725e885f..1044b6fce0d5 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -717,7 +717,7 @@ int __init icmpv6_init(struct net_proto_family *ops)
         struct sock *sk;
         int err, i, j;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 err = sock_create_kern(PF_INET6, SOCK_RAW, IPPROTO_ICMPV6,
                                        &per_cpu(__icmpv6_socket, i));
                 if (err < 0) {
@@ -763,7 +763,7 @@ void icmpv6_cleanup(void)
 {
         int i;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 sock_release(per_cpu(__icmpv6_socket, i));
         }
         inet6_del_protocol(&icmpv6_protocol, IPPROTO_ICMPV6);
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index bb8ffb8a14c5..2ae84c961678 100644
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -23,6 +23,86 @@
 #include <net/inet6_hashtables.h>
 #include <net/ip.h>
 
+void __inet6_hash(struct inet_hashinfo *hashinfo,
+                                struct sock *sk)
+{
+        struct hlist_head *list;
+        rwlock_t *lock;
+
+        BUG_TRAP(sk_unhashed(sk));
+
+        if (sk->sk_state == TCP_LISTEN) {
+                list = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];
+                lock = &hashinfo->lhash_lock;
+                inet_listen_wlock(hashinfo);
+        } else {
+                unsigned int hash;
+                sk->sk_hash = hash = inet6_sk_ehashfn(sk);
+                hash &= (hashinfo->ehash_size - 1);
+                list = &hashinfo->ehash[hash].chain;
+                lock = &hashinfo->ehash[hash].lock;
+                write_lock(lock);
+        }
+
+        __sk_add_node(sk, list);
+        sock_prot_inc_use(sk->sk_prot);
+        write_unlock(lock);
+}
+EXPORT_SYMBOL(__inet6_hash);
+
+/*
+ * Sockets in TCP_CLOSE state are _always_ taken out of the hash, so
+ * we need not check it for TCP lookups anymore, thanks Alexey. -DaveM
+ *
+ * The sockhash lock must be held as a reader here.
+ */
+struct sock *__inet6_lookup_established(struct inet_hashinfo *hashinfo,
+                                           const struct in6_addr *saddr,
+                                           const u16 sport,
+                                           const struct in6_addr *daddr,
+                                           const u16 hnum,
+                                           const int dif)
+{
+        struct sock *sk;
+        const struct hlist_node *node;
+        const __u32 ports = INET_COMBINED_PORTS(sport, hnum);
+        /* Optimize here for direct hit, only listening connections can
+         * have wildcards anyways.
+         */
+        unsigned int hash = inet6_ehashfn(daddr, hnum, saddr, sport);
+        struct inet_ehash_bucket *head = inet_ehash_bucket(hashinfo, hash);
+
+        prefetch(head->chain.first);
+        read_lock(&head->lock);
+        sk_for_each(sk, node, &head->chain) {
+                /* For IPV6 do the cheaper port and family tests first. */
+                if (INET6_MATCH(sk, hash, saddr, daddr, ports, dif))
+                        goto hit; /* You sunk my battleship! */
+        }
+        /* Must check for a TIME_WAIT'er before going to listener hash. */
+        sk_for_each(sk, node, &(head + hashinfo->ehash_size)->chain) {
+                const struct inet_timewait_sock *tw = inet_twsk(sk);
+
+                if(*((__u32 *)&(tw->tw_dport))  == ports        &&
+                   sk->sk_family                == PF_INET6) {
+                        const struct inet6_timewait_sock *tw6 = inet6_twsk(sk);
+
+                        if (ipv6_addr_equal(&tw6->tw_v6_daddr, saddr)   &&
+                            ipv6_addr_equal(&tw6->tw_v6_rcv_saddr, daddr)       &&
+                            (!sk->sk_bound_dev_if || sk->sk_bound_dev_if == dif))
+                                goto hit;
+                }
+        }
+        read_unlock(&head->lock);
+        return NULL;
+
+hit:
+        sock_hold(sk);
+        read_unlock(&head->lock);
+        return sk;
+}
+EXPORT_SYMBOL(__inet6_lookup_established);
+
 struct sock *inet6_lookup_listener(struct inet_hashinfo *hashinfo,
                                    const struct in6_addr *daddr,
                                    const unsigned short hnum, const int dif)
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index ff9040c92556..a995796b5a57 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -519,9 +519,6 @@ ip6ip6_rcv(struct sk_buff *skb)
         struct ipv6hdr *ipv6h;
         struct ip6_tnl *t;
 
-        if (!pskb_may_pull(skb, sizeof (*ipv6h)))
-                goto discard;
-
         ipv6h = skb->nh.ipv6h;
 
         read_lock(&ip6ip6_lock);
@@ -529,8 +526,7 @@ ip6ip6_rcv(struct sk_buff *skb)
         if ((t = ip6ip6_tnl_lookup(&ipv6h->saddr, &ipv6h->daddr)) != NULL) {
                 if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) {
                         read_unlock(&ip6ip6_lock);
-                        kfree_skb(skb);
-                        return 0;
+                        goto discard;
                 }
 
                 if (!(t->parms.flags & IP6_TNL_F_CAP_RCV)) {
@@ -557,9 +553,11 @@ ip6ip6_rcv(struct sk_buff *skb)
                 return 0;
         }
         read_unlock(&ip6ip6_lock);
-        icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_ADDR_UNREACH, 0, skb->dev);
-discard:
         return 1;
+
+discard:
+        kfree_skb(skb);
+        return 0;
 }
 
 static inline struct ipv6_txoptions *create_tel(__u8 encap_limit)
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 00f3fadfcca7..05eb67def39f 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -290,7 +290,7 @@ static void ipcomp6_free_scratches(void)
         if (!scratches)
                 return;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 void *scratch = *per_cpu_ptr(scratches, i);
 
                 vfree(scratch);
@@ -313,7 +313,7 @@ static void **ipcomp6_alloc_scratches(void)
 
         ipcomp6_scratches = scratches;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 void *scratch = vmalloc(IPCOMP_SCRATCH_SIZE);
                 if (!scratch)
                         return NULL;
@@ -344,7 +344,7 @@ static void ipcomp6_free_tfms(struct crypto_tfm **tfms)
         if (!tfms)
                 return;
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 struct crypto_tfm *tfm = *per_cpu_ptr(tfms, cpu);
                 crypto_free_tfm(tfm);
         }
@@ -384,7 +384,7 @@ static struct crypto_tfm **ipcomp6_alloc_tfms(const char *alg_name)
         if (!tfms)
                 goto error;
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 struct crypto_tfm *tfm = crypto_alloc_tfm(alg_name, 0);
                 if (!tfm)
                         goto error;
diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c
index d750cfc019dc..395a417ba955 100644
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -7,6 +7,7 @@
 #include <net/ipv6.h>
 #include <net/ip6_route.h>
 #include <net/xfrm.h>
+#include <net/ip6_checksum.h>
 
 int ip6_route_me_harder(struct sk_buff *skb)
 {
@@ -54,7 +55,7 @@ struct ip6_rt_info {
         struct in6_addr saddr;
 };
 
-static void save(const struct sk_buff *skb, struct nf_info *info)
+static void nf_ip6_saveroute(const struct sk_buff *skb, struct nf_info *info)
 {
         struct ip6_rt_info *rt_info = nf_info_reroute(info);
 
@@ -66,7 +67,7 @@ static void save(const struct sk_buff *skb, struct nf_info *info)
         }
 }
 
-static int reroute(struct sk_buff **pskb, const struct nf_info *info)
+static int nf_ip6_reroute(struct sk_buff **pskb, const struct nf_info *info)
 {
         struct ip6_rt_info *rt_info = nf_info_reroute(info);
 
@@ -79,15 +80,50 @@ static int reroute(struct sk_buff **pskb, const struct nf_info *info)
         return 0;
 }
 
-static struct nf_queue_rerouter ip6_reroute = {
-        .rer_size       = sizeof(struct ip6_rt_info),
-        .save           = &save,
-        .reroute        = &reroute,
+unsigned int nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
+                             unsigned int dataoff, u_int8_t protocol)
+{
+        struct ipv6hdr *ip6h = skb->nh.ipv6h;
+        unsigned int csum = 0;
+
+        switch (skb->ip_summed) {
+        case CHECKSUM_HW:
+                if (hook != NF_IP6_PRE_ROUTING && hook != NF_IP6_LOCAL_IN)
+                        break;
+                if (!csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
+                                     skb->len - dataoff, protocol,
+                                     csum_sub(skb->csum,
+                                              skb_checksum(skb, 0,
+                                                           dataoff, 0)))) {
+                        skb->ip_summed = CHECKSUM_UNNECESSARY;
+                        break;
+                }
+                /* fall through */
+        case CHECKSUM_NONE:
+                skb->csum = ~csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
+                                             skb->len - dataoff,
+                                             protocol,
+                                             csum_sub(0,
+                                                      skb_checksum(skb, 0,
+                                                                   dataoff, 0)));
+                csum = __skb_checksum_complete(skb);
+        }
+        return csum;
+}
+
+EXPORT_SYMBOL(nf_ip6_checksum);
+
+static struct nf_afinfo nf_ip6_afinfo = {
+        .family         = AF_INET6,
+        .checksum       = nf_ip6_checksum,
+        .saveroute      = nf_ip6_saveroute,
+        .reroute        = nf_ip6_reroute,
+        .route_key_size = sizeof(struct ip6_rt_info),
 };
 
 int __init ipv6_netfilter_init(void)
 {
-        return nf_register_queue_rerouter(PF_INET6, &ip6_reroute);
+        return nf_register_afinfo(&nf_ip6_afinfo);
 }
 
 /* This can be called from inet6_init() on errors, so it cannot
@@ -95,5 +131,5 @@ int __init ipv6_netfilter_init(void)
  */
 void ipv6_netfilter_fini(void)
 {
-        nf_unregister_queue_rerouter(PF_INET6);
+        nf_unregister_afinfo(&nf_ip6_afinfo);
 }
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index e81c6a9dab81..b4b7d441af25 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -658,15 +658,11 @@ static struct nf_queue_handler nfqh = {
         .outfn  = &ipq_enqueue_packet,
 };
 
-static int
-init_or_cleanup(int init)
+static int __init ip6_queue_init(void)
 {
         int status = -ENOMEM;
         struct proc_dir_entry *proc;
         
-        if (!init)
-                goto cleanup;
-
         netlink_register_notifier(&ipq_nl_notifier);
         ipqnl = netlink_kernel_create(NETLINK_IP6_FW, 0, ipq_rcv_sk,
                                       THIS_MODULE);
@@ -693,11 +689,6 @@ init_or_cleanup(int init)
         }
         return status;
 
-cleanup:
-        nf_unregister_queue_handlers(&nfqh);
-        synchronize_net();
-        ipq_flush(NF_DROP);
-        
 cleanup_sysctl:
         unregister_sysctl_table(ipq_sysctl_header);
         unregister_netdevice_notifier(&ipq_dev_notifier);
@@ -713,15 +704,21 @@ cleanup_netlink_notifier:
         return status;
 }
 
-static int __init ip6_queue_init(void)
-{
-        
-        return init_or_cleanup(1);
-}
-
 static void __exit ip6_queue_fini(void)
 {
-        init_or_cleanup(0);
+        nf_unregister_queue_handlers(&nfqh);
+        synchronize_net();
+        ipq_flush(NF_DROP);
+
+        unregister_sysctl_table(ipq_sysctl_header);
+        unregister_netdevice_notifier(&ipq_dev_notifier);
+        proc_net_remove(IPQ_PROC_FS_NAME);
+
+        sock_release(ipqnl->sk_socket);
+        mutex_lock(&ipqnl_mutex);
+        mutex_unlock(&ipqnl_mutex);
+
+        netlink_unregister_notifier(&ipq_nl_notifier);
 }
 
 MODULE_DESCRIPTION("IPv6 packet queue handler");
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 3ecf2db841f8..642b4b11464f 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -788,7 +788,7 @@ translate_table(const char *name,
         }
 
         /* And one copy for every other CPU */
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 if (newinfo->entries[i] && newinfo->entries[i] != entry0)
                         memcpy(newinfo->entries[i], entry0, newinfo->size);
         }
@@ -841,7 +841,7 @@ get_counters(const struct xt_table_info *t,
                            counters,
                            &i);
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 if (cpu == curcpu)
                         continue;
                 i = 0;
diff --git a/net/ipv6/netfilter/ip6table_filter.c b/net/ipv6/netfilter/ip6table_filter.c
index e5e724d9ee60..60976c0c58e8 100644
--- a/net/ipv6/netfilter/ip6table_filter.c
+++ b/net/ipv6/netfilter/ip6table_filter.c
@@ -177,37 +177,20 @@ static int __init ip6table_filter_init(void)
                 return ret;
 
         /* Register hooks */
-        ret = nf_register_hook(&ip6t_ops[0]);
+        ret = nf_register_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
         if (ret < 0)
                 goto cleanup_table;
 
-        ret = nf_register_hook(&ip6t_ops[1]);
-        if (ret < 0)
-                goto cleanup_hook0;
-
-        ret = nf_register_hook(&ip6t_ops[2]);
-        if (ret < 0)
-                goto cleanup_hook1;
-
         return ret;
 
- cleanup_hook1:
-        nf_unregister_hook(&ip6t_ops[1]);
- cleanup_hook0:
-        nf_unregister_hook(&ip6t_ops[0]);
  cleanup_table:
         ip6t_unregister_table(&packet_filter);
-
         return ret;
 }
 
 static void __exit ip6table_filter_fini(void)
 {
-        unsigned int i;
-
-        for (i = 0; i < sizeof(ip6t_ops)/sizeof(struct nf_hook_ops); i++)
-                nf_unregister_hook(&ip6t_ops[i]);
-
+        nf_unregister_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
         ip6t_unregister_table(&packet_filter);
 }
 
diff --git a/net/ipv6/netfilter/ip6table_mangle.c b/net/ipv6/netfilter/ip6table_mangle.c
index e1f0f6ae9841..03a13eab1dae 100644
--- a/net/ipv6/netfilter/ip6table_mangle.c
+++ b/net/ipv6/netfilter/ip6table_mangle.c
@@ -238,49 +238,20 @@ static int __init ip6table_mangle_init(void)
                 return ret;
 
         /* Register hooks */
-        ret = nf_register_hook(&ip6t_ops[0]);
+        ret = nf_register_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
         if (ret < 0)
                 goto cleanup_table;
 
-        ret = nf_register_hook(&ip6t_ops[1]);
-        if (ret < 0)
-                goto cleanup_hook0;
-
-        ret = nf_register_hook(&ip6t_ops[2]);
-        if (ret < 0)
-                goto cleanup_hook1;
-
-        ret = nf_register_hook(&ip6t_ops[3]);
-        if (ret < 0)
-                goto cleanup_hook2;
-
-        ret = nf_register_hook(&ip6t_ops[4]);
-        if (ret < 0)
-                goto cleanup_hook3;
-
         return ret;
 
- cleanup_hook3:
-        nf_unregister_hook(&ip6t_ops[3]);
- cleanup_hook2:
-        nf_unregister_hook(&ip6t_ops[2]);
- cleanup_hook1:
-        nf_unregister_hook(&ip6t_ops[1]);
- cleanup_hook0:
-        nf_unregister_hook(&ip6t_ops[0]);
  cleanup_table:
         ip6t_unregister_table(&packet_mangler);
-
         return ret;
 }
 
 static void __exit ip6table_mangle_fini(void)
 {
-        unsigned int i;
-
-        for (i = 0; i < sizeof(ip6t_ops)/sizeof(struct nf_hook_ops); i++)
-                nf_unregister_hook(&ip6t_ops[i]);
-
+        nf_unregister_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
         ip6t_unregister_table(&packet_mangler);
 }
 
diff --git a/net/ipv6/netfilter/ip6table_raw.c b/net/ipv6/netfilter/ip6table_raw.c
index 54d1fffd62ba..61a7c58e99f8 100644
--- a/net/ipv6/netfilter/ip6table_raw.c
+++ b/net/ipv6/netfilter/ip6table_raw.c
@@ -152,31 +152,20 @@ static int __init ip6table_raw_init(void)
                 return ret;
 
         /* Register hooks */
-        ret = nf_register_hook(&ip6t_ops[0]);
+        ret = nf_register_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
         if (ret < 0)
                 goto cleanup_table;
 
-        ret = nf_register_hook(&ip6t_ops[1]);
-        if (ret < 0)
-                goto cleanup_hook0;
-
         return ret;
 
- cleanup_hook0:
-        nf_unregister_hook(&ip6t_ops[0]);
  cleanup_table:
         ip6t_unregister_table(&packet_raw);
-
         return ret;
 }
 
 static void __exit ip6table_raw_fini(void)
 {
-        unsigned int i;
-
-        for (i = 0; i < sizeof(ip6t_ops)/sizeof(struct nf_hook_ops); i++)
-                nf_unregister_hook(&ip6t_ops[i]);
-
+        nf_unregister_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
         ip6t_unregister_table(&packet_raw);
 }
 
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index c8b5a96cbb0f..93bae36f2663 100644
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -286,55 +286,49 @@ static unsigned int ipv6_conntrack_local(unsigned int hooknum,
         return ipv6_conntrack_in(hooknum, pskb, in, out, okfn);
 }
 
-/* Connection tracking may drop packets, but never alters them, so
-   make it the first hook. */
-static struct nf_hook_ops ipv6_conntrack_defrag_ops = {
-        .hook           = ipv6_defrag,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET6,
-        .hooknum        = NF_IP6_PRE_ROUTING,
-        .priority       = NF_IP6_PRI_CONNTRACK_DEFRAG,
-};
-
-static struct nf_hook_ops ipv6_conntrack_in_ops = {
-        .hook           = ipv6_conntrack_in,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET6,
-        .hooknum        = NF_IP6_PRE_ROUTING,
-        .priority       = NF_IP6_PRI_CONNTRACK,
-};
-
-static struct nf_hook_ops ipv6_conntrack_local_out_ops = {
-        .hook           = ipv6_conntrack_local,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET6,
-        .hooknum        = NF_IP6_LOCAL_OUT,
-        .priority       = NF_IP6_PRI_CONNTRACK,
-};
-
-static struct nf_hook_ops ipv6_conntrack_defrag_local_out_ops = {
-        .hook           = ipv6_defrag,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET6,
-        .hooknum        = NF_IP6_LOCAL_OUT,
-        .priority       = NF_IP6_PRI_CONNTRACK_DEFRAG,
-};
-
-/* Refragmenter; last chance. */
-static struct nf_hook_ops ipv6_conntrack_out_ops = {
-        .hook           = ipv6_confirm,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET6,
-        .hooknum        = NF_IP6_POST_ROUTING,
-        .priority       = NF_IP6_PRI_LAST,
-};
-
-static struct nf_hook_ops ipv6_conntrack_local_in_ops = {
-        .hook           = ipv6_confirm,
-        .owner          = THIS_MODULE,
-        .pf             = PF_INET6,
-        .hooknum        = NF_IP6_LOCAL_IN,
-        .priority       = NF_IP6_PRI_LAST-1,
+static struct nf_hook_ops ipv6_conntrack_ops[] = {
+        {
+                .hook           = ipv6_defrag,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET6,
+                .hooknum        = NF_IP6_PRE_ROUTING,
+                .priority       = NF_IP6_PRI_CONNTRACK_DEFRAG,
+        },
+        {
+                .hook           = ipv6_conntrack_in,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET6,
+                .hooknum        = NF_IP6_PRE_ROUTING,
+                .priority       = NF_IP6_PRI_CONNTRACK,
+        },
+        {
+                .hook           = ipv6_conntrack_local,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET6,
+                .hooknum        = NF_IP6_LOCAL_OUT,
+                .priority       = NF_IP6_PRI_CONNTRACK,
+        },
+        {
+                .hook           = ipv6_defrag,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET6,
+                .hooknum        = NF_IP6_LOCAL_OUT,
+                .priority       = NF_IP6_PRI_CONNTRACK_DEFRAG,
+        },
+        {
+                .hook           = ipv6_confirm,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET6,
+                .hooknum        = NF_IP6_POST_ROUTING,
+                .priority       = NF_IP6_PRI_LAST,
+        },
+        {
+                .hook           = ipv6_confirm,
+                .owner          = THIS_MODULE,
+                .pf             = PF_INET6,
+                .hooknum        = NF_IP6_LOCAL_IN,
+                .priority       = NF_IP6_PRI_LAST-1,
+        },
 };
 
 #ifdef CONFIG_SYSCTL
@@ -470,16 +464,21 @@ extern struct nf_conntrack_protocol nf_conntrack_protocol_udp6;
 extern struct nf_conntrack_protocol nf_conntrack_protocol_icmpv6;
 extern int nf_ct_frag6_init(void);
 extern void nf_ct_frag6_cleanup(void);
-static int init_or_cleanup(int init)
+
+MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET6));
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Yasuyuki KOZAKAI @USAGI <yasuyuki.kozakai@toshiba.co.jp>");
+
+static int __init nf_conntrack_l3proto_ipv6_init(void)
 {
         int ret = 0;
 
-        if (!init) goto cleanup;
+        need_conntrack();
 
         ret = nf_ct_frag6_init();
         if (ret < 0) {
                 printk("nf_conntrack_ipv6: can't initialize frag6.\n");
-                goto cleanup_nothing;
+                return ret;
         }
         ret = nf_conntrack_protocol_register(&nf_conntrack_protocol_tcp6);
         if (ret < 0) {
@@ -505,71 +504,27 @@ static int init_or_cleanup(int init)
                 goto cleanup_icmpv6;
         }
 
-        ret = nf_register_hook(&ipv6_conntrack_defrag_ops);
+        ret = nf_register_hooks(ipv6_conntrack_ops,
+                                ARRAY_SIZE(ipv6_conntrack_ops));
         if (ret < 0) {
                 printk("nf_conntrack_ipv6: can't register pre-routing defrag "
                        "hook.\n");
                 goto cleanup_ipv6;
         }
-
-        ret = nf_register_hook(&ipv6_conntrack_defrag_local_out_ops);
-        if (ret < 0) {
-                printk("nf_conntrack_ipv6: can't register local_out defrag "
-                       "hook.\n");
-                goto cleanup_defragops;
-        }
-
-        ret = nf_register_hook(&ipv6_conntrack_in_ops);
-        if (ret < 0) {
-                printk("nf_conntrack_ipv6: can't register pre-routing hook.\n");
-                goto cleanup_defraglocalops;
-        }
-
-        ret = nf_register_hook(&ipv6_conntrack_local_out_ops);
-        if (ret < 0) {
-                printk("nf_conntrack_ipv6: can't register local out hook.\n");
-                goto cleanup_inops;
-        }
-
-        ret = nf_register_hook(&ipv6_conntrack_out_ops);
-        if (ret < 0) {
-                printk("nf_conntrack_ipv6: can't register post-routing hook.\n");
-                goto cleanup_inandlocalops;
-        }
-
-        ret = nf_register_hook(&ipv6_conntrack_local_in_ops);
-        if (ret < 0) {
-                printk("nf_conntrack_ipv6: can't register local in hook.\n");
-                goto cleanup_inoutandlocalops;
-        }
-
 #ifdef CONFIG_SYSCTL
         nf_ct_ipv6_sysctl_header = register_sysctl_table(nf_ct_net_table, 0);
         if (nf_ct_ipv6_sysctl_header == NULL) {
                 printk("nf_conntrack: can't register to sysctl.\n");
                 ret = -ENOMEM;
-                goto cleanup_localinops;
+                goto cleanup_hooks;
         }
 #endif
         return ret;
 
- cleanup:
-        synchronize_net();
 #ifdef CONFIG_SYSCTL
-        unregister_sysctl_table(nf_ct_ipv6_sysctl_header);
- cleanup_localinops:
+ cleanup_hooks:
+        nf_unregister_hooks(ipv6_conntrack_ops, ARRAY_SIZE(ipv6_conntrack_ops));
 #endif
-        nf_unregister_hook(&ipv6_conntrack_local_in_ops);
- cleanup_inoutandlocalops:
-        nf_unregister_hook(&ipv6_conntrack_out_ops);
- cleanup_inandlocalops:
-        nf_unregister_hook(&ipv6_conntrack_local_out_ops);
- cleanup_inops:
-        nf_unregister_hook(&ipv6_conntrack_in_ops);
- cleanup_defraglocalops:
-        nf_unregister_hook(&ipv6_conntrack_defrag_local_out_ops);
- cleanup_defragops:
-        nf_unregister_hook(&ipv6_conntrack_defrag_ops);
  cleanup_ipv6:
         nf_conntrack_l3proto_unregister(&nf_conntrack_l3proto_ipv6);
  cleanup_icmpv6:
@@ -580,23 +535,21 @@ static int init_or_cleanup(int init)
         nf_conntrack_protocol_unregister(&nf_conntrack_protocol_tcp6);
  cleanup_frag6:
         nf_ct_frag6_cleanup();
- cleanup_nothing:
         return ret;
 }
 
-MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET6));
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Yasuyuki KOZAKAI @USAGI <yasuyuki.kozakai@toshiba.co.jp>");
-
-static int __init nf_conntrack_l3proto_ipv6_init(void)
-{
-        need_conntrack();
-        return init_or_cleanup(1);
-}
-
 static void __exit nf_conntrack_l3proto_ipv6_fini(void)
 {
-        init_or_cleanup(0);
+        synchronize_net();
+#ifdef CONFIG_SYSCTL
+        unregister_sysctl_table(nf_ct_ipv6_sysctl_header);
+#endif
+        nf_unregister_hooks(ipv6_conntrack_ops, ARRAY_SIZE(ipv6_conntrack_ops));
+        nf_conntrack_l3proto_unregister(&nf_conntrack_l3proto_ipv6);
+        nf_conntrack_protocol_unregister(&nf_conntrack_protocol_icmpv6);
+        nf_conntrack_protocol_unregister(&nf_conntrack_protocol_udp6);
+        nf_conntrack_protocol_unregister(&nf_conntrack_protocol_tcp6);
+        nf_ct_frag6_cleanup();
 }
 
 module_init(nf_conntrack_l3proto_ipv6_init);
diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
index 09945c333055..86c6703265d0 100644
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
@@ -233,21 +233,13 @@ icmpv6_error(struct sk_buff *skb, unsigned int dataoff,
                 return -NF_ACCEPT;
         }
 
-        if (hooknum != NF_IP6_PRE_ROUTING)
-                goto skipped;
-
-        /* Ignore it if the checksum's bogus. */
-        if (csum_ipv6_magic(&skb->nh.ipv6h->saddr, &skb->nh.ipv6h->daddr,
-                            skb->len - dataoff, IPPROTO_ICMPV6,
-                            skb_checksum(skb, dataoff,
-                                         skb->len - dataoff, 0))) {
+        if (hooknum == NF_IP6_PRE_ROUTING &&
+            nf_ip6_checksum(skb, hooknum, dataoff, IPPROTO_ICMPV6)) {
                 nf_log_packet(PF_INET6, 0, skb, NULL, NULL, NULL,
                               "nf_ct_icmpv6: ICMPv6 checksum failed\n");
                 return -NF_ACCEPT;
         }
 
-skipped:
-
         /* is not error message ? */
         if (icmp6h->icmp6_type >= 128)
                 return NF_ACCEPT;
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 4238b1ed8860..779ddf77f4d4 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -38,7 +38,7 @@ static int fold_prot_inuse(struct proto *proto)
         int res = 0;
         int cpu;
 
-        for_each_cpu(cpu)
+        for_each_possible_cpu(cpu)
                 res += proto->stats[cpu].inuse;
 
         return res;
@@ -140,7 +140,7 @@ fold_field(void *mib[], int offt)
         unsigned long res = 0;
         int i;
  
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 res += *(((unsigned long *)per_cpu_ptr(mib[0], i)) + offt);
                 res += *(((unsigned long *)per_cpu_ptr(mib[1], i)) + offt);
         }
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index c2d3e17beae6..6578c3080f47 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -397,7 +397,7 @@ static int ipip6_rcv(struct sk_buff *skb)
                 return 0;
         }
 
-        icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PROT_UNREACH, 0);
+        icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
         kfree_skb(skb);
         read_unlock(&ipip6_lock);
 out:
diff --git a/net/ipv6/tunnel6.c b/net/ipv6/tunnel6.c
index 5659b52284bd..0ef9a35798d1 100644
--- a/net/ipv6/tunnel6.c
+++ b/net/ipv6/tunnel6.c
@@ -19,11 +19,13 @@
  *              YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
  */
 
+#include <linux/icmpv6.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <net/ipv6.h>
 #include <net/protocol.h>
 #include <net/xfrm.h>
 
@@ -87,10 +89,16 @@ static int tunnel6_rcv(struct sk_buff **pskb)
         struct sk_buff *skb = *pskb;
         struct xfrm6_tunnel *handler;
 
+        if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))
+                goto drop;
+
         for (handler = tunnel6_handlers; handler; handler = handler->next)
                 if (!handler->handler(skb))
                         return 0;
 
+        icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, skb->dev);
+
+drop:
         kfree_skb(skb);
         return 0;
 }
diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index 1ceb1a6c254b..8455a32ea5c4 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -27,6 +27,29 @@
 
 #include "nf_internals.h"
 
+static DEFINE_SPINLOCK(afinfo_lock);
+
+struct nf_afinfo *nf_afinfo[NPROTO];
+EXPORT_SYMBOL(nf_afinfo);
+
+int nf_register_afinfo(struct nf_afinfo *afinfo)
+{
+        spin_lock(&afinfo_lock);
+        rcu_assign_pointer(nf_afinfo[afinfo->family], afinfo);
+        spin_unlock(&afinfo_lock);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(nf_register_afinfo);
+
+void nf_unregister_afinfo(struct nf_afinfo *afinfo)
+{
+        spin_lock(&afinfo_lock);
+        rcu_assign_pointer(nf_afinfo[afinfo->family], NULL);
+        spin_unlock(&afinfo_lock);
+        synchronize_rcu();
+}
+EXPORT_SYMBOL_GPL(nf_unregister_afinfo);
+
 /* In this code, we can be waiting indefinitely for userspace to
  * service a packet if a hook returns NF_QUEUE.  We could keep a count
  * of skbuffs queued for userspace, and not deregister a hook unless
@@ -63,6 +86,34 @@ void nf_unregister_hook(struct nf_hook_ops *reg)
 }
 EXPORT_SYMBOL(nf_unregister_hook);
 
+int nf_register_hooks(struct nf_hook_ops *reg, unsigned int n)
+{
+        unsigned int i;
+        int err = 0;
+
+        for (i = 0; i < n; i++) {
+                err = nf_register_hook(&reg[i]);
+                if (err)
+                        goto err;
+        }
+        return err;
+
+err:
+        if (i > 0)
+                nf_unregister_hooks(reg, i);
+        return err;
+}
+EXPORT_SYMBOL(nf_register_hooks);
+
+void nf_unregister_hooks(struct nf_hook_ops *reg, unsigned int n)
+{
+        unsigned int i;
+
+        for (i = 0; i < n; i++)
+                nf_unregister_hook(&reg[i]);
+}
+EXPORT_SYMBOL(nf_unregister_hooks);
+
 unsigned int nf_iterate(struct list_head *head,
                         struct sk_buff **skb,
                         int hook,
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 56389c83557c..e581190fb6c3 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -146,7 +146,7 @@ static void nf_ct_event_cache_flush(void)
         struct nf_conntrack_ecache *ecache;
         int cpu;
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 ecache = &per_cpu(nf_conntrack_ecache, cpu);
                 if (ecache->ct)
                         nf_ct_put(ecache->ct);
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index 6492ed66fb3c..69899f27d26a 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -799,8 +799,7 @@ static int tcp_error(struct sk_buff *skb,
                      unsigned int dataoff,
                      enum ip_conntrack_info *ctinfo,
                      int pf,
-                     unsigned int hooknum,
-                     int(*csum)(const struct sk_buff *,unsigned int))
+                     unsigned int hooknum)
 {
         struct tcphdr _tcph, *th;
         unsigned int tcplen = skb->len - dataoff;
@@ -830,9 +829,8 @@ static int tcp_error(struct sk_buff *skb,
          */
         /* FIXME: Source route IP option packets --RR */
         if (((pf == PF_INET && hooknum == NF_IP_PRE_ROUTING) ||
-             (pf == PF_INET6 && hooknum  == NF_IP6_PRE_ROUTING))
-            && skb->ip_summed != CHECKSUM_UNNECESSARY
-            && csum(skb, dataoff)) {
+             (pf == PF_INET6 && hooknum  == NF_IP6_PRE_ROUTING)) &&
+            nf_checksum(skb, hooknum, dataoff, IPPROTO_TCP, pf)) {
                 if (LOG_INVALID(IPPROTO_TCP))
                         nf_log_packet(pf, 0, skb, NULL, NULL, NULL,
                                   "nf_ct_tcp: bad TCP checksum ");
@@ -851,44 +849,6 @@ static int tcp_error(struct sk_buff *skb,
         return NF_ACCEPT;
 }
 
-static int csum4(const struct sk_buff *skb, unsigned int dataoff)
-{
-        return csum_tcpudp_magic(skb->nh.iph->saddr, skb->nh.iph->daddr,
-                                 skb->len - dataoff, IPPROTO_TCP,
-                                 skb->ip_summed == CHECKSUM_HW ? skb->csum
-                                 : skb_checksum(skb, dataoff,
-                                                skb->len - dataoff, 0));
-}
-
-static int csum6(const struct sk_buff *skb, unsigned int dataoff)
-{
-        return csum_ipv6_magic(&skb->nh.ipv6h->saddr, &skb->nh.ipv6h->daddr,
-                               skb->len - dataoff, IPPROTO_TCP,
-                               skb->ip_summed == CHECKSUM_HW
-                               ? csum_sub(skb->csum,
-                                          skb_checksum(skb, 0, dataoff, 0))
-                               : skb_checksum(skb, dataoff, skb->len - dataoff,
-                                              0));
-}
-
-static int tcp_error4(struct sk_buff *skb,
-                      unsigned int dataoff,
-                      enum ip_conntrack_info *ctinfo,
-                      int pf,
-                      unsigned int hooknum)
-{
-        return tcp_error(skb, dataoff, ctinfo, pf, hooknum, csum4);
-}
-
-static int tcp_error6(struct sk_buff *skb,
-                      unsigned int dataoff,
-                      enum ip_conntrack_info *ctinfo,
-                      int pf,
-                      unsigned int hooknum)
-{
-        return tcp_error(skb, dataoff, ctinfo, pf, hooknum, csum6);
-}
-
 /* Returns verdict for packet, or -1 for invalid. */
 static int tcp_packet(struct nf_conn *conntrack,
                       const struct sk_buff *skb,
@@ -1218,7 +1178,7 @@ struct nf_conntrack_protocol nf_conntrack_protocol_tcp4 =
         .print_conntrack        = tcp_print_conntrack,
         .packet                 = tcp_packet,
         .new                    = tcp_new,
-        .error                  = tcp_error4,
+        .error                  = tcp_error,
 #if defined(CONFIG_NF_CT_NETLINK) || \
     defined(CONFIG_NF_CT_NETLINK_MODULE)
         .to_nfattr              = tcp_to_nfattr,
@@ -1239,7 +1199,7 @@ struct nf_conntrack_protocol nf_conntrack_protocol_tcp6 =
         .print_conntrack        = tcp_print_conntrack,
         .packet                 = tcp_packet,
         .new                    = tcp_new,
-        .error                  = tcp_error6,
+        .error                  = tcp_error,
 #if defined(CONFIG_NF_CT_NETLINK) || \
     defined(CONFIG_NF_CT_NETLINK_MODULE)
         .to_nfattr              = tcp_to_nfattr,
diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c
index 831d206344e0..d93edbfde9e3 100644
--- a/net/netfilter/nf_conntrack_proto_udp.c
+++ b/net/netfilter/nf_conntrack_proto_udp.c
@@ -103,8 +103,7 @@ static int udp_new(struct nf_conn *conntrack, const struct sk_buff *skb,
 static int udp_error(struct sk_buff *skb, unsigned int dataoff,
                      enum ip_conntrack_info *ctinfo,
                      int pf,
-                     unsigned int hooknum,
-                     int (*csum)(const struct sk_buff *, unsigned int))
+                     unsigned int hooknum)
 {
         unsigned int udplen = skb->len - dataoff;
         struct udphdr _hdr, *hdr;
@@ -136,9 +135,8 @@ static int udp_error(struct sk_buff *skb, unsigned int dataoff,
          * and moreover root might send raw packets.
          * FIXME: Source route IP option packets --RR */
         if (((pf == PF_INET && hooknum == NF_IP_PRE_ROUTING) ||
-             (pf == PF_INET6 && hooknum == NF_IP6_PRE_ROUTING))
-            && skb->ip_summed != CHECKSUM_UNNECESSARY
-            && csum(skb, dataoff)) {
+             (pf == PF_INET6 && hooknum == NF_IP6_PRE_ROUTING)) &&
+            nf_checksum(skb, hooknum, dataoff, IPPROTO_UDP, pf)) {
                 if (LOG_INVALID(IPPROTO_UDP))
                         nf_log_packet(pf, 0, skb, NULL, NULL, NULL,
                                 "nf_ct_udp: bad UDP checksum ");
@@ -148,44 +146,6 @@ static int udp_error(struct sk_buff *skb, unsigned int dataoff,
         return NF_ACCEPT;
 }
 
-static int csum4(const struct sk_buff *skb, unsigned int dataoff)
-{
-        return csum_tcpudp_magic(skb->nh.iph->saddr, skb->nh.iph->daddr,
-                                 skb->len - dataoff, IPPROTO_UDP,
-                                 skb->ip_summed == CHECKSUM_HW ? skb->csum
-                                 : skb_checksum(skb, dataoff,
-                                                skb->len - dataoff, 0));
-}
-
-static int csum6(const struct sk_buff *skb, unsigned int dataoff)
-{
-        return csum_ipv6_magic(&skb->nh.ipv6h->saddr, &skb->nh.ipv6h->daddr,
-                               skb->len - dataoff, IPPROTO_UDP,
-                               skb->ip_summed == CHECKSUM_HW
-                               ? csum_sub(skb->csum,
-                                          skb_checksum(skb, 0, dataoff, 0))
-                               : skb_checksum(skb, dataoff, skb->len - dataoff,
-                                              0));
-}
-
-static int udp_error4(struct sk_buff *skb,
-                      unsigned int dataoff,
-                      enum ip_conntrack_info *ctinfo,
-                      int pf,
-                      unsigned int hooknum)
-{
-        return udp_error(skb, dataoff, ctinfo, pf, hooknum, csum4);
-}
-
-static int udp_error6(struct sk_buff *skb,
-                      unsigned int dataoff,
-                      enum ip_conntrack_info *ctinfo,
-                      int pf,
-                      unsigned int hooknum)
-{
-        return udp_error(skb, dataoff, ctinfo, pf, hooknum, csum6);
-}
-
 struct nf_conntrack_protocol nf_conntrack_protocol_udp4 =
 {
         .l3proto                = PF_INET,
@@ -197,7 +157,7 @@ struct nf_conntrack_protocol nf_conntrack_protocol_udp4 =
         .print_conntrack        = udp_print_conntrack,
         .packet                 = udp_packet,
         .new                    = udp_new,
-        .error                  = udp_error4,
+        .error                  = udp_error,
 #if defined(CONFIG_NF_CT_NETLINK) || \
     defined(CONFIG_NF_CT_NETLINK_MODULE)
         .tuple_to_nfattr        = nf_ct_port_tuple_to_nfattr,
@@ -216,7 +176,7 @@ struct nf_conntrack_protocol nf_conntrack_protocol_udp6 =
         .print_conntrack        = udp_print_conntrack,
         .packet                 = udp_packet,
         .new                    = udp_new,
-        .error                  = udp_error6,
+        .error                  = udp_error,
 #if defined(CONFIG_NF_CT_NETLINK) || \
     defined(CONFIG_NF_CT_NETLINK_MODULE)
         .tuple_to_nfattr        = nf_ct_port_tuple_to_nfattr,
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index c72aa3cd22e4..408960c6a544 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -649,63 +649,6 @@ static ctl_table nf_ct_net_table[] = {
 EXPORT_SYMBOL(nf_ct_log_invalid);
 #endif /* CONFIG_SYSCTL */
 
-static int init_or_cleanup(int init)
-{
-#ifdef CONFIG_PROC_FS
-        struct proc_dir_entry *proc, *proc_exp, *proc_stat;
-#endif
-        int ret = 0;
-
-        if (!init) goto cleanup;
-
-        ret = nf_conntrack_init();
-        if (ret < 0)
-                goto cleanup_nothing;
-
-#ifdef CONFIG_PROC_FS
-        proc = proc_net_fops_create("nf_conntrack", 0440, &ct_file_ops);
-        if (!proc) goto cleanup_init;
-
-        proc_exp = proc_net_fops_create("nf_conntrack_expect", 0440,
-                                        &exp_file_ops);
-        if (!proc_exp) goto cleanup_proc;
-
-        proc_stat = create_proc_entry("nf_conntrack", S_IRUGO, proc_net_stat);
-        if (!proc_stat)
-                goto cleanup_proc_exp;
-
-        proc_stat->proc_fops = &ct_cpu_seq_fops;
-        proc_stat->owner = THIS_MODULE;
-#endif
-#ifdef CONFIG_SYSCTL
-        nf_ct_sysctl_header = register_sysctl_table(nf_ct_net_table, 0);
-        if (nf_ct_sysctl_header == NULL) {
-                printk("nf_conntrack: can't register to sysctl.\n");
-                ret = -ENOMEM;
-                goto cleanup_proc_stat;
-        }
-#endif
-
-        return ret;
-
- cleanup:
-#ifdef CONFIG_SYSCTL
-        unregister_sysctl_table(nf_ct_sysctl_header);
- cleanup_proc_stat:
-#endif
-#ifdef CONFIG_PROC_FS
-        remove_proc_entry("nf_conntrack", proc_net_stat);
- cleanup_proc_exp:
-        proc_net_remove("nf_conntrack_expect");
- cleanup_proc:
-        proc_net_remove("nf_conntrack");
- cleanup_init:
-#endif /* CNFIG_PROC_FS */
-        nf_conntrack_cleanup();
- cleanup_nothing:
-        return ret;
-}
-
 int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto)
 {
         int ret = 0;
@@ -808,12 +751,66 @@ void nf_conntrack_protocol_unregister(struct nf_conntrack_protocol *proto)
 
 static int __init nf_conntrack_standalone_init(void)
 {
-        return init_or_cleanup(1);
+#ifdef CONFIG_PROC_FS
+        struct proc_dir_entry *proc, *proc_exp, *proc_stat;
+#endif
+        int ret = 0;
+
+        ret = nf_conntrack_init();
+        if (ret < 0)
+                return ret;
+
+#ifdef CONFIG_PROC_FS
+        proc = proc_net_fops_create("nf_conntrack", 0440, &ct_file_ops);
+        if (!proc) goto cleanup_init;
+
+        proc_exp = proc_net_fops_create("nf_conntrack_expect", 0440,
+                                        &exp_file_ops);
+        if (!proc_exp) goto cleanup_proc;
+
+        proc_stat = create_proc_entry("nf_conntrack", S_IRUGO, proc_net_stat);
+        if (!proc_stat)
+                goto cleanup_proc_exp;
+
+        proc_stat->proc_fops = &ct_cpu_seq_fops;
+        proc_stat->owner = THIS_MODULE;
+#endif
+#ifdef CONFIG_SYSCTL
+        nf_ct_sysctl_header = register_sysctl_table(nf_ct_net_table, 0);
+        if (nf_ct_sysctl_header == NULL) {
+                printk("nf_conntrack: can't register to sysctl.\n");
+                ret = -ENOMEM;
+                goto cleanup_proc_stat;
+        }
+#endif
+        return ret;
+
+#ifdef CONFIG_SYSCTL
+ cleanup_proc_stat:
+#endif
+#ifdef CONFIG_PROC_FS
+        remove_proc_entry("nf_conntrack", proc_net_stat);
+ cleanup_proc_exp:
+        proc_net_remove("nf_conntrack_expect");
+ cleanup_proc:
+        proc_net_remove("nf_conntrack");
+ cleanup_init:
+#endif /* CNFIG_PROC_FS */
+        nf_conntrack_cleanup();
+        return ret;
 }
 
 static void __exit nf_conntrack_standalone_fini(void)
 {
-        init_or_cleanup(0);
+#ifdef CONFIG_SYSCTL
+        unregister_sysctl_table(nf_ct_sysctl_header);
+#endif
+#ifdef CONFIG_PROC_FS
+        remove_proc_entry("nf_conntrack", proc_net_stat);
+        proc_net_remove("nf_conntrack_expect");
+        proc_net_remove("nf_conntrack");
+#endif /* CNFIG_PROC_FS */
+        nf_conntrack_cleanup();
 }
 
 module_init(nf_conntrack_standalone_init);
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index d9f0d7ef103b..ee8f70889f47 100644
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -17,7 +17,6 @@
  * for queueing and must reinject all packets it receives, no matter what.
  */
 static struct nf_queue_handler *queue_handler[NPROTO];
-static struct nf_queue_rerouter *queue_rerouter[NPROTO];
 
 static DEFINE_RWLOCK(queue_handler_lock);
 
@@ -59,32 +58,6 @@ int nf_unregister_queue_handler(int pf)
 }
 EXPORT_SYMBOL(nf_unregister_queue_handler);
 
-int nf_register_queue_rerouter(int pf, struct nf_queue_rerouter *rer)
-{
-        if (pf >= NPROTO)
-                return -EINVAL;
-
-        write_lock_bh(&queue_handler_lock);
-        rcu_assign_pointer(queue_rerouter[pf], rer);
-        write_unlock_bh(&queue_handler_lock);
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(nf_register_queue_rerouter);
-
-int nf_unregister_queue_rerouter(int pf)
-{
-        if (pf >= NPROTO)
-                return -EINVAL;
-
-        write_lock_bh(&queue_handler_lock);
-        rcu_assign_pointer(queue_rerouter[pf], NULL);
-        write_unlock_bh(&queue_handler_lock);
-        synchronize_rcu();
-        return 0;
-}
-EXPORT_SYMBOL_GPL(nf_unregister_queue_rerouter);
-
 void nf_unregister_queue_handlers(struct nf_queue_handler *qh)
 {
         int pf;
@@ -116,7 +89,7 @@ int nf_queue(struct sk_buff **skb,
         struct net_device *physindev = NULL;
         struct net_device *physoutdev = NULL;
 #endif
-        struct nf_queue_rerouter *rerouter;
+        struct nf_afinfo *afinfo;
 
         /* QUEUE == DROP if noone is waiting, to be safe. */
         read_lock(&queue_handler_lock);
@@ -126,7 +99,14 @@ int nf_queue(struct sk_buff **skb,
                 return 1;
         }
 
-        info = kmalloc(sizeof(*info)+queue_rerouter[pf]->rer_size, GFP_ATOMIC);
+        afinfo = nf_get_afinfo(pf);
+        if (!afinfo) {
+                read_unlock(&queue_handler_lock);
+                kfree_skb(*skb);
+                return 1;
+        }
+
+        info = kmalloc(sizeof(*info) + afinfo->route_key_size, GFP_ATOMIC);
         if (!info) {
                 if (net_ratelimit())
                         printk(KERN_ERR "OOM queueing packet %p\n",
@@ -158,10 +138,7 @@ int nf_queue(struct sk_buff **skb,
                 if (physoutdev) dev_hold(physoutdev);
         }
 #endif
-        rerouter = rcu_dereference(queue_rerouter[pf]);
-        if (rerouter)
-                rerouter->save(*skb, info);
-
+        afinfo->saveroute(*skb, info);
         status = queue_handler[pf]->outfn(*skb, info, queuenum,
                                           queue_handler[pf]->data);
 
@@ -190,7 +167,7 @@ void nf_reinject(struct sk_buff *skb, struct nf_info *info,
 {
         struct list_head *elem = &info->elem->list;
         struct list_head *i;
-        struct nf_queue_rerouter *rerouter;
+        struct nf_afinfo *afinfo;
 
         rcu_read_lock();
 
@@ -228,8 +205,8 @@ void nf_reinject(struct sk_buff *skb, struct nf_info *info,
         }
 
         if (verdict == NF_ACCEPT) {
-                rerouter = rcu_dereference(queue_rerouter[info->pf]);
-                if (rerouter && rerouter->reroute(&skb, info) < 0)
+                afinfo = nf_get_afinfo(info->pf);
+                if (!afinfo || afinfo->reroute(&skb, info) < 0)
                         verdict = NF_DROP;
         }
 
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 3e3f5448bacb..c60273cad778 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -1033,17 +1033,13 @@ static struct file_operations nful_file_ops = {
 
 #endif /* PROC_FS */
 
-static int
-init_or_cleanup(int init)
+static int __init nfnetlink_log_init(void)
 {
         int i, status = -ENOMEM;
 #ifdef CONFIG_PROC_FS
         struct proc_dir_entry *proc_nful;
 #endif
         
-        if (!init)
-                goto cleanup;
-
         for (i = 0; i < INSTANCE_BUCKETS; i++)
                 INIT_HLIST_HEAD(&instance_table[i]);
         
@@ -1066,30 +1062,25 @@ init_or_cleanup(int init)
                 goto cleanup_subsys;
         proc_nful->proc_fops = &nful_file_ops;
 #endif
-
         return status;
 
-cleanup:
-        nf_log_unregister_logger(&nfulnl_logger);
 #ifdef CONFIG_PROC_FS
-        remove_proc_entry("nfnetlink_log", proc_net_netfilter);
 cleanup_subsys:
-#endif
         nfnetlink_subsys_unregister(&nfulnl_subsys);
+#endif
 cleanup_netlink_notifier:
         netlink_unregister_notifier(&nfulnl_rtnl_notifier);
         return status;
 }
 
-static int __init nfnetlink_log_init(void)
-{
-        
-        return init_or_cleanup(1);
-}
-
 static void __exit nfnetlink_log_fini(void)
 {
-        init_or_cleanup(0);
+        nf_log_unregister_logger(&nfulnl_logger);
+#ifdef CONFIG_PROC_FS
+        remove_proc_entry("nfnetlink_log", proc_net_netfilter);
+#endif
+        nfnetlink_subsys_unregister(&nfulnl_subsys);
+        netlink_unregister_notifier(&nfulnl_rtnl_notifier);
 }
 
 MODULE_DESCRIPTION("netfilter userspace logging");
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index d0e62f68139f..86a4ac33de34 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -1071,17 +1071,13 @@ static struct file_operations nfqnl_file_ops = {
 
 #endif /* PROC_FS */
 
-static int
-init_or_cleanup(int init)
+static int __init nfnetlink_queue_init(void)
 {
         int i, status = -ENOMEM;
 #ifdef CONFIG_PROC_FS
         struct proc_dir_entry *proc_nfqueue;
 #endif
         
-        if (!init)
-                goto cleanup;
-
         for (i = 0; i < INSTANCE_BUCKETS; i++)
                 INIT_HLIST_HEAD(&instance_table[i]);
 
@@ -1101,31 +1097,26 @@ init_or_cleanup(int init)
 #endif
 
         register_netdevice_notifier(&nfqnl_dev_notifier);
-
         return status;
 
-cleanup:
-        nf_unregister_queue_handlers(&nfqh);
-        unregister_netdevice_notifier(&nfqnl_dev_notifier);
 #ifdef CONFIG_PROC_FS
-        remove_proc_entry("nfnetlink_queue", proc_net_netfilter);
 cleanup_subsys:
-#endif  
         nfnetlink_subsys_unregister(&nfqnl_subsys);
+#endif
 cleanup_netlink_notifier:
         netlink_unregister_notifier(&nfqnl_rtnl_notifier);
         return status;
 }
 
-static int __init nfnetlink_queue_init(void)
-{
-        
-        return init_or_cleanup(1);
-}
-
 static void __exit nfnetlink_queue_fini(void)
 {
-        init_or_cleanup(0);
+        nf_unregister_queue_handlers(&nfqh);
+        unregister_netdevice_notifier(&nfqnl_dev_notifier);
+#ifdef CONFIG_PROC_FS
+        remove_proc_entry("nfnetlink_queue", proc_net_netfilter);
+#endif
+        nfnetlink_subsys_unregister(&nfqnl_subsys);
+        netlink_unregister_notifier(&nfqnl_rtnl_notifier);
 }
 
 MODULE_DESCRIPTION("netfilter packet queue handler");
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index feb8a9e066b0..00cf0a4f4d92 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -413,7 +413,7 @@ struct xt_table_info *xt_alloc_table_info(unsigned int size)
 
         newinfo->size = size;
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 if (size <= PAGE_SIZE)
                         newinfo->entries[cpu] = kmalloc_node(size,
                                                         GFP_KERNEL,
@@ -436,7 +436,7 @@ void xt_free_table_info(struct xt_table_info *info)
 {
         int cpu;
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 if (info->size <= PAGE_SIZE)
                         kfree(info->entries[cpu]);
                 else
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index fa877f8f652c..24c348fa8922 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -66,7 +66,7 @@ static __inline__ struct tcf_police * tcf_police_lookup(u32 index)
 }
 
 #ifdef CONFIG_NET_CLS_ACT
-static int tcf_generic_walker(struct sk_buff *skb, struct netlink_callback *cb,
+static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *cb,
                               int type, struct tc_action *a)
 {
         struct tcf_police *p;
@@ -113,7 +113,7 @@ rtattr_failure:
 }
 
 static inline int
-tcf_hash_search(struct tc_action *a, u32 index)
+tcf_act_police_hash_search(struct tc_action *a, u32 index)
 {
         struct tcf_police *p = tcf_police_lookup(index);
 
@@ -387,9 +387,9 @@ static struct tc_action_ops act_police_ops = {
         .act            =       tcf_act_police,
         .dump           =       tcf_act_police_dump,
         .cleanup        =       tcf_act_police_cleanup,
-        .lookup         =       tcf_hash_search,
+        .lookup         =       tcf_act_police_hash_search,
         .init           =       tcf_act_police_locate,
-        .walk           =       tcf_generic_walker
+        .walk           =       tcf_act_police_walker
 };
 
 static int __init
diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index d47a52c303a8..5b3b0e0ae7e5 100644
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -69,7 +69,7 @@ fold_field(void *mib[], int nr)
         unsigned long res = 0;
         int i;
 
-        for_each_cpu(i) {
+        for_each_possible_cpu(i) {
                 res +=
                     *((unsigned long *) (((void *) per_cpu_ptr(mib[0], i)) +
                                          sizeof (unsigned long) * nr));
diff --git a/net/socket.c b/net/socket.c
index b807f360e02c..23898f45f713 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -119,10 +119,6 @@ static ssize_t sock_writev(struct file *file, const struct iovec *vector,
 static ssize_t sock_sendpage(struct file *file, struct page *page,
                              int offset, size_t size, loff_t *ppos, int more);
 
-extern ssize_t generic_splice_sendpage(struct inode *inode, struct file *out,
-                                size_t len, unsigned int flags);
-
-
 /*
  *      Socket files have a set of 'special' operations as well as the generic file ones. These don't appear
  *      in the operation structures but are done directly via the socketcall() multiplexor.
@@ -2136,7 +2132,7 @@ void socket_seq_show(struct seq_file *seq)
         int cpu;
         int counter = 0;
 
-        for_each_cpu(cpu)
+        for_each_possible_cpu(cpu)
                 counter += per_cpu(sockets_in_use, cpu);
 
         /* It can be negative, by the way. 8) */
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 4d7eb9e704da..d51e316c5821 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -1122,18 +1122,20 @@ svcauth_gss_release(struct svc_rqst *rqstp)
                                         integ_len))
                         BUG();
                 if (resbuf->page_len == 0
-                        && resbuf->tail[0].iov_len + RPC_MAX_AUTH_SIZE
+                        && resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE
                                 < PAGE_SIZE) {
                         BUG_ON(resbuf->tail[0].iov_len);
                         /* Use head for everything */
                         resv = &resbuf->head[0];
                 } else if (resbuf->tail[0].iov_base == NULL) {
-                        /* copied from nfsd4_encode_read */
-                        svc_take_page(rqstp);
-                        resbuf->tail[0].iov_base = page_address(rqstp
-                                        ->rq_respages[rqstp->rq_resused-1]);
-                        rqstp->rq_restailpage = rqstp->rq_resused-1;
+                        if (resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE
+                                        > PAGE_SIZE)
+                                goto out_err;
+                        resbuf->tail[0].iov_base =
+                                resbuf->head[0].iov_base
+                                + resbuf->head[0].iov_len;
                         resbuf->tail[0].iov_len = 0;
+                        rqstp->rq_restailpage = 0;
                         resv = &resbuf->tail[0];
                 } else {
                         resv = &resbuf->tail[0];
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 59620b1554e0..b0d067be7390 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -87,6 +87,11 @@ cc-ifversion = $(shell if [ $(call cc-version, $(CC)) $(1) $(2) ]; then \
 # $(Q)$(MAKE) $(build)=dir
 build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
 
+# Prefix -I with $(srctree) if it is not an absolute path
+addtree = $(if $(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1)
+# Find all -I options and call addtree
+flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
+
 # If quiet is set, only print short version of command
 cmd = @$(echo-cmd) $(cmd_$(1))
 
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 550798f57da5..2cb4935e85d1 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -99,11 +99,6 @@ __a_flags	= $(_a_flags)
 __cpp_flags     = $(_cpp_flags)
 else
 
-# Prefix -I with $(srctree) if it is not an absolute path
-addtree = $(if $(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1)
-# Find all -I options and call addtree
-flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
-
 # -I$(obj) locates generated .h files
 # $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files
 #   and locates generated .h files
diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index 75f21d843c1d..75f21d843c1d 100644..100755
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index dadfa20ffec0..dadfa20ffec0 100644..100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
index 6d411169bfa6..56b3bed1108f 100644
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -1,22 +1,55 @@
 #!/bin/bash
 # Copyright (C) Martin Schlemmer <azarah@nosferatu.za.org>
-# Released under the terms of the GNU GPL
-#
-# Generate a newline separated list of entries from the file/directory
-# supplied as an argument.
-#
-# If a file/directory is not supplied then generate a small dummy file.
+# Copyright (c) 2006           Sam Ravnborg <sam@ravnborg.org>
 #
-# The output is suitable for gen_init_cpio built from usr/gen_init_cpio.c.
+# Released under the terms of the GNU GPL
 #
+# Generate a cpio packed initramfs. It uses gen_init_cpio to generate
+# the cpio archive, and gzip to pack it.
+# The script may also be used to generate the inputfile used for gen_init_cpio
+# This script assumes that gen_init_cpio is located in usr/ directory
+
+# error out on errors
+set -e
+
+usage() {
+cat << EOF
+Usage:
+$0 [-o <file>] [-u <uid>] [-g <gid>] {-d | <cpio_source>} ...
+        -o <file>      Create gzipped initramfs file named <file> using
+                       gen_init_cpio and gzip
+        -u <uid>       User ID to map to user ID 0 (root).
+                       <uid> is only meaningful if <cpio_source>
+                       is a directory.
+        -g <gid>       Group ID to map to group ID 0 (root).
+                       <gid> is only meaningful if <cpio_source>
+                       is a directory.
+        <cpio_source>  File list or directory for cpio archive.
+                       If <cpio_source> is a .cpio file it will be used
+                       as direct input to initramfs.
+        -d             Output the default cpio list.
+
+All options except -o and -l may be repeated and are interpreted
+sequentially and immediately.  -u and -g states are preserved across
+<cpio_source> options so an explicit "-u 0 -g 0" is required
+to reset the root/group mapping.
+EOF
+}
+
+list_default_initramfs() {
+        # echo usr/kinit/kinit
+        :
+}
 
 default_initramfs() {
-        cat <<-EOF
+        cat <<-EOF >> ${output}
                 # This is a very simple, default initramfs
 
                 dir /dev 0755 0 0
                 nod /dev/console 0600 0 0 c 5 1
                 dir /root 0700 0 0
+                # file /kinit usr/kinit/kinit 0755 0 0
+                # slink /init kinit 0755 0 0
         EOF
 }
 
@@ -42,18 +75,28 @@ filetype() {
         return 0
 }
 
+list_print_mtime() {
+        :
+}
+
 print_mtime() {
-        local argv1="$1"
         local my_mtime="0"
 
-        if [ -e "${argv1}" ]; then
-                my_mtime=$(find "${argv1}" -printf "%T@\n" | sort -r | head -n 1)
+        if [ -e "$1" ]; then
+                my_mtime=$(find "$1" -printf "%T@\n" | sort -r | head -n 1)
         fi
-        
-        echo "# Last modified: ${my_mtime}"
-        echo
+
+        echo "# Last modified: ${my_mtime}" >> ${output}
+        echo "" >> ${output}
+}
+
+list_parse() {
+        echo "$1 \\"
 }
 
+# for each file print a line in following format
+# <filetype> <name> <path to file> <octal mode> <uid> <gid>
+# for links, devices etc the format differs. See gen_init_cpio for details
 parse() {
         local location="$1"
         local name="${location/${srcdir}//}"
@@ -99,80 +142,112 @@ parse() {
                         ;;
         esac
 
-        echo "${str}"
+        echo "${str}" >> ${output}
 
         return 0
 }
 
-usage() {
-        printf    "Usage:\n"
-        printf    "$0 [ [-u <root_uid>] [-g <root_gid>] [-d | <cpio_source>] ] . . .\n"
-        printf    "\n"
-        printf -- "-u <root_uid>  User ID to map to user ID 0 (root).\n"
-        printf    "               <root_uid> is only meaningful if <cpio_source>\n"
-        printf    "               is a directory.\n"
-        printf -- "-g <root_gid>  Group ID to map to group ID 0 (root).\n"
-        printf    "               <root_gid> is only meaningful if <cpio_source>\n"
-        printf    "               is a directory.\n"
-        printf    "<cpio_source>  File list or directory for cpio archive.\n"
-        printf    "               If <cpio_source> is not provided then a\n"
-        printf    "               a default list will be output.\n"
-        printf -- "-d             Output the default cpio list.  If no <cpio_source>\n"
-        printf    "               is given then the default cpio list will be output.\n"
-        printf    "\n"
-        printf    "All options may be repeated and are interpreted sequentially\n"
-        printf    "and immediately.  -u and -g states are preserved across\n"
-        printf    "<cpio_source> options so an explicit \"-u 0 -g 0\" is required\n"
-        printf    "to reset the root/group mapping.\n"
+unknown_option() {
+        printf "ERROR: unknown option \"$arg\"\n" >&2
+        printf "If the filename validly begins with '-', " >&2
+        printf "then it must be prefixed\n" >&2
+        printf "by './' so that it won't be interpreted as an option." >&2
+        printf "\n" >&2
+        usage >&2
+        exit 1
+}
+
+list_header() {
+        echo "deps_initramfs := \\"
+}
+
+header() {
+        printf "\n#####################\n# $1\n" >> ${output}
+}
+
+# process one directory (incl sub-directories)
+dir_filelist() {
+        ${dep_list}header "$1"
+
+        srcdir=$(echo "$1" | sed -e 's://*:/:g')
+        dirlist=$(find "${srcdir}" -printf "%p %m %U %G\n" 2>/dev/null)
+
+        # If $dirlist is only one line, then the directory is empty
+        if [  "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
+                ${dep_list}print_mtime "$1"
+
+                echo "${dirlist}" | \
+                while read x; do
+                        ${dep_list}parse ${x}
+                done
+        fi
 }
 
-build_list() {
-        printf "\n#####################\n# $cpio_source\n"
-
-        if [ -f "$cpio_source" ]; then
-                print_mtime "$cpio_source"
-                cat "$cpio_source"
-        elif [ -d "$cpio_source" ]; then
-                srcdir=$(echo "$cpio_source" | sed -e 's://*:/:g')
-                dirlist=$(find "${srcdir}" -printf "%p %m %U %G\n" 2>/dev/null)
-
-                # If $dirlist is only one line, then the directory is empty
-                if [  "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
-                        print_mtime "$cpio_source"
-                
-                        echo "${dirlist}" | \
-                        while read x; do
-                                parse ${x}
-                        done
+# if only one file is specified and it is .cpio file then use it direct as fs
+# if a directory is specified then add all files in given direcotry to fs
+# if a regular file is specified assume it is in gen_initramfs format
+input_file() {
+        source="$1"
+        if [ -f "$1" ]; then
+                ${dep_list}header "$1"
+                is_cpio="$(echo "$1" | sed 's/^.*\.cpio/cpio/')"
+                if [ $2 -eq 0 -a ${is_cpio} == "cpio" ]; then
+                        cpio_file=$1
+                        [ ! -z ${dep_list} ] && echo "$1"
+                        return 0
+                fi
+                if [ -z ${dep_list} ]; then
+                        print_mtime "$1" >> ${output}
+                        cat "$1"         >> ${output}
                 else
-                        # Failsafe in case directory is empty
-                        default_initramfs
+                        grep ^file "$1" | cut -d ' ' -f 3
                 fi
+        elif [ -d "$1" ]; then
+                dir_filelist "$1"
         else
-                echo "  $0: Cannot open '$cpio_source'" >&2
+                echo "  ${prog}: Cannot open '$1'" >&2
                 exit 1
         fi
 }
 
-
+prog=$0
 root_uid=0
 root_gid=0
+dep_list=
+cpio_file=
+cpio_list=
+output="/dev/stdout"
+output_file=""
 
+arg="$1"
+case "$arg" in
+        "-l")   # files included in initramfs - used by kbuild
+                dep_list="list_"
+                shift
+                ;;
+        "-o")   # generate gzipped cpio image named $1
+                shift
+                output_file="$1"
+                cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
+                output=${cpio_list}
+                shift
+                ;;
+esac
 while [ $# -gt 0 ]; do
         arg="$1"
         shift
         case "$arg" in
-                "-u")
+                "-u")   # map $1 to uid=0 (root)
                         root_uid="$1"
                         shift
                         ;;
-                "-g")
+                "-g")   # map $1 to gid=0 (root)
                         root_gid="$1"
                         shift
                         ;;
-                "-d")
+                "-d")   # display default initramfs list
                         default_list="$arg"
-                        default_initramfs
+                        ${dep_list}default_initramfs
                         ;;
                 "-h")
                         usage
@@ -181,23 +256,27 @@ while [ $# -gt 0 ]; do
                 *)
                         case "$arg" in
                                 "-"*)
-                                        printf "ERROR: unknown option \"$arg\"\n" >&2
-                                        printf "If the filename validly begins with '-', then it must be prefixed\n" >&2
-                                        printf "by './' so that it won't be interpreted as an option." >&2
-                                        printf "\n" >&2
-                                        usage >&2
-                                        exit 1
+                                        unknown_option
                                         ;;
-                                *)
-                                        cpio_source="$arg"
-                                        build_list
+                                *)      # input file/dir - process it
+                                        input_file "$arg" "$#"
                                         ;;
                         esac
                         ;;
         esac
 done
 
-# spit out the default cpio list if a source hasn't been specified
-[ -z "$cpio_source" -a -z "$default_list" ] && default_initramfs
-
+# If output_file is set we will generate cpio archive and gzip it
+# we are carefull to delete tmp files
+if [ ! -z ${output_file} ]; then
+        if [ -z ${cpio_file} ]; then
+                cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)"
+                usr/gen_init_cpio ${cpio_list} > ${cpio_tfile}
+        else
+                cpio_tfile=${cpio_file}
+        fi
+        rm ${cpio_list}
+        cat ${cpio_tfile} | gzip -f -9 - > ${output_file}
+        [ -z ${cpio_file} ] && rm ${cpio_tfile}
+fi
 exit 0
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 10eeae53d827..ae5ab981bb1d 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -63,20 +63,6 @@ static void check_stdin(void)
         }
 }
 
-static char *fgets_check_stream(char *s, int size, FILE *stream)
-{
-        char *ret = fgets(s, size, stream);
-
-        if (ret == NULL && feof(stream)) {
-                printf(_("aborted!\n\n"));
-                printf(_("Console input is closed. "));
-                printf(_("Run 'make oldconfig' to update configuration.\n\n"));
-                exit(1);
-        }
-
-        return ret;
-}
-
 static void conf_askvalue(struct symbol *sym, const char *def)
 {
         enum symbol_type type = sym_get_type(sym);
@@ -114,7 +100,7 @@ static void conf_askvalue(struct symbol *sym, const char *def)
                 check_stdin();
         case ask_all:
                 fflush(stdout);
-                fgets_check_stream(line, 128, stdin);
+                fgets(line, 128, stdin);
                 return;
         case set_default:
                 printf("%s\n", def);
@@ -328,8 +314,7 @@ static int conf_choice(struct menu *menu)
                 printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
                 def_sym = sym_get_choice_value(sym);
                 cnt = def = 0;
-                line[0] = '0';
-                line[1] = 0;
+                line[0] = 0;
                 for (child = menu->list; child; child = child->next) {
                         if (!menu_is_visible(child))
                                 continue;
@@ -370,7 +355,7 @@ static int conf_choice(struct menu *menu)
                         check_stdin();
                 case ask_all:
                         fflush(stdout);
-                        fgets_check_stream(line, 128, stdin);
+                        fgets(line, 128, stdin);
                         strip(line);
                         if (line[0] == '?') {
                                 printf("\n%s\n", menu->sym->help ?
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 1b8882ddbc74..1b5df589f3ae 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -325,7 +325,7 @@ int conf_read(const char *name)
                                 sym->flags |= e->right.sym->flags & SYMBOL_NEW;
         }
 
-        sym_change_count = conf_warnings && conf_unsaved;
+        sym_change_count = conf_warnings || conf_unsaved;
 
         return 0;
 }
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index 09512b544375..bf8052f4fd4a 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -58,8 +58,7 @@
 
 #include "dialog.h"
 
-#define ITEM_IDENT 1   /* Indent of menu entries. Fixed for all menus */
-static int menu_width;
+static int menu_width, item_x;
 
 /*
  * Print menu item
@@ -70,7 +69,7 @@ static void do_print_item(WINDOW * win, const char *item, int choice,
         int j;
         char *menu_item = malloc(menu_width + 1);
 
-        strncpy(menu_item, item, menu_width - ITEM_IDENT);
+        strncpy(menu_item, item, menu_width - item_x);
         menu_item[menu_width] = 0;
         j = first_alpha(menu_item, "YyNnMmHh");
 
@@ -87,13 +86,13 @@ static void do_print_item(WINDOW * win, const char *item, int choice,
         wclrtoeol(win);
 #endif
         wattrset(win, selected ? item_selected_attr : item_attr);
-        mvwaddstr(win, choice, ITEM_IDENT, menu_item);
+        mvwaddstr(win, choice, item_x, menu_item);
         if (hotkey) {
                 wattrset(win, selected ? tag_key_selected_attr : tag_key_attr);
-                mvwaddch(win, choice, ITEM_IDENT + j, menu_item[j]);
+                mvwaddch(win, choice, item_x + j, menu_item[j]);
         }
         if (selected) {
-                wmove(win, choice, ITEM_IDENT + 1);
+                wmove(win, choice, item_x + 1);
         }
         free(menu_item);
         wrefresh(win);
@@ -227,6 +226,8 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
         draw_box(dialog, box_y, box_x, menu_height + 2, menu_width + 2,
                  menubox_border_attr, menubox_attr);
 
+        item_x = (menu_width - 70) / 2;
+
         /* Set choice to default item */
         for (i = 0; i < item_no; i++)
                 if (strcmp(current, items[i * 2]) == 0)
@@ -263,10 +264,10 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
         wnoutrefresh(menu);
 
         print_arrows(dialog, item_no, scroll,
-                     box_y, box_x + ITEM_IDENT + 1, menu_height);
+                     box_y, box_x + item_x + 1, menu_height);
 
         print_buttons(dialog, height, width, 0);
-        wmove(menu, choice, ITEM_IDENT + 1);
+        wmove(menu, choice, item_x + 1);
         wrefresh(menu);
 
         while (key != ESC) {
@@ -349,7 +350,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,
-                                     box_y, box_x + ITEM_IDENT + 1, menu_height);
+                                     box_y, box_x + item_x + 1, menu_height);
 
                         wnoutrefresh(dialog);
                         wrefresh(menu);
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 0b92ddff26fd..7e8079a34adf 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -658,7 +658,7 @@ static void warn_sec_mismatch(const char *modname, const char *fromsec,
                 warn("%s - Section mismatch: reference to %s:%s from %s "
                      "before '%s' (at offset -0x%llx)\n",
                      modname, secname, refsymname, fromsec,
-                     elf->strtab + before->st_name,
+                     elf->strtab + after->st_name,
                      (long long)r.r_offset);
         } else {
                 warn("%s - Section mismatch: reference to %s:%s from %s "
diff --git a/scripts/namespace.pl b/scripts/namespace.pl
index f34373853ef8..f34373853ef8 100644..100755
--- a/scripts/namespace.pl
+++ b/scripts/namespace.pl
diff --git a/scripts/show_delta b/scripts/show_delta
index 48a706ab3d0c..48a706ab3d0c 100644..100755
--- a/scripts/show_delta
+++ b/scripts/show_delta
diff --git a/scripts/ver_linux b/scripts/ver_linux
index beb43ef7f761..84999f69773d 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -39,10 +39,10 @@ tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' |  awk \
 fsck.jfs -V 2>&1 | grep version | sed 's/,//' |  awk \
 'NR==1 {print "jfsutils              ", $3}'
 
-reiserfsck -V 2>&1 | grep reiserfsck | awk \
+reiserfsck -V 2>&1 | grep ^reiserfsck | awk \
 'NR==1{print "reiserfsprogs         ", $2}'
 
-fsck.reiser4 -V 2>&1 | grep fsck.reiser4 | awk \
+fsck.reiser4 -V 2>&1 | grep ^fsck.reiser4 | awk \
 'NR==1{print "reiser4progs          ", $2}'
 
 xfs_db -V 2>&1 | grep version | awk \
diff --git a/security/keys/key.c b/security/keys/key.c
index a057e3311aad..b6061fa29da7 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -785,6 +785,10 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
 
         key_check(keyring);
 
+        key_ref = ERR_PTR(-ENOTDIR);
+        if (keyring->type != &key_type_keyring)
+                goto error_2;
+
         down_write(&keyring->sem);
 
         /* if we're going to allocate a new key, we're going to have
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index d65a180f888d..bffa924c1f88 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -437,6 +437,7 @@ EXPORT_SYMBOL(keyring_search);
 /*
  * search the given keyring only (no recursion)
  * - keyring must be locked by caller
+ * - caller must guarantee that the keyring is a keyring
  */
 key_ref_t __keyring_search_one(key_ref_t keyring_ref,
                                const struct key_type *ktype,
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index f6940618e345..217a0bef3c82 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -168,11 +168,12 @@ error:
  */
 int install_process_keyring(struct task_struct *tsk)
 {
-        unsigned long flags;
         struct key *keyring;
         char buf[20];
         int ret;
 
+        might_sleep();
+
         if (!tsk->signal->process_keyring) {
                 sprintf(buf, "_pid.%u", tsk->tgid);
 
@@ -183,12 +184,12 @@ int install_process_keyring(struct task_struct *tsk)
                 }
 
                 /* attach keyring */
-                spin_lock_irqsave(&tsk->sighand->siglock, flags);
+                spin_lock_irq(&tsk->sighand->siglock);
                 if (!tsk->signal->process_keyring) {
                         tsk->signal->process_keyring = keyring;
                         keyring = NULL;
                 }
-                spin_unlock_irqrestore(&tsk->sighand->siglock, flags);
+                spin_unlock_irq(&tsk->sighand->siglock);
 
                 key_put(keyring);
         }
@@ -207,38 +208,37 @@ error:
 static int install_session_keyring(struct task_struct *tsk,
                                    struct key *keyring)
 {
-        unsigned long flags;
         struct key *old;
         char buf[20];
-        int ret;
+
+        might_sleep();
 
         /* create an empty session keyring */
         if (!keyring) {
                 sprintf(buf, "_ses.%u", tsk->tgid);
 
                 keyring = keyring_alloc(buf, tsk->uid, tsk->gid, 1, NULL);
-                if (IS_ERR(keyring)) {
-                        ret = PTR_ERR(keyring);
-                        goto error;
-                }
+                if (IS_ERR(keyring))
+                        return PTR_ERR(keyring);
         }
         else {
                 atomic_inc(&keyring->usage);
         }
 
         /* install the keyring */
-        spin_lock_irqsave(&tsk->sighand->siglock, flags);
-        old = rcu_dereference(tsk->signal->session_keyring);
+        spin_lock_irq(&tsk->sighand->siglock);
+        old = tsk->signal->session_keyring;
         rcu_assign_pointer(tsk->signal->session_keyring, keyring);
-        spin_unlock_irqrestore(&tsk->sighand->siglock, flags);
+        spin_unlock_irq(&tsk->sighand->siglock);
 
-        ret = 0;
+        /* we're using RCU on the pointer, but there's no point synchronising
+         * on it if it didn't previously point to anything */
+        if (old) {
+                synchronize_rcu();
+                key_put(old);
+        }
 
-        /* we're using RCU on the pointer */
-        synchronize_rcu();
-        key_put(old);
-error:
-        return ret;
+        return 0;
 
 } /* end install_session_keyring() */
 
@@ -311,7 +311,6 @@ void exit_keys(struct task_struct *tsk)
  */
 int exec_keys(struct task_struct *tsk)
 {
-        unsigned long flags;
         struct key *old;
 
         /* newly exec'd tasks don't get a thread keyring */
@@ -323,10 +322,10 @@ int exec_keys(struct task_struct *tsk)
         key_put(old);
 
         /* discard the process keyring from a newly exec'd task */
-        spin_lock_irqsave(&tsk->sighand->siglock, flags);
+        spin_lock_irq(&tsk->sighand->siglock);
         old = tsk->signal->process_keyring;
         tsk->signal->process_keyring = NULL;
-        spin_unlock_irqrestore(&tsk->sighand->siglock, flags);
+        spin_unlock_irq(&tsk->sighand->siglock);
 
         key_put(old);
 
diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c
index dfab6c886698..abe99d881376 100644
--- a/security/selinux/xfrm.c
+++ b/security/selinux/xfrm.c
@@ -281,7 +281,7 @@ u32 selinux_socket_getpeer_dgram(struct sk_buff *skb)
                 int i;
 
                 for (i = sp->len-1; i >= 0; i--) {
-                        struct xfrm_state *x = sp->x[i].xvec;
+                        struct xfrm_state *x = sp->xvec[i];
                         if (selinux_authorizable_xfrm(x)) {
                                 struct xfrm_sec_ctx *ctx = x->security;
                                 return ctx->ctx_sid;
@@ -314,7 +314,7 @@ int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb)
                  *  Only need to verify the existence of an authorizable sp.
                  */
                 for (i = 0; i < sp->len; i++) {
-                        struct xfrm_state *x = sp->x[i].xvec;
+                        struct xfrm_state *x = sp->xvec[i];
 
                         if (x && selinux_authorizable_xfrm(x))
                                 goto accept;
diff --git a/sound/oss/emu10k1/main.c b/sound/oss/emu10k1/main.c
index 0cd44a6f7ac0..3721c5857b90 100644
--- a/sound/oss/emu10k1/main.c
+++ b/sound/oss/emu10k1/main.c
@@ -94,6 +94,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/proc_fs.h>
+#include <linux/dma-mapping.h>
 
 #include "hwaccess.h"
 #include "8010.h"
@@ -119,7 +120,7 @@
  
 
 /* the emu10k1 _seems_ to only supports 29 bit (512MiB) bit bus master */
-#define EMU10K1_DMA_MASK                0x1fffffff      /* DMA buffer mask for pci_alloc_consist */
+#define EMU10K1_DMA_MASK DMA_29BIT_MASK /* DMA buffer mask for pci_alloc_consist */
 
 #ifndef PCI_VENDOR_ID_CREATIVE
 #define PCI_VENDOR_ID_CREATIVE 0x1102
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 37b80570a5c6..91899f87f037 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 
@@ -691,8 +692,8 @@ static int __devinit snd_als300_create(snd_card_t *card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
 
-        if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
-                pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
+        if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
+                pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
                 printk(KERN_ERR "error setting 28bit DMA mask\n");
                 pci_disable_device(pci);
                 return -ENXIO;
diff --git a/usr/Makefile b/usr/Makefile
index e2129cb570bb..19d74e6f2685 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -1,65 +1,48 @@
+#
+# kbuild file for usr/ - including initramfs image
+#
 
-obj-y := initramfs_data.o
-
-hostprogs-y  := gen_init_cpio
+klibcdirs:;
 
-clean-files := initramfs_data.cpio.gz initramfs_list
+# Generate builtin.o based on initramfs_data.o
+obj-y := initramfs_data.o
 
 # initramfs_data.o contains the initramfs_data.cpio.gz image.
 # The image is included using .incbin, a dependency which is not
 # tracked automatically.
 $(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio.gz FORCE
 
-ifdef CONFIG_INITRAMFS_ROOT_UID
-gen_initramfs_args += -u $(CONFIG_INITRAMFS_ROOT_UID)
-endif
-
-ifdef CONFIG_INITRAMFS_ROOT_GID
-gen_initramfs_args += -g $(CONFIG_INITRAMFS_ROOT_GID)
-endif
-
-# The $(shell echo $(CONFIG_INITRAMFS_SOURCE)) is to remove the
-# gratuitous begin and end quotes from the Kconfig string type.
-# Internal, escaped quotes in the Kconfig string will loose the
-# escape and become active quotes.
-quotefixed_initramfs_source := $(shell echo $(CONFIG_INITRAMFS_SOURCE))
-
-filechk_initramfs_list = $(CONFIG_SHELL) \
- $(srctree)/scripts/gen_initramfs_list.sh $(gen_initramfs_args) $(quotefixed_initramfs_source)
-
-$(obj)/initramfs_list: $(obj)/Makefile FORCE
-        $(call filechk,initramfs_list)
-
-quiet_cmd_cpio = CPIO    $@
-      cmd_cpio = ./$< $(obj)/initramfs_list > $@
-
-
-# Check if the INITRAMFS_SOURCE is a cpio archive
-ifneq (,$(findstring .cpio,$(quotefixed_initramfs_source)))
-
-# INITRAMFS_SOURCE has a cpio archive - verify that it's a single file
-ifneq (1,$(words $(quotefixed_initramfs_source)))
-$(error Only a single file may be specified in CONFIG_INITRAMFS_SOURCE (="$(quotefixed_initramfs_source)") when a cpio archive is directly specified.)
-endif
-# Now use the cpio archive directly
-initramfs_data_cpio = $(quotefixed_initramfs_source)
-targets += $(quotefixed_initramfs_source)
-
-else
-
-# INITRAMFS_SOURCE is not a cpio archive - create one
-$(obj)/initramfs_data.cpio: $(obj)/gen_init_cpio \
-                            $(initramfs-y) $(obj)/initramfs_list FORCE
-        $(call if_changed,cpio)
-
-targets += initramfs_data.cpio
-initramfs_data_cpio = $(obj)/initramfs_data.cpio
-
+#####
+# Generate the initramfs cpio archive
+
+hostprogs-y := gen_init_cpio
+initramfs   := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh
+ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \
+                    $(CONFIG_INITRAMFS_SOURCE),-d)
+ramfs-args  := \
+        $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \
+        $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID)) \
+        $(ramfs-input)
+
+# .initramfs_data.cpio.gz.d is used to identify all files included
+# in initramfs and to detect if any files are added/removed.
+# Removed files are identified by directory timestamp being updated
+# The dependency list is generated by gen_initramfs.sh -l
+ifneq ($(wildcard $(obj)/.initramfs_data.cpio.gz.d),)
+        include $(obj)/.initramfs_data.cpio.gz.d
 endif
 
-
-$(obj)/initramfs_data.cpio.gz: $(initramfs_data_cpio) FORCE
-        $(call if_changed,gzip)
-
-targets += initramfs_data.cpio.gz
+quiet_cmd_initfs = GEN     $@
+      cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
+
+targets := initramfs_data.cpio.gz
+$(deps_initramfs): klibcdirs
+# We rebuild initramfs_data.cpio.gz if:
+# 1) Any included file is newer then initramfs_data.cpio.gz
+# 2) There are changes in which files are included (added or deleted)
+# 3) If gen_init_cpio are newer than initramfs_data.cpio.gz
+# 4) arguments to gen_initramfs.sh changes
+$(obj)/initramfs_data.cpio.gz: $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
+        $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.gz.d
+        $(call if_changed,initfs)