337 files changed, 6510 insertions, 14945 deletions

diff --git a/Documentation/IPMI.txt b/Documentation/IPMI.txt
index 24dc3fcf1594..bc38283379f0 100644
--- a/Documentation/IPMI.txt
+++ b/Documentation/IPMI.txt
@@ -441,17 +441,20 @@ ACPI, and if none of those then a KCS device at the spec-specified
 0xca2.  If you want to turn this off, set the "trydefaults" option to
 false.
 
-If you have high-res timers compiled into the kernel, the driver will
-use them to provide much better performance.  Note that if you do not
-have high-res timers enabled in the kernel and you don't have
-interrupts enabled, the driver will run VERY slowly.  Don't blame me,
+If your IPMI interface does not support interrupts and is a KCS or
+SMIC interface, the IPMI driver will start a kernel thread for the
+interface to help speed things up.  This is a low-priority kernel
+thread that constantly polls the IPMI driver while an IPMI operation
+is in progress.  The force_kipmid module parameter will all the user to
+force this thread on or off.  If you force it off and don't have
+interrupts, the driver will run VERY slowly.  Don't blame me,
 these interfaces suck.
 
 The driver supports a hot add and remove of interfaces.  This way,
 interfaces can be added or removed after the kernel is up and running.
-This is done using /sys/modules/ipmi_si/hotmod, which is a write-only
-parameter.  You write a string to this interface.  The string has the
-format:
+This is done using /sys/modules/ipmi_si/parameters/hotmod, which is a
+write-only parameter.  You write a string to this interface.  The string
+has the format:
    <op1>[:op2[:op3...]]
 The "op"s are:
    add|remove,kcs|bt|smic,mem|i/o,<address>[,<opt1>[,<opt2>[,...]]]
@@ -581,9 +584,11 @@ The watchdog will panic and start a 120 second reset timeout if it
 gets a pre-action.  During a panic or a reboot, the watchdog will
 start a 120 timer if it is running to make sure the reboot occurs.
 
-Note that if you use the NMI preaction for the watchdog, you MUST
-NOT use nmi watchdog mode 1.  If you use the NMI watchdog, you
-must use mode 2.
+Note that if you use the NMI preaction for the watchdog, you MUST NOT
+use the nmi watchdog.  There is no reasonable way to tell if an NMI
+comes from the IPMI controller, so it must assume that if it gets an
+otherwise unhandled NMI, it must be from IPMI and it will panic
+immediately.
 
 Once you open the watchdog timer, you must write a 'V' character to the
 device to close it, or the timer will not stop.  This is a new semantic
diff --git a/Documentation/atomic_ops.txt b/Documentation/atomic_ops.txt
index d46306fea230..f20c10c2858f 100644
--- a/Documentation/atomic_ops.txt
+++ b/Documentation/atomic_ops.txt
@@ -418,6 +418,20 @@ brothers:
          */
          smp_mb__after_clear_bit();
 
+There are two special bitops with lock barrier semantics (acquire/release,
+same as spinlocks). These operate in the same way as their non-_lock/unlock
+postfixed variants, except that they are to provide acquire/release semantics,
+respectively. This means they can be used for bit_spin_trylock and
+bit_spin_unlock type operations without specifying any more barriers.
+
+        int test_and_set_bit_lock(unsigned long nr, unsigned long *addr);
+        void clear_bit_unlock(unsigned long nr, unsigned long *addr);
+        void __clear_bit_unlock(unsigned long nr, unsigned long *addr);
+
+The __clear_bit_unlock version is non-atomic, however it still implements
+unlock barrier semantics. This can be useful if the lock itself is protecting
+the other bits in the word.
+
 Finally, there are non-atomic versions of the bitmask operations
 provided.  They are used in contexts where some other higher-level SMP
 locking scheme is being used to protect the bitmask, and thus less
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 280ec06573e6..6b0f963f5379 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -82,6 +82,41 @@ Who:	Dominik Brodowski <linux@brodo.de>
 
 ---------------------------
 
+What:   sys_sysctl
+When:   September 2010
+Option: CONFIG_SYSCTL_SYSCALL
+Why:    The same information is available in a more convenient from
+        /proc/sys, and none of the sysctl variables appear to be
+        important performance wise.
+
+        Binary sysctls are a long standing source of subtle kernel
+        bugs and security issues.
+
+        When I looked several months ago all I could find after
+        searching several distributions were 5 user space programs and
+        glibc (which falls back to /proc/sys) using this syscall.
+
+        The man page for sysctl(2) documents it as unusable for user
+        space programs.
+
+        sysctl(2) is not generally ABI compatible to a 32bit user
+        space application on a 64bit and a 32bit kernel.
+
+        For the last several months the policy has been no new binary
+        sysctls and no one has put forward an argument to use them.
+
+        Binary sysctls issues seem to keep happening appearing so
+        properly deprecating them (with a warning to user space) and a
+        2 year grace warning period will mean eventually we can kill
+        them and end the pain.
+
+        In the mean time individual binary sysctls can be dealt with
+        in a piecewise fashion.
+
+Who:    Eric Biederman <ebiederm@xmission.com>
+
+---------------------------
+
 What:  a.out interpreter support for ELF executables
 When:  2.6.25
 Files: fs/binfmt_elf.c
@@ -184,13 +219,6 @@ Who:	Jean Delvare <khali@linux-fr.org>,
 
 ---------------------------
 
-What:  drivers depending on OBSOLETE_OSS
-When:  options in 2.6.22, code in 2.6.24
-Why:   OSS drivers with ALSA replacements
-Who:   Adrian Bunk <bunk@stusta.de>
-
----------------------------
-
 What:   ACPI procfs interface
 When:   July 2008
 Why:    ACPI sysfs conversion should be finished by January 2008.
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 98cf90f2631d..189df0bcab99 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -479,6 +479,16 @@ and is between 256 and 4096 characters. It is defined in the file
                         UART at the specified I/O port or MMIO address.
                         The options are the same as for ttyS, above.
 
+        no_console_suspend
+                        [HW] Never suspend the console
+                        Disable suspending of consoles during suspend and
+                        hibernate operations.  Once disabled, debugging
+                        messages can reach various consoles while the rest
+                        of the system is being put to sleep (ie, while
+                        debugging driver suspend/resume hooks).  This may
+                        not work reliably with all consoles, but is known
+                        to work with serial and VGA consoles.
+
         cpcihp_generic= [HW,PCI] Generic port I/O CompactPCI driver
                         Format:
                         <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt
index 650657c54733..4e17beba2379 100644
--- a/Documentation/memory-barriers.txt
+++ b/Documentation/memory-barriers.txt
@@ -1479,7 +1479,8 @@ 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:
+(smp_mb()) on each side of the actual operation (with the exception of
+explicit lock operations, described later).  These include:
 
         xchg();
         cmpxchg();
@@ -1536,10 +1537,19 @@ If they're used for constructing a lock of some description, then they probably
 do need memory barriers as a lock primitive generally has to do things in a
 specific order.
 
-
 Basically, each usage case has to be carefully considered as to whether memory
 barriers are needed or not.
 
+The following operations are special locking primitives:
+
+        test_and_set_bit_lock();
+        clear_bit_unlock();
+        __clear_bit_unlock();
+
+These implement LOCK-class and UNLOCK-class operations. These should be used in
+preference to other operations when implementing locking primitives, because
+their implementations can be optimised on many architectures.
+
 [!] 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,
diff --git a/Documentation/parport-lowlevel.txt b/Documentation/parport-lowlevel.txt
index 8f2302415eff..265fcdcb8e5f 100644
--- a/Documentation/parport-lowlevel.txt
+++ b/Documentation/parport-lowlevel.txt
@@ -25,7 +25,6 @@ Global functions:
   parport_open
   parport_close
   parport_device_id
-  parport_device_num
   parport_device_coords
   parport_find_class
   parport_find_device
@@ -735,7 +734,7 @@ NULL is returned.
 
 SEE ALSO
 
-parport_register_device, parport_device_num
+parport_register_device
 
 parport_close - unregister device for particular device number
 -------------
@@ -787,29 +786,7 @@ Many devices have ill-formed IEEE 1284 Device IDs.
 
 SEE ALSO
 
-parport_find_class, parport_find_device, parport_device_num
-
-parport_device_num - convert device coordinates to device number
-------------------
-
-SYNOPSIS
-
-#include <linux/parport.h>
-
-int parport_device_num (int parport, int mux, int daisy);
-
-DESCRIPTION
-
-Convert between device coordinates (port, multiplexor, daisy chain
-address) and device number (zero-based).
-
-RETURN VALUE
-
-Device number, or -1 if no device at given coordinates.
-
-SEE ALSO
-
-parport_device_coords, parport_open, parport_device_id
+parport_find_class, parport_find_device
 
 parport_device_coords - convert device number to device coordinates
 ------------------
@@ -833,7 +810,7 @@ Zero on success, in which case the coordinates are (*parport, *mux,
 
 SEE ALSO
 
-parport_device_num, parport_open, parport_device_id
+parport_open, parport_device_id
 
 parport_find_class - find a device by its class
 ------------------
diff --git a/Documentation/power/basic-pm-debugging.txt b/Documentation/power/basic-pm-debugging.txt
index 1a85e2b964dc..57aef2f6e0de 100644
--- a/Documentation/power/basic-pm-debugging.txt
+++ b/Documentation/power/basic-pm-debugging.txt
@@ -78,8 +78,8 @@ c) Advanced debugging
 In case the STD does not work on your system even in the minimal configuration
 and compiling more drivers as modules is not practical or some modules cannot
 be unloaded, you can use one of the more advanced debugging techniques to find
-the problem.  First, if there is a serial port in your box, you can set the
-CONFIG_DISABLE_CONSOLE_SUSPEND kernel configuration option and try to log kernel
+the problem.  First, if there is a serial port in your box, you can boot the
+kernel with the 'no_console_suspend' parameter and try to log kernel
 messages using the serial console.  This may provide you with some information
 about the reasons of the suspend (resume) failure.  Alternatively, it may be
 possible to use a FireWire port for debugging with firescope
diff --git a/Documentation/power/freezing-of-tasks.txt b/Documentation/power/freezing-of-tasks.txt
index 04dc1cf9d215..38b57248fd61 100644
--- a/Documentation/power/freezing-of-tasks.txt
+++ b/Documentation/power/freezing-of-tasks.txt
@@ -19,12 +19,13 @@ we only consider hibernation, but the description also applies to suspend).
 Namely, as the first step of the hibernation procedure the function
 freeze_processes() (defined in kernel/power/process.c) is called.  It executes
 try_to_freeze_tasks() that sets TIF_FREEZE for all of the freezable tasks and
-sends a fake signal to each of them.  A task that receives such a signal and has
-TIF_FREEZE set, should react to it by calling the refrigerator() function
-(defined in kernel/power/process.c), which sets the task's PF_FROZEN flag,
-changes its state to TASK_UNINTERRUPTIBLE and makes it loop until PF_FROZEN is
-cleared for it.  Then, we say that the task is 'frozen' and therefore the set of
-functions handling this mechanism is called 'the freezer' (these functions are
+either wakes them up, if they are kernel threads, or sends fake signals to them,
+if they are user space processes.  A task that has TIF_FREEZE set, should react
+to it by calling the function called refrigerator() (defined in
+kernel/power/process.c), which sets the task's PF_FROZEN flag, changes its state
+to TASK_UNINTERRUPTIBLE and makes it loop until PF_FROZEN is cleared for it.
+Then, we say that the task is 'frozen' and therefore the set of functions
+handling this mechanism is referred to as 'the freezer' (these functions are
 defined in kernel/power/process.c and include/linux/freezer.h).  User space
 processes are generally frozen before kernel threads.
 
@@ -35,21 +36,27 @@ task enter refrigerator() if the flag is set.
 
 For user space processes try_to_freeze() is called automatically from the
 signal-handling code, but the freezable kernel threads need to call it
-explicitly in suitable places.  The code to do this may look like the following:
+explicitly in suitable places or use the wait_event_freezable() or
+wait_event_freezable_timeout() macros (defined in include/linux/freezer.h)
+that combine interruptible sleep with checking if TIF_FREEZE is set and calling
+try_to_freeze().  The main loop of a freezable kernel thread may look like the
+following one:
 
+        set_freezable();
         do {
                 hub_events();
-                wait_event_interruptible(khubd_wait,
-                                        !list_empty(&hub_event_list));
-                try_to_freeze();
-        } while (!signal_pending(current));
+                wait_event_freezable(khubd_wait,
+                                !list_empty(&hub_event_list) ||
+                                kthread_should_stop());
+        } while (!kthread_should_stop() || !list_empty(&hub_event_list));
 
 (from drivers/usb/core/hub.c::hub_thread()).
 
 If a freezable kernel thread fails to call try_to_freeze() after the freezer has
 set TIF_FREEZE for it, the freezing of tasks will fail and the entire
 hibernation operation will be cancelled.  For this reason, freezable kernel
-threads must call try_to_freeze() somewhere.
+threads must call try_to_freeze() somewhere or use one of the
+wait_event_freezable() and wait_event_freezable_timeout() macros.
 
 After the system memory state has been restored from a hibernation image and
 devices have been reinitialized, the function thaw_processes() is called in
@@ -81,7 +88,16 @@ hibernation image has been created and before the system is finally powered off.
 The majority of these are user space processes, but if any of the kernel threads
 may cause something like this to happen, they have to be freezable.
 
-2. The second reason is to prevent user space processes and some kernel threads
+2. Next, to create the hibernation image we need to free a sufficient amount of
+memory (approximately 50% of available RAM) and we need to do that before
+devices are deactivated, because we generally need them for swapping out.  Then,
+after the memory for the image has been freed, we don't want tasks to allocate
+additional memory and we prevent them from doing that by freezing them earlier.
+[Of course, this also means that device drivers should not allocate substantial
+amounts of memory from their .suspend() callbacks before hibernation, but this
+is e separate issue.]
+
+3. The third reason is to prevent user space processes and some kernel threads
 from interfering with the suspending and resuming of devices.  A user space
 process running on a second CPU while we are suspending devices may, for
 example, be troublesome and without the freezing of tasks we would need some
@@ -111,7 +127,7 @@ frozen before the driver's .suspend() callback is executed and it will be
 thawed after the driver's .resume() callback has run, so it won't be accessing
 the device while it's suspended.
 
-3. Another reason for freezing tasks is to prevent user space processes from
+4. Another reason for freezing tasks is to prevent user space processes from
 realizing that hibernation (or suspend) operation takes place.  Ideally, user
 space processes should not notice that such a system-wide operation has occurred
 and should continue running without any problems after the restore (or resume
diff --git a/Documentation/power/interface.txt b/Documentation/power/interface.txt
index fd5192a8fa8a..e67211fe0ee2 100644
--- a/Documentation/power/interface.txt
+++ b/Documentation/power/interface.txt
@@ -20,7 +20,7 @@ states.
 /sys/power/disk controls the operating mode of the suspend-to-disk
 mechanism. Suspend-to-disk can be handled in several ways. We have a
 few options for putting the system to sleep - using the platform driver
-(e.g. ACPI or other pm_ops), powering off the system or rebooting the
+(e.g. ACPI or other suspend_ops), powering off the system or rebooting the
 system (for testing).
 
 Additionally, /sys/power/disk can be used to turn on one of the two testing
diff --git a/Documentation/sound/oss/es1371 b/Documentation/sound/oss/es1371
deleted file mode 100644
index c3151266771c..000000000000
--- a/Documentation/sound/oss/es1371
+++ /dev/null
@@ -1,64 +0,0 @@
-/proc/sound, /dev/sndstat
--------------------------
-
-/proc/sound and /dev/sndstat is not supported by the
-driver. To find out whether the driver succeeded loading,
-check the kernel log (dmesg).
-
-
-ALaw/uLaw sample formats
-------------------------
-
-This driver does not support the ALaw/uLaw sample formats.
-ALaw is the default mode when opening a sound device
-using OSS/Free. The reason for the lack of support is
-that the hardware does not support these formats, and adding
-conversion routines to the kernel would lead to very ugly
-code in the presence of the mmap interface to the driver.
-And since xquake uses mmap, mmap is considered important :-)
-and no sane application uses ALaw/uLaw these days anyway.
-In short, playing a Sun .au file as follows:
-
-cat my_file.au > /dev/dsp
-
-does not work. Instead, you may use the play script from
-Chris Bagwell's sox-12.14 package (available from the URL
-below) to play many different audio file formats.
-The script automatically determines the audio format
-and does do audio conversions if necessary.
-http://home.sprynet.com/sprynet/cbagwell/projects.html
-
-
-Blocking vs. nonblocking IO
----------------------------
-
-Unlike OSS/Free this driver honours the O_NONBLOCK file flag
-not only during open, but also during read and write.
-This is an effort to make the sound driver interface more
-regular. Timidity has problems with this; a patch
-is available from http://www.ife.ee.ethz.ch/~sailer/linux/pciaudio.html.
-(Timidity patched will also run on OSS/Free).
-
-
-MIDI UART
----------
-
-The driver supports a simple MIDI UART interface, with
-no ioctl's supported.
-
-
-MIDI synthesizer
-----------------
-
-This soundcard does not have any hardware MIDI synthesizer;
-MIDI synthesis has to be done in software. To allow this
-the driver/soundcard supports two PCM (/dev/dsp) interfaces.
-
-There is a freely available software package that allows
-MIDI file playback on this soundcard called Timidity.
-See http://www.cgs.fi/~tt/timidity/.
-
-
-
-Thomas Sailer
-t.sailer@alumni.ethz.ch
diff --git a/MAINTAINERS b/MAINTAINERS
index 10deabeb3929..2534dc4aa95a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2234,7 +2234,7 @@ S:	Supported
 KEXEC
 P:      Eric Biederman
 M:      ebiederm@xmission.com
-W:      http://www.xmission.com/~ebiederm/files/kexec/
+W:      http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
 L:      linux-kernel@vger.kernel.org
 L:      kexec@lists.infradead.org
 S:      Maintained
@@ -2940,13 +2940,6 @@ L:	linux-kernel@vger.kernel.org
 L:      linux-pci@atrey.karlin.mff.cuni.cz
 S:      Supported
 
-PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES)
-P:      Thomas Sailer
-M:      sailer@ife.ee.ethz.ch
-L:      linux-sound@vger.kernel.org
-W:      http://www.ife.ee.ethz.ch/~sailer/linux/pciaudio.html
-S:      Maintained
-
 PCI SUBSYSTEM
 P:      Greg Kroah-Hartman
 M:      gregkh@suse.de
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c
index 111a7fa5debe..5bba5255b119 100644
--- a/arch/arm/common/sharpsl_pm.c
+++ b/arch/arm/common/sharpsl_pm.c
@@ -24,6 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 #include <linux/apm-emulation.h>
+#include <linux/suspend.h>
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
@@ -765,9 +766,9 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info)
         info->battery_life = sharpsl_pm.battstat.mainbat_percent;
 }
 
-static struct pm_ops sharpsl_pm_ops = {
+static struct platform_suspend_ops sharpsl_pm_ops = {
         .enter          = corgi_pxa_pm_enter,
-        .valid          = pm_valid_only_mem,
+        .valid          = suspend_valid_only_mem,
 };
 
 static int __init sharpsl_pm_probe(struct platform_device *pdev)
@@ -799,7 +800,7 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev)
 
         apm_get_power_status = sharpsl_apm_get_power_status;
 
-        pm_set_ops(&sharpsl_pm_ops);
+        suspend_set_ops(&sharpsl_pm_ops);
 
         mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250));
 
@@ -808,7 +809,7 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev)
 
 static int sharpsl_pm_remove(struct platform_device *pdev)
 {
-        pm_set_ops(NULL);
+        suspend_set_ops(NULL);
 
         device_remove_file(&pdev->dev, &dev_attr_battery_percentage);
         device_remove_file(&pdev->dev, &dev_attr_battery_voltage);
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index ddf9184d561d..98cb61482917 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -10,10 +10,9 @@
  * (at your option) any later version.
  */
 
-#include <linux/pm.h>
+#include <linux/suspend.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
-#include <linux/pm.h>
 #include <linux/interrupt.h>
 #include <linux/sysfs.h>
 #include <linux/module.h>
@@ -199,7 +198,7 @@ error:
 }
 
 
-static struct pm_ops at91_pm_ops ={
+static struct platform_suspend_ops at91_pm_ops ={
         .valid          = at91_pm_valid_state,
         .set_target     = at91_pm_set_target,
         .enter          = at91_pm_enter,
@@ -220,7 +219,7 @@ static int __init at91_pm_init(void)
         /* Disable SDRAM low-power mode.  Cannot be used with self-refresh. */
         at91_sys_write(AT91_SDRAMC_LPR, 0);
 
-        pm_set_ops(&at91_pm_ops);
+        suspend_set_ops(&at91_pm_ops);
 
         return 0;
 }
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 089b8208de0e..3bf01e28df33 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -35,10 +35,9 @@
  * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/pm.h>
+#include <linux/suspend.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
-#include <linux/pm.h>
 #include <linux/interrupt.h>
 #include <linux/sysfs.h>
 #include <linux/module.h>
@@ -600,27 +599,15 @@ static void (*saved_idle)(void) = NULL;
 
 /*
  *      omap_pm_prepare - Do preliminary suspend work.
- *      @state:         suspend state we're entering.
  *
  */
-static int omap_pm_prepare(suspend_state_t state)
+static int omap_pm_prepare(void)
 {
-        int error = 0;
-
         /* We cannot sleep in idle until we have resumed */
         saved_idle = pm_idle;
         pm_idle = NULL;
 
-        switch (state)
-        {
-        case PM_SUSPEND_STANDBY:
-        case PM_SUSPEND_MEM:
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        return error;
+        return 0;
 }
 
 
@@ -648,16 +635,14 @@ static int omap_pm_enter(suspend_state_t state)
 
 /**
  *      omap_pm_finish - Finish up suspend sequence.
- *      @state:         State we're coming out of.
  *
  *      This is called after we wake back up (or if entering the sleep state
  *      failed).
  */
 
-static int omap_pm_finish(suspend_state_t state)
+static void omap_pm_finish(void)
 {
         pm_idle = saved_idle;
-        return 0;
 }
 
 
@@ -674,11 +659,11 @@ static struct irqaction omap_wakeup_irq = {
 
 
 
-static struct pm_ops omap_pm_ops ={
+static struct platform_suspend_ops omap_pm_ops ={
         .prepare        = omap_pm_prepare,
         .enter          = omap_pm_enter,
         .finish         = omap_pm_finish,
-        .valid          = pm_valid_only_mem,
+        .valid          = suspend_valid_only_mem,
 };
 
 static int __init omap_pm_init(void)
@@ -735,7 +720,7 @@ static int __init omap_pm_init(void)
         else if (cpu_is_omap16xx())
                 omap_writel(OMAP1610_IDLECT3_VAL, OMAP1610_IDLECT3);
 
-        pm_set_ops(&omap_pm_ops);
+        suspend_set_ops(&omap_pm_ops);
 
 #if defined(DEBUG) && defined(CONFIG_PROC_FS)
         omap_pm_init_proc();
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 6f4a5436d0ce..baf7d82b458b 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -16,10 +16,9 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/pm.h>
+#include <linux/suspend.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
-#include <linux/pm.h>
 #include <linux/interrupt.h>
 #include <linux/sysfs.h>
 #include <linux/module.h>
@@ -71,28 +70,12 @@ void omap2_pm_idle(void)
         local_irq_enable();
 }
 
-static int omap2_pm_prepare(suspend_state_t state)
+static int omap2_pm_prepare(void)
 {
-        int error = 0;
-
         /* We cannot sleep in idle until we have resumed */
         saved_idle = pm_idle;
         pm_idle = NULL;
-
-        switch (state)
-        {
-        case PM_SUSPEND_STANDBY:
-        case PM_SUSPEND_MEM:
-                break;
-
-        case PM_SUSPEND_DISK:
-                return -ENOTSUPP;
-
-        default:
-                return -EINVAL;
-        }
-
-        return error;
+        return 0;
 }
 
 #define INT0_WAKE_MASK  (OMAP_IRQ_BIT(INT_24XX_GPIO_BANK1) |    \
@@ -353,9 +336,6 @@ static int omap2_pm_enter(suspend_state_t state)
         case PM_SUSPEND_MEM:
                 ret = omap2_pm_suspend();
                 break;
-        case PM_SUSPEND_DISK:
-                ret = -ENOTSUPP;
-                break;
         default:
                 ret = -EINVAL;
         }
@@ -363,17 +343,16 @@ static int omap2_pm_enter(suspend_state_t state)
         return ret;
 }
 
-static int omap2_pm_finish(suspend_state_t state)
+static void omap2_pm_finish(void)
 {
         pm_idle = saved_idle;
-        return 0;
 }
 
-static struct pm_ops omap_pm_ops = {
+static struct platform_suspend_ops omap_pm_ops = {
         .prepare        = omap2_pm_prepare,
         .enter          = omap2_pm_enter,
         .finish         = omap2_pm_finish,
-        .valid          = pm_valid_only_mem,
+        .valid          = suspend_valid_only_mem,
 };
 
 int __init omap2_pm_init(void)
@@ -397,7 +376,7 @@ int __init omap2_pm_init(void)
         omap2_sram_suspend = omap_sram_push(omap24xx_cpu_suspend,
                                             omap24xx_cpu_suspend_sz);
 
-        pm_set_ops(&omap_pm_ops);
+        suspend_set_ops(&omap_pm_ops);
         pm_idle = omap2_pm_idle;
 
         pmdomain_init();
diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c
index 2a137f33f752..40116d254349 100644
--- a/arch/arm/mach-pnx4008/pm.c
+++ b/arch/arm/mach-pnx4008/pm.c
@@ -15,7 +15,7 @@
 #include <linux/rtc.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
-#include <linux/pm.h>
+#include <linux/suspend.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
 
@@ -117,7 +117,7 @@ static int pnx4008_pm_valid(suspend_state_t state)
                (state == PM_SUSPEND_MEM);
 }
 
-static struct pm_ops pnx4008_pm_ops = {
+static struct platform_suspend_ops pnx4008_pm_ops = {
         .enter = pnx4008_pm_enter,
         .valid = pnx4008_pm_valid,
 };
@@ -146,7 +146,7 @@ static int __init pnx4008_pm_init(void)
                 return -ENOMEM;
         }
 
-        pm_set_ops(&pnx4008_pm_ops);
+        suspend_set_ops(&pnx4008_pm_ops);
         return 0;
 }
 
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index b59a81a8e7d3..a941c71c7d06 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -86,7 +86,7 @@ static int pxa_pm_valid(suspend_state_t state)
         return -EINVAL;
 }
 
-static struct pm_ops pxa_pm_ops = {
+static struct platform_suspend_ops pxa_pm_ops = {
         .valid          = pxa_pm_valid,
         .enter          = pxa_pm_enter,
 };
@@ -104,7 +104,7 @@ static int __init pxa_pm_init(void)
                 return -ENOMEM;
         }
 
-        pm_set_ops(&pxa_pm_ops);
+        suspend_set_ops(&pxa_pm_ops);
         return 0;
 }
 
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index 0d6a72504caa..dcd81f8d0833 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -20,7 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/pm.h>
+#include <linux/suspend.h>
 
 #include <asm/hardware.h>
 #include <asm/arch/irqs.h>
@@ -215,7 +215,7 @@ static void pxa25x_cpu_pm_enter(suspend_state_t state)
 
 static struct pxa_cpu_pm_fns pxa25x_cpu_pm_fns = {
         .save_size      = SLEEP_SAVE_SIZE,
-        .valid          = pm_valid_only_mem,
+        .valid          = suspend_valid_only_mem,
         .save           = pxa25x_cpu_pm_save,
         .restore        = pxa25x_cpu_pm_restore,
         .enter          = pxa25x_cpu_pm_enter,
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 2d7fc39732e4..d0f2b597db12 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/pm.h>
+#include <linux/suspend.h>
 #include <linux/platform_device.h>
 
 #include <asm/hardware.h>
diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
index 01a37d3c0727..246c573e7252 100644
--- a/arch/arm/mach-sa1100/pm.c
+++ b/arch/arm/mach-sa1100/pm.c
@@ -122,14 +122,14 @@ unsigned long sleep_phys_sp(void *sp)
         return virt_to_phys(sp);
 }
 
-static struct pm_ops sa11x0_pm_ops = {
+static struct platform_suspend_ops sa11x0_pm_ops = {
         .enter          = sa11x0_pm_enter,
-        .valid          = pm_valid_only_mem,
+        .valid          = suspend_valid_only_mem,
 };
 
 static int __init sa11x0_pm_init(void)
 {
-        pm_set_ops(&sa11x0_pm_ops);
+        suspend_set_ops(&sa11x0_pm_ops);
         return 0;
 }
 
diff --git a/arch/arm/nwfpe/fpopcode.h b/arch/arm/nwfpe/fpopcode.h
index ec78e3517fc9..0090b19bbe61 100644
--- a/arch/arm/nwfpe/fpopcode.h
+++ b/arch/arm/nwfpe/fpopcode.h
@@ -369,20 +369,20 @@ TABLE 5
 #define getRoundingMode(opcode)         ((opcode & MASK_ROUNDING_MODE) >> 5)
 
 #ifdef CONFIG_FPE_NWFPE_XP
-static inline __attribute_pure__ floatx80 getExtendedConstant(const unsigned int nIndex)
+static inline floatx80 __pure getExtendedConstant(const unsigned int nIndex)
 {
         extern const floatx80 floatx80Constant[];
         return floatx80Constant[nIndex];
 }
 #endif
 
-static inline __attribute_pure__ float64 getDoubleConstant(const unsigned int nIndex)
+static inline float64 __pure getDoubleConstant(const unsigned int nIndex)
 {
         extern const float64 float64Constant[];
         return float64Constant[nIndex];
 }
 
-static inline __attribute_pure__ float32 getSingleConstant(const unsigned int nIndex)
+static inline float32 __pure getSingleConstant(const unsigned int nIndex)
 {
         extern const float32 float32Constant[];
         return float32Constant[nIndex];
diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c
index eab1850616d8..4fdb3117744f 100644
--- a/arch/arm/plat-s3c24xx/pm.c
+++ b/arch/arm/plat-s3c24xx/pm.c
@@ -612,9 +612,9 @@ static int s3c2410_pm_enter(suspend_state_t state)
         return 0;
 }
 
-static struct pm_ops s3c2410_pm_ops = {
+static struct platform_suspend_ops s3c2410_pm_ops = {
         .enter          = s3c2410_pm_enter,
-        .valid          = pm_valid_only_mem,
+        .valid          = suspend_valid_only_mem,
 };
 
 /* s3c2410_pm_init
@@ -628,6 +628,6 @@ int __init s3c2410_pm_init(void)
 {
         printk("S3C2410 Power Management, (c) 2004 Simtec Electronics\n");
 
-        pm_set_ops(&s3c2410_pm_ops);
+        suspend_set_ops(&s3c2410_pm_ops);
         return 0;
 }
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index b10302722202..dac51fb06f22 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -32,7 +32,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <linux/pm.h>
+#include <linux/suspend.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
 #include <linux/io.h>
@@ -89,28 +89,15 @@ void bfin_pm_suspend_standby_enter(void)
 #endif                          /* CONFIG_PM_WAKEUP_GPIO_BY_SIC_IWR */
 }
 
-
 /*
- *      bfin_pm_prepare - Do preliminary suspend work.
- *      @state:         suspend state we're entering.
+ *      bfin_pm_valid - Tell the PM core that we only support the standby sleep
+ *                      state
+ *      @state:         suspend state we're checking.
  *
  */
-static int bfin_pm_prepare(suspend_state_t state)
+static int bfin_pm_valid(suspend_state_t state)
 {
-        int error = 0;
-
-        switch (state) {
-        case PM_SUSPEND_STANDBY:
-                break;
-
-        case PM_SUSPEND_MEM:
-                return -ENOTSUPP;
-
-        default:
-                return -EINVAL;
-        }
-
-        return error;
+        return (state == PM_SUSPEND_STANDBY);
 }
 
 /*
@@ -135,44 +122,14 @@ static int bfin_pm_enter(suspend_state_t state)
         return 0;
 }
 
-/*
- *      bfin_pm_finish - Finish up suspend sequence.
- *      @state:         State we're coming out of.
- *
- *      This is called after we wake back up (or if entering the sleep state
- *      failed).
- */
-static int bfin_pm_finish(suspend_state_t state)
-{
-        switch (state) {
-        case PM_SUSPEND_STANDBY:
-                break;
-
-        case PM_SUSPEND_MEM:
-                return -ENOTSUPP;
-
-        default:
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static int bfin_pm_valid(suspend_state_t state)
-{
-        return (state == PM_SUSPEND_STANDBY);
-}
-
-struct pm_ops bfin_pm_ops = {
-        .prepare = bfin_pm_prepare,
+struct platform_suspend_ops bfin_pm_ops = {
         .enter = bfin_pm_enter,
-        .finish = bfin_pm_finish,
         .valid  = bfin_pm_valid,
 };
 
 static int __init bfin_pm_init(void)
 {
-        pm_set_ops(&bfin_pm_ops);
+        suspend_set_ops(&bfin_pm_ops);
         return 0;
 }
 
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 98cfc90cab1d..2bb84214e5f1 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -371,6 +371,11 @@ ia64_setup_printk_clock(void)
                 ia64_printk_clock = ia64_itc_printk_clock;
 }
 
+/* IA64 doesn't cache the timezone */
+void update_vsyscall_tz(void)
+{
+}
+
 void update_vsyscall(struct timespec *wall, struct clocksource *c)
 {
         unsigned long flags;
diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c
index e58fcadff2e9..a5df672d8392 100644
--- a/arch/ia64/sn/kernel/xpnet.c
+++ b/arch/ia64/sn/kernel/xpnet.c
@@ -269,8 +269,9 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
         skb->protocol = eth_type_trans(skb, xpnet_device);
         skb->ip_summed = CHECKSUM_UNNECESSARY;
 
-        dev_dbg(xpnet, "passing skb to network layer; \n\tskb->head=0x%p "
-                "skb->data=0x%p skb->tail=0x%p skb->end=0x%p skb->len=%d\n",
+        dev_dbg(xpnet, "passing skb to network layer\n"
+                KERN_DEBUG "\tskb->head=0x%p skb->data=0x%p skb->tail=0x%p "
+                "skb->end=0x%p skb->len=%d\n",
                 (void *)skb->head, (void *)skb->data, skb_tail_pointer(skb),
                 skb_end_pointer(skb), skb->len);
 
@@ -576,10 +577,10 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 msg->tailout_ignore = end_addr - (u64)skb_tail_pointer(skb);
                 msg->buf_pa = __pa(start_addr);
 
-                dev_dbg(xpnet, "sending XPC message to %d:%d\nmsg->buf_pa="
-                        "0x%lx, msg->size=%u, msg->leadin_ignore=%u, "
-                        "msg->tailout_ignore=%u\n", dest_partid,
-                        XPC_NET_CHANNEL, msg->buf_pa, msg->size,
+                dev_dbg(xpnet, "sending XPC message to %d:%d\n"
+                        KERN_DEBUG "msg->buf_pa=0x%lx, msg->size=%u, "
+                        "msg->leadin_ignore=%u, msg->tailout_ignore=%u\n",
+                        dest_partid, XPC_NET_CHANNEL, msg->buf_pa, msg->size,
                         msg->leadin_ignore, msg->tailout_ignore);
 
 
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 95b823b60c97..8e5988c4a164 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -209,7 +209,6 @@ CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 CONFIG_PM_DEBUG=y
 # CONFIG_PM_VERBOSE is not set
-# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_HIBERNATION=y
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 0ae5d57b9368..2c8e756d19a3 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -141,6 +141,7 @@ int main(void)
         DEFINE(PACALPPACAPTR, offsetof(struct paca_struct, lppaca_ptr));
         DEFINE(PACAHWCPUID, offsetof(struct paca_struct, hw_cpu_id));
         DEFINE(PACA_STARTPURR, offsetof(struct paca_struct, startpurr));
+        DEFINE(PACA_STARTSPURR, offsetof(struct paca_struct, startspurr));
         DEFINE(PACA_USER_TIME, offsetof(struct paca_struct, user_time));
         DEFINE(PACA_SYSTEM_TIME, offsetof(struct paca_struct, system_time));
         DEFINE(PACA_SLBSHADOWPTR, offsetof(struct paca_struct, slb_shadow_ptr));
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 863a5d6d9b18..9eb3284deac4 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -212,23 +212,44 @@ static u64 read_purr(void)
 }
 
 /*
+ * Read the SPURR on systems that have it, otherwise the purr
+ */
+static u64 read_spurr(u64 purr)
+{
+        if (cpu_has_feature(CPU_FTR_SPURR))
+                return mfspr(SPRN_SPURR);
+        return purr;
+}
+
+/*
  * Account time for a transition between system, hard irq
  * or soft irq state.
  */
 void account_system_vtime(struct task_struct *tsk)
 {
-        u64 now, delta;
+        u64 now, nowscaled, delta, deltascaled;
         unsigned long flags;
 
         local_irq_save(flags);
         now = read_purr();
         delta = now - get_paca()->startpurr;
         get_paca()->startpurr = now;
+        nowscaled = read_spurr(now);
+        deltascaled = nowscaled - get_paca()->startspurr;
+        get_paca()->startspurr = nowscaled;
         if (!in_interrupt()) {
+                /* deltascaled includes both user and system time.
+                 * Hence scale it based on the purr ratio to estimate
+                 * the system time */
+                deltascaled = deltascaled * get_paca()->system_time /
+                        (get_paca()->system_time + get_paca()->user_time);
                 delta += get_paca()->system_time;
                 get_paca()->system_time = 0;
         }
         account_system_time(tsk, 0, delta);
+        get_paca()->purrdelta = delta;
+        account_system_time_scaled(tsk, deltascaled);
+        get_paca()->spurrdelta = deltascaled;
         local_irq_restore(flags);
 }
 
@@ -240,11 +261,17 @@ void account_system_vtime(struct task_struct *tsk)
  */
 void account_process_vtime(struct task_struct *tsk)
 {
-        cputime_t utime;
+        cputime_t utime, utimescaled;
 
         utime = get_paca()->user_time;
         get_paca()->user_time = 0;
         account_user_time(tsk, utime);
+
+        /* Estimate the scaled utime by scaling the real utime based
+         * on the last spurr to purr ratio */
+        utimescaled = utime * get_paca()->spurrdelta / get_paca()->purrdelta;
+        get_paca()->spurrdelta = get_paca()->purrdelta = 0;
+        account_user_time_scaled(tsk, utimescaled);
 }
 
 static void account_process_time(struct pt_regs *regs)
@@ -266,6 +293,7 @@ struct cpu_purr_data {
         int     initialized;                    /* thread is running */
         u64     tb;                     /* last TB value read */
         u64     purr;                   /* last PURR value read */
+        u64     spurr;                  /* last SPURR value read */
 };
 
 /*
diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c
index f26afcd41757..ffa14aff5248 100644
--- a/arch/powerpc/platforms/52xx/lite5200_pm.c
+++ b/arch/powerpc/platforms/52xx/lite5200_pm.c
@@ -1,5 +1,5 @@
 #include <linux/init.h>
-#include <linux/pm.h>
+#include <linux/suspend.h>
 #include <asm/io.h>
 #include <asm/time.h>
 #include <asm/mpc52xx.h>
@@ -18,6 +18,8 @@ static void __iomem *sram;
 static const int sram_size = 0x4000;    /* 16 kBytes */
 static void __iomem *mbar;
 
+static suspend_state_t lite5200_pm_target_state;
+
 static int lite5200_pm_valid(suspend_state_t state)
 {
         switch (state) {
@@ -29,13 +31,22 @@ static int lite5200_pm_valid(suspend_state_t state)
         }
 }
 
-static int lite5200_pm_prepare(suspend_state_t state)
+static int lite5200_pm_set_target(suspend_state_t state)
+{
+        if (lite5200_pm_valid(state)) {
+                lite5200_pm_target_state = state;
+                return 0;
+        }
+        return -EINVAL;
+}
+
+static int lite5200_pm_prepare(void)
 {
         /* deep sleep? let mpc52xx code handle that */
-        if (state == PM_SUSPEND_STANDBY)
-                return mpc52xx_pm_prepare(state);
+        if (lite5200_pm_target_state == PM_SUSPEND_STANDBY)
+                return mpc52xx_pm_prepare();
 
-        if (state != PM_SUSPEND_MEM)
+        if (lite5200_pm_target_state != PM_SUSPEND_MEM)
                 return -EINVAL;
 
         /* map registers */
@@ -190,17 +201,16 @@ static int lite5200_pm_enter(suspend_state_t state)
         return 0;
 }
 
-static int lite5200_pm_finish(suspend_state_t state)
+static void lite5200_pm_finish(void)
 {
         /* deep sleep? let mpc52xx code handle that */
-        if (state == PM_SUSPEND_STANDBY) {
-                return mpc52xx_pm_finish(state);
-        }
-        return 0;
+        if (lite5200_pm_target_state == PM_SUSPEND_STANDBY)
+                mpc52xx_pm_finish();
 }
 
-static struct pm_ops lite5200_pm_ops = {
+static struct platform_suspend_ops lite5200_pm_ops = {
         .valid          = lite5200_pm_valid,
+        .set_target     = lite5200_pm_set_target,
         .prepare        = lite5200_pm_prepare,
         .enter          = lite5200_pm_enter,
         .finish         = lite5200_pm_finish,
@@ -208,6 +218,6 @@ static struct pm_ops lite5200_pm_ops = {
 
 int __init lite5200_pm_init(void)
 {
-        pm_set_ops(&lite5200_pm_ops);
+        suspend_set_ops(&lite5200_pm_ops);
         return 0;
 }
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pm.c b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
index ee2e7639c63e..7ffa7babf254 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
@@ -1,5 +1,5 @@
 #include <linux/init.h>
-#include <linux/pm.h>
+#include <linux/suspend.h>
 #include <linux/io.h>
 #include <asm/time.h>
 #include <asm/cacheflush.h>
@@ -57,11 +57,8 @@ int mpc52xx_set_wakeup_gpio(u8 pin, u8 level)
         return 0;
 }
 
-int mpc52xx_pm_prepare(suspend_state_t state)
+int mpc52xx_pm_prepare(void)
 {
-        if (state != PM_SUSPEND_STANDBY)
-                return -EINVAL;
-
         /* map the whole register space */
         mbar = mpc52xx_find_and_map("mpc5200");
         if (!mbar) {
@@ -166,18 +163,16 @@ int mpc52xx_pm_enter(suspend_state_t state)
         return 0;
 }
 
-int mpc52xx_pm_finish(suspend_state_t state)
+void mpc52xx_pm_finish(void)
 {
         /* call board resume code */
         if (mpc52xx_suspend.board_resume_finish)
                 mpc52xx_suspend.board_resume_finish(mbar);
 
         iounmap(mbar);
-
-        return 0;
 }
 
-static struct pm_ops mpc52xx_pm_ops = {
+static struct platform_suspend_ops mpc52xx_pm_ops = {
         .valid          = mpc52xx_pm_valid,
         .prepare        = mpc52xx_pm_prepare,
         .enter          = mpc52xx_pm_enter,
@@ -186,6 +181,6 @@ static struct pm_ops mpc52xx_pm_ops = {
 
 int __init mpc52xx_pm_init(void)
 {
-        pm_set_ops(&mpc52xx_pm_ops);
+        suspend_set_ops(&mpc52xx_pm_ops);
         return 0;
 }
diff --git a/arch/sh/boards/hp6xx/pm.c b/arch/sh/boards/hp6xx/pm.c
index 8143d1b948e7..d22f6eac9cca 100644
--- a/arch/sh/boards/hp6xx/pm.c
+++ b/arch/sh/boards/hp6xx/pm.c
@@ -67,14 +67,14 @@ static int hp6x0_pm_enter(suspend_state_t state)
         return 0;
 }
 
-static struct pm_ops hp6x0_pm_ops = {
+static struct platform_suspend_ops hp6x0_pm_ops = {
         .enter          = hp6x0_pm_enter,
-        .valid          = pm_valid_only_mem,
+        .valid          = suspend_valid_only_mem,
 };
 
 static int __init hp6x0_pm_init(void)
 {
-        pm_set_ops(&hp6x0_pm_ops);
+        suspend_set_ops(&hp6x0_pm_ops);
         return 0;
 }
 
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c
index fb2caef79cec..3ea000d15e3a 100644
--- a/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
@@ -585,24 +585,6 @@ static int __init of_debug(char *str)
 
 __setup("of_debug=", of_debug);
 
-int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
-{
-        /* initialize common driver fields */
-        if (!drv->driver.name)
-                drv->driver.name = drv->name;
-        if (!drv->driver.owner)
-                drv->driver.owner = drv->owner;
-        drv->driver.bus = bus;
-
-        /* register with core */
-        return driver_register(&drv->driver);
-}
-
-void of_unregister_driver(struct of_platform_driver *drv)
-{
-        driver_unregister(&drv->driver);
-}
-
 struct of_device* of_platform_device_create(struct device_node *np,
                                             const char *bus_id,
                                             struct device *parent,
@@ -628,6 +610,4 @@ struct of_device* of_platform_device_create(struct device_node *np,
         return dev;
 }
 
-EXPORT_SYMBOL(of_register_driver);
-EXPORT_SYMBOL(of_unregister_driver);
 EXPORT_SYMBOL(of_platform_device_create);
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index f3922e5a89f6..2c3bea228159 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -877,7 +877,7 @@ void __cpuinit sun4v_register_mondo_queues(int this_cpu)
 static void __init alloc_one_mondo(unsigned long *pa_ptr, unsigned long qmask)
 {
         unsigned long size = PAGE_ALIGN(qmask + 1);
-        void *p = __alloc_bootmem_low(size, size, 0);
+        void *p = __alloc_bootmem(size, size, 0);
         if (!p) {
                 prom_printf("SUN4V: Error, cannot allocate mondo queue.\n");
                 prom_halt();
@@ -889,7 +889,7 @@ static void __init alloc_one_mondo(unsigned long *pa_ptr, unsigned long qmask)
 static void __init alloc_one_kbuf(unsigned long *pa_ptr, unsigned long qmask)
 {
         unsigned long size = PAGE_ALIGN(qmask + 1);
-        void *p = __alloc_bootmem_low(size, size, 0);
+        void *p = __alloc_bootmem(size, size, 0);
 
         if (!p) {
                 prom_printf("SUN4V: Error, cannot allocate kbuf page.\n");
@@ -906,7 +906,7 @@ static void __init init_cpu_send_mondo_info(struct trap_per_cpu *tb)
 
         BUILD_BUG_ON((NR_CPUS * sizeof(u16)) > (PAGE_SIZE - 64));
 
-        page = alloc_bootmem_low_pages(PAGE_SIZE);
+        page = alloc_bootmem_pages(PAGE_SIZE);
         if (!page) {
                 prom_printf("SUN4V: Error, cannot allocate cpu mondo page.\n");
                 prom_halt();
@@ -953,7 +953,7 @@ void __init init_IRQ(void)
         kill_prom_timer();
 
         size = sizeof(struct ino_bucket) * NUM_IVECS;
-        ivector_table = alloc_bootmem_low(size);
+        ivector_table = alloc_bootmem(size);
         if (!ivector_table) {
                 prom_printf("Fatal error, cannot allocate ivector_table\n");
                 prom_halt();
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index 42d779866fba..fc5c0cc793b8 100644
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
@@ -869,26 +869,6 @@ static int __init of_debug(char *str)
 
 __setup("of_debug=", of_debug);
 
-int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
-{
-        /* initialize common driver fields */
-        if (!drv->driver.name)
-                drv->driver.name = drv->name;
-        if (!drv->driver.owner)
-                drv->driver.owner = drv->owner;
-        drv->driver.bus = bus;
-
-        /* register with core */
-        return driver_register(&drv->driver);
-}
-EXPORT_SYMBOL(of_register_driver);
-
-void of_unregister_driver(struct of_platform_driver *drv)
-{
-        driver_unregister(&drv->driver);
-}
-EXPORT_SYMBOL(of_unregister_driver);
-
 struct of_device* of_platform_device_create(struct device_node *np,
                                             const char *bus_id,
                                             struct device *parent,
diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c
index c76bfbb7da08..923e0bcc3bfd 100644
--- a/arch/sparc64/kernel/pci_common.c
+++ b/arch/sparc64/kernel/pci_common.c
@@ -396,6 +396,13 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
 
         saw_mem = saw_io = 0;
         pbm_ranges = of_get_property(pbm->prom_node, "ranges", &i);
+        if (!pbm_ranges) {
+                prom_printf("PCI: Fatal error, missing PBM ranges property "
+                            " for %s\n",
+                            pbm->name);
+                prom_halt();
+        }
+
         num_pbm_ranges = i / sizeof(*pbm_ranges);
 
         for (i = 0; i < num_pbm_ranges; i++) {
diff --git a/arch/sparc64/lib/atomic.S b/arch/sparc64/lib/atomic.S
index 9633750167d0..70ac4186f62b 100644
--- a/arch/sparc64/lib/atomic.S
+++ b/arch/sparc64/lib/atomic.S
@@ -1,10 +1,10 @@
-/* $Id: atomic.S,v 1.4 2001/11/18 00:12:56 davem Exp $
- * atomic.S: These things are too big to do inline.
+/* atomic.S: These things are too big to do inline.
  *
- * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1999, 2007 David S. Miller (davem@davemloft.net)
  */
 
 #include <asm/asi.h>
+#include <asm/backoff.h>
 
         .text
 
@@ -16,27 +16,31 @@
         .globl  atomic_add
         .type   atomic_add,#function
 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
+        BACKOFF_SETUP(%o2)
 1:      lduw    [%o1], %g1
         add     %g1, %o0, %g7
         cas     [%o1], %g1, %g7
         cmp     %g1, %g7
-        bne,pn  %icc, 1b
+        bne,pn  %icc, 2f
          nop
         retl
          nop
+2:      BACKOFF_SPIN(%o2, %o3, 1b)
         .size   atomic_add, .-atomic_add
 
         .globl  atomic_sub
         .type   atomic_sub,#function
 atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
+        BACKOFF_SETUP(%o2)
 1:      lduw    [%o1], %g1
         sub     %g1, %o0, %g7
         cas     [%o1], %g1, %g7
         cmp     %g1, %g7
-        bne,pn  %icc, 1b
+        bne,pn  %icc, 2f
          nop
         retl
          nop
+2:      BACKOFF_SPIN(%o2, %o3, 1b)
         .size   atomic_sub, .-atomic_sub
 
         /* On SMP we need to use memory barriers to ensure
@@ -60,89 +64,101 @@ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
         .globl  atomic_add_ret
         .type   atomic_add_ret,#function
 atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
+        BACKOFF_SETUP(%o2)
         ATOMIC_PRE_BARRIER
 1:      lduw    [%o1], %g1
         add     %g1, %o0, %g7
         cas     [%o1], %g1, %g7
         cmp     %g1, %g7
-        bne,pn  %icc, 1b
+        bne,pn  %icc, 2f
          add    %g7, %o0, %g7
         sra     %g7, 0, %o0
         ATOMIC_POST_BARRIER
         retl
          nop
+2:      BACKOFF_SPIN(%o2, %o3, 1b)
         .size   atomic_add_ret, .-atomic_add_ret
 
         .globl  atomic_sub_ret
         .type   atomic_sub_ret,#function
 atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
+        BACKOFF_SETUP(%o2)
         ATOMIC_PRE_BARRIER
 1:      lduw    [%o1], %g1
         sub     %g1, %o0, %g7
         cas     [%o1], %g1, %g7
         cmp     %g1, %g7
-        bne,pn  %icc, 1b
+        bne,pn  %icc, 2f
          sub    %g7, %o0, %g7
         sra     %g7, 0, %o0
         ATOMIC_POST_BARRIER
         retl
          nop
+2:      BACKOFF_SPIN(%o2, %o3, 1b)
         .size   atomic_sub_ret, .-atomic_sub_ret
 
         .globl  atomic64_add
         .type   atomic64_add,#function
 atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
+        BACKOFF_SETUP(%o2)
 1:      ldx     [%o1], %g1
         add     %g1, %o0, %g7
         casx    [%o1], %g1, %g7
         cmp     %g1, %g7
-        bne,pn  %xcc, 1b
+        bne,pn  %xcc, 2f
          nop
         retl
          nop
+2:      BACKOFF_SPIN(%o2, %o3, 1b)
         .size   atomic64_add, .-atomic64_add
 
         .globl  atomic64_sub
         .type   atomic64_sub,#function
 atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
+        BACKOFF_SETUP(%o2)
 1:      ldx     [%o1], %g1
         sub     %g1, %o0, %g7
         casx    [%o1], %g1, %g7
         cmp     %g1, %g7
-        bne,pn  %xcc, 1b
+        bne,pn  %xcc, 2f
          nop
         retl
          nop
+2:      BACKOFF_SPIN(%o2, %o3, 1b)
         .size   atomic64_sub, .-atomic64_sub
 
         .globl  atomic64_add_ret
         .type   atomic64_add_ret,#function
 atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
+        BACKOFF_SETUP(%o2)
         ATOMIC_PRE_BARRIER
 1:      ldx     [%o1], %g1
         add     %g1, %o0, %g7
         casx    [%o1], %g1, %g7
         cmp     %g1, %g7
-        bne,pn  %xcc, 1b
+        bne,pn  %xcc, 2f
          add    %g7, %o0, %g7
         mov     %g7, %o0
         ATOMIC_POST_BARRIER
         retl
          nop
+2:      BACKOFF_SPIN(%o2, %o3, 1b)
         .size   atomic64_add_ret, .-atomic64_add_ret
 
         .globl  atomic64_sub_ret
         .type   atomic64_sub_ret,#function
 atomic64_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
+        BACKOFF_SETUP(%o2)
         ATOMIC_PRE_BARRIER
 1:      ldx     [%o1], %g1
         sub     %g1, %o0, %g7
         casx    [%o1], %g1, %g7
         cmp     %g1, %g7
-        bne,pn  %xcc, 1b
+        bne,pn  %xcc, 2f
          sub    %g7, %o0, %g7
         mov     %g7, %o0
         ATOMIC_POST_BARRIER
         retl
          nop
+2:      BACKOFF_SPIN(%o2, %o3, 1b)
         .size   atomic64_sub_ret, .-atomic64_sub_ret
diff --git a/arch/sparc64/lib/bitops.S b/arch/sparc64/lib/bitops.S
index 892431a82131..6b015a6eefb5 100644
--- a/arch/sparc64/lib/bitops.S
+++ b/arch/sparc64/lib/bitops.S
@@ -1,10 +1,10 @@
-/* $Id: bitops.S,v 1.3 2001/11/18 00:12:56 davem Exp $
- * bitops.S: Sparc64 atomic bit operations.
+/* bitops.S: Sparc64 atomic bit operations.
  *
- * Copyright (C) 2000 David S. Miller (davem@redhat.com)
+ * Copyright (C) 2000, 2007 David S. Miller (davem@davemloft.net)
  */
 
 #include <asm/asi.h>
+#include <asm/backoff.h>
 
         .text
 
@@ -29,6 +29,7 @@
         .globl  test_and_set_bit
         .type   test_and_set_bit,#function
 test_and_set_bit:       /* %o0=nr, %o1=addr */
+        BACKOFF_SETUP(%o3)
         BITOP_PRE_BARRIER
         srlx    %o0, 6, %g1
         mov     1, %o2
@@ -40,18 +41,20 @@ test_and_set_bit:	/* %o0=nr, %o1=addr */
         or      %g7, %o2, %g1
         casx    [%o1], %g7, %g1
         cmp     %g7, %g1
-        bne,pn  %xcc, 1b
+        bne,pn  %xcc, 2f
          and    %g7, %o2, %g2
         clr     %o0
         movrne  %g2, 1, %o0
         BITOP_POST_BARRIER
         retl
          nop
+2:      BACKOFF_SPIN(%o3, %o4, 1b)
         .size   test_and_set_bit, .-test_and_set_bit
 
         .globl  test_and_clear_bit
         .type   test_and_clear_bit,#function
 test_and_clear_bit:     /* %o0=nr, %o1=addr */
+        BACKOFF_SETUP(%o3)
         BITOP_PRE_BARRIER
         srlx    %o0, 6, %g1
         mov     1, %o2
@@ -63,18 +66,20 @@ test_and_clear_bit:	/* %o0=nr, %o1=addr */
         andn    %g7, %o2, %g1
         casx    [%o1], %g7, %g1
         cmp     %g7, %g1
-        bne,pn  %xcc, 1b
+        bne,pn  %xcc, 2f
          and    %g7, %o2, %g2
         clr     %o0
         movrne  %g2, 1, %o0
         BITOP_POST_BARRIER
         retl
          nop
+2:      BACKOFF_SPIN(%o3, %o4, 1b)
         .size   test_and_clear_bit, .-test_and_clear_bit
 
         .globl  test_and_change_bit
         .type   test_and_change_bit,#function
 test_and_change_bit:    /* %o0=nr, %o1=addr */
+        BACKOFF_SETUP(%o3)
         BITOP_PRE_BARRIER
         srlx    %o0, 6, %g1
         mov     1, %o2
@@ -86,18 +91,20 @@ test_and_change_bit:	/* %o0=nr, %o1=addr */
         xor     %g7, %o2, %g1
         casx    [%o1], %g7, %g1
         cmp     %g7, %g1
-        bne,pn  %xcc, 1b
+        bne,pn  %xcc, 2f
          and    %g7, %o2, %g2
         clr     %o0
         movrne  %g2, 1, %o0
         BITOP_POST_BARRIER
         retl
          nop
+2:      BACKOFF_SPIN(%o3, %o4, 1b)
         .size   test_and_change_bit, .-test_and_change_bit
 
         .globl  set_bit
         .type   set_bit,#function
 set_bit:                /* %o0=nr, %o1=addr */
+        BACKOFF_SETUP(%o3)
         srlx    %o0, 6, %g1
         mov     1, %o2
         sllx    %g1, 3, %g3
@@ -108,15 +115,17 @@ set_bit:		/* %o0=nr, %o1=addr */
         or      %g7, %o2, %g1
         casx    [%o1], %g7, %g1
         cmp     %g7, %g1
-        bne,pn  %xcc, 1b
+        bne,pn  %xcc, 2f
          nop
         retl
          nop
+2:      BACKOFF_SPIN(%o3, %o4, 1b)
         .size   set_bit, .-set_bit
 
         .globl  clear_bit
         .type   clear_bit,#function
 clear_bit:              /* %o0=nr, %o1=addr */
+        BACKOFF_SETUP(%o3)
         srlx    %o0, 6, %g1
         mov     1, %o2
         sllx    %g1, 3, %g3
@@ -127,15 +136,17 @@ clear_bit:		/* %o0=nr, %o1=addr */
         andn    %g7, %o2, %g1
         casx    [%o1], %g7, %g1
         cmp     %g7, %g1
-        bne,pn  %xcc, 1b
+        bne,pn  %xcc, 2f
          nop
         retl
          nop
+2:      BACKOFF_SPIN(%o3, %o4, 1b)
         .size   clear_bit, .-clear_bit
 
         .globl  change_bit
         .type   change_bit,#function
 change_bit:             /* %o0=nr, %o1=addr */
+        BACKOFF_SETUP(%o3)
         srlx    %o0, 6, %g1
         mov     1, %o2
         sllx    %g1, 3, %g3
@@ -146,8 +157,9 @@ change_bit:		/* %o0=nr, %o1=addr */
         xor     %g7, %o2, %g1
         casx    [%o1], %g7, %g1
         cmp     %g7, %g1
-        bne,pn  %xcc, 1b
+        bne,pn  %xcc, 2f
          nop
         retl
          nop
+2:      BACKOFF_SPIN(%o3, %o4, 1b)
         .size   change_bit, .-change_bit
diff --git a/arch/x86/ia32/ia32_binfmt.c b/arch/x86/ia32/ia32_binfmt.c
index 118b9f9ff499..5027650eb273 100644
--- a/arch/x86/ia32/ia32_binfmt.c
+++ b/arch/x86/ia32/ia32_binfmt.c
@@ -289,7 +289,6 @@ static void elf32_init(struct pt_regs *regs)
 
 static ctl_table abi_table2[] = {
         {
-                .ctl_name       = 99,
                 .procname       = "vsyscall32",
                 .data           = &sysctl_vsyscall32,
                 .maxlen         = sizeof(int),
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
index f22ba8534d26..a97313b1270e 100644
--- a/arch/x86/kernel/acpi/wakeup_32.S
+++ b/arch/x86/kernel/acpi/wakeup_32.S
@@ -11,7 +11,7 @@
 #
 # If physical address of wakeup_code is 0x12345, BIOS should call us with
 # cs = 0x1234, eip = 0x05
-# 
+#
 
 #define BEEP \
         inb     $97, %al;       \
@@ -52,7 +52,6 @@ wakeup_code:
         BEEP
 1:
         mov     $(wakeup_stack - wakeup_code), %sp              # Private stack is needed for ASUS board
-        movw    $0x0e00 + 'S', %fs:(0x12)
 
         pushl   $0                                              # Kill any dangerous flags
         popfl
@@ -90,9 +89,6 @@ wakeup_code:
         # make sure %cr4 is set correctly (features, etc)
         movl    real_save_cr4 - wakeup_code, %eax
         movl    %eax, %cr4
-        movw    $0xb800, %ax
-        movw    %ax,%fs
-        movw    $0x0e00 + 'i', %fs:(0x12)
         
         # need a gdt -- use lgdtl to force 32-bit operands, in case
         # the GDT is located past 16 megabytes.
@@ -102,8 +98,6 @@ wakeup_code:
         movl    %eax, %cr0
         jmp 1f
 1:
-        movw    $0x0e00 + 'n', %fs:(0x14)
-
         movl    real_magic - wakeup_code, %eax
         cmpl    $0x12345678, %eax
         jne     bogus_real_magic
@@ -122,13 +116,11 @@ real_save_cr4:	.long 0
 real_magic:     .long 0
 video_mode:     .long 0
 realmode_flags: .long 0
-beep_flags:     .long 0
 real_efer_save_restore: .long 0
 real_save_efer_edx:     .long 0
 real_save_efer_eax:     .long 0
 
 bogus_real_magic:
-        movw    $0x0e00 + 'B', %fs:(0x12)
         jmp bogus_real_magic
 
 /* This code uses an extended set of video mode numbers. These include:
@@ -194,7 +186,6 @@ wakeup_pmode_return:
         movw    %ax, %es
         movw    %ax, %fs
         movw    %ax, %gs
-        movw    $0x0e00 + 'u', 0xb8016
 
         # reload the gdt, as we need the full 32 bit address
         lgdt    saved_gdt
@@ -218,7 +209,6 @@ wakeup_pmode_return:
         jmp     *%eax
 
 bogus_magic:
-        movw    $0x0e00 + 'B', 0xb8018
         jmp     bogus_magic
 
 
diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S
index 8b4357e1efe0..55608ec2ed72 100644
--- a/arch/x86/kernel/acpi/wakeup_64.S
+++ b/arch/x86/kernel/acpi/wakeup_64.S
@@ -41,7 +41,6 @@ wakeup_code:
 
 # Running in *copy* of this code, somewhere in low 1MB.
 
-        movb    $0xa1, %al      ;  outb %al, $0x80
         cli
         cld
         # setup data segment
@@ -65,11 +64,6 @@ wakeup_code:
         cmpl    $0x12345678, %eax
         jne     bogus_real_magic
 
-        call    verify_cpu                      # Verify the cpu supports long
-                                                # mode
-        testl   %eax, %eax
-        jnz     no_longmode
-
         testl   $1, realmode_flags - wakeup_code
         jz      1f
         lcall   $0xc000,$3
@@ -84,12 +78,6 @@ wakeup_code:
         call    mode_set
 1:
 
-        movw    $0xb800, %ax
-        movw    %ax,%fs
-        movw    $0x0e00 + 'L', %fs:(0x10)
-
-        movb    $0xa2, %al      ;  outb %al, $0x80
-        
         mov     %ds, %ax                        # Find 32bit wakeup_code addr
         movzx   %ax, %esi                       # (Convert %ds:gdt to a liner ptr)
         shll    $4, %esi
@@ -117,14 +105,10 @@ wakeup_32_vector:
         .code32
 wakeup_32:
 # Running in this code, but at low address; paging is not yet turned on.
-        movb    $0xa5, %al      ;  outb %al, $0x80
 
         movl    $__KERNEL_DS, %eax
         movl    %eax, %ds
 
-        movw    $0x0e00 + 'i', %ds:(0xb8012)
-        movb    $0xa8, %al      ;  outb %al, $0x80;
-
         /*
          * Prepare for entering 64bits mode
          */
@@ -200,16 +184,11 @@ wakeup_long64:
          */
         lgdt    cpu_gdt_descr
 
-        movw    $0x0e00 + 'n', %ds:(0xb8014)
-        movb    $0xa9, %al      ;  outb %al, $0x80
-
         movq    saved_magic, %rax
         movq    $0x123456789abcdef0, %rdx
         cmpq    %rdx, %rax
         jne     bogus_64_magic
 
-        movw    $0x0e00 + 'u', %ds:(0xb8016)
-        
         nop
         nop
         movw    $__KERNEL_DS, %ax
@@ -220,13 +199,11 @@ wakeup_long64:
         movw    %ax, %gs
         movq    saved_rsp, %rsp
 
-        movw    $0x0e00 + 'x', %ds:(0xb8018)
         movq    saved_rbx, %rbx
         movq    saved_rdi, %rdi
         movq    saved_rsi, %rsi
         movq    saved_rbp, %rbp
 
-        movw    $0x0e00 + '!', %ds:(0xb801a)
         movq    saved_rip, %rax
         jmp     *%rax
 
@@ -256,21 +233,12 @@ realmode_flags:	.quad 0
 
 .code16
 bogus_real_magic:
-        movb    $0xba,%al       ;  outb %al,$0x80
         jmp bogus_real_magic
 
 .code64
 bogus_64_magic:
-        movb    $0xb3,%al       ;  outb %al,$0x80
         jmp bogus_64_magic
 
-.code16
-no_longmode:
-        movb    $0xbc,%al       ;  outb %al,$0x80
-        jmp no_longmode
-
-#include "../verify_cpu_64.S"
-        
 /* This code uses an extended set of video mode numbers. These include:
  * Aliases for standard modes
  *      NORMAL_VGA (-1)
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 1826395ebeeb..297a24116949 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -499,6 +499,11 @@ static void __cpuinit cache_remove_shared_cpu_map(unsigned int cpu, int index) {
 
 static void free_cache_attributes(unsigned int cpu)
 {
+        int i;
+
+        for (i = 0; i < num_cache_leaves; i++)
+                cache_remove_shared_cpu_map(cpu, i);
+
         kfree(cpuid4_info[cpu]);
         cpuid4_info[cpu] = NULL;
 }
@@ -506,8 +511,8 @@ static void free_cache_attributes(unsigned int cpu)
 static int __cpuinit detect_cache_attributes(unsigned int cpu)
 {
         struct _cpuid4_info     *this_leaf;
-        unsigned long           j;
-        int                     retval;
+        unsigned long           j;
+        int                     retval;
         cpumask_t               oldmask;
 
         if (num_cache_leaves == 0)
@@ -524,19 +529,26 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu)
                 goto out;
 
         /* Do cpuid and store the results */
-        retval = 0;
         for (j = 0; j < num_cache_leaves; j++) {
                 this_leaf = CPUID4_INFO_IDX(cpu, j);
                 retval = cpuid4_cache_lookup(j, this_leaf);
-                if (unlikely(retval < 0))
+                if (unlikely(retval < 0)) {
+                        int i;
+
+                        for (i = 0; i < j; i++)
+                                cache_remove_shared_cpu_map(cpu, i);
                         break;
+                }
                 cache_shared_cpu_map_setup(cpu, j);
         }
         set_cpus_allowed(current, oldmask);
 
 out:
-        if (retval)
-                free_cache_attributes(cpu);
+        if (retval) {
+                kfree(cpuid4_info[cpu]);
+                cpuid4_info[cpu] = NULL;
+        }
+
         return retval;
 }
 
@@ -669,7 +681,7 @@ static struct kobj_type ktype_percpu_entry = {
         .sysfs_ops      = &sysfs_ops,
 };
 
-static void cpuid4_cache_sysfs_exit(unsigned int cpu)
+static void __cpuinit cpuid4_cache_sysfs_exit(unsigned int cpu)
 {
         kfree(cache_kobject[cpu]);
         kfree(index_kobject[cpu]);
@@ -680,13 +692,14 @@ static void cpuid4_cache_sysfs_exit(unsigned int cpu)
 
 static int __cpuinit cpuid4_cache_sysfs_init(unsigned int cpu)
 {
+        int err;
 
         if (num_cache_leaves == 0)
                 return -ENOENT;
 
-        detect_cache_attributes(cpu);
-        if (cpuid4_info[cpu] == NULL)
-                return -ENOENT;
+        err = detect_cache_attributes(cpu);
+        if (err)
+                return err;
 
         /* Allocate all required memory */
         cache_kobject[cpu] = kzalloc(sizeof(struct kobject), GFP_KERNEL);
@@ -705,13 +718,15 @@ err_out:
         return -ENOMEM;
 }
 
+static cpumask_t cache_dev_map = CPU_MASK_NONE;
+
 /* Add/Remove cache interface for CPU device */
 static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
 {
         unsigned int cpu = sys_dev->id;
         unsigned long i, j;
         struct _index_kobject *this_object;
-        int retval = 0;
+        int retval;
 
         retval = cpuid4_cache_sysfs_init(cpu);
         if (unlikely(retval < 0))
@@ -721,6 +736,10 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
         kobject_set_name(cache_kobject[cpu], "%s", "cache");
         cache_kobject[cpu]->ktype = &ktype_percpu_entry;
         retval = kobject_register(cache_kobject[cpu]);
+        if (retval < 0) {
+                cpuid4_cache_sysfs_exit(cpu);
+                return retval;
+        }
 
         for (i = 0; i < num_cache_leaves; i++) {
                 this_object = INDEX_KOBJECT_PTR(cpu,i);
@@ -740,6 +759,9 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
                         break;
                 }
         }
+        if (!retval)
+                cpu_set(cpu, cache_dev_map);
+
         return retval;
 }
 
@@ -750,13 +772,14 @@ static void __cpuinit cache_remove_dev(struct sys_device * sys_dev)
 
         if (cpuid4_info[cpu] == NULL)
                 return;
-        for (i = 0; i < num_cache_leaves; i++) {
-                cache_remove_shared_cpu_map(cpu, i);
+        if (!cpu_isset(cpu, cache_dev_map))
+                return;
+        cpu_clear(cpu, cache_dev_map);
+
+        for (i = 0; i < num_cache_leaves; i++)
                 kobject_unregister(&(INDEX_KOBJECT_PTR(cpu,i)->kobj));
-        }
         kobject_unregister(cache_kobject[cpu]);
         cpuid4_cache_sysfs_exit(cpu);
-        return;
 }
 
 static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb,
@@ -781,7 +804,7 @@ static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb,
 
 static struct notifier_block __cpuinitdata cacheinfo_cpu_notifier =
 {
-    .notifier_call = cacheinfo_cpu_callback,
+        .notifier_call = cacheinfo_cpu_callback,
 };
 
 static int __cpuinit cache_sysfs_init(void)
@@ -791,14 +814,15 @@ static int __cpuinit cache_sysfs_init(void)
         if (num_cache_leaves == 0)
                 return 0;
 
-        register_hotcpu_notifier(&cacheinfo_cpu_notifier);
-
         for_each_online_cpu(i) {
-                struct sys_device *sys_dev = get_cpu_sysdev((unsigned int)i);
+                int err;
+                struct sys_device *sys_dev = get_cpu_sysdev(i);
 
-                cache_add_dev(sys_dev);
+                err = cache_add_dev(sys_dev);
+                if (err)
+                        return err;
         }
-
+        register_hotcpu_notifier(&cacheinfo_cpu_notifier);
         return 0;
 }
 
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index 494d320d909b..24885be5c48c 100644
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -131,17 +131,19 @@ static __cpuinit int thermal_throttle_cpu_callback(struct notifier_block *nfb,
 {
         unsigned int cpu = (unsigned long)hcpu;
         struct sys_device *sys_dev;
-        int err;
+        int err = 0;
 
         sys_dev = get_cpu_sysdev(cpu);
         switch (action) {
-        case CPU_ONLINE:
-        case CPU_ONLINE_FROZEN:
+        case CPU_UP_PREPARE:
+        case CPU_UP_PREPARE_FROZEN:
                 mutex_lock(&therm_cpu_lock);
                 err = thermal_throttle_add_dev(sys_dev);
                 mutex_unlock(&therm_cpu_lock);
                 WARN_ON(err);
                 break;
+        case CPU_UP_CANCELED:
+        case CPU_UP_CANCELED_FROZEN:
         case CPU_DEAD:
         case CPU_DEAD_FROZEN:
                 mutex_lock(&therm_cpu_lock);
@@ -149,7 +151,7 @@ static __cpuinit int thermal_throttle_cpu_callback(struct notifier_block *nfb,
                 mutex_unlock(&therm_cpu_lock);
                 break;
         }
-        return NOTIFY_OK;
+        return err ? NOTIFY_BAD : NOTIFY_OK;
 }
 
 static struct notifier_block thermal_throttle_cpu_notifier __cpuinitdata =
diff --git a/arch/x86/kernel/mce_64.c b/arch/x86/kernel/mce_64.c
index 8ca8f8648969..66e6b797b2cb 100644
--- a/arch/x86/kernel/mce_64.c
+++ b/arch/x86/kernel/mce_64.c
@@ -802,16 +802,29 @@ static __cpuinit int mce_create_device(unsigned int cpu)
         if (!mce_available(&cpu_data[cpu]))
                 return -EIO;
 
+        memset(&per_cpu(device_mce, cpu).kobj, 0, sizeof(struct kobject));
         per_cpu(device_mce,cpu).id = cpu;
         per_cpu(device_mce,cpu).cls = &mce_sysclass;
 
         err = sysdev_register(&per_cpu(device_mce,cpu));
+        if (err)
+                return err;
+
+        for (i = 0; mce_attributes[i]; i++) {
+                err = sysdev_create_file(&per_cpu(device_mce,cpu),
+                                         mce_attributes[i]);
+                if (err)
+                        goto error;
+        }
 
-        if (!err) {
-                for (i = 0; mce_attributes[i]; i++)
-                        sysdev_create_file(&per_cpu(device_mce,cpu),
-                                mce_attributes[i]);
+        return 0;
+error:
+        while (i--) {
+                sysdev_remove_file(&per_cpu(device_mce,cpu),
+                                   mce_attributes[i]);
         }
+        sysdev_unregister(&per_cpu(device_mce,cpu));
+
         return err;
 }
 
@@ -823,7 +836,6 @@ static void mce_remove_device(unsigned int cpu)
                 sysdev_remove_file(&per_cpu(device_mce,cpu),
                         mce_attributes[i]);
         sysdev_unregister(&per_cpu(device_mce,cpu));
-        memset(&per_cpu(device_mce, cpu).kobj, 0, sizeof(struct kobject));
 }
 
 /* Get notified when a cpu comes on/off. Be hotplug friendly. */
@@ -831,18 +843,21 @@ static int
 mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
+        int err = 0;
 
         switch (action) {
-        case CPU_ONLINE:
-        case CPU_ONLINE_FROZEN:
-                mce_create_device(cpu);
+        case CPU_UP_PREPARE:
+        case CPU_UP_PREPARE_FROZEN:
+                err = mce_create_device(cpu);
                 break;
+        case CPU_UP_CANCELED:
+        case CPU_UP_CANCELED_FROZEN:
         case CPU_DEAD:
         case CPU_DEAD_FROZEN:
                 mce_remove_device(cpu);
                 break;
         }
-        return NOTIFY_OK;
+        return err ? NOTIFY_BAD : NOTIFY_OK;
 }
 
 static struct notifier_block mce_cpu_notifier = {
@@ -857,9 +872,13 @@ static __init int mce_init_device(void)
         if (!mce_available(&boot_cpu_data))
                 return -EIO;
         err = sysdev_class_register(&mce_sysclass);
+        if (err)
+                return err;
 
         for_each_online_cpu(i) {
-                mce_create_device(i);
+                err = mce_create_device(i);
+                if (err)
+                        return err;
         }
 
         register_hotcpu_notifier(&mce_cpu_notifier);
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index df85c9c13601..e18e516cf549 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -133,37 +133,42 @@ static const struct file_operations msr_fops = {
         .open = msr_open,
 };
 
-static int __cpuinit msr_device_create(int i)
+static int __cpuinit msr_device_create(int cpu)
 {
-        int err = 0;
         struct device *dev;
 
-        dev = device_create(msr_class, NULL, MKDEV(MSR_MAJOR, i), "msr%d",i);
-        if (IS_ERR(dev))
-                err = PTR_ERR(dev);
-        return err;
+        dev = device_create(msr_class, NULL, MKDEV(MSR_MAJOR, cpu),
+                            "msr%d", cpu);
+        return IS_ERR(dev) ? PTR_ERR(dev) : 0;
+}
+
+static void msr_device_destroy(int cpu)
+{
+        device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
 }
 
 static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb,
                                 unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
+        int err = 0;
 
         switch (action) {
-        case CPU_ONLINE:
-        case CPU_ONLINE_FROZEN:
-                msr_device_create(cpu);
+        case CPU_UP_PREPARE:
+        case CPU_UP_PREPARE_FROZEN:
+                err = msr_device_create(cpu);
                 break;
+        case CPU_UP_CANCELED:
+        case CPU_UP_CANCELED_FROZEN:
         case CPU_DEAD:
         case CPU_DEAD_FROZEN:
-                device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
+                msr_device_destroy(cpu);
                 break;
         }
-        return NOTIFY_OK;
+        return err ? NOTIFY_BAD : NOTIFY_OK;
 }
 
-static struct notifier_block __cpuinitdata msr_class_cpu_notifier =
-{
+static struct notifier_block __cpuinitdata msr_class_cpu_notifier = {
         .notifier_call = msr_class_cpu_callback,
 };
 
@@ -196,7 +201,7 @@ static int __init msr_init(void)
 out_class:
         i = 0;
         for_each_online_cpu(i)
-                device_destroy(msr_class, MKDEV(MSR_MAJOR, i));
+                msr_device_destroy(i);
         class_destroy(msr_class);
 out_chrdev:
         unregister_chrdev(MSR_MAJOR, "cpu/msr");
@@ -208,7 +213,7 @@ static void __exit msr_exit(void)
 {
         int cpu = 0;
         for_each_online_cpu(cpu)
-                device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
+                msr_device_destroy(cpu);
         class_destroy(msr_class);
         unregister_chrdev(MSR_MAJOR, "cpu/msr");
         unregister_hotcpu_notifier(&msr_class_cpu_notifier);
diff --git a/arch/x86/kernel/suspend_64.c b/arch/x86/kernel/suspend_64.c
index 573c0a6e0ac6..f8fafe527ff1 100644
--- a/arch/x86/kernel/suspend_64.c
+++ b/arch/x86/kernel/suspend_64.c
@@ -150,8 +150,22 @@ void fix_processor_context(void)
 /* Defined in arch/x86_64/kernel/suspend_asm.S */
 extern int restore_image(void);
 
+/*
+ * Address to jump to in the last phase of restore in order to get to the image
+ * kernel's text (this value is passed in the image header).
+ */
+unsigned long restore_jump_address;
+
+/*
+ * Value of the cr3 register from before the hibernation (this value is passed
+ * in the image header).
+ */
+unsigned long restore_cr3;
+
 pgd_t *temp_level4_pgt;
 
+void *relocated_restore_code;
+
 static int res_phys_pud_init(pud_t *pud, unsigned long address, unsigned long end)
 {
         long i, j;
@@ -175,7 +189,7 @@ static int res_phys_pud_init(pud_t *pud, unsigned long address, unsigned long en
 
                         if (paddr >= end)
                                 break;
-                        pe = _PAGE_NX | _PAGE_PSE | _KERNPG_TABLE | paddr;
+                        pe = __PAGE_KERNEL_LARGE_EXEC | paddr;
                         pe &= __supported_pte_mask;
                         set_pmd(pmd, __pmd(pe));
                 }
@@ -183,25 +197,42 @@ static int res_phys_pud_init(pud_t *pud, unsigned long address, unsigned long en
         return 0;
 }
 
+static int res_kernel_text_pud_init(pud_t *pud, unsigned long start)
+{
+        pmd_t *pmd;
+        unsigned long paddr;
+
+        pmd = (pmd_t *)get_safe_page(GFP_ATOMIC);
+        if (!pmd)
+                return -ENOMEM;
+        set_pud(pud + pud_index(start), __pud(__pa(pmd) | _KERNPG_TABLE));
+        for (paddr = 0; paddr < KERNEL_TEXT_SIZE; pmd++, paddr += PMD_SIZE) {
+                unsigned long pe;
+
+                pe = __PAGE_KERNEL_LARGE_EXEC | _PAGE_GLOBAL | paddr;
+                pe &= __supported_pte_mask;
+                set_pmd(pmd, __pmd(pe));
+        }
+
+        return 0;
+}
+
 static int set_up_temporary_mappings(void)
 {
         unsigned long start, end, next;
+        pud_t *pud;
         int error;
 
         temp_level4_pgt = (pgd_t *)get_safe_page(GFP_ATOMIC);
         if (!temp_level4_pgt)
                 return -ENOMEM;
 
-        /* It is safe to reuse the original kernel mapping */
-        set_pgd(temp_level4_pgt + pgd_index(__START_KERNEL_map),
-                init_level4_pgt[pgd_index(__START_KERNEL_map)]);
-
         /* Set up the direct mapping from scratch */
         start = (unsigned long)pfn_to_kaddr(0);
         end = (unsigned long)pfn_to_kaddr(end_pfn);
 
         for (; start < end; start = next) {
-                pud_t *pud = (pud_t *)get_safe_page(GFP_ATOMIC);
+                pud = (pud_t *)get_safe_page(GFP_ATOMIC);
                 if (!pud)
                         return -ENOMEM;
                 next = start + PGDIR_SIZE;
@@ -212,7 +243,17 @@ static int set_up_temporary_mappings(void)
                 set_pgd(temp_level4_pgt + pgd_index(start),
                         mk_kernel_pgd(__pa(pud)));
         }
-        return 0;
+
+        /* Set up the kernel text mapping from scratch */
+        pud = (pud_t *)get_safe_page(GFP_ATOMIC);
+        if (!pud)
+                return -ENOMEM;
+        error = res_kernel_text_pud_init(pud, __START_KERNEL_map);
+        if (!error)
+                set_pgd(temp_level4_pgt + pgd_index(__START_KERNEL_map),
+                        __pgd(__pa(pud) | _PAGE_TABLE));
+
+        return error;
 }
 
 int swsusp_arch_resume(void)
@@ -222,6 +263,13 @@ int swsusp_arch_resume(void)
         /* We have got enough memory and from now on we cannot recover */
         if ((error = set_up_temporary_mappings()))
                 return error;
+
+        relocated_restore_code = (void *)get_safe_page(GFP_ATOMIC);
+        if (!relocated_restore_code)
+                return -ENOMEM;
+        memcpy(relocated_restore_code, &core_restore_code,
+               &restore_registers - &core_restore_code);
+
         restore_image();
         return 0;
 }
@@ -236,4 +284,43 @@ int pfn_is_nosave(unsigned long pfn)
         unsigned long nosave_end_pfn = PAGE_ALIGN(__pa_symbol(&__nosave_end)) >> PAGE_SHIFT;
         return (pfn >= nosave_begin_pfn) && (pfn < nosave_end_pfn);
 }
+
+struct restore_data_record {
+        unsigned long jump_address;
+        unsigned long cr3;
+        unsigned long magic;
+};
+
+#define RESTORE_MAGIC   0x0123456789ABCDEFUL
+
+/**
+ *      arch_hibernation_header_save - populate the architecture specific part
+ *              of a hibernation image header
+ *      @addr: address to save the data at
+ */
+int arch_hibernation_header_save(void *addr, unsigned int max_size)
+{
+        struct restore_data_record *rdr = addr;
+
+        if (max_size < sizeof(struct restore_data_record))
+                return -EOVERFLOW;
+        rdr->jump_address = restore_jump_address;
+        rdr->cr3 = restore_cr3;
+        rdr->magic = RESTORE_MAGIC;
+        return 0;
+}
+
+/**
+ *      arch_hibernation_header_restore - read the architecture specific data
+ *              from the hibernation image header
+ *      @addr: address to read the data from
+ */
+int arch_hibernation_header_restore(void *addr)
+{
+        struct restore_data_record *rdr = addr;
+
+        restore_jump_address = rdr->jump_address;
+        restore_cr3 = rdr->cr3;
+        return (rdr->magic == RESTORE_MAGIC) ? 0 : -EINVAL;
+}
 #endif /* CONFIG_HIBERNATION */
diff --git a/arch/x86/kernel/suspend_asm_64.S b/arch/x86/kernel/suspend_asm_64.S
index 16d183f67bc1..48344b666d2c 100644
--- a/arch/x86/kernel/suspend_asm_64.S
+++ b/arch/x86/kernel/suspend_asm_64.S
@@ -2,8 +2,8 @@
  *
  * Distribute under GPLv2.
  *
- * swsusp_arch_resume may not use any stack, nor any variable that is
- * not "NoSave" during copying pages:
+ * swsusp_arch_resume must not use any stack or any nonlocal variables while
+ * copying pages:
  *
  * Its rewriting one kernel image with another. What is stack in "old"
  * image could very well be data page in "new" image, and overwriting
@@ -36,6 +36,13 @@ ENTRY(swsusp_arch_suspend)
         movq %r15, saved_context_r15(%rip)
         pushfq ; popq saved_context_eflags(%rip)
 
+        /* save the address of restore_registers */
+        movq    $restore_registers, %rax
+        movq    %rax, restore_jump_address(%rip)
+        /* save cr3 */
+        movq    %cr3, %rax
+        movq    %rax, restore_cr3(%rip)
+
         call swsusp_save
         ret
 
@@ -54,7 +61,17 @@ ENTRY(restore_image)
         movq    %rcx, %cr3;
         movq    %rax, %cr4;  # turn PGE back on
 
+        /* prepare to jump to the image kernel */
+        movq    restore_jump_address(%rip), %rax
+        movq    restore_cr3(%rip), %rbx
+
+        /* prepare to copy image data to their original locations */
         movq    restore_pblist(%rip), %rdx
+        movq    relocated_restore_code(%rip), %rcx
+        jmpq    *%rcx
+
+        /* code below has been relocated to a safe page */
+ENTRY(core_restore_code)
 loop:
         testq   %rdx, %rdx
         jz      done
@@ -62,7 +79,7 @@ loop:
         /* get addresses from the pbe and copy the page */
         movq    pbe_address(%rdx), %rsi
         movq    pbe_orig_address(%rdx), %rdi
-        movq    $512, %rcx
+        movq    $(PAGE_SIZE >> 3), %rcx
         rep
         movsq
 
@@ -70,10 +87,22 @@ loop:
         movq    pbe_next(%rdx), %rdx
         jmp     loop
 done:
+        /* jump to the restore_registers address from the image header */
+        jmpq    *%rax
+        /*
+         * NOTE: This assumes that the boot kernel's text mapping covers the
+         * image kernel's page containing restore_registers and the address of
+         * this page is the same as in the image kernel's text mapping (it
+         * should always be true, because the text mapping is linear, starting
+         * from 0, and is supposed to cover the entire kernel text for every
+         * kernel).
+         *
+         * code below belongs to the image kernel
+         */
+
+ENTRY(restore_registers)
         /* go back to the original page tables */
-        movq    $(init_level4_pgt - __START_KERNEL_map), %rax
-        addq    phys_base(%rip), %rax
-        movq    %rax, %cr3
+        movq    %rbx, %cr3
 
         /* Flush TLB, including "global" things (vmalloc) */
         movq    mmu_cr4_features(%rip), %rax
@@ -84,12 +113,9 @@ done:
         movq    %rcx, %cr3
         movq    %rax, %cr4;  # turn PGE back on
 
-        movl    $24, %eax
-        movl    %eax, %ds
-
         movq saved_context_esp(%rip), %rsp
         movq saved_context_ebp(%rip), %rbp
-        /* Don't restore %rax, it must be 0 anyway */
+        /* restore GPRs (we don't restore %rax, it must be 0 anyway) */
         movq saved_context_ebx(%rip), %rbx
         movq saved_context_ecx(%rip), %rcx
         movq saved_context_edx(%rip), %rdx
@@ -107,4 +133,7 @@ done:
 
         xorq    %rax, %rax
 
+        /* tell the hibernation core that we've just restored the memory */
+        movq    %rax, in_suspend(%rip)
+
         ret
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index 8a67e282cb5e..585541ca1a7e 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -64,6 +64,16 @@ struct vsyscall_gtod_data __vsyscall_gtod_data __section_vsyscall_gtod_data =
         .sysctl_enabled = 1,
 };
 
+void update_vsyscall_tz(void)
+{
+        unsigned long flags;
+
+        write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
+        /* sys_tz has changed */
+        vsyscall_gtod_data.sys_tz = sys_tz;
+        write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags);
+}
+
 void update_vsyscall(struct timespec *wall_time, struct clocksource *clock)
 {
         unsigned long flags;
@@ -77,7 +87,6 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock)
         vsyscall_gtod_data.clock.shift = clock->shift;
         vsyscall_gtod_data.wall_time_sec = wall_time->tv_sec;
         vsyscall_gtod_data.wall_time_nsec = wall_time->tv_nsec;
-        vsyscall_gtod_data.sys_tz = sys_tz;
         vsyscall_gtod_data.wall_to_monotonic = wall_to_monotonic;
         write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags);
 }
@@ -163,7 +172,7 @@ time_t __vsyscall(1) vtime(time_t *t)
         if (unlikely(!__vsyscall_gtod_data.sysctl_enabled))
                 return time_syscall(t);
 
-        vgettimeofday(&tv, 0);
+        vgettimeofday(&tv, NULL);
         result = tv.tv_sec;
         if (t)
                 *t = result;
@@ -257,18 +266,10 @@ out:
         return ret;
 }
 
-static int vsyscall_sysctl_nostrat(ctl_table *t, int __user *name, int nlen,
-                                void __user *oldval, size_t __user *oldlenp,
-                                void __user *newval, size_t newlen)
-{
-        return -ENOSYS;
-}
-
 static ctl_table kernel_table2[] = {
-        { .ctl_name = 99, .procname = "vsyscall64",
+        { .procname = "vsyscall64",
           .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int),
           .mode = 0644,
-          .strategy = vsyscall_sysctl_nostrat,
           .proc_handler = vsyscall_sysctl_change },
         {}
 };
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 43fafe9e9c08..78cb68f2ebbd 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -716,6 +716,11 @@ menu "Power management options"
 
 source kernel/power/Kconfig
 
+config ARCH_HIBERNATION_HEADER
+        bool
+        depends on HIBERNATION
+        default y
+
 source "drivers/acpi/Kconfig"
 
 source "arch/x86/kernel/cpufreq/Kconfig"
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 5055acf2163c..048295ec3707 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -50,7 +50,7 @@ int acpi_sleep_prepare(u32 acpi_state)
 }
 
 #ifdef CONFIG_SUSPEND
-static struct pm_ops acpi_pm_ops;
+static struct platform_suspend_ops acpi_pm_ops;
 
 extern void do_suspend_lowlevel(void);
 
@@ -85,13 +85,12 @@ static int acpi_pm_set_target(suspend_state_t pm_state)
 
 /**
  *      acpi_pm_prepare - Do preliminary suspend work.
- *      @pm_state: ignored
  *
  *      If necessary, set the firmware waking vector and do arch-specific
  *      nastiness to get the wakeup code to the waking vector.
  */
 
-static int acpi_pm_prepare(suspend_state_t pm_state)
+static int acpi_pm_prepare(void)
 {
         int error = acpi_sleep_prepare(acpi_target_sleep_state);
 
@@ -160,13 +159,12 @@ static int acpi_pm_enter(suspend_state_t pm_state)
 
 /**
  *      acpi_pm_finish - Finish up suspend sequence.
- *      @pm_state: ignored
  *
  *      This is called after we wake back up (or if entering the sleep state
  *      failed). 
  */
 
-static int acpi_pm_finish(suspend_state_t pm_state)
+static void acpi_pm_finish(void)
 {
         u32 acpi_state = acpi_target_sleep_state;
 
@@ -184,7 +182,6 @@ static int acpi_pm_finish(suspend_state_t pm_state)
                 init_8259A(0);
         }
 #endif
-        return 0;
 }
 
 static int acpi_pm_state_valid(suspend_state_t pm_state)
@@ -203,7 +200,7 @@ static int acpi_pm_state_valid(suspend_state_t pm_state)
         }
 }
 
-static struct pm_ops acpi_pm_ops = {
+static struct platform_suspend_ops acpi_pm_ops = {
         .valid = acpi_pm_state_valid,
         .set_target = acpi_pm_set_target,
         .prepare = acpi_pm_prepare,
@@ -233,6 +230,12 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 #endif /* CONFIG_SUSPEND */
 
 #ifdef CONFIG_HIBERNATION
+static int acpi_hibernation_start(void)
+{
+        acpi_target_sleep_state = ACPI_STATE_S4;
+        return 0;
+}
+
 static int acpi_hibernation_prepare(void)
 {
         return acpi_sleep_prepare(ACPI_STATE_S4);
@@ -254,6 +257,15 @@ static int acpi_hibernation_enter(void)
         return ACPI_SUCCESS(status) ? 0 : -EFAULT;
 }
 
+static void acpi_hibernation_leave(void)
+{
+        /*
+         * If ACPI is not enabled by the BIOS and the boot kernel, we need to
+         * enable it here.
+         */
+        acpi_enable();
+}
+
 static void acpi_hibernation_finish(void)
 {
         acpi_leave_sleep_state(ACPI_STATE_S4);
@@ -261,6 +273,8 @@ static void acpi_hibernation_finish(void)
 
         /* reset firmware waking vector */
         acpi_set_firmware_waking_vector((acpi_physical_address) 0);
+
+        acpi_target_sleep_state = ACPI_STATE_S0;
 }
 
 static int acpi_hibernation_pre_restore(void)
@@ -277,10 +291,13 @@ static void acpi_hibernation_restore_cleanup(void)
         acpi_hw_enable_all_runtime_gpes();
 }
 
-static struct hibernation_ops acpi_hibernation_ops = {
+static struct platform_hibernation_ops acpi_hibernation_ops = {
+        .start = acpi_hibernation_start,
+        .pre_snapshot = acpi_hibernation_prepare,
+        .finish = acpi_hibernation_finish,
         .prepare = acpi_hibernation_prepare,
         .enter = acpi_hibernation_enter,
-        .finish = acpi_hibernation_finish,
+        .leave = acpi_hibernation_leave,
         .pre_restore = acpi_hibernation_pre_restore,
         .restore_cleanup = acpi_hibernation_restore_cleanup,
 };
@@ -417,7 +434,7 @@ int __init acpi_sleep_init(void)
                 }
         }
 
-        pm_set_ops(&acpi_pm_ops);
+        suspend_set_ops(&acpi_pm_ops);
 #endif
 
 #ifdef CONFIG_HIBERNATION
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 026439e05afe..c7501058d07d 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -882,7 +882,7 @@ unsigned long ata_pci_default_filter(struct ata_device *adev, unsigned long xfer
         /* Filter out DMA modes if the device has been configured by
            the BIOS as PIO only */
 
-        if (adev->link->ap->ioaddr.bmdma_addr == 0)
+        if (adev->link->ap->ioaddr.bmdma_addr == NULL)
                 xfer_mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);
         return xfer_mask;
 }
diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c
index fbae8674e491..5beddc322e6f 100644
--- a/drivers/base/dmapool.c
+++ b/drivers/base/dmapool.c
@@ -366,7 +366,7 @@ dma_pool_free (struct dma_pool *pool, void *vaddr, dma_addr_t dma)
         unsigned long           flags;
         int                     map, block;
 
-        if ((page = pool_find_page (pool, dma)) == 0) {
+        if ((page = pool_find_page(pool, dma)) == NULL) {
                 if (pool->dev)
                         dev_err(pool->dev, "dma_pool_free %s, %p/%lx (bad dma)\n",
                                 pool->name, vaddr, (unsigned long) dma);
diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c
index 2b0c601e422e..2b4b392dcbc1 100644
--- a/drivers/base/power/trace.c
+++ b/drivers/base/power/trace.c
@@ -114,7 +114,7 @@ static unsigned int read_magic_time(void)
         get_rtc_time(&time);
         printk("Time: %2d:%02d:%02d  Date: %02d/%02d/%02d\n",
                 time.tm_hour, time.tm_min, time.tm_sec,
-                time.tm_mon, time.tm_mday, time.tm_year);
+                time.tm_mon + 1, time.tm_mday, time.tm_year % 100);
         val = time.tm_year;                             /* 100 years */
         if (val > 100)
                 val -= 100;
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 8d8cdfec6529..e1d3ad4db2f0 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -94,27 +94,18 @@ static struct attribute_group topology_attr_group = {
         .name = "topology"
 };
 
-static cpumask_t topology_dev_map = CPU_MASK_NONE;
-
 /* Add/Remove cpu_topology interface for CPU device */
 static int __cpuinit topology_add_dev(unsigned int cpu)
 {
-        int rc;
         struct sys_device *sys_dev = get_cpu_sysdev(cpu);
 
-        rc = sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
-        if (!rc)
-                cpu_set(cpu, topology_dev_map);
-        return rc;
+        return sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
 }
 
 static void __cpuinit topology_remove_dev(unsigned int cpu)
 {
         struct sys_device *sys_dev = get_cpu_sysdev(cpu);
 
-        if (!cpu_isset(cpu, topology_dev_map))
-                return;
-        cpu_clear(cpu, topology_dev_map);
         sysfs_remove_group(&sys_dev->kobj, &topology_attr_group);
 }
 
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 9e7652dcde6c..82effce97c51 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -390,8 +390,8 @@ static inline void ace_dump_mem(void *base, int len)
 static void ace_dump_regs(struct ace_device *ace)
 {
         dev_info(ace->dev, "    ctrl:  %.8x  seccnt/cmd: %.4x      ver:%.4x\n"
-                 "    status:%.8x  mpu_lba:%.8x  busmode:%4x\n"
-                 "    error: %.8x  cfg_lba:%.8x  fatstat:%.4x\n",
+                 KERN_INFO "    status:%.8x  mpu_lba:%.8x  busmode:%4x\n"
+                 KERN_INFO "    error: %.8x  cfg_lba:%.8x  fatstat:%.4x\n",
                  ace_in32(ace, ACE_CTRL),
                  ace_in(ace, ACE_SECCNTCMD),
                  ace_in(ace, ACE_VERSION),
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 79245714f0a7..d70745c84250 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -3458,47 +3458,19 @@ static void cdrom_update_settings(void)
 static int cdrom_sysctl_handler(ctl_table *ctl, int write, struct file * filp,
                                 void __user *buffer, size_t *lenp, loff_t *ppos)
 {
-        int *valp = ctl->data;
-        int val = *valp;
         int ret;
         
         ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
 
-        if (write && *valp != val) {
+        if (write) {
         
                 /* we only care for 1 or 0. */
-                if (*valp)
-                        *valp = 1;
-                else
-                        *valp = 0;
+                autoclose        = !!cdrom_sysctl_settings.autoclose;
+                autoeject        = !!cdrom_sysctl_settings.autoeject;
+                debug            = !!cdrom_sysctl_settings.debug;
+                lockdoor         = !!cdrom_sysctl_settings.lock;
+                check_media_type = !!cdrom_sysctl_settings.check;
 
-                switch (ctl->ctl_name) {
-                case DEV_CDROM_AUTOCLOSE: {
-                        if (valp == &cdrom_sysctl_settings.autoclose)
-                                autoclose = cdrom_sysctl_settings.autoclose;
-                        break;
-                        }
-                case DEV_CDROM_AUTOEJECT: {
-                        if (valp == &cdrom_sysctl_settings.autoeject)
-                                autoeject = cdrom_sysctl_settings.autoeject;
-                        break;
-                        }
-                case DEV_CDROM_DEBUG: {
-                        if (valp == &cdrom_sysctl_settings.debug)
-                                debug = cdrom_sysctl_settings.debug;
-                        break;
-                        }
-                case DEV_CDROM_LOCK: {
-                        if (valp == &cdrom_sysctl_settings.lock)
-                                lockdoor = cdrom_sysctl_settings.lock;
-                        break;
-                        }
-                case DEV_CDROM_CHECK_MEDIA: {
-                        if (valp == &cdrom_sysctl_settings.check)
-                                check_media_type = cdrom_sysctl_settings.check;
-                        break;
-                        }
-                }
                 /* update the option flags according to the changes. we
                    don't have per device options through sysctl yet,
                    but we will have and then this will disappear. */
@@ -3511,7 +3483,6 @@ static int cdrom_sysctl_handler(ctl_table *ctl, int write, struct file * filp,
 /* Place files in /proc/sys/dev/cdrom */
 static ctl_table cdrom_table[] = {
         {
-                .ctl_name       = DEV_CDROM_INFO,
                 .procname       = "info",
                 .data           = &cdrom_sysctl_settings.info, 
                 .maxlen         = CDROM_STR_SIZE,
@@ -3519,7 +3490,6 @@ static ctl_table cdrom_table[] = {
                 .proc_handler   = &cdrom_sysctl_info,
         },
         {
-                .ctl_name       = DEV_CDROM_AUTOCLOSE,
                 .procname       = "autoclose",
                 .data           = &cdrom_sysctl_settings.autoclose,
                 .maxlen         = sizeof(int),
@@ -3527,7 +3497,6 @@ static ctl_table cdrom_table[] = {
                 .proc_handler   = &cdrom_sysctl_handler,
         },
         {
-                .ctl_name       = DEV_CDROM_AUTOEJECT,
                 .procname       = "autoeject",
                 .data           = &cdrom_sysctl_settings.autoeject,
                 .maxlen         = sizeof(int),
@@ -3535,7 +3504,6 @@ static ctl_table cdrom_table[] = {
                 .proc_handler   = &cdrom_sysctl_handler,
         },
         {
-                .ctl_name       = DEV_CDROM_DEBUG,
                 .procname       = "debug",
                 .data           = &cdrom_sysctl_settings.debug,
                 .maxlen         = sizeof(int),
@@ -3543,7 +3511,6 @@ static ctl_table cdrom_table[] = {
                 .proc_handler   = &cdrom_sysctl_handler,
         },
         {
-                .ctl_name       = DEV_CDROM_LOCK,
                 .procname       = "lock",
                 .data           = &cdrom_sysctl_settings.lock,
                 .maxlen         = sizeof(int),
@@ -3551,7 +3518,6 @@ static ctl_table cdrom_table[] = {
                 .proc_handler   = &cdrom_sysctl_handler,
         },
         {
-                .ctl_name       = DEV_CDROM_CHECK_MEDIA,
                 .procname       = "check_media",
                 .data           = &cdrom_sysctl_settings.check,
                 .maxlen         = sizeof(int),
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 204d53e506de..4dbee616eac6 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -36,23 +36,6 @@ config VT
           If unsure, say Y, or else you won't be able to do much with your new
           shiny Linux system :-)
 
-config VT_UNICODE
-        bool "Virtual console is Unicode by default"
-        depends on VT
-        default n
-        ---help---
-          If you say Y here, the virtual terminal will be in UTF-8 by default,
-          and the keyboard will run in unicode mode.
-
-          If you say N here, the virtual terminal will not be in UTF-8 by
-          default, and the keyboard will run in XLATE mode.
-
-          This can also be changed by passing 'default_utf8=<0|1>' on the
-          kernel command line.
-
-          Historically, the kernel has defaulted to non-UTF8 and XLATE mode.
-          If unsure, say N here.
-
 config VT_CONSOLE
         bool "Support for console on virtual terminal" if EMBEDDED
         depends on VT
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index ec116df919d9..c99e43b837f5 100644
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -18,7 +18,7 @@
 #include <linux/apm_bios.h>
 #include <linux/capability.h>
 #include <linux/sched.h>
-#include <linux/pm.h>
+#include <linux/suspend.h>
 #include <linux/apm-emulation.h>
 #include <linux/freezer.h>
 #include <linux/device.h>
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 9e0adfe27c12..d15234c5965e 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -662,7 +662,7 @@
 static void cy_throttle(struct tty_struct *tty);
 static void cy_send_xchar(struct tty_struct *tty, char ch);
 
-#define IS_CYC_Z(card) ((card).num_chips == -1)
+#define IS_CYC_Z(card) ((card).num_chips == (unsigned int)-1)
 
 #define Z_FPGA_CHECK(card) \
         ((readl(&((struct RUNTIME_9060 __iomem *) \
@@ -897,71 +897,6 @@ static inline int serial_paranoia_check(struct cyclades_port *info,
         return 0;
 }                               /* serial_paranoia_check */
 
-/*
- * This routine is used by the interrupt handler to schedule
- * processing in the software interrupt portion of the driver
- * (also known as the "bottom half").  This can be called any
- * number of times for any channel without harm.
- */
-static inline void cy_sched_event(struct cyclades_port *info, int event)
-{
-        info->event |= 1 << event; /* remember what kind of event and who */
-        schedule_work(&info->tqueue);
-}                               /* cy_sched_event */
-
-/*
- * This routine is used to handle the "bottom half" processing for the
- * serial driver, known also the "software interrupt" processing.
- * This processing is done at the kernel interrupt level, after the
- * cy#/_interrupt() has returned, BUT WITH INTERRUPTS TURNED ON.  This
- * is where time-consuming activities which can not be done in the
- * interrupt driver proper are done; the interrupt driver schedules
- * them using cy_sched_event(), and they get done here.
- *
- * This is done through one level of indirection--the task queue.
- * When a hardware interrupt service routine wants service by the
- * driver's bottom half, it enqueues the appropriate tq_struct (one
- * per port) to the keventd work queue and sets a request flag
- * that the work queue be processed.
- *
- * Although this may seem unwieldy, it gives the system a way to
- * pass an argument (in this case the pointer to the cyclades_port
- * structure) to the bottom half of the driver.  Previous kernels
- * had to poll every port to see if that port needed servicing.
- */
-static void
-do_softint(struct work_struct *work)
-{
-        struct cyclades_port *info =
-                container_of(work, struct cyclades_port, tqueue);
-        struct tty_struct    *tty;
-
-        tty = info->tty;
-        if (!tty)
-                return;
-
-        if (test_and_clear_bit(Cy_EVENT_HANGUP, &info->event)) {
-                tty_hangup(info->tty);
-                wake_up_interruptible(&info->open_wait);
-                        info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        }
-        if (test_and_clear_bit(Cy_EVENT_OPEN_WAKEUP, &info->event))
-                wake_up_interruptible(&info->open_wait);
-#ifdef CONFIG_CYZ_INTR
-        if (test_and_clear_bit(Cy_EVENT_Z_RX_FULL, &info->event) &&
-                        !timer_pending(&cyz_rx_full_timer[info->line]))
-                mod_timer(&cyz_rx_full_timer[info->line], jiffies + 1);
-#endif
-        if (test_and_clear_bit(Cy_EVENT_DELTA_WAKEUP, &info->event))
-                wake_up_interruptible(&info->delta_msr_wait);
-        tty_wakeup(tty);
-#ifdef Z_WAKE
-        if (test_and_clear_bit(Cy_EVENT_SHUTDOWN_WAKEUP, &info->event))
-                complete(&info->shutdown_wait);
-#endif
-} /* do_softint */
-
-
 /***********************************************************/
 /********* Start of block of Cyclom-Y specific code ********/
 
@@ -1045,382 +980,332 @@ static unsigned detect_isa_irq(void __iomem * address)
 }
 #endif                          /* CONFIG_ISA */
 
-static void cyy_intr_chip(struct cyclades_card *cinfo, int chip,
-                        void __iomem * base_addr, int status, int index)
+static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
+                void __iomem *base_addr)
 {
         struct cyclades_port *info;
         struct tty_struct *tty;
-        int char_count;
-        int j, len, mdm_change, mdm_status, outch;
-        int save_xir, channel, save_car;
-        char data;
+        int len, index = cinfo->bus_index;
+        u8 save_xir, channel, save_car, data, char_count;
 
-        if (status & CySRReceive) {     /* reception interrupt */
 #ifdef CY_DEBUG_INTERRUPTS
-                printk(KERN_DEBUG "cyy_interrupt: rcvd intr, chip %d\n", chip);
+        printk(KERN_DEBUG "cyy_interrupt: rcvd intr, chip %d\n", chip);
 #endif
-                /* determine the channel & change to that context */
-                spin_lock(&cinfo->card_lock);
-                save_xir = (u_char) readb(base_addr + (CyRIR << index));
-                channel = (u_short) (save_xir & CyIRChannel);
-                info = &cinfo->ports[channel + chip * 4];
-                save_car = readb(base_addr + (CyCAR << index));
-                cy_writeb(base_addr + (CyCAR << index), save_xir);
-
-                /* if there is nowhere to put the data, discard it */
-                if (info->tty == NULL) {
-                        j = (readb(base_addr + (CyRIVR << index)) &
-                                CyIVRMask);
-                        if (j == CyIVRRxEx) {   /* exception */
+        /* determine the channel & change to that context */
+        save_xir = readb(base_addr + (CyRIR << index));
+        channel = save_xir & CyIRChannel;
+        info = &cinfo->ports[channel + chip * 4];
+        save_car = readb(base_addr + (CyCAR << index));
+        cy_writeb(base_addr + (CyCAR << index), save_xir);
+
+        /* if there is nowhere to put the data, discard it */
+        if (info->tty == NULL) {
+                if ((readb(base_addr + (CyRIVR << index)) & CyIVRMask) ==
+                                CyIVRRxEx) {    /* exception */
+                        data = readb(base_addr + (CyRDSR << index));
+                } else {        /* normal character reception */
+                        char_count = readb(base_addr + (CyRDCR << index));
+                        while (char_count--)
                                 data = readb(base_addr + (CyRDSR << index));
-                        } else {        /* normal character reception */
-                                char_count = readb(base_addr +
-                                                (CyRDCR << index));
-                                while (char_count--) {
-                                        data = readb(base_addr +
-                                                (CyRDSR << index));
-                                }
-                        }
-                } else {        /* there is an open port for this data */
-                        tty = info->tty;
-                        j = (readb(base_addr + (CyRIVR << index)) &
-                                        CyIVRMask);
-                        if (j == CyIVRRxEx) {   /* exception */
-                                data = readb(base_addr + (CyRDSR << index));
-
-                                /* For statistics only */
-                                if (data & CyBREAK)
-                                        info->icount.brk++;
-                                else if (data & CyFRAME)
-                                        info->icount.frame++;
-                                else if (data & CyPARITY)
-                                        info->icount.parity++;
-                                else if (data & CyOVERRUN)
-                                        info->icount.overrun++;
-
-                                if (data & info->ignore_status_mask) {
+                }
+                goto end;
+        }
+        /* there is an open port for this data */
+        tty = info->tty;
+        if ((readb(base_addr + (CyRIVR << index)) & CyIVRMask) ==
+                        CyIVRRxEx) {    /* exception */
+                data = readb(base_addr + (CyRDSR << index));
+
+                /* For statistics only */
+                if (data & CyBREAK)
+                        info->icount.brk++;
+                else if (data & CyFRAME)
+                        info->icount.frame++;
+                else if (data & CyPARITY)
+                        info->icount.parity++;
+                else if (data & CyOVERRUN)
+                        info->icount.overrun++;
+
+                if (data & info->ignore_status_mask) {
+                        info->icount.rx++;
+                        return;
+                }
+                if (tty_buffer_request_room(tty, 1)) {
+                        if (data & info->read_status_mask) {
+                                if (data & CyBREAK) {
+                                        tty_insert_flip_char(tty,
+                                                readb(base_addr + (CyRDSR <<
+                                                        index)), TTY_BREAK);
+                                        info->icount.rx++;
+                                        if (info->flags & ASYNC_SAK)
+                                                do_SAK(tty);
+                                } else if (data & CyFRAME) {
+                                        tty_insert_flip_char( tty,
+                                                readb(base_addr + (CyRDSR <<
+                                                        index)), TTY_FRAME);
+                                        info->icount.rx++;
+                                        info->idle_stats.frame_errs++;
+                                } else if (data & CyPARITY) {
+                                        /* Pieces of seven... */
+                                        tty_insert_flip_char(tty,
+                                                readb(base_addr + (CyRDSR <<
+                                                        index)), TTY_PARITY);
+                                        info->icount.rx++;
+                                        info->idle_stats.parity_errs++;
+                                } else if (data & CyOVERRUN) {
+                                        tty_insert_flip_char(tty, 0,
+                                                        TTY_OVERRUN);
+                                        info->icount.rx++;
+                                        /* If the flip buffer itself is
+                                           overflowing, we still lose
+                                           the next incoming character.
+                                         */
+                                        tty_insert_flip_char(tty,
+                                                readb(base_addr + (CyRDSR <<
+                                                        index)), TTY_FRAME);
                                         info->icount.rx++;
-                                        spin_unlock(&cinfo->card_lock);
-                                        return;
-                                }
-                                if (tty_buffer_request_room(tty, 1)) {
-                                        if (data & info->read_status_mask) {
-                                                if (data & CyBREAK) {
-                                                        tty_insert_flip_char(
-                                                                tty,
-                                                                readb(
-                                                                base_addr +
-                                                                (CyRDSR <<
-                                                                        index)),
-                                                                TTY_BREAK);
-                                                        info->icount.rx++;
-                                                        if (info->flags &
-                                                            ASYNC_SAK) {
-                                                                do_SAK(tty);
-                                                        }
-                                                } else if (data & CyFRAME) {
-                                                        tty_insert_flip_char(
-                                                                tty,
-                                                                readb(
-                                                                base_addr +
-                                                                (CyRDSR <<
-                                                                        index)),
-                                                                TTY_FRAME);
-                                                        info->icount.rx++;
-                                                        info->idle_stats.
-                                                                frame_errs++;
-                                                } else if (data & CyPARITY) {
-                                                        /* Pieces of seven... */
-                                                        tty_insert_flip_char(
-                                                                tty,
-                                                                readb(
-                                                                base_addr +
-                                                                (CyRDSR <<
-                                                                        index)),
-                                                                TTY_PARITY);
-                                                        info->icount.rx++;
-                                                        info->idle_stats.
-                                                                parity_errs++;
-                                                } else if (data & CyOVERRUN) {
-                                                        tty_insert_flip_char(
-                                                                tty, 0,
-                                                                TTY_OVERRUN);
-                                                        info->icount.rx++;
-                                                /* If the flip buffer itself is
-                                                   overflowing, we still lose
-                                                   the next incoming character.
-                                                 */
-                                                        tty_insert_flip_char(
-                                                                tty,
-                                                                readb(
-                                                                base_addr +
-                                                                (CyRDSR <<
-                                                                        index)),
-                                                                TTY_FRAME);
-                                                        info->icount.rx++;
-                                                        info->idle_stats.
-                                                                overruns++;
-                                        /* These two conditions may imply */
-                                        /* a normal read should be done. */
-                                        /* }else if(data & CyTIMEOUT){ */
-                                        /* }else if(data & CySPECHAR){ */
-                                                } else {
-                                                        tty_insert_flip_char(
-                                                                tty, 0,
-                                                                TTY_NORMAL);
-                                                        info->icount.rx++;
-                                                }
-                                        } else {
-                                                tty_insert_flip_char(tty, 0,
-                                                                TTY_NORMAL);
-                                                info->icount.rx++;
-                                        }
-                                } else {
-                                        /* there was a software buffer
-                                           overrun and nothing could be
-                                           done about it!!! */
-                                        info->icount.buf_overrun++;
                                         info->idle_stats.overruns++;
+                                /* These two conditions may imply */
+                                /* a normal read should be done. */
+                                /* } else if(data & CyTIMEOUT) { */
+                                /* } else if(data & CySPECHAR) { */
+                                } else {
+                                        tty_insert_flip_char(tty, 0,
+                                                        TTY_NORMAL);
+                                        info->icount.rx++;
                                 }
-                        } else {        /* normal character reception */
-                                /* load # chars available from the chip */
-                                char_count = readb(base_addr +
-                                                (CyRDCR << index));
+                        } else {
+                                tty_insert_flip_char(tty, 0, TTY_NORMAL);
+                                info->icount.rx++;
+                        }
+                } else {
+                        /* there was a software buffer overrun and nothing
+                         * could be done about it!!! */
+                        info->icount.buf_overrun++;
+                        info->idle_stats.overruns++;
+                }
+        } else {        /* normal character reception */
+                /* load # chars available from the chip */
+                char_count = readb(base_addr + (CyRDCR << index));
 
 #ifdef CY_ENABLE_MONITORING
-                                ++info->mon.int_count;
-                                info->mon.char_count += char_count;
-                                if (char_count > info->mon.char_max)
-                                        info->mon.char_max = char_count;
-                                info->mon.char_last = char_count;
+                ++info->mon.int_count;
+                info->mon.char_count += char_count;
+                if (char_count > info->mon.char_max)
+                        info->mon.char_max = char_count;
+                info->mon.char_last = char_count;
 #endif
-                                len = tty_buffer_request_room(tty, char_count);
-                                while (len--) {
-                                        data = readb(base_addr +
-                                                        (CyRDSR << index));
-                                        tty_insert_flip_char(tty, data,
-                                                        TTY_NORMAL);
-                                        info->idle_stats.recv_bytes++;
-                                        info->icount.rx++;
+                len = tty_buffer_request_room(tty, char_count);
+                while (len--) {
+                        data = readb(base_addr + (CyRDSR << index));
+                        tty_insert_flip_char(tty, data, TTY_NORMAL);
+                        info->idle_stats.recv_bytes++;
+                        info->icount.rx++;
 #ifdef CY_16Y_HACK
-                                        udelay(10L);
+                        udelay(10L);
 #endif
-                                }
-                                info->idle_stats.recv_idle = jiffies;
-                        }
-                        tty_schedule_flip(tty);
                 }
-                /* end of service */
-                cy_writeb(base_addr + (CyRIR << index), (save_xir & 0x3f));
-                cy_writeb(base_addr + (CyCAR << index), (save_car));
-                spin_unlock(&cinfo->card_lock);
+                info->idle_stats.recv_idle = jiffies;
         }
+        tty_schedule_flip(tty);
+end:
+        /* end of service */
+        cy_writeb(base_addr + (CyRIR << index), save_xir & 0x3f);
+        cy_writeb(base_addr + (CyCAR << index), save_car);
+}
+
+static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
+                void __iomem *base_addr)
+{
+        struct cyclades_port *info;
+        int char_count, index = cinfo->bus_index;
+        u8 save_xir, channel, save_car, outch;
 
-        if (status & CySRTransmit) {    /* transmission interrupt */
-                /* Since we only get here when the transmit buffer
-                   is empty, we know we can always stuff a dozen
-                   characters. */
+        /* Since we only get here when the transmit buffer
+           is empty, we know we can always stuff a dozen
+           characters. */
 #ifdef CY_DEBUG_INTERRUPTS
-                printk(KERN_DEBUG "cyy_interrupt: xmit intr, chip %d\n", chip);
+        printk(KERN_DEBUG "cyy_interrupt: xmit intr, chip %d\n", chip);
 #endif
 
-                /* determine the channel & change to that context */
-                spin_lock(&cinfo->card_lock);
-                save_xir = (u_char) readb(base_addr + (CyTIR << index));
-                channel = (u_short) (save_xir & CyIRChannel);
-                save_car = readb(base_addr + (CyCAR << index));
-                cy_writeb(base_addr + (CyCAR << index), save_xir);
+        /* determine the channel & change to that context */
+        save_xir = readb(base_addr + (CyTIR << index));
+        channel = save_xir & CyIRChannel;
+        save_car = readb(base_addr + (CyCAR << index));
+        cy_writeb(base_addr + (CyCAR << index), save_xir);
 
-                /* validate the port# (as configured and open) */
-                if (channel + chip * 4 >= cinfo->nports) {
-                        cy_writeb(base_addr + (CySRER << index),
-                                  readb(base_addr + (CySRER << index)) &
-                                  ~CyTxRdy);
-                        goto txend;
-                }
-                info = &cinfo->ports[channel + chip * 4];
-                if (info->tty == NULL) {
-                        cy_writeb(base_addr + (CySRER << index),
-                                  readb(base_addr + (CySRER << index)) &
-                                  ~CyTxRdy);
-                        goto txdone;
-                }
+        /* validate the port# (as configured and open) */
+        if (channel + chip * 4 >= cinfo->nports) {
+                cy_writeb(base_addr + (CySRER << index),
+                          readb(base_addr + (CySRER << index)) & ~CyTxRdy);
+                goto end;
+        }
+        info = &cinfo->ports[channel + chip * 4];
+        if (info->tty == NULL) {
+                cy_writeb(base_addr + (CySRER << index),
+                          readb(base_addr + (CySRER << index)) & ~CyTxRdy);
+                goto end;
+        }
 
-                /* load the on-chip space for outbound data */
-                char_count = info->xmit_fifo_size;
+        /* load the on-chip space for outbound data */
+        char_count = info->xmit_fifo_size;
 
-                if (info->x_char) {     /* send special char */
-                        outch = info->x_char;
-                        cy_writeb(base_addr + (CyTDR << index), outch);
-                        char_count--;
-                        info->icount.tx++;
-                        info->x_char = 0;
-                }
+        if (info->x_char) {     /* send special char */
+                outch = info->x_char;
+                cy_writeb(base_addr + (CyTDR << index), outch);
+                char_count--;
+                info->icount.tx++;
+                info->x_char = 0;
+        }
 
-                if (info->breakon || info->breakoff) {
-                        if (info->breakon) {
-                                cy_writeb(base_addr + (CyTDR << index), 0);
-                                cy_writeb(base_addr + (CyTDR << index), 0x81);
-                                info->breakon = 0;
-                                char_count -= 2;
-                        }
-                        if (info->breakoff) {
-                                cy_writeb(base_addr + (CyTDR << index), 0);
-                                cy_writeb(base_addr + (CyTDR << index), 0x83);
-                                info->breakoff = 0;
-                                char_count -= 2;
-                        }
+        if (info->breakon || info->breakoff) {
+                if (info->breakon) {
+                        cy_writeb(base_addr + (CyTDR << index), 0);
+                        cy_writeb(base_addr + (CyTDR << index), 0x81);
+                        info->breakon = 0;
+                        char_count -= 2;
+                }
+                if (info->breakoff) {
+                        cy_writeb(base_addr + (CyTDR << index), 0);
+                        cy_writeb(base_addr + (CyTDR << index), 0x83);
+                        info->breakoff = 0;
+                        char_count -= 2;
                 }
+        }
 
-                while (char_count-- > 0) {
-                        if (!info->xmit_cnt) {
-                                if (readb(base_addr + (CySRER << index)) &
-                                                CyTxMpty) {
-                                        cy_writeb(base_addr + (CySRER << index),
-                                                readb(base_addr +
-                                                        (CySRER << index)) &
+        while (char_count-- > 0) {
+                if (!info->xmit_cnt) {
+                        if (readb(base_addr + (CySRER << index)) & CyTxMpty) {
+                                cy_writeb(base_addr + (CySRER << index),
+                                        readb(base_addr + (CySRER << index)) &
                                                 ~CyTxMpty);
-                                } else {
-                                        cy_writeb(base_addr + (CySRER << index),
-                                                (readb(base_addr +
-                                                        (CySRER << index)) &
+                        } else {
+                                cy_writeb(base_addr + (CySRER << index),
+                                        (readb(base_addr + (CySRER << index)) &
                                                 ~CyTxRdy) | CyTxMpty);
-                                }
-                                goto txdone;
                         }
-                        if (info->xmit_buf == NULL) {
-                                cy_writeb(base_addr + (CySRER << index),
-                                        readb(base_addr + (CySRER << index)) &
+                        goto done;
+                }
+                if (info->xmit_buf == NULL) {
+                        cy_writeb(base_addr + (CySRER << index),
+                                readb(base_addr + (CySRER << index)) &
                                         ~CyTxRdy);
-                                goto txdone;
-                        }
-                        if (info->tty->stopped || info->tty->hw_stopped) {
-                                cy_writeb(base_addr + (CySRER << index),
-                                        readb(base_addr + (CySRER << index)) &
+                        goto done;
+                }
+                if (info->tty->stopped || info->tty->hw_stopped) {
+                        cy_writeb(base_addr + (CySRER << index),
+                                readb(base_addr + (CySRER << index)) &
                                         ~CyTxRdy);
-                                goto txdone;
-                        }
-                        /* Because the Embedded Transmit Commands have
-                           been enabled, we must check to see if the
-                           escape character, NULL, is being sent.  If it
-                           is, we must ensure that there is room for it
-                           to be doubled in the output stream.  Therefore
-                           we no longer advance the pointer when the
-                           character is fetched, but rather wait until
-                           after the check for a NULL output character.
-                           This is necessary because there may not be
-                           room for the two chars needed to send a NULL.)
-                         */
-                        outch = info->xmit_buf[info->xmit_tail];
-                        if (outch) {
+                        goto done;
+                }
+                /* Because the Embedded Transmit Commands have been enabled,
+                 * we must check to see if the escape character, NULL, is being
+                 * sent. If it is, we must ensure that there is room for it to
+                 * be doubled in the output stream.  Therefore we no longer
+                 * advance the pointer when the character is fetched, but
+                 * rather wait until after the check for a NULL output
+                 * character. This is necessary because there may not be room
+                 * for the two chars needed to send a NULL.)
+                 */
+                outch = info->xmit_buf[info->xmit_tail];
+                if (outch) {
+                        info->xmit_cnt--;
+                        info->xmit_tail = (info->xmit_tail + 1) &
+                                        (SERIAL_XMIT_SIZE - 1);
+                        cy_writeb(base_addr + (CyTDR << index), outch);
+                        info->icount.tx++;
+                } else {
+                        if (char_count > 1) {
                                 info->xmit_cnt--;
                                 info->xmit_tail = (info->xmit_tail + 1) &
-                                                (SERIAL_XMIT_SIZE - 1);
+                                        (SERIAL_XMIT_SIZE - 1);
                                 cy_writeb(base_addr + (CyTDR << index), outch);
+                                cy_writeb(base_addr + (CyTDR << index), 0);
                                 info->icount.tx++;
-                        } else {
-                                if (char_count > 1) {
-                                        info->xmit_cnt--;
-                                        info->xmit_tail = (info->xmit_tail + 1)&
-                                                (SERIAL_XMIT_SIZE - 1);
-                                        cy_writeb(base_addr + (CyTDR << index),
-                                                outch);
-                                        cy_writeb(base_addr + (CyTDR << index),
-                                                0);
-                                        info->icount.tx++;
-                                        char_count--;
-                                }
+                                char_count--;
                         }
                 }
-
-txdone:
-                if (info->xmit_cnt < WAKEUP_CHARS) {
-                        cy_sched_event(info, Cy_EVENT_WRITE_WAKEUP);
-                }
-txend:
-                /* end of service */
-                cy_writeb(base_addr + (CyTIR << index), (save_xir & 0x3f));
-                cy_writeb(base_addr + (CyCAR << index), (save_car));
-                spin_unlock(&cinfo->card_lock);
         }
 
-        if (status & CySRModem) {       /* modem interrupt */
+done:
+        tty_wakeup(info->tty);
+end:
+        /* end of service */
+        cy_writeb(base_addr + (CyTIR << index), save_xir & 0x3f);
+        cy_writeb(base_addr + (CyCAR << index), save_car);
+}
 
-                /* determine the channel & change to that context */
-                spin_lock(&cinfo->card_lock);
-                save_xir = (u_char) readb(base_addr + (CyMIR << index));
-                channel = (u_short) (save_xir & CyIRChannel);
-                info = &cinfo->ports[channel + chip * 4];
-                save_car = readb(base_addr + (CyCAR << index));
-                cy_writeb(base_addr + (CyCAR << index), save_xir);
+static void cyy_chip_modem(struct cyclades_card *cinfo, int chip,
+                void __iomem *base_addr)
+{
+        struct cyclades_port *info;
+        int index = cinfo->bus_index;
+        u8 save_xir, channel, save_car, mdm_change, mdm_status;
 
-                mdm_change = readb(base_addr + (CyMISR << index));
-                mdm_status = readb(base_addr + (CyMSVR1 << index));
+        /* determine the channel & change to that context */
+        save_xir = readb(base_addr + (CyMIR << index));
+        channel = save_xir & CyIRChannel;
+        info = &cinfo->ports[channel + chip * 4];
+        save_car = readb(base_addr + (CyCAR << index));
+        cy_writeb(base_addr + (CyCAR << index), save_xir);
 
-                if (info->tty) {
-                        if (mdm_change & CyANY_DELTA) {
-                                /* For statistics only */
-                                if (mdm_change & CyDCD)
-                                        info->icount.dcd++;
-                                if (mdm_change & CyCTS)
-                                        info->icount.cts++;
-                                if (mdm_change & CyDSR)
-                                        info->icount.dsr++;
-                                if (mdm_change & CyRI)
-                                        info->icount.rng++;
-
-                                cy_sched_event(info, Cy_EVENT_DELTA_WAKEUP);
-                        }
+        mdm_change = readb(base_addr + (CyMISR << index));
+        mdm_status = readb(base_addr + (CyMSVR1 << index));
 
-                        if ((mdm_change & CyDCD) &&
-                                        (info->flags & ASYNC_CHECK_CD)) {
-                                if (mdm_status & CyDCD) {
-                                        cy_sched_event(info,
-                                                        Cy_EVENT_OPEN_WAKEUP);
-                                } else {
-                                        cy_sched_event(info, Cy_EVENT_HANGUP);
-                                }
-                        }
-                        if ((mdm_change & CyCTS) &&
-                                        (info->flags & ASYNC_CTS_FLOW)) {
-                                if (info->tty->hw_stopped) {
-                                        if (mdm_status & CyCTS) {
-                                                /* cy_start isn't used
-                                                   because... !!! */
-                                                info->tty->hw_stopped = 0;
-                                                cy_writeb(base_addr +
-                                                        (CySRER << index),
-                                                        readb(base_addr +
-                                                                (CySRER <<
-                                                                        index))|
-                                                        CyTxRdy);
-                                                cy_sched_event(info,
-                                                        Cy_EVENT_WRITE_WAKEUP);
-                                        }
-                                } else {
-                                        if (!(mdm_status & CyCTS)) {
-                                                /* cy_stop isn't used
-                                                   because ... !!! */
-                                                info->tty->hw_stopped = 1;
-                                                cy_writeb(base_addr +
-                                                        (CySRER << index),
-                                                        readb(base_addr +
-                                                                (CySRER <<
-                                                                index)) &
-                                                        ~CyTxRdy);
-                                        }
-                                }
+        if (!info->tty)
+                goto end;
+
+        if (mdm_change & CyANY_DELTA) {
+                /* For statistics only */
+                if (mdm_change & CyDCD)
+                        info->icount.dcd++;
+                if (mdm_change & CyCTS)
+                        info->icount.cts++;
+                if (mdm_change & CyDSR)
+                        info->icount.dsr++;
+                if (mdm_change & CyRI)
+                        info->icount.rng++;
+
+                wake_up_interruptible(&info->delta_msr_wait);
+        }
+
+        if ((mdm_change & CyDCD) && (info->flags & ASYNC_CHECK_CD)) {
+                if (!(mdm_status & CyDCD)) {
+                        tty_hangup(info->tty);
+                        info->flags &= ~ASYNC_NORMAL_ACTIVE;
+                }
+                wake_up_interruptible(&info->open_wait);
+        }
+        if ((mdm_change & CyCTS) && (info->flags & ASYNC_CTS_FLOW)) {
+                if (info->tty->hw_stopped) {
+                        if (mdm_status & CyCTS) {
+                                /* cy_start isn't used
+                                   because... !!! */
+                                info->tty->hw_stopped = 0;
+                                cy_writeb(base_addr + (CySRER << index),
+                                        readb(base_addr + (CySRER << index)) |
+                                                CyTxRdy);
+                                tty_wakeup(info->tty);
                         }
-/*                      if (mdm_change & CyDSR) {
+                } else {
+                        if (!(mdm_status & CyCTS)) {
+                                /* cy_stop isn't used
+                                   because ... !!! */
+                                info->tty->hw_stopped = 1;
+                                cy_writeb(base_addr + (CySRER << index),
+                                        readb(base_addr + (CySRER << index)) &
+                                                ~CyTxRdy);
                         }
-                        if (mdm_change & CyRI) {
-                        }*/
                 }
-                /* end of service */
-                cy_writeb(base_addr + (CyMIR << index), (save_xir & 0x3f));
-                cy_writeb(base_addr + (CyCAR << index), save_car);
-                spin_unlock(&cinfo->card_lock);
         }
+/*      if (mdm_change & CyDSR) {
+        }
+        if (mdm_change & CyRI) {
+        }*/
+end:
+        /* end of service */
+        cy_writeb(base_addr + (CyMIR << index), save_xir & 0x3f);
+        cy_writeb(base_addr + (CyCAR << index), save_car);
 }
 
 /* The real interrupt service routine is called
@@ -1432,10 +1317,8 @@ static irqreturn_t cyy_interrupt(int irq, void *dev_id)
         int status;
         struct cyclades_card *cinfo = dev_id;
         void __iomem *base_addr, *card_base_addr;
-        int chip;
+        unsigned int chip, too_many, had_work;
         int index;
-        int too_many;
-        int had_work;
 
         if (unlikely(cinfo == NULL)) {
 #ifdef CY_DEBUG_INTERRUPTS
@@ -1470,11 +1353,16 @@ static irqreturn_t cyy_interrupt(int irq, void *dev_id)
                            chips to be checked in a round-robin fashion (after
                            draining each of a bunch (1000) of characters).
                          */
-                                if (1000 < too_many++) {
+                                if (1000 < too_many++)
                                         break;
-                                }
-                                cyy_intr_chip(cinfo, chip, base_addr, status,
-                                                index);
+                                spin_lock(&cinfo->card_lock);
+                                if (status & CySRReceive) /* rx intr */
+                                        cyy_chip_rx(cinfo, chip, base_addr);
+                                if (status & CySRTransmit) /* tx intr */
+                                        cyy_chip_tx(cinfo, chip, base_addr);
+                                if (status & CySRModem) /* modem intr */
+                                        cyy_chip_modem(cinfo, chip, base_addr);
+                                spin_unlock(&cinfo->card_lock);
                         }
                 }
         } while (had_work);
@@ -1529,7 +1417,7 @@ cyz_issue_cmd(struct cyclades_card *cinfo,
         struct ZFW_CTRL __iomem *zfw_ctrl;
         struct BOARD_CTRL __iomem *board_ctrl;
         __u32 __iomem *pci_doorbell;
-        int index;
+        unsigned int index;
 
         firm_id = cinfo->base_addr + ID_ADDRESS;
         if (!ISZLOADED(*cinfo)) {
@@ -1554,13 +1442,12 @@ cyz_issue_cmd(struct cyclades_card *cinfo,
         return 0;
 }                               /* cyz_issue_cmd */
 
-static void
-cyz_handle_rx(struct cyclades_port *info, struct CH_CTRL __iomem *ch_ctrl,
+static void cyz_handle_rx(struct cyclades_port *info,
                 struct BUF_CTRL __iomem *buf_ctrl)
 {
         struct cyclades_card *cinfo = info->card;
         struct tty_struct *tty = info->tty;
-        int char_count;
+        unsigned int char_count;
         int len;
 #ifdef BLOCKMOVE
         unsigned char *buf;
@@ -1633,9 +1520,11 @@ cyz_handle_rx(struct cyclades_port *info, struct CH_CTRL __iomem *ch_ctrl,
                                 char_count = rx_put - rx_get;
                         else
                                 char_count = rx_put - rx_get + rx_bufsize;
-                        if (char_count >= (int)readl(&buf_ctrl->rx_threshold)) {
-                                cy_sched_event(info, Cy_EVENT_Z_RX_FULL);
-                        }
+                        if (char_count >= readl(&buf_ctrl->rx_threshold) &&
+                                        !timer_pending(&cyz_rx_full_timer[
+                                                        info->line]))
+                                mod_timer(&cyz_rx_full_timer[info->line],
+                                                jiffies + 1);
 #endif
                         info->idle_stats.recv_idle = jiffies;
                         tty_schedule_flip(tty);
@@ -1645,14 +1534,13 @@ cyz_handle_rx(struct cyclades_port *info, struct CH_CTRL __iomem *ch_ctrl,
         }
 }
 
-static void
-cyz_handle_tx(struct cyclades_port *info, struct CH_CTRL __iomem *ch_ctrl,
+static void cyz_handle_tx(struct cyclades_port *info,
                 struct BUF_CTRL __iomem *buf_ctrl)
 {
         struct cyclades_card *cinfo = info->card;
         struct tty_struct *tty = info->tty;
-        char data;
-        int char_count;
+        u8 data;
+        unsigned int char_count;
 #ifdef BLOCKMOVE
         int small_count;
 #endif
@@ -1717,9 +1605,7 @@ cyz_handle_tx(struct cyclades_port *info, struct CH_CTRL __iomem *ch_ctrl,
                 }
 #endif
 ztxdone:
-                if (info->xmit_cnt < WAKEUP_CHARS) {
-                        cy_sched_event(info, Cy_EVENT_WRITE_WAKEUP);
-                }
+                tty_wakeup(tty);
                 /* Update tx_put */
                 cy_writel(&buf_ctrl->tx_put, tx_put);
         }
@@ -1781,10 +1667,11 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                                 if ((fw_ver > 241 ? ((u_long) param) :
                                                 readl(&ch_ctrl->rs_status)) &
                                                 C_RS_DCD) {
-                                        cy_sched_event(info,
-                                                        Cy_EVENT_OPEN_WAKEUP);
+                                        wake_up_interruptible(&info->open_wait);
                                 } else {
-                                        cy_sched_event(info, Cy_EVENT_HANGUP);
+                                        tty_hangup(info->tty);
+                                        wake_up_interruptible(&info->open_wait);
+                                        info->flags &= ~ASYNC_NORMAL_ACTIVE;
                                 }
                         }
                         break;
@@ -1802,7 +1689,7 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                         break;
 #ifdef Z_WAKE
                 case C_CM_IOCTLW:
-                        cy_sched_event(info, Cy_EVENT_SHUTDOWN_WAKEUP);
+                        complete(&info->shutdown_wait);
                         break;
 #endif
 #ifdef CONFIG_CYZ_INTR
@@ -1814,7 +1701,7 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                         printk(KERN_DEBUG "cyz_interrupt: rcvd intr, card %d, "
                                         "port %ld\n", info->card, channel);
 #endif
-                        cyz_handle_rx(info, ch_ctrl, buf_ctrl);
+                        cyz_handle_rx(info, buf_ctrl);
                         break;
                 case C_CM_TXBEMPTY:
                 case C_CM_TXLOWWM:
@@ -1824,7 +1711,7 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                         printk(KERN_DEBUG "cyz_interrupt: xmit intr, card %d, "
                                         "port %ld\n", info->card, channel);
 #endif
-                        cyz_handle_tx(info, ch_ctrl, buf_ctrl);
+                        cyz_handle_tx(info, buf_ctrl);
                         break;
 #endif                          /* CONFIG_CYZ_INTR */
                 case C_CM_FATAL:
@@ -1834,7 +1721,7 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                         break;
                 }
                 if (delta_count)
-                        cy_sched_event(info, Cy_EVENT_DELTA_WAKEUP);
+                        wake_up_interruptible(&info->delta_msr_wait);
                 if (special_count)
                         tty_schedule_flip(tty);
         }
@@ -1893,10 +1780,9 @@ static void cyz_poll(unsigned long arg)
         struct FIRM_ID __iomem *firm_id;
         struct ZFW_CTRL __iomem *zfw_ctrl;
         struct BOARD_CTRL __iomem *board_ctrl;
-        struct CH_CTRL __iomem *ch_ctrl;
         struct BUF_CTRL __iomem *buf_ctrl;
         unsigned long expires = jiffies + HZ;
-        int card, port;
+        unsigned int port, card;
 
         for (card = 0; card < NR_CARDS; card++) {
                 cinfo = &cy_card[card];
@@ -1923,12 +1809,11 @@ static void cyz_poll(unsigned long arg)
                 for (port = 0; port < cinfo->nports; port++) {
                         info = &cinfo->ports[port];
                         tty = info->tty;
-                        ch_ctrl = &(zfw_ctrl->ch_ctrl[port]);
                         buf_ctrl = &(zfw_ctrl->buf_ctrl[port]);
 
                         if (!info->throttle)
-                                cyz_handle_rx(info, ch_ctrl, buf_ctrl);
-                        cyz_handle_tx(info, ch_ctrl, buf_ctrl);
+                                cyz_handle_rx(info, buf_ctrl);
+                        cyz_handle_tx(info, buf_ctrl);
                 }
                 /* poll every 'cyz_polling_cycle' period */
                 expires = jiffies + cyz_polling_cycle;
@@ -2491,11 +2376,11 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
 static int cy_open(struct tty_struct *tty, struct file *filp)
 {
         struct cyclades_port *info;
-        unsigned int i;
-        int retval, line;
+        unsigned int i, line;
+        int retval;
 
         line = tty->index;
-        if ((line < 0) || (NR_PORTS <= line)) {
+        if ((tty->index < 0) || (NR_PORTS <= line)) {
                 return -ENODEV;
         }
         for (i = 0; i < NR_CARDS; i++)
@@ -2812,7 +2697,6 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
         spin_lock_irqsave(&card->card_lock, flags);
 
         tty->closing = 0;
-        info->event = 0;
         info->tty = NULL;
         if (info->blocked_open) {
                 spin_unlock_irqrestore(&card->card_lock, flags);
@@ -4444,7 +4328,6 @@ static void cy_hangup(struct tty_struct *tty)
 
         cy_flush_buffer(tty);
         shutdown(info);
-        info->event = 0;
         info->count = 0;
 #ifdef CY_DEBUG_COUNT
         printk(KERN_DEBUG "cyc:cy_hangup (%d): setting count to 0\n",
@@ -4467,9 +4350,9 @@ static int __devinit cy_init_card(struct cyclades_card *cinfo)
 {
         struct cyclades_port *info;
         u32 uninitialized_var(mailbox);
-        unsigned int nports;
+        unsigned int nports, port;
         unsigned short chip_number;
-        int uninitialized_var(index), port;
+        int uninitialized_var(index);
 
         spin_lock_init(&cinfo->card_lock);
 
@@ -4502,7 +4385,6 @@ static int __devinit cy_init_card(struct cyclades_card *cinfo)
                 info->closing_wait = CLOSING_WAIT_DELAY;
                 info->close_delay = 5 * HZ / 10;
 
-                INIT_WORK(&info->tqueue, do_softint);
                 init_waitqueue_head(&info->open_wait);
                 init_waitqueue_head(&info->close_wait);
                 init_completion(&info->shutdown_wait);
@@ -5236,7 +5118,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
                         }
                 }
 #endif                          /* CONFIG_CYZ_INTR */
-                cy_card[card_no].num_chips = -1;
+                cy_card[card_no].num_chips = (unsigned int)-1;
         }
 
         /* set cy_card */
@@ -5480,13 +5362,13 @@ static int __init cy_init(void)
 #ifdef CONFIG_PCI
         /* look for pci boards */
         retval = pci_register_driver(&cy_pci_driver);
-        if (retval && !nboards)
-                goto err_unr;
+        if (retval && !nboards) {
+                tty_unregister_driver(cy_serial_driver);
+                goto err_frtty;
+        }
 #endif
 
         return 0;
-err_unr:
-        tty_unregister_driver(cy_serial_driver);
 err_frtty:
         put_tty_driver(cy_serial_driver);
 err:
@@ -5496,7 +5378,7 @@ err:
 static void __exit cy_cleanup_module(void)
 {
         struct cyclades_card *card;
-        int i, e1;
+        unsigned int i, e1;
 
 #ifndef CONFIG_CYZ_INTR
         del_timer_sync(&cyz_timerlist);
@@ -5524,8 +5406,7 @@ static void __exit cy_cleanup_module(void)
 #endif /* CONFIG_CYZ_INTR */
                                 )
                                 free_irq(card->irq, card);
-                        for (e1 = card->first_line;
-                                        e1 < card->first_line +
+                        for (e1 = card->first_line; e1 < card->first_line +
                                         card->nports; e1++)
                                 tty_unregister_device(cy_serial_driver, e1);
                         kfree(card->ports);
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 8435fba73daf..5dc1265ce1d5 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -221,10 +221,8 @@ struct ipmi_smi
         void                     *send_info;
 
 #ifdef CONFIG_PROC_FS
-        /* A list of proc entries for this interface.  This does not
-           need a lock, only one thread creates it and only one thread
-           destroys it. */
-        spinlock_t             proc_entry_lock;
+        /* A list of proc entries for this interface. */
+        struct mutex           proc_entry_lock;
         struct ipmi_proc_entry *proc_entries;
 #endif
 
@@ -1891,11 +1889,11 @@ int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name,
                 file->write_proc = write_proc;
                 file->owner = owner;
 
-                spin_lock(&smi->proc_entry_lock);
+                mutex_lock(&smi->proc_entry_lock);
                 /* Stick it on the list. */
                 entry->next = smi->proc_entries;
                 smi->proc_entries = entry;
-                spin_unlock(&smi->proc_entry_lock);
+                mutex_unlock(&smi->proc_entry_lock);
         }
 #endif /* CONFIG_PROC_FS */
 
@@ -1939,7 +1937,7 @@ static void remove_proc_entries(ipmi_smi_t smi)
 #ifdef CONFIG_PROC_FS
         struct ipmi_proc_entry *entry;
 
-        spin_lock(&smi->proc_entry_lock);
+        mutex_lock(&smi->proc_entry_lock);
         while (smi->proc_entries) {
                 entry = smi->proc_entries;
                 smi->proc_entries = entry->next;
@@ -1948,7 +1946,7 @@ static void remove_proc_entries(ipmi_smi_t smi)
                 kfree(entry->name);
                 kfree(entry);
         }
-        spin_unlock(&smi->proc_entry_lock);
+        mutex_unlock(&smi->proc_entry_lock);
         remove_proc_entry(smi->proc_dir_name, proc_ipmi_root);
 #endif /* CONFIG_PROC_FS */
 }
@@ -2614,6 +2612,14 @@ channel_handler(ipmi_smi_t intf, struct ipmi_recv_msg *msg)
         return;
 }
 
+void ipmi_poll_interface(ipmi_user_t user)
+{
+        ipmi_smi_t intf = user->intf;
+
+        if (intf->handlers->poll)
+                intf->handlers->poll(intf->send_info);
+}
+
 int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
                       void                     *send_info,
                       struct ipmi_device_id    *device_id,
@@ -2671,7 +2677,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
         }
         intf->curr_seq = 0;
 #ifdef CONFIG_PROC_FS
-        spin_lock_init(&intf->proc_entry_lock);
+        mutex_init(&intf->proc_entry_lock);
 #endif
         spin_lock_init(&intf->waiting_msgs_lock);
         INIT_LIST_HEAD(&intf->waiting_msgs);
@@ -4166,6 +4172,7 @@ EXPORT_SYMBOL(ipmi_destroy_user);
 EXPORT_SYMBOL(ipmi_get_version);
 EXPORT_SYMBOL(ipmi_request_settime);
 EXPORT_SYMBOL(ipmi_request_supply_msgs);
+EXPORT_SYMBOL(ipmi_poll_interface);
 EXPORT_SYMBOL(ipmi_register_smi);
 EXPORT_SYMBOL(ipmi_unregister_smi);
 EXPORT_SYMBOL(ipmi_register_for_cmd);
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index c1222e98525d..4f560d0bb808 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -675,7 +675,8 @@ static void handle_transaction_done(struct smi_info *smi_info)
 }
 
 /* Called on timeouts and events.  Timeouts should pass the elapsed
-   time, interrupts should pass in zero. */
+   time, interrupts should pass in zero.  Must be called with
+   si_lock held and interrupts disabled. */
 static enum si_sm_result smi_event_handler(struct smi_info *smi_info,
                                            int time)
 {
@@ -892,13 +893,16 @@ static int ipmi_thread(void *data)
 static void poll(void *send_info)
 {
         struct smi_info *smi_info = send_info;
+        unsigned long flags;
 
         /*
          * Make sure there is some delay in the poll loop so we can
          * drive time forward and timeout things.
          */
         udelay(10);
+        spin_lock_irqsave(&smi_info->si_lock, flags);
         smi_event_handler(smi_info, 10);
+        spin_unlock_irqrestore(&smi_info->si_lock, flags);
 }
 
 static void request_events(void *send_info)
@@ -1006,6 +1010,10 @@ static int smi_start_processing(void       *send_info,
 
         new_smi->intf = intf;
 
+        /* Try to claim any interrupts. */
+        if (new_smi->irq_setup)
+                new_smi->irq_setup(new_smi);
+
         /* Set up the timer that drives the interface. */
         setup_timer(&new_smi->si_timer, smi_timeout, (long)new_smi);
         new_smi->last_timeout_jiffies = jiffies;
@@ -2372,20 +2380,9 @@ static int try_get_dev_id(struct smi_info *smi_info)
         /* Otherwise, we got some data. */
         resp_len = smi_info->handlers->get_result(smi_info->si_sm,
                                                   resp, IPMI_MAX_MSG_LENGTH);
-        if (resp_len < 14) {
-                /* That's odd, it should be longer. */
-                rv = -EINVAL;
-                goto out;
-        }
 
-        if ((resp[1] != IPMI_GET_DEVICE_ID_CMD) || (resp[2] != 0)) {
-                /* That's odd, it shouldn't be able to fail. */
-                rv = -EINVAL;
-                goto out;
-        }
-
-        /* Record info from the get device id, in case we need it. */
-        ipmi_demangle_device_id(resp+3, resp_len-3, &smi_info->device_id);
+        /* Check and record info from the get device id, in case we need it. */
+        rv = ipmi_demangle_device_id(resp, resp_len, &smi_info->device_id);
 
  out:
         kfree(resp);
@@ -2765,10 +2762,6 @@ static int try_smi_init(struct smi_info *new_smi)
         setup_oem_data_handler(new_smi);
         setup_xaction_handlers(new_smi);
 
-        /* Try to claim any interrupts. */
-        if (new_smi->irq_setup)
-                new_smi->irq_setup(new_smi);
-
         INIT_LIST_HEAD(&(new_smi->xmit_msgs));
         INIT_LIST_HEAD(&(new_smi->hp_xmit_msgs));
         new_smi->curr_msg = NULL;
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 41f78e2c158f..e686fc925168 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -50,10 +50,19 @@
 #include <linux/poll.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
+#include <linux/delay.h>
 #include <asm/atomic.h>
 
-#ifdef CONFIG_X86_LOCAL_APIC
-#include <asm/apic.h>
+#ifdef CONFIG_X86
+/* This is ugly, but I've determined that x86 is the only architecture
+   that can reasonably support the IPMI NMI watchdog timeout at this
+   time.  If another architecture adds this capability somehow, it
+   will have to be a somewhat different mechanism and I have no idea
+   how it will work.  So in the unlikely event that another
+   architecture supports this, we can figure out a good generic
+   mechanism for it at that time. */
+#include <asm/kdebug.h>
+#define HAVE_DIE_NMI
 #endif
 
 #define PFX "IPMI Watchdog: "
@@ -166,8 +175,6 @@ static char expect_close;
 
 static int ifnum_to_use = -1;
 
-static DECLARE_RWSEM(register_sem);
-
 /* Parameters to ipmi_set_timeout */
 #define IPMI_SET_TIMEOUT_NO_HB                  0
 #define IPMI_SET_TIMEOUT_HB_IF_NECESSARY        1
@@ -193,11 +200,9 @@ static int set_param_int(const char *val, struct kernel_param *kp)
         if (endp == val)
                 return -EINVAL;
 
-        down_read(&register_sem);
         *((int *)kp->arg) = l;
         if (watchdog_user)
                 rv = ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY);
-        up_read(&register_sem);
 
         return rv;
 }
@@ -226,17 +231,15 @@ static int set_param_str(const char *val, struct kernel_param *kp)
 
         s = strstrip(valcp);
 
-        down_read(&register_sem);
         rv = fn(s, NULL);
         if (rv)
-                goto out_unlock;
+                goto out;
 
         check_parms();
         if (watchdog_user)
                 rv = ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY);
 
- out_unlock:
-        up_read(&register_sem);
+ out:
         return rv;
 }
 
@@ -319,9 +322,12 @@ static unsigned char ipmi_version_minor;
 /* If a pretimeout occurs, this is used to allow only one panic to happen. */
 static atomic_t preop_panic_excl = ATOMIC_INIT(-1);
 
-static int ipmi_heartbeat(void);
-static void panic_halt_ipmi_heartbeat(void);
+#ifdef HAVE_DIE_NMI
+static int testing_nmi;
+static int nmi_handler_registered;
+#endif
 
+static int ipmi_heartbeat(void);
 
 /* We use a mutex to make sure that only one thing can send a set
    timeout at one time, because we only have one copy of the data.
@@ -360,6 +366,9 @@ static int i_ipmi_set_timeout(struct ipmi_smi_msg  *smi_msg,
         int                               hbnow = 0;
 
 
+        /* These can be cleared as we are setting the timeout. */
+        pretimeout_since_last_heartbeat = 0;
+
         data[0] = 0;
         WDOG_SET_TIMER_USE(data[0], WDOG_TIMER_USE_SMS_OS);
 
@@ -434,31 +443,75 @@ static int ipmi_set_timeout(int do_heartbeat)
 
         wait_for_completion(&set_timeout_wait);
 
+        mutex_unlock(&set_timeout_lock);
+
         if ((do_heartbeat == IPMI_SET_TIMEOUT_FORCE_HB)
             || ((send_heartbeat_now)
                 && (do_heartbeat == IPMI_SET_TIMEOUT_HB_IF_NECESSARY)))
-        {
                 rv = ipmi_heartbeat();
-        }
-        mutex_unlock(&set_timeout_lock);
 
 out:
         return rv;
 }
 
-static void dummy_smi_free(struct ipmi_smi_msg *msg)
+static atomic_t panic_done_count = ATOMIC_INIT(0);
+
+static void panic_smi_free(struct ipmi_smi_msg *msg)
 {
+        atomic_dec(&panic_done_count);
 }
-static void dummy_recv_free(struct ipmi_recv_msg *msg)
+static void panic_recv_free(struct ipmi_recv_msg *msg)
 {
+        atomic_dec(&panic_done_count);
+}
+
+static struct ipmi_smi_msg panic_halt_heartbeat_smi_msg =
+{
+        .done = panic_smi_free
+};
+static struct ipmi_recv_msg panic_halt_heartbeat_recv_msg =
+{
+        .done = panic_recv_free
+};
+
+static void panic_halt_ipmi_heartbeat(void)
+{
+        struct kernel_ipmi_msg             msg;
+        struct ipmi_system_interface_addr addr;
+        int rv;
+
+        /* Don't reset the timer if we have the timer turned off, that
+           re-enables the watchdog. */
+        if (ipmi_watchdog_state == WDOG_TIMEOUT_NONE)
+                return;
+
+        addr.addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
+        addr.channel = IPMI_BMC_CHANNEL;
+        addr.lun = 0;
+
+        msg.netfn = 0x06;
+        msg.cmd = IPMI_WDOG_RESET_TIMER;
+        msg.data = NULL;
+        msg.data_len = 0;
+        rv = ipmi_request_supply_msgs(watchdog_user,
+                                      (struct ipmi_addr *) &addr,
+                                      0,
+                                      &msg,
+                                      NULL,
+                                      &panic_halt_heartbeat_smi_msg,
+                                      &panic_halt_heartbeat_recv_msg,
+                                      1);
+        if (!rv)
+                atomic_add(2, &panic_done_count);
 }
+
 static struct ipmi_smi_msg panic_halt_smi_msg =
 {
-        .done = dummy_smi_free
+        .done = panic_smi_free
 };
 static struct ipmi_recv_msg panic_halt_recv_msg =
 {
-        .done = dummy_recv_free
+        .done = panic_recv_free
 };
 
 /* Special call, doesn't claim any locks.  This is only to be called
@@ -470,13 +523,21 @@ static void panic_halt_ipmi_set_timeout(void)
         int send_heartbeat_now;
         int rv;
 
+        /* Wait for the messages to be free. */
+        while (atomic_read(&panic_done_count) != 0)
+                ipmi_poll_interface(watchdog_user);
         rv = i_ipmi_set_timeout(&panic_halt_smi_msg,
                                 &panic_halt_recv_msg,
                                 &send_heartbeat_now);
         if (!rv) {
+                atomic_add(2, &panic_done_count);
                 if (send_heartbeat_now)
                         panic_halt_ipmi_heartbeat();
-        }
+        } else
+                printk(KERN_WARNING PFX
+                       "Unable to extend the watchdog timeout.");
+        while (atomic_read(&panic_done_count) != 0)
+                ipmi_poll_interface(watchdog_user);
 }
 
 /* We use a semaphore to make sure that only one thing can send a
@@ -505,24 +566,14 @@ static struct ipmi_recv_msg heartbeat_recv_msg =
         .done = heartbeat_free_recv
 };
  
-static struct ipmi_smi_msg panic_halt_heartbeat_smi_msg =
-{
-        .done = dummy_smi_free
-};
-static struct ipmi_recv_msg panic_halt_heartbeat_recv_msg =
-{
-        .done = dummy_recv_free
-};
- 
 static int ipmi_heartbeat(void)
 {
         struct kernel_ipmi_msg            msg;
         int                               rv;
         struct ipmi_system_interface_addr addr;
 
-        if (ipmi_ignore_heartbeat) {
+        if (ipmi_ignore_heartbeat)
                 return 0;
-        }
 
         if (ipmi_start_timer_on_heartbeat) {
                 ipmi_start_timer_on_heartbeat = 0;
@@ -533,7 +584,6 @@ static int ipmi_heartbeat(void)
                    We don't want to set the action, though, we want to
                    leave that alone (thus it can't be combined with the
                    above operation. */
-                pretimeout_since_last_heartbeat = 0;
                 return ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY);
         }
 
@@ -586,35 +636,6 @@ static int ipmi_heartbeat(void)
         return rv;
 }
 
-static void panic_halt_ipmi_heartbeat(void)
-{
-        struct kernel_ipmi_msg             msg;
-        struct ipmi_system_interface_addr addr;
-
-
-        /* Don't reset the timer if we have the timer turned off, that
-           re-enables the watchdog. */
-        if (ipmi_watchdog_state == WDOG_TIMEOUT_NONE)
-                return;
-
-        addr.addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
-        addr.channel = IPMI_BMC_CHANNEL;
-        addr.lun = 0;
-
-        msg.netfn = 0x06;
-        msg.cmd = IPMI_WDOG_RESET_TIMER;
-        msg.data = NULL;
-        msg.data_len = 0;
-        ipmi_request_supply_msgs(watchdog_user,
-                                 (struct ipmi_addr *) &addr,
-                                 0,
-                                 &msg,
-                                 NULL,
-                                 &panic_halt_heartbeat_smi_msg,
-                                 &panic_halt_heartbeat_recv_msg,
-                                 1);
-}
-
 static struct watchdog_info ident =
 {
         .options        = 0,    /* WDIOF_SETTIMEOUT, */
@@ -895,7 +916,6 @@ static void ipmi_register_watchdog(int ipmi_intf)
 {
         int rv = -EBUSY;
 
-        down_write(&register_sem);
         if (watchdog_user)
                 goto out;
 
@@ -921,15 +941,56 @@ static void ipmi_register_watchdog(int ipmi_intf)
                 printk(KERN_CRIT PFX "Unable to register misc device\n");
         }
 
- out:
-        up_write(&register_sem);
+#ifdef HAVE_DIE_NMI
+        if (nmi_handler_registered) {
+                int old_pretimeout = pretimeout;
+                int old_timeout = timeout;
+                int old_preop_val = preop_val;
+
+                /* Set the pretimeout to go off in a second and give
+                   ourselves plenty of time to stop the timer. */
+                ipmi_watchdog_state = WDOG_TIMEOUT_RESET;
+                preop_val = WDOG_PREOP_NONE; /* Make sure nothing happens */
+                pretimeout = 99;
+                timeout = 100;
+
+                testing_nmi = 1;
+
+                rv = ipmi_set_timeout(IPMI_SET_TIMEOUT_FORCE_HB);
+                if (rv) {
+                        printk(KERN_WARNING PFX "Error starting timer to"
+                               " test NMI: 0x%x.  The NMI pretimeout will"
+                               " likely not work\n", rv);
+                        rv = 0;
+                        goto out_restore;
+                }
+
+                msleep(1500);
 
+                if (testing_nmi != 2) {
+                        printk(KERN_WARNING PFX "IPMI NMI didn't seem to"
+                               " occur.  The NMI pretimeout will"
+                               " likely not work\n");
+                }
+        out_restore:
+                testing_nmi = 0;
+                preop_val = old_preop_val;
+                pretimeout = old_pretimeout;
+                timeout = old_timeout;
+        }
+#endif
+
+ out:
         if ((start_now) && (rv == 0)) {
                 /* Run from startup, so start the timer now. */
                 start_now = 0; /* Disable this function after first startup. */
                 ipmi_watchdog_state = action_val;
                 ipmi_set_timeout(IPMI_SET_TIMEOUT_FORCE_HB);
                 printk(KERN_INFO PFX "Starting now!\n");
+        } else {
+                /* Stop the timer now. */
+                ipmi_watchdog_state = WDOG_TIMEOUT_NONE;
+                ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB);
         }
 }
 
@@ -937,8 +998,6 @@ static void ipmi_unregister_watchdog(int ipmi_intf)
 {
         int rv;
 
-        down_write(&register_sem);
-
         if (!watchdog_user)
                 goto out;
 
@@ -963,20 +1022,44 @@ static void ipmi_unregister_watchdog(int ipmi_intf)
         watchdog_user = NULL;
 
  out:
-        up_write(&register_sem);
+        return;
 }
 
-#ifdef HAVE_NMI_HANDLER
+#ifdef HAVE_DIE_NMI
 static int
-ipmi_nmi(void *dev_id, int cpu, int handled)
+ipmi_nmi(struct notifier_block *self, unsigned long val, void *data)
 {
+        struct die_args *args = data;
+
+        if (val != DIE_NMI)
+                return NOTIFY_OK;
+
+        /* Hack, if it's a memory or I/O error, ignore it. */
+        if (args->err & 0xc0)
+                return NOTIFY_OK;
+
+        /*
+         * If we get here, it's an NMI that's not a memory or I/O
+         * error.  We can't truly tell if it's from IPMI or not
+         * without sending a message, and sending a message is almost
+         * impossible because of locking.
+         */
+
+        if (testing_nmi) {
+                testing_nmi = 2;
+                return NOTIFY_STOP;
+        }
+
         /* If we are not expecting a timeout, ignore it. */
         if (ipmi_watchdog_state == WDOG_TIMEOUT_NONE)
-                return NOTIFY_DONE;
+                return NOTIFY_OK;
+
+        if (preaction_val != WDOG_PRETIMEOUT_NMI)
+                return NOTIFY_OK;
 
         /* If no one else handled the NMI, we assume it was the IPMI
            watchdog. */
-        if ((!handled) && (preop_val == WDOG_PREOP_PANIC)) {
+        if (preop_val == WDOG_PREOP_PANIC) {
                 /* On some machines, the heartbeat will give
                    an error and not work unless we re-enable
                    the timer.   So do so. */
@@ -985,18 +1068,12 @@ ipmi_nmi(void *dev_id, int cpu, int handled)
                         panic(PFX "pre-timeout");
         }
 
-        return NOTIFY_DONE;
+        return NOTIFY_STOP;
 }
 
-static struct nmi_handler ipmi_nmi_handler =
-{
-        .link     = LIST_HEAD_INIT(ipmi_nmi_handler.link),
-        .dev_name = "ipmi_watchdog",
-        .dev_id   = NULL,
-        .handler  = ipmi_nmi,
-        .priority = 0, /* Call us last. */
+static struct notifier_block ipmi_nmi_handler = {
+        .notifier_call = ipmi_nmi
 };
-int nmi_handler_registered;
 #endif
 
 static int wdog_reboot_handler(struct notifier_block *this,
@@ -1009,7 +1086,7 @@ static int wdog_reboot_handler(struct notifier_block *this,
                 /* Make sure we only do this once. */
                 reboot_event_handled = 1;
 
-                if (code == SYS_DOWN || code == SYS_HALT) {
+                if (code == SYS_POWER_OFF || code == SYS_HALT) {
                         /* Disable the WDT if we are shutting down. */
                         ipmi_watchdog_state = WDOG_TIMEOUT_NONE;
                         panic_halt_ipmi_set_timeout();
@@ -1113,7 +1190,7 @@ static int preaction_op(const char *inval, char *outval)
                 preaction_val = WDOG_PRETIMEOUT_NONE;
         else if (strcmp(inval, "pre_smi") == 0)
                 preaction_val = WDOG_PRETIMEOUT_SMI;
-#ifdef HAVE_NMI_HANDLER
+#ifdef HAVE_DIE_NMI
         else if (strcmp(inval, "pre_nmi") == 0)
                 preaction_val = WDOG_PRETIMEOUT_NMI;
 #endif
@@ -1147,7 +1224,7 @@ static int preop_op(const char *inval, char *outval)
 
 static void check_parms(void)
 {
-#ifdef HAVE_NMI_HANDLER
+#ifdef HAVE_DIE_NMI
         int do_nmi = 0;
         int rv;
 
@@ -1160,20 +1237,9 @@ static void check_parms(void)
                         preop_op("preop_none", NULL);
                         do_nmi = 0;
                 }
-#ifdef CONFIG_X86_LOCAL_APIC
-                if (nmi_watchdog == NMI_IO_APIC) {
-                        printk(KERN_WARNING PFX "nmi_watchdog is set to IO APIC"
-                               " mode (value is %d), that is incompatible"
-                               " with using NMI in the IPMI watchdog."
-                               " Disabling IPMI nmi pretimeout.\n",
-                               nmi_watchdog);
-                        preaction_val = WDOG_PRETIMEOUT_NONE;
-                        do_nmi = 0;
-                }
-#endif
         }
         if (do_nmi && !nmi_handler_registered) {
-                rv = request_nmi(&ipmi_nmi_handler);
+                rv = register_die_notifier(&ipmi_nmi_handler);
                 if (rv) {
                         printk(KERN_WARNING PFX
                                "Can't register nmi handler\n");
@@ -1181,7 +1247,7 @@ static void check_parms(void)
                 } else
                         nmi_handler_registered = 1;
         } else if (!do_nmi && nmi_handler_registered) {
-                release_nmi(&ipmi_nmi_handler);
+                unregister_die_notifier(&ipmi_nmi_handler);
                 nmi_handler_registered = 0;
         }
 #endif
@@ -1217,9 +1283,9 @@ static int __init ipmi_wdog_init(void)
 
         rv = ipmi_smi_watcher_register(&smi_watcher);
         if (rv) {
-#ifdef HAVE_NMI_HANDLER
-                if (preaction_val == WDOG_PRETIMEOUT_NMI)
-                        release_nmi(&ipmi_nmi_handler);
+#ifdef HAVE_DIE_NMI
+                if (nmi_handler_registered)
+                        unregister_die_notifier(&ipmi_nmi_handler);
 #endif
                 atomic_notifier_chain_unregister(&panic_notifier_list,
                                                  &wdog_panic_notifier);
@@ -1238,9 +1304,9 @@ static void __exit ipmi_wdog_exit(void)
         ipmi_smi_watcher_unregister(&smi_watcher);
         ipmi_unregister_watchdog(watchdog_ifnum);
 
-#ifdef HAVE_NMI_HANDLER
+#ifdef HAVE_DIE_NMI
         if (nmi_handler_registered)
-                release_nmi(&ipmi_nmi_handler);
+                unregister_die_notifier(&ipmi_nmi_handler);
 #endif
 
         atomic_notifier_chain_unregister(&panic_notifier_list,
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 77a7a4a06620..85d596a3c18c 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -1529,7 +1529,7 @@ static int __devinit reset_card(struct pci_dev *pdev,
         portcount = inw(base + 0x2);
         if (!inw(base + 0xe) & 0x1 || (portcount != 0 && portcount != 4 &&
                                 portcount != 8 && portcount != 16)) {
-                dev_err(&pdev->dev, "ISILoad:PCI Card%d reset failure.",
+                dev_err(&pdev->dev, "ISILoad:PCI Card%d reset failure.\n",
                         card + 1);
                 retval = -EIO;
                 goto end;
@@ -1622,7 +1622,9 @@ static int __devinit load_firmware(struct pci_dev *pdev,
 
                 if ((status = inw(base + 0x4)) != 0) {
                         dev_warn(&pdev->dev, "Card%d rejected load header:\n"
-                                "Address:0x%x\nCount:0x%x\nStatus:0x%x\n",
+                                KERN_WARNING "Address:0x%x\n"
+                                KERN_WARNING "Count:0x%x\n"
+                                KERN_WARNING "Status:0x%x\n",
                                 index + 1, frame->addr, frame->count, status);
                         goto errrelfw;
                 }
@@ -1666,7 +1668,9 @@ static int __devinit load_firmware(struct pci_dev *pdev,
 
                 if ((status = inw(base + 0x4)) != 0) {
                         dev_warn(&pdev->dev, "Card%d rejected verify header:\n"
-                                "Address:0x%x\nCount:0x%x\nStatus: 0x%x\n",
+                                KERN_WARNING "Address:0x%x\n"
+                                KERN_WARNING "Count:0x%x\n"
+                                KERN_WARNING "Status: 0x%x\n",
                                 index + 1, frame->addr, frame->count, status);
                         goto errrelfw;
                 }
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index ed76f0a127fd..2fc255a21486 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -41,6 +41,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/bitops.h>
+#include <linux/completion.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -142,7 +143,7 @@ struct moxa_port {
         struct tty_struct *tty;
         int cflag;
         wait_queue_head_t open_wait;
-        wait_queue_head_t close_wait;
+        struct completion close_wait;
 
         struct timer_list emptyTimer;
 
@@ -166,7 +167,6 @@ struct moxa_port {
 
 #define WAKEUP_CHARS            256
 
-static int verbose = 0;
 static int ttymajor = MOXAMAJOR;
 /* Variables for insmod */
 #ifdef MODULE
@@ -184,7 +184,6 @@ module_param_array(baseaddr, int, NULL, 0);
 module_param_array(numports, int, NULL, 0);
 #endif
 module_param(ttymajor, int, 0);
-module_param(verbose, bool, 0644);
 
 /*
  * static functions:
@@ -208,13 +207,13 @@ static int moxa_tiocmget(struct tty_struct *tty, struct file *file);
 static int moxa_tiocmset(struct tty_struct *tty, struct file *file,
                          unsigned int set, unsigned int clear);
 static void moxa_poll(unsigned long);
-static void set_tty_param(struct tty_struct *);
-static int block_till_ready(struct tty_struct *, struct file *,
+static void moxa_set_tty_param(struct tty_struct *);
+static int moxa_block_till_ready(struct tty_struct *, struct file *,
                             struct moxa_port *);
-static void setup_empty_event(struct tty_struct *);
-static void check_xmit_empty(unsigned long);
-static void shut_down(struct moxa_port *);
-static void receive_data(struct moxa_port *);
+static void moxa_setup_empty_event(struct tty_struct *);
+static void moxa_check_xmit_empty(unsigned long);
+static void moxa_shut_down(struct moxa_port *);
+static void moxa_receive_data(struct moxa_port *);
 /*
  * moxa board interface functions:
  */
@@ -283,8 +282,10 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev,
         int retval;
 
         retval = pci_enable_device(pdev);
-        if (retval)
+        if (retval) {
+                dev_err(&pdev->dev, "can't enable pci device\n");
                 goto err;
+        }
 
         for (i = 0; i < MAX_BOARDS; i++)
                 if (moxa_boards[i].basemem == NULL)
@@ -292,16 +293,17 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev,
 
         retval = -ENODEV;
         if (i >= MAX_BOARDS) {
-                if (verbose)
-                        printk("More than %d MOXA Intellio family boards "
+                dev_warn(&pdev->dev, "more than %u MOXA Intellio family boards "
                                 "found. Board is ignored.\n", MAX_BOARDS);
                 goto err;
         }
 
         board = &moxa_boards[i];
         board->basemem = pci_iomap(pdev, 2, 0x4000);
-        if (board->basemem == NULL)
+        if (board->basemem == NULL) {
+                dev_err(&pdev->dev, "can't remap io space 2\n");
                 goto err;
+        }
 
         board->boardType = board_type;
         switch (board_type) {
@@ -347,7 +349,8 @@ static int __init moxa_init(void)
         int i, numBoards, retval = 0;
         struct moxa_port *ch;
 
-        printk(KERN_INFO "MOXA Intellio family driver version %s\n", MOXA_VERSION);
+        printk(KERN_INFO "MOXA Intellio family driver version %s\n",
+                        MOXA_VERSION);
         moxaDriver = alloc_tty_driver(MAX_PORTS + 1);
         if (!moxaDriver)
                 return -ENOMEM;
@@ -372,13 +375,13 @@ static int __init moxa_init(void)
                 ch->closing_wait = 30 * HZ;
                 ch->cflag = B9600 | CS8 | CREAD | CLOCAL | HUPCL;
                 init_waitqueue_head(&ch->open_wait);
-                init_waitqueue_head(&ch->close_wait);
+                init_completion(&ch->close_wait);
 
-                setup_timer(&ch->emptyTimer, check_xmit_empty,
+                setup_timer(&ch->emptyTimer, moxa_check_xmit_empty,
                                 (unsigned long)ch);
         }
 
-        printk("Tty devices major number = %d\n", ttymajor);
+        pr_debug("Moxa tty devices major number = %d\n", ttymajor);
 
         if (tty_register_driver(moxaDriver)) {
                 printk(KERN_ERR "Couldn't install MOXA Smartio family driver !\n");
@@ -400,11 +403,10 @@ static int __init moxa_init(void)
                                 moxa_boards[numBoards].numPorts = moxa_isa_boards[i].numPorts;
                         moxa_boards[numBoards].busType = MOXA_BUS_TYPE_ISA;
                         moxa_boards[numBoards].baseAddr = moxa_isa_boards[i].baseAddr;
-                        if (verbose)
-                                printk("Board %2d: %s board(baseAddr=%lx)\n",
-                                       numBoards + 1,
-                                       moxa_brdname[moxa_boards[numBoards].boardType - 1],
-                                       moxa_boards[numBoards].baseAddr);
+                        pr_debug("Moxa board %2d: %s board(baseAddr=%lx)\n",
+                               numBoards + 1,
+                               moxa_brdname[moxa_boards[numBoards].boardType-1],
+                               moxa_boards[numBoards].baseAddr);
                         numBoards++;
                 }
         }
@@ -413,14 +415,13 @@ static int __init moxa_init(void)
         for (i = 0; i < MAX_BOARDS; i++) {
                 if ((type[i] == MOXA_BOARD_C218_ISA) ||
                     (type[i] == MOXA_BOARD_C320_ISA)) {
-                        if (verbose)
-                                printk("Board %2d: %s board(baseAddr=%lx)\n",
-                                       numBoards + 1,
-                                       moxa_brdname[type[i] - 1],
-                                       (unsigned long) baseaddr[i]);
+                        pr_debug("Moxa board %2d: %s board(baseAddr=%lx)\n",
+                               numBoards + 1, moxa_brdname[type[i] - 1],
+                               (unsigned long)baseaddr[i]);
                         if (numBoards >= MAX_BOARDS) {
-                                if (verbose)
-                                        printk("More than %d MOXA Intellio family boards found. Board is ignored.", MAX_BOARDS);
+                                printk(KERN_WARNING "More than %d MOXA "
+                                        "Intellio family boards found. Board "
+                                        "is ignored.\n", MAX_BOARDS);
                                 continue;
                         }
                         moxa_boards[numBoards].boardType = type[i];
@@ -456,16 +457,14 @@ static void __exit moxa_exit(void)
 {
         int i;
 
-        if (verbose)
-                printk("Unloading module moxa ...\n");
-
         del_timer_sync(&moxaTimer);
 
         for (i = 0; i < MAX_PORTS; i++)
                 del_timer_sync(&moxa_ports[i].emptyTimer);
 
         if (tty_unregister_driver(moxaDriver))
-                printk("Couldn't unregister MOXA Intellio family serial driver\n");
+                printk(KERN_ERR "Couldn't unregister MOXA Intellio family "
+                                "serial driver\n");
         put_tty_driver(moxaDriver);
 
 #ifdef CONFIG_PCI
@@ -475,9 +474,6 @@ static void __exit moxa_exit(void)
         for (i = 0; i < MAX_BOARDS; i++)
                 if (moxa_boards[i].basemem)
                         iounmap(moxa_boards[i].basemem);
-
-        if (verbose)
-                printk("Done\n");
 }
 
 module_init(moxa_init);
@@ -504,12 +500,12 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
         ch->tty = tty;
         if (!(ch->asyncflags & ASYNC_INITIALIZED)) {
                 ch->statusflags = 0;
-                set_tty_param(tty);
+                moxa_set_tty_param(tty);
                 MoxaPortLineCtrl(ch->port, 1, 1);
                 MoxaPortEnable(ch->port);
                 ch->asyncflags |= ASYNC_INITIALIZED;
         }
-        retval = block_till_ready(tty, filp, ch);
+        retval = moxa_block_till_ready(tty, filp, ch);
 
         moxa_unthrottle(tty);
 
@@ -532,9 +528,7 @@ static void moxa_close(struct tty_struct *tty, struct file *filp)
                 return;
         }
         if (!MoxaPortIsValid(port)) {
-#ifdef SERIAL_DEBUG_CLOSE
-                printk("Invalid portno in moxa_close\n");
-#endif
+                pr_debug("Invalid portno in moxa_close\n");
                 tty->driver_data = NULL;
                 return;
         }
@@ -547,13 +541,13 @@ static void moxa_close(struct tty_struct *tty, struct file *filp)
         ch = (struct moxa_port *) tty->driver_data;
 
         if ((tty->count == 1) && (ch->count != 1)) {
-                printk("moxa_close: bad serial port count; tty->count is 1, "
-                       "ch->count is %d\n", ch->count);
+                printk(KERN_WARNING "moxa_close: bad serial port count; "
+                        "tty->count is 1, ch->count is %d\n", ch->count);
                 ch->count = 1;
         }
         if (--ch->count < 0) {
-                printk("moxa_close: bad serial port count, device=%s\n",
-                       tty->name);
+                printk(KERN_WARNING "moxa_close: bad serial port count, "
+                        "device=%s\n", tty->name);
                 ch->count = 0;
         }
         if (ch->count) {
@@ -563,11 +557,11 @@ static void moxa_close(struct tty_struct *tty, struct file *filp)
 
         ch->cflag = tty->termios->c_cflag;
         if (ch->asyncflags & ASYNC_INITIALIZED) {
-                setup_empty_event(tty);
+                moxa_setup_empty_event(tty);
                 tty_wait_until_sent(tty, 30 * HZ);      /* 30 seconds timeout */
                 del_timer_sync(&moxa_ports[ch->port].emptyTimer);
         }
-        shut_down(ch);
+        moxa_shut_down(ch);
         MoxaPortFlushData(port, 2);
 
         if (tty->driver->flush_buffer)
@@ -584,7 +578,7 @@ static void moxa_close(struct tty_struct *tty, struct file *filp)
                 wake_up_interruptible(&ch->open_wait);
         }
         ch->asyncflags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
-        wake_up_interruptible(&ch->close_wait);
+        complete_all(&ch->close_wait);
 }
 
 static int moxa_write(struct tty_struct *tty,
@@ -653,7 +647,7 @@ static int moxa_chars_in_buffer(struct tty_struct *tty)
                  * in tty_ioctl.c, etc.
                  */
                 if (!(ch->statusflags & EMPTYWAIT))
-                        setup_empty_event(tty);
+                        moxa_setup_empty_event(tty);
         }
         return (chars);
 }
@@ -751,7 +745,7 @@ static int moxa_ioctl(struct tty_struct *tty, struct file *file,
                 retval = tty_check_change(tty);
                 if (retval)
                         return (retval);
-                setup_empty_event(tty);
+                moxa_setup_empty_event(tty);
                 tty_wait_until_sent(tty, 0);
                 if (!arg)
                         MoxaPortSendBreak(ch->port, 0);
@@ -760,7 +754,7 @@ static int moxa_ioctl(struct tty_struct *tty, struct file *file,
                 retval = tty_check_change(tty);
                 if (retval)
                         return (retval);
-                setup_empty_event(tty);
+                moxa_setup_empty_event(tty);
                 tty_wait_until_sent(tty, 0);
                 MoxaPortSendBreak(ch->port, arg);
                 return (0);
@@ -809,7 +803,7 @@ static void moxa_set_termios(struct tty_struct *tty,
 
         if (ch == NULL)
                 return;
-        set_tty_param(tty);
+        moxa_set_tty_param(tty);
         if (!(old_termios->c_cflag & CLOCAL) &&
             (tty->termios->c_cflag & CLOCAL))
                 wake_up_interruptible(&ch->open_wait);
@@ -845,7 +839,7 @@ static void moxa_hangup(struct tty_struct *tty)
         struct moxa_port *ch = (struct moxa_port *) tty->driver_data;
 
         moxa_flush_buffer(tty);
-        shut_down(ch);
+        moxa_shut_down(ch);
         ch->event = 0;
         ch->count = 0;
         ch->asyncflags &= ~ASYNC_NORMAL_ACTIVE;
@@ -875,7 +869,7 @@ static void moxa_poll(unsigned long ignored)
                                 continue;
                         if (!(ch->statusflags & THROTTLE) &&
                             (MoxaPortRxQueue(ch->port) > 0))
-                                receive_data(ch);
+                                moxa_receive_data(ch);
                         if ((tp = ch->tty) == 0)
                                 continue;
                         if (ch->statusflags & LOWWAIT) {
@@ -909,7 +903,7 @@ static void moxa_poll(unsigned long ignored)
 
 /******************************************************************************/
 
-static void set_tty_param(struct tty_struct *tty)
+static void moxa_set_tty_param(struct tty_struct *tty)
 {
         register struct ktermios *ts;
         struct moxa_port *ch;
@@ -934,7 +928,7 @@ static void set_tty_param(struct tty_struct *tty)
         MoxaPortSetTermio(ch->port, ts, tty_get_baud_rate(tty));
 }
 
-static int block_till_ready(struct tty_struct *tty, struct file *filp,
+static int moxa_block_till_ready(struct tty_struct *tty, struct file *filp,
                             struct moxa_port *ch)
 {
         DECLARE_WAITQUEUE(wait,current);
@@ -948,7 +942,7 @@ static int block_till_ready(struct tty_struct *tty, struct file *filp,
          */
         if (tty_hung_up_p(filp) || (ch->asyncflags & ASYNC_CLOSING)) {
                 if (ch->asyncflags & ASYNC_CLOSING)
-                        interruptible_sleep_on(&ch->close_wait);
+                        wait_for_completion_interruptible(&ch->close_wait);
 #ifdef SERIAL_DO_RESTART
                 if (ch->asyncflags & ASYNC_HUP_NOTIFY)
                         return (-EAGAIN);
@@ -971,10 +965,8 @@ static int block_till_ready(struct tty_struct *tty, struct file *filp,
          */
         retval = 0;
         add_wait_queue(&ch->open_wait, &wait);
-#ifdef SERIAL_DEBUG_OPEN
-        printk("block_til_ready before block: ttys%d, count = %d\n",
-               ch->line, ch->count);
-#endif
+        pr_debug("block_til_ready before block: ttys%d, count = %d\n",
+                ch->port, ch->count);
         spin_lock_irqsave(&moxa_lock, flags);
         if (!tty_hung_up_p(filp))
                 ch->count--;
@@ -1013,10 +1005,8 @@ static int block_till_ready(struct tty_struct *tty, struct file *filp,
                 ch->count++;
         ch->blocked_open--;
         spin_unlock_irqrestore(&moxa_lock, flags);
-#ifdef SERIAL_DEBUG_OPEN
-        printk("block_til_ready after blocking: ttys%d, count = %d\n",
-               ch->line, ch->count);
-#endif
+        pr_debug("block_til_ready after blocking: ttys%d, count = %d\n",
+                ch->port, ch->count);
         if (retval)
                 return (retval);
         /* FIXME: review to see if we need to use set_bit on these */
@@ -1024,7 +1014,7 @@ static int block_till_ready(struct tty_struct *tty, struct file *filp,
         return 0;
 }
 
-static void setup_empty_event(struct tty_struct *tty)
+static void moxa_setup_empty_event(struct tty_struct *tty)
 {
         struct moxa_port *ch = tty->driver_data;
         unsigned long flags;
@@ -1035,24 +1025,24 @@ static void setup_empty_event(struct tty_struct *tty)
         spin_unlock_irqrestore(&moxa_lock, flags);
 }
 
-static void check_xmit_empty(unsigned long data)
+static void moxa_check_xmit_empty(unsigned long data)
 {
         struct moxa_port *ch;
 
         ch = (struct moxa_port *) data;
-        del_timer_sync(&moxa_ports[ch->port].emptyTimer);
         if (ch->tty && (ch->statusflags & EMPTYWAIT)) {
                 if (MoxaPortTxQueue(ch->port) == 0) {
                         ch->statusflags &= ~EMPTYWAIT;
                         tty_wakeup(ch->tty);
                         return;
                 }
-                mod_timer(&moxa_ports[ch->port].emptyTimer, jiffies + HZ);
+                mod_timer(&moxa_ports[ch->port].emptyTimer,
+                                round_jiffies(jiffies + HZ));
         } else
                 ch->statusflags &= ~EMPTYWAIT;
 }
 
-static void shut_down(struct moxa_port *ch)
+static void moxa_shut_down(struct moxa_port *ch)
 {
         struct tty_struct *tp;
 
@@ -1072,7 +1062,7 @@ static void shut_down(struct moxa_port *ch)
         ch->asyncflags &= ~ASYNC_INITIALIZED;
 }
 
-static void receive_data(struct moxa_port *ch)
+static void moxa_receive_data(struct moxa_port *ch)
 {
         struct tty_struct *tp;
         struct ktermios *ts;
@@ -1406,8 +1396,8 @@ static struct mon_str moxaLog;
 static int moxaFuncTout = HZ / 2;
 
 static void moxafunc(void __iomem *, int, ushort);
-static void wait_finish(void __iomem *);
-static void low_water_check(void __iomem *);
+static void moxa_wait_finish(void __iomem *);
+static void moxa_low_water_check(void __iomem *);
 static int moxaloadbios(int, unsigned char __user *, int);
 static int moxafindcard(int);
 static int moxaload320b(int, unsigned char __user *, int);
@@ -1473,7 +1463,7 @@ void MoxaPortFlushData(int port, int mode)
         moxafunc(ofsAddr, FC_FlushQueue, mode);
         if (mode != 1) {
                 moxa_ports[port].lowChkFlag = 0;
-                low_water_check(ofsAddr);
+                moxa_low_water_check(ofsAddr);
         }
 }
 
@@ -1654,7 +1644,7 @@ int MoxaDriverPoll(void)
                                 if (moxa_ports[p].lowChkFlag) {
                                         moxa_ports[p].lowChkFlag = 0;
                                         ofsAddr = moxa_ports[p].tableAddr;
-                                        low_water_check(ofsAddr);
+                                        moxa_low_water_check(ofsAddr);
                                 }
                         }
                 }
@@ -2081,7 +2071,7 @@ int MoxaPortSetTermio(int port, struct ktermios *termio, speed_t baud)
                 writeb(termio->c_cc[VSTART], ofsAddr + FuncArg);
                 writeb(termio->c_cc[VSTOP], ofsAddr + FuncArg1);
                 writeb(FC_SetXonXoff, ofsAddr + FuncCode);
-                wait_finish(ofsAddr);
+                moxa_wait_finish(ofsAddr);
 
         }
         return (0);
@@ -2480,10 +2470,10 @@ static void moxafunc(void __iomem *ofsAddr, int cmd, ushort arg)
 
         writew(arg, ofsAddr + FuncArg);
         writew(cmd, ofsAddr + FuncCode);
-        wait_finish(ofsAddr);
+        moxa_wait_finish(ofsAddr);
 }
 
-static void wait_finish(void __iomem *ofsAddr)
+static void moxa_wait_finish(void __iomem *ofsAddr)
 {
         unsigned long i, j;
 
@@ -2496,7 +2486,7 @@ static void wait_finish(void __iomem *ofsAddr)
         }
 }
 
-static void low_water_check(void __iomem *ofsAddr)
+static void moxa_low_water_check(void __iomem *ofsAddr)
 {
         int len;
         ushort rptr, wptr, mask;
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 2aee3fef0416..661aca0e155d 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -383,7 +383,6 @@ static int mxser_init(void);
 
 /* static void   mxser_poll(unsigned long); */
 static int mxser_get_ISA_conf(int, struct mxser_hwconf *);
-static int mxser_get_PCI_conf(int, int, int, struct mxser_hwconf *);
 static void mxser_do_softint(struct work_struct *);
 static int mxser_open(struct tty_struct *, struct file *);
 static void mxser_close(struct tty_struct *, struct file *);
@@ -422,7 +421,7 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout);
 static void mxser_startrx(struct tty_struct *tty);
 static void mxser_stoprx(struct tty_struct *tty);
 
-
+#ifdef CONFIG_PCI
 static int CheckIsMoxaMust(int io)
 {
         u8 oldmcr, hwid;
@@ -445,6 +444,7 @@ static int CheckIsMoxaMust(int io)
         }
         return MOXA_OTHER_UART;
 }
+#endif
 
 /* above is modified by Victor Yu. 08-15-2002 */
 
@@ -1938,14 +1938,6 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id)
                                 inb(info->base + UART_MSR);
                                 continue;
                         }
-                        /* above add by Victor Yu. 09-13-2002 */
-                        /*
-                           if (info->tty->flip.count < TTY_FLIPBUF_SIZE / 4) {
-                           info->IER |= MOXA_MUST_RECV_ISR;
-                           outb(info->IER, info->base + UART_IER);
-                           }
-                         */
-
 
                         /* mask by Victor Yu. 09-13-2002
                            if ( !info->tty ||
@@ -2599,19 +2591,8 @@ static int mxser_change_speed(struct mxser_struct *info, struct ktermios *old_te
                 info->IER |= UART_IER_MSI;
                 if ((info->type == PORT_16550A) || (info->IsMoxaMustChipFlag)) {
                         info->MCR |= UART_MCR_AFE;
-                        /* status = mxser_get_msr(info->base, 0, info->port); */
-/*
-        save_flags(flags);
-        cli();
-        status = inb(baseaddr + UART_MSR);
-        restore_flags(flags);
-*/
-                        /* mxser_check_modem_status(info, status); */
                 } else {
-                        /* status = mxser_get_msr(info->base, 0, info->port); */
-                        /* MX_LOCK(&info->slock); */
                         status = inb(info->base + UART_MSR);
-                        /* MX_UNLOCK(&info->slock); */
                         if (info->tty->hw_stopped) {
                                 if (status & UART_MSR_CTS) {
                                         info->tty->hw_stopped = 0;
diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c
index 6a563932ba19..854dbf59eb68 100644
--- a/drivers/char/mxser_new.c
+++ b/drivers/char/mxser_new.c
@@ -2,7 +2,7 @@
  *          mxser.c  -- MOXA Smartio/Industio family multiport serial driver.
  *
  *      Copyright (C) 1999-2006  Moxa Technologies (support@moxa.com.tw).
- *      Copyright (C) 2006       Jiri Slaby <jirislaby@gmail.com>
+ *      Copyright (C) 2006-2007  Jiri Slaby <jirislaby@gmail.com>
  *
  *      This code is loosely based on the 1.8 moxa driver which is based on
  *      Linux serial driver, written by Linus Torvalds, Theodore T'so and
@@ -48,7 +48,7 @@
 
 #include "mxser_new.h"
 
-#define MXSER_VERSION   "2.0.1"         /* 1.9.15 */
+#define MXSER_VERSION   "2.0.2"         /* 1.10 */
 #define MXSERMAJOR       174
 #define MXSERCUMAJOR     175
 
@@ -72,6 +72,12 @@
 #define UART_MCR_AFE            0x20
 #define UART_LSR_SPECIAL        0x1E
 
+#define PCI_DEVICE_ID_CB108     0x1080
+#define PCI_DEVICE_ID_CB114     0x1142
+#define PCI_DEVICE_ID_CB134I    0x1341
+#define PCI_DEVICE_ID_CP138U    0x1380
+#define PCI_DEVICE_ID_POS104UL  0x1044
+
 
 #define C168_ASIC_ID    1
 #define C104_ASIC_ID    2
@@ -107,71 +113,63 @@ struct mxser_cardinfo {
 };
 
 static const struct mxser_cardinfo mxser_cards[] = {
-        { 8, "C168 series", },                  /* C168-ISA */
-        { 4, "C104 series", },                  /* C104-ISA */
-        { 4, "CI-104J series", },               /* CI104J */
-        { 8, "C168H/PCI series", },             /* C168-PCI */
-        { 4, "C104H/PCI series", },             /* C104-PCI */
-        { 4, "C102 series", MXSER_HAS2 },       /* C102-ISA */
-        { 4, "CI-132 series", MXSER_HAS2 },     /* CI132 */
-        { 4, "CI-134 series", },                /* CI134 */
-        { 2, "CP-132 series", },                /* CP132 */
-        { 4, "CP-114 series", },                /* CP114 */
-        { 4, "CT-114 series", },                /* CT114 */
-        { 2, "CP-102 series", MXSER_HIGHBAUD }, /* CP102 */
-        { 4, "CP-104U series", },               /* CP104U */
-        { 8, "CP-168U series", },               /* CP168U */
-        { 2, "CP-132U series", },               /* CP132U */
-        { 4, "CP-134U series", },               /* CP134U */
-        { 4, "CP-104JU series", },              /* CP104JU */
+/* 0*/  { 8, "C168 series", },
+        { 4, "C104 series", },
+        { 4, "CI-104J series", },
+        { 8, "C168H/PCI series", },
+        { 4, "C104H/PCI series", },
+/* 5*/  { 4, "C102 series", MXSER_HAS2 },       /* C102-ISA */
+        { 4, "CI-132 series", MXSER_HAS2 },
+        { 4, "CI-134 series", },
+        { 2, "CP-132 series", },
+        { 4, "CP-114 series", },
+/*10*/  { 4, "CT-114 series", },
+        { 2, "CP-102 series", MXSER_HIGHBAUD },
+        { 4, "CP-104U series", },
+        { 8, "CP-168U series", },
+        { 2, "CP-132U series", },
+/*15*/  { 4, "CP-134U series", },
+        { 4, "CP-104JU series", },
         { 8, "Moxa UC7000 Serial", },           /* RC7000 */
-        { 8, "CP-118U series", },               /* CP118U */
-        { 2, "CP-102UL series", },              /* CP102UL */
-        { 2, "CP-102U series", },               /* CP102U */
-        { 8, "CP-118EL series", },              /* CP118EL */
-        { 8, "CP-168EL series", },              /* CP168EL */
-        { 4, "CP-104EL series", }               /* CP104EL */
+        { 8, "CP-118U series", },
+        { 2, "CP-102UL series", },
+/*20*/  { 2, "CP-102U series", },
+        { 8, "CP-118EL series", },
+        { 8, "CP-168EL series", },
+        { 4, "CP-104EL series", },
+        { 8, "CB-108 series", },
+/*25*/  { 4, "CB-114 series", },
+        { 4, "CB-134I series", },
+        { 8, "CP-138U series", },
+        { 4, "POS-104UL series", }
 };
 
 /* driver_data correspond to the lines in the structure above
    see also ISA probe function before you change something */
 static struct pci_device_id mxser_pcibrds[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_C168),
-                .driver_data = 3 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_C104),
-                .driver_data = 4 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP132),
-                .driver_data = 8 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP114),
-                .driver_data = 9 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CT114),
-                .driver_data = 10 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102),
-                .driver_data = 11 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104U),
-                .driver_data = 12 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP168U),
-                .driver_data = 13 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP132U),
-                .driver_data = 14 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP134U),
-                .driver_data = 15 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104JU),
-                .driver_data = 16 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_RC7000),
-                .driver_data = 17 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118U),
-                .driver_data = 18 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102UL),
-                .driver_data = 19 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102U),
-                .driver_data = 20 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118EL),
-                .driver_data = 21 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP168EL),
-                .driver_data = 22 },
-        { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104EL),
-                .driver_data = 23 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_C168),   .driver_data = 3 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_C104),   .driver_data = 4 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP132),  .driver_data = 8 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP114),  .driver_data = 9 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CT114),  .driver_data = 10 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102),  .driver_data = 11 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104U), .driver_data = 12 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP168U), .driver_data = 13 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP132U), .driver_data = 14 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP134U), .driver_data = 15 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104JU),.driver_data = 16 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_RC7000), .driver_data = 17 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118U), .driver_data = 18 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102UL),.driver_data = 19 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102U), .driver_data = 20 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118EL),.driver_data = 21 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP168EL),.driver_data = 22 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104EL),.driver_data = 23 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB108),       .driver_data = 24 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB114),       .driver_data = 25 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB134I),      .driver_data = 26 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP138U),      .driver_data = 27 },
+        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_POS104UL),    .driver_data = 28 },
         { }
 };
 MODULE_DEVICE_TABLE(pci, mxser_pcibrds);
diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index 73de77105fea..706ff34728f1 100644
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -318,7 +318,7 @@ int pty_limit = NR_UNIX98_PTY_DEFAULT;
 static int pty_limit_min = 0;
 static int pty_limit_max = NR_UNIX98_PTY_MAX;
 
-ctl_table pty_table[] = {
+static struct ctl_table pty_table[] = {
         {
                 .ctl_name       = PTY_MAX,
                 .procname       = "max",
@@ -340,6 +340,27 @@ ctl_table pty_table[] = {
         }
 };
 
+static struct ctl_table pty_kern_table[] = {
+        {
+                .ctl_name       = KERN_PTY,
+                .procname       = "pty",
+                .mode           = 0555,
+                .child          = pty_table,
+        },
+        {}
+};
+
+static struct ctl_table pty_root_table[] = {
+        {
+                .ctl_name       = CTL_KERN,
+                .procname       = "kernel",
+                .mode           = 0555,
+                .child          = pty_kern_table,
+        },
+        {}
+};
+
+
 static int pty_unix98_ioctl(struct tty_struct *tty, struct file *file,
                             unsigned int cmd, unsigned long arg)
 {
@@ -404,6 +425,7 @@ static void __init unix98_pty_init(void)
                 panic("Couldn't register Unix98 pts driver");
 
         pty_table[1].data = &ptm_driver->refcount;
+        register_sysctl_table(pty_root_table);
 }
 #else
 static inline void unix98_pty_init(void) { }
diff --git a/drivers/char/random.c b/drivers/char/random.c
index af274e5a25ee..1756b1f7cb72 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -649,7 +649,7 @@ EXPORT_SYMBOL_GPL(add_input_randomness);
 
 void add_interrupt_randomness(int irq)
 {
-        if (irq >= NR_IRQS || irq_timer_state[irq] == 0)
+        if (irq >= NR_IRQS || irq_timer_state[irq] == NULL)
                 return;
 
         DEBUG_ENT("irq event %d\n", irq);
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 56cbba7b6ec0..7e6a3a413bb2 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -84,6 +84,7 @@
 #include <linux/mutex.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
+#include <linux/completion.h>
 #include <linux/wait.h>
 #include <linux/pci.h>
 #include <asm/uaccess.h>
@@ -548,8 +549,8 @@ static void rp_handle_port(struct r_port *info)
 static void rp_do_poll(unsigned long dummy)
 {
         CONTROLLER_t *ctlp;
-        int ctrl, aiop, ch, line, i;
-        unsigned int xmitmask;
+        int ctrl, aiop, ch, line;
+        unsigned int xmitmask, i;
         unsigned int CtlMask;
         unsigned char AiopMask;
         Word_t bit;
@@ -650,7 +651,7 @@ static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
         info->closing_wait = 3000;
         info->close_delay = 50;
         init_waitqueue_head(&info->open_wait);
-        init_waitqueue_head(&info->close_wait);
+        init_completion(&info->close_wait);
         info->flags &= ~ROCKET_MODE_MASK;
         switch (pc104[board][line]) {
         case 422:
@@ -699,8 +700,8 @@ static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
         spin_lock_init(&info->slock);
         mutex_init(&info->write_mtx);
         rp_table[line] = info;
-        if (pci_dev)
-                tty_register_device(rocket_driver, line, &pci_dev->dev);
+        tty_register_device(rocket_driver, line, pci_dev ? &pci_dev->dev :
+                        NULL);
 }
 
 /*
@@ -878,7 +879,8 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
         if (tty_hung_up_p(filp))
                 return ((info->flags & ROCKET_HUP_NOTIFY) ? -EAGAIN : -ERESTARTSYS);
         if (info->flags & ROCKET_CLOSING) {
-                interruptible_sleep_on(&info->close_wait);
+                if (wait_for_completion_interruptible(&info->close_wait))
+                        return -ERESTARTSYS;
                 return ((info->flags & ROCKET_HUP_NOTIFY) ? -EAGAIN : -ERESTARTSYS);
         }
 
@@ -983,8 +985,10 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
                 return -ENOMEM;
 
         if (info->flags & ROCKET_CLOSING) {
-                interruptible_sleep_on(&info->close_wait);
+                retval = wait_for_completion_interruptible(&info->close_wait);
                 free_page(page);
+                if (retval)
+                        return retval;
                 return ((info->flags & ROCKET_HUP_NOTIFY) ? -EAGAIN : -ERESTARTSYS);
         }
 
@@ -1176,7 +1180,7 @@ static void rp_close(struct tty_struct *tty, struct file *filp)
         }
         info->flags &= ~(ROCKET_INITIALIZED | ROCKET_CLOSING | ROCKET_NORMAL_ACTIVE);
         tty->closing = 0;
-        wake_up_interruptible(&info->close_wait);
+        complete_all(&info->close_wait);
         atomic_dec(&rp_num_ports_open);
 
 #ifdef ROCKET_DEBUG_OPEN
@@ -1869,8 +1873,6 @@ static __init int register_PCI(int i, struct pci_dev *dev)
         int fast_clock = 0;
         int altChanRingIndicator = 0;
         int ports_per_aiop = 8;
-        int ret;
-        unsigned int class_rev;
         WordIO_t ConfigIO = 0;
         ByteIO_t UPCIRingInd = 0;
 
@@ -1878,12 +1880,6 @@ static __init int register_PCI(int i, struct pci_dev *dev)
                 return 0;
 
         rcktpt_io_addr[i] = pci_resource_start(dev, 0);
-        ret = pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);
-
-        if (ret) {
-                printk(KERN_INFO "  Error during register_PCI(), unable to read config dword \n");
-                return 0;
-        }
 
         rcktpt_type[i] = ROCKET_TYPE_NORMAL;
         rocketModel[i].loadrm2 = 0;
@@ -2037,8 +2033,9 @@ static __init int register_PCI(int i, struct pci_dev *dev)
                 ports_per_aiop = 6;
                 str = "6-port";
 
-                /*  If class_rev is 1, the rocketmodem flash must be loaded.  If it is 2 it is a "socketed" version. */
-                if ((class_rev & 0xFF) == 1) {
+                /*  If revision is 1, the rocketmodem flash must be loaded.
+                 *  If it is 2 it is a "socketed" version. */
+                if (dev->revision == 1) {
                         rcktpt_type[i] = ROCKET_TYPE_MODEMII;
                         rocketModel[i].loadrm2 = 1;
                 } else {
@@ -2053,7 +2050,7 @@ static __init int register_PCI(int i, struct pci_dev *dev)
                 max_num_aiops = 1;
                 ports_per_aiop = 4;
                 str = "4-port";
-                if ((class_rev & 0xFF) == 1) {
+                if (dev->revision == 1) {
                         rcktpt_type[i] = ROCKET_TYPE_MODEMII;
                         rocketModel[i].loadrm2 = 1;
                 } else {
@@ -2362,26 +2359,14 @@ static const struct tty_operations rocket_ops = {
  */
 static int __init rp_init(void)
 {
-        int retval, pci_boards_found, isa_boards_found, i;
+        int ret = -ENOMEM, pci_boards_found, isa_boards_found, i;
 
         printk(KERN_INFO "RocketPort device driver module, version %s, %s\n",
                ROCKET_VERSION, ROCKET_DATE);
 
         rocket_driver = alloc_tty_driver(MAX_RP_PORTS);
         if (!rocket_driver)
-                return -ENOMEM;
-
-        /*
-         * Initialize the array of pointers to our own internal state
-         * structures.
-         */
-        memset(rp_table, 0, sizeof (rp_table));
-        memset(xmit_flags, 0, sizeof (xmit_flags));
-
-        for (i = 0; i < MAX_RP_PORTS; i++)
-                lineNumbers[i] = 0;
-        nextLineNumber = 0;
-        memset(rocketModel, 0, sizeof (rocketModel));
+                goto err;
 
         /*
          *  If board 1 is non-zero, there is at least one ISA configured.  If controller is 
@@ -2396,8 +2381,11 @@ static int __init rp_init(void)
 
         /*  If an ISA card is configured, reserve the 4 byte IO space for the Mudbac controller */
         if (controller && (!request_region(controller, 4, "Comtrol RocketPort"))) {
-                printk(KERN_INFO "Unable to reserve IO region for first configured ISA RocketPort controller 0x%lx.  Driver exiting \n", controller);
-                return -EBUSY;
+                printk(KERN_ERR "Unable to reserve IO region for first "
+                        "configured ISA RocketPort controller 0x%lx.  "
+                        "Driver exiting\n", controller);
+                ret = -EBUSY;
+                goto err_tty;
         }
 
         /*  Store ISA variable retrieved from command line or .conf file. */
@@ -2434,15 +2422,14 @@ static int __init rp_init(void)
         rocket_driver->init_termios.c_ispeed = 9600;
         rocket_driver->init_termios.c_ospeed = 9600;
 #ifdef ROCKET_SOFT_FLOW
-        rocket_driver->flags |= TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
+        rocket_driver->flags |= TTY_DRIVER_REAL_RAW;
 #endif
         tty_set_operations(rocket_driver, &rocket_ops);
 
-        retval = tty_register_driver(rocket_driver);
-        if (retval < 0) {
-                printk(KERN_INFO "Couldn't install tty RocketPort driver (error %d)\n", -retval);
-                put_tty_driver(rocket_driver);
-                return -1;
+        ret = tty_register_driver(rocket_driver);
+        if (ret < 0) {
+                printk(KERN_ERR "Couldn't install tty RocketPort driver\n");
+                goto err_tty;
         }
 
 #ifdef ROCKET_DEBUG_OPEN
@@ -2469,14 +2456,18 @@ static int __init rp_init(void)
         max_board = pci_boards_found + isa_boards_found;
 
         if (max_board == 0) {
-                printk(KERN_INFO "No rocketport ports found; unloading driver.\n");
-                del_timer_sync(&rocket_timer);
-                tty_unregister_driver(rocket_driver);
-                put_tty_driver(rocket_driver);
-                return -ENXIO;
+                printk(KERN_ERR "No rocketport ports found; unloading driver\n");
+                ret = -ENXIO;
+                goto err_ttyu;
         }
 
         return 0;
+err_ttyu:
+        tty_unregister_driver(rocket_driver);
+err_tty:
+        put_tty_driver(rocket_driver);
+err:
+        return ret;
 }
 
 
@@ -2491,10 +2482,14 @@ static void rp_cleanup_module(void)
         if (retval)
                 printk(KERN_INFO "Error %d while trying to unregister "
                        "rocketport driver\n", -retval);
-        put_tty_driver(rocket_driver);
 
         for (i = 0; i < MAX_RP_PORTS; i++)
-                kfree(rp_table[i]);
+                if (rp_table[i]) {
+                        tty_unregister_device(rocket_driver, i);
+                        kfree(rp_table[i]);
+                }
+
+        put_tty_driver(rocket_driver);
 
         for (i = 0; i < NUM_BOARDS; i++) {
                 if (rcktpt_io_addr[i] <= 0 || is_PCI[i])
diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
index b4c53dfa7951..55b8f2d71a96 100644
--- a/drivers/char/rocket_int.h
+++ b/drivers/char/rocket_int.h
@@ -1163,13 +1163,8 @@ struct r_port {
         int read_status_mask;
         int cps;
 
-#ifdef DECLARE_WAITQUEUE
         wait_queue_head_t open_wait;
-        wait_queue_head_t close_wait;
-#else
-        struct wait_queue *open_wait;
-        struct wait_queue *close_wait;
-#endif
+        struct completion close_wait;
         spinlock_t slock;
         struct mutex write_mtx;
 };
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index 745d552620bf..0def089cc1f2 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -228,7 +228,8 @@ EXPORT_SYMBOL(tty_termios_input_baud_rate);
  *      and will all go away once this is done.
  */
 
-void tty_termios_encode_baud_rate(struct ktermios *termios, speed_t ibaud, speed_t obaud)
+void tty_termios_encode_baud_rate(struct ktermios *termios,
+                                  speed_t ibaud, speed_t obaud)
 {
         int i = 0;
         int ifound = -1, ofound = -1;
@@ -263,11 +264,15 @@ void tty_termios_encode_baud_rate(struct ktermios *termios, speed_t ibaud, speed
          */
 
         do {
-                if (obaud - oclose >= baud_table[i] && obaud + oclose <= baud_table[i]) {
+                if (obaud - oclose <= baud_table[i] &&
+                    obaud + oclose >= baud_table[i]) {
                         termios->c_cflag |= baud_bits[i];
                         ofound = i;
                 }
-                if (ibaud - iclose >= baud_table[i] && ibaud + iclose <= baud_table[i]) {
+                if (ibaud - iclose <= baud_table[i] &&
+                    ibaud + iclose >= baud_table[i]) {
+                        /* For the case input == output don't set IBAUD bits
+                           if the user didn't do so */
                         if (ofound == i && !ibinput)
                                 ifound  = i;
 #ifdef IBSHIFT
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 645ad9808982..1764c67b585f 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -158,11 +158,7 @@ static void blank_screen_t(unsigned long dummy);
 static void set_palette(struct vc_data *vc);
 
 static int printable;           /* Is console ready for printing? */
-#ifdef CONFIG_VT_UNICODE
-int default_utf8 = 1;
-#else
-int default_utf8;
-#endif
+int default_utf8 = true;
 module_param(default_utf8, int, S_IRUGO | S_IWUSR);
 
 /*
diff --git a/drivers/dma/ioat.c b/drivers/dma/ioat.c
index f7276bf2fe7e..f204c39fb412 100644
--- a/drivers/dma/ioat.c
+++ b/drivers/dma/ioat.c
@@ -34,7 +34,7 @@
 #include "ioatdma_registers.h"
 #include "ioatdma_hw.h"
 
-MODULE_VERSION("1.24");
+MODULE_VERSION(IOAT_DMA_VERSION);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Intel Corporation");
 
@@ -55,9 +55,7 @@ struct ioat_device {
 
 static int __devinit ioat_probe(struct pci_dev *pdev,
                                 const struct pci_device_id *id);
-#ifdef IOAT_DMA_REMOVE
 static void __devexit ioat_remove(struct pci_dev *pdev);
-#endif
 
 static int ioat_dca_enabled = 1;
 module_param(ioat_dca_enabled, int, 0644);
@@ -73,7 +71,7 @@ static int ioat_setup_functionality(struct pci_dev *pdev, void __iomem *iobase)
         switch (version) {
         case IOAT_VER_1_2:
                 device->dma = ioat_dma_probe(pdev, iobase);
-                if (ioat_dca_enabled)
+                if (device->dma && ioat_dca_enabled)
                         device->dca = ioat_dca_init(pdev, iobase);
                 break;
         default:
@@ -87,27 +85,25 @@ static void ioat_shutdown_functionality(struct pci_dev *pdev)
 {
         struct ioat_device *device = pci_get_drvdata(pdev);
 
-        if (device->dma) {
-                ioat_dma_remove(device->dma);
-                device->dma = NULL;
-        }
-
+        dev_err(&pdev->dev, "Removing dma and dca services\n");
         if (device->dca) {
                 unregister_dca_provider(device->dca);
                 free_dca_provider(device->dca);
                 device->dca = NULL;
         }
 
+        if (device->dma) {
+                ioat_dma_remove(device->dma);
+                device->dma = NULL;
+        }
 }
 
-static struct pci_driver ioat_pci_drv = {
+static struct pci_driver ioat_pci_driver = {
         .name           = "ioatdma",
         .id_table       = ioat_pci_tbl,
         .probe          = ioat_probe,
         .shutdown       = ioat_shutdown_functionality,
-#ifdef IOAT_DMA_REMOVE
         .remove         = __devexit_p(ioat_remove),
-#endif
 };
 
 static int __devinit ioat_probe(struct pci_dev *pdev,
@@ -122,7 +118,7 @@ static int __devinit ioat_probe(struct pci_dev *pdev,
         if (err)
                 goto err_enable_device;
 
-        err = pci_request_regions(pdev, ioat_pci_drv.name);
+        err = pci_request_regions(pdev, ioat_pci_driver.name);
         if (err)
                 goto err_request_regions;
 
@@ -176,13 +172,11 @@ err_enable_device:
         return err;
 }
 
-#ifdef IOAT_DMA_REMOVE
 /*
  * It is unsafe to remove this module: if removed while a requested
  * dma is outstanding, esp. from tcp, it is possible to hang while
- * waiting for something that will never finish, thus hanging at
- * least one cpu.  However, if you're feeling lucky and need to do
- * some testing, this usually works just fine.
+ * waiting for something that will never finish.  However, if you're
+ * feeling lucky, this usually works just fine.
  */
 static void __devexit ioat_remove(struct pci_dev *pdev)
 {
@@ -191,21 +185,16 @@ static void __devexit ioat_remove(struct pci_dev *pdev)
         ioat_shutdown_functionality(pdev);
 
         kfree(device);
-
-        iounmap(device->iobase);
-        pci_release_regions(pdev);
-        pci_disable_device(pdev);
 }
-#endif
 
 static int __init ioat_init_module(void)
 {
-        return pci_register_driver(&ioat_pci_drv);
+        return pci_register_driver(&ioat_pci_driver);
 }
 module_init(ioat_init_module);
 
 static void __exit ioat_exit_module(void)
 {
-        pci_unregister_driver(&ioat_pci_drv);
+        pci_unregister_driver(&ioat_pci_driver);
 }
 module_exit(ioat_exit_module);
diff --git a/drivers/dma/ioat_dca.c b/drivers/dma/ioat_dca.c
index 2ae04c30edeb..ba985715b803 100644
--- a/drivers/dma/ioat_dca.c
+++ b/drivers/dma/ioat_dca.c
@@ -65,7 +65,7 @@ static inline u16 dcaid_from_pcidev(struct pci_dev *pci)
         return (pci->bus->number << 8) | pci->devfn;
 }
 
-static int dca_enabled_in_bios(void)
+static int dca_enabled_in_bios(struct pci_dev *pdev)
 {
         /* CPUID level 9 returns DCA configuration */
         /* Bit 0 indicates DCA enabled by the BIOS */
@@ -75,17 +75,17 @@ static int dca_enabled_in_bios(void)
         cpuid_level_9 = cpuid_eax(9);
         res = test_bit(0, &cpuid_level_9);
         if (!res)
-                printk(KERN_ERR "ioat dma: DCA is disabled in BIOS\n");
+                dev_err(&pdev->dev, "DCA is disabled in BIOS\n");
 
         return res;
 }
 
-static int system_has_dca_enabled(void)
+static int system_has_dca_enabled(struct pci_dev *pdev)
 {
         if (boot_cpu_has(X86_FEATURE_DCA))
-                return dca_enabled_in_bios();
+                return dca_enabled_in_bios(pdev);
 
-        printk(KERN_ERR "ioat dma: boot cpu doesn't have X86_FEATURE_DCA\n");
+        dev_err(&pdev->dev, "boot cpu doesn't have X86_FEATURE_DCA\n");
         return 0;
 }
 
@@ -208,7 +208,7 @@ struct dca_provider *ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase)
         int i;
         int err;
 
-        if (!system_has_dca_enabled())
+        if (!system_has_dca_enabled(pdev))
                 return NULL;
 
         /* I/OAT v1 systems must have a known tag_map to support DCA */
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c
index 66c5bb53211b..7e4a785c2dff 100644
--- a/drivers/dma/ioat_dma.c
+++ b/drivers/dma/ioat_dma.c
@@ -46,9 +46,12 @@
 /* internal functions */
 static void ioat_dma_start_null_desc(struct ioat_dma_chan *ioat_chan);
 static void ioat_dma_memcpy_cleanup(struct ioat_dma_chan *ioat_chan);
+static struct ioat_desc_sw *
+ioat_dma_get_next_descriptor(struct ioat_dma_chan *ioat_chan);
 
-static struct ioat_dma_chan *ioat_lookup_chan_by_index(struct ioatdma_device *device,
-                                                       int index)
+static inline struct ioat_dma_chan *ioat_lookup_chan_by_index(
+                                                struct ioatdma_device *device,
+                                                int index)
 {
         return device->idx[index];
 }
@@ -148,57 +151,102 @@ static void ioat_set_src(dma_addr_t addr,
                          struct dma_async_tx_descriptor *tx,
                          int index)
 {
-        struct ioat_desc_sw *iter, *desc = tx_to_ioat_desc(tx);
-        struct ioat_dma_chan *ioat_chan = to_ioat_chan(tx->chan);
-
-        pci_unmap_addr_set(desc, src, addr);
-
-        list_for_each_entry(iter, &desc->async_tx.tx_list, node) {
-                iter->hw->src_addr = addr;
-                addr += ioat_chan->xfercap;
-        }
-
+        tx_to_ioat_desc(tx)->src = addr;
 }
 
 static void ioat_set_dest(dma_addr_t addr,
                           struct dma_async_tx_descriptor *tx,
                           int index)
 {
-        struct ioat_desc_sw *iter, *desc = tx_to_ioat_desc(tx);
-        struct ioat_dma_chan *ioat_chan = to_ioat_chan(tx->chan);
-
-        pci_unmap_addr_set(desc, dst, addr);
-
-        list_for_each_entry(iter, &desc->async_tx.tx_list, node) {
-                iter->hw->dst_addr = addr;
-                addr += ioat_chan->xfercap;
-        }
+        tx_to_ioat_desc(tx)->dst = addr;
 }
 
 static dma_cookie_t ioat_tx_submit(struct dma_async_tx_descriptor *tx)
 {
         struct ioat_dma_chan *ioat_chan = to_ioat_chan(tx->chan);
-        struct ioat_desc_sw *desc = tx_to_ioat_desc(tx);
+        struct ioat_desc_sw *first = tx_to_ioat_desc(tx);
+        struct ioat_desc_sw *prev, *new;
+        struct ioat_dma_descriptor *hw;
         int append = 0;
         dma_cookie_t cookie;
-        struct ioat_desc_sw *group_start;
+        LIST_HEAD(new_chain);
+        u32 copy;
+        size_t len;
+        dma_addr_t src, dst;
+        int orig_ack;
+        unsigned int desc_count = 0;
+
+        /* src and dest and len are stored in the initial descriptor */
+        len = first->len;
+        src = first->src;
+        dst = first->dst;
+        orig_ack = first->async_tx.ack;
+        new = first;
 
-        group_start = list_entry(desc->async_tx.tx_list.next,
-                                 struct ioat_desc_sw, node);
         spin_lock_bh(&ioat_chan->desc_lock);
+        prev = to_ioat_desc(ioat_chan->used_desc.prev);
+        prefetch(prev->hw);
+        do {
+                copy = min((u32) len, ioat_chan->xfercap);
+
+                new->async_tx.ack = 1;
+
+                hw = new->hw;
+                hw->size = copy;
+                hw->ctl = 0;
+                hw->src_addr = src;
+                hw->dst_addr = dst;
+                hw->next = 0;
+
+                /* chain together the physical address list for the HW */
+                wmb();
+                prev->hw->next = (u64) new->async_tx.phys;
+
+                len -= copy;
+                dst += copy;
+                src += copy;
+
+                list_add_tail(&new->node, &new_chain);
+                desc_count++;
+                prev = new;
+        } while (len && (new = ioat_dma_get_next_descriptor(ioat_chan)));
+
+        hw->ctl = IOAT_DMA_DESCRIPTOR_CTL_CP_STS;
+        if (new->async_tx.callback) {
+                hw->ctl |= IOAT_DMA_DESCRIPTOR_CTL_INT_GN;
+                if (first != new) {
+                        /* move callback into to last desc */
+                        new->async_tx.callback = first->async_tx.callback;
+                        new->async_tx.callback_param
+                                        = first->async_tx.callback_param;
+                        first->async_tx.callback = NULL;
+                        first->async_tx.callback_param = NULL;
+                }
+        }
+
+        new->tx_cnt = desc_count;
+        new->async_tx.ack = orig_ack; /* client is in control of this ack */
+
+        /* store the original values for use in later cleanup */
+        if (new != first) {
+                new->src = first->src;
+                new->dst = first->dst;
+                new->len = first->len;
+        }
+
         /* cookie incr and addition to used_list must be atomic */
         cookie = ioat_chan->common.cookie;
         cookie++;
         if (cookie < 0)
                 cookie = 1;
-        ioat_chan->common.cookie = desc->async_tx.cookie = cookie;
+        ioat_chan->common.cookie = new->async_tx.cookie = cookie;
 
         /* write address into NextDescriptor field of last desc in chain */
         to_ioat_desc(ioat_chan->used_desc.prev)->hw->next =
-                                                group_start->async_tx.phys;
-        list_splice_init(&desc->async_tx.tx_list, ioat_chan->used_desc.prev);
+                                                        first->async_tx.phys;
+        __list_splice(&new_chain, ioat_chan->used_desc.prev);
 
-        ioat_chan->pending += desc->tx_cnt;
+        ioat_chan->pending += desc_count;
         if (ioat_chan->pending >= 4) {
                 append = 1;
                 ioat_chan->pending = 0;
@@ -267,7 +315,7 @@ static int ioat_dma_alloc_chan_resources(struct dma_chan *chan)
         chanerr = readl(ioat_chan->reg_base + IOAT_CHANERR_OFFSET);
         if (chanerr) {
                 dev_err(&ioat_chan->device->pdev->dev,
-                        "ioatdma: CHANERR = %x, clearing\n", chanerr);
+                        "CHANERR = %x, clearing\n", chanerr);
                 writel(chanerr, ioat_chan->reg_base + IOAT_CHANERR_OFFSET);
         }
 
@@ -276,7 +324,7 @@ static int ioat_dma_alloc_chan_resources(struct dma_chan *chan)
                 desc = ioat_dma_alloc_descriptor(ioat_chan, GFP_KERNEL);
                 if (!desc) {
                         dev_err(&ioat_chan->device->pdev->dev,
-                                "ioatdma: Only %d initial descriptors\n", i);
+                                "Only %d initial descriptors\n", i);
                         break;
                 }
                 list_add_tail(&desc->node, &tmp_list);
@@ -342,12 +390,13 @@ static void ioat_dma_free_chan_resources(struct dma_chan *chan)
         /* one is ok since we left it on there on purpose */
         if (in_use_descs > 1)
                 dev_err(&ioat_chan->device->pdev->dev,
-                        "ioatdma: Freeing %d in use descriptors!\n",
+                        "Freeing %d in use descriptors!\n",
                         in_use_descs - 1);
 
         ioat_chan->last_completion = ioat_chan->completion_addr = 0;
         ioat_chan->pending = 0;
 }
+
 /**
  * ioat_dma_get_next_descriptor - return the next available descriptor
  * @ioat_chan: IOAT DMA channel handle
@@ -356,8 +405,8 @@ static void ioat_dma_free_chan_resources(struct dma_chan *chan)
  * channel's desc_lock held.  Allocates more descriptors if the channel
  * has run out.
  */
-static struct ioat_desc_sw *ioat_dma_get_next_descriptor(
-                                                struct ioat_dma_chan *ioat_chan)
+static struct ioat_desc_sw *
+ioat_dma_get_next_descriptor(struct ioat_dma_chan *ioat_chan)
 {
         struct ioat_desc_sw *new = NULL;
 
@@ -382,51 +431,11 @@ static struct dma_async_tx_descriptor *ioat_dma_prep_memcpy(
                                                 int int_en)
 {
         struct ioat_dma_chan *ioat_chan = to_ioat_chan(chan);
-        struct ioat_desc_sw *first, *prev, *new;
-        LIST_HEAD(new_chain);
-        u32 copy;
-        size_t orig_len;
-        int desc_count = 0;
-
-        if (!len)
-                return NULL;
-
-        orig_len = len;
-
-        first = NULL;
-        prev = NULL;
+        struct ioat_desc_sw *new;
 
         spin_lock_bh(&ioat_chan->desc_lock);
-        while (len) {
-                new = ioat_dma_get_next_descriptor(ioat_chan);
-                copy = min((u32) len, ioat_chan->xfercap);
-
-                new->hw->size = copy;
-                new->hw->ctl = 0;
-                new->async_tx.cookie = 0;
-                new->async_tx.ack = 1;
-
-                /* chain together the physical address list for the HW */
-                if (!first)
-                        first = new;
-                else
-                        prev->hw->next = (u64) new->async_tx.phys;
-
-                prev = new;
-                len  -= copy;
-                list_add_tail(&new->node, &new_chain);
-                desc_count++;
-        }
-
-        list_splice(&new_chain, &new->async_tx.tx_list);
-
-        new->hw->ctl = IOAT_DMA_DESCRIPTOR_CTL_CP_STS;
-        new->hw->next = 0;
-        new->tx_cnt = desc_count;
-        new->async_tx.ack = 0; /* client is in control of this ack */
-        new->async_tx.cookie = -EBUSY;
-
-        pci_unmap_len_set(new, len, orig_len);
+        new = ioat_dma_get_next_descriptor(ioat_chan);
+        new->len = len;
         spin_unlock_bh(&ioat_chan->desc_lock);
 
         return new ? &new->async_tx : NULL;
@@ -464,7 +473,7 @@ static void ioat_dma_memcpy_cleanup(struct ioat_dma_chan *ioat_chan)
 
         prefetch(ioat_chan->completion_virt);
 
-        if (!spin_trylock(&ioat_chan->cleanup_lock))
+        if (!spin_trylock_bh(&ioat_chan->cleanup_lock))
                 return;
 
         /* The completion writeback can happen at any time,
@@ -474,22 +483,25 @@ static void ioat_dma_memcpy_cleanup(struct ioat_dma_chan *ioat_chan)
 
 #if (BITS_PER_LONG == 64)
         phys_complete =
-        ioat_chan->completion_virt->full & IOAT_CHANSTS_COMPLETED_DESCRIPTOR_ADDR;
+                ioat_chan->completion_virt->full
+                & IOAT_CHANSTS_COMPLETED_DESCRIPTOR_ADDR;
 #else
-        phys_complete = ioat_chan->completion_virt->low & IOAT_LOW_COMPLETION_MASK;
+        phys_complete =
+                ioat_chan->completion_virt->low & IOAT_LOW_COMPLETION_MASK;
 #endif
 
-        if ((ioat_chan->completion_virt->full & IOAT_CHANSTS_DMA_TRANSFER_STATUS) ==
+        if ((ioat_chan->completion_virt->full
+                & IOAT_CHANSTS_DMA_TRANSFER_STATUS) ==
                                 IOAT_CHANSTS_DMA_TRANSFER_STATUS_HALTED) {
                 dev_err(&ioat_chan->device->pdev->dev,
-                        "ioatdma: Channel halted, chanerr = %x\n",
+                        "Channel halted, chanerr = %x\n",
                         readl(ioat_chan->reg_base + IOAT_CHANERR_OFFSET));
 
                 /* TODO do something to salvage the situation */
         }
 
         if (phys_complete == ioat_chan->last_completion) {
-                spin_unlock(&ioat_chan->cleanup_lock);
+                spin_unlock_bh(&ioat_chan->cleanup_lock);
                 return;
         }
 
@@ -517,6 +529,11 @@ static void ioat_dma_memcpy_cleanup(struct ioat_dma_chan *ioat_chan)
                                         pci_unmap_addr(desc, src),
                                         pci_unmap_len(desc, len),
                                         PCI_DMA_TODEVICE);
+                        if (desc->async_tx.callback) {
+                                desc->async_tx.callback(
+                                                desc->async_tx.callback_param);
+                                desc->async_tx.callback = NULL;
+                        }
                 }
 
                 if (desc->async_tx.phys != phys_complete) {
@@ -548,7 +565,7 @@ static void ioat_dma_memcpy_cleanup(struct ioat_dma_chan *ioat_chan)
         if (cookie != 0)
                 ioat_chan->completed_cookie = cookie;
 
-        spin_unlock(&ioat_chan->cleanup_lock);
+        spin_unlock_bh(&ioat_chan->cleanup_lock);
 }
 
 static void ioat_dma_dependency_added(struct dma_chan *chan)
@@ -613,8 +630,13 @@ static void ioat_dma_start_null_desc(struct ioat_dma_chan *ioat_chan)
         spin_lock_bh(&ioat_chan->desc_lock);
 
         desc = ioat_dma_get_next_descriptor(ioat_chan);
-        desc->hw->ctl = IOAT_DMA_DESCRIPTOR_NUL;
+        desc->hw->ctl = IOAT_DMA_DESCRIPTOR_NUL
+                                | IOAT_DMA_DESCRIPTOR_CTL_INT_GN
+                                | IOAT_DMA_DESCRIPTOR_CTL_CP_STS;
         desc->hw->next = 0;
+        desc->hw->size = 0;
+        desc->hw->src_addr = 0;
+        desc->hw->dst_addr = 0;
         desc->async_tx.ack = 1;
 
         list_add_tail(&desc->node, &ioat_chan->used_desc);
@@ -633,6 +655,12 @@ static void ioat_dma_start_null_desc(struct ioat_dma_chan *ioat_chan)
  */
 #define IOAT_TEST_SIZE 2000
 
+static void ioat_dma_test_callback(void *dma_async_param)
+{
+        printk(KERN_ERR "ioatdma: ioat_dma_test_callback(%p)\n",
+                        dma_async_param);
+}
+
 /**
  * ioat_dma_self_test - Perform a IOAT transaction to verify the HW works.
  * @device: device to be tested
@@ -643,7 +671,7 @@ static int ioat_dma_self_test(struct ioatdma_device *device)
         u8 *src;
         u8 *dest;
         struct dma_chan *dma_chan;
-        struct dma_async_tx_descriptor *tx;
+        struct dma_async_tx_descriptor *tx = NULL;
         dma_addr_t addr;
         dma_cookie_t cookie;
         int err = 0;
@@ -673,6 +701,13 @@ static int ioat_dma_self_test(struct ioatdma_device *device)
         }
 
         tx = ioat_dma_prep_memcpy(dma_chan, IOAT_TEST_SIZE, 0);
+        if (!tx) {
+                dev_err(&device->pdev->dev,
+                        "Self-test prep failed, disabling\n");
+                err = -ENODEV;
+                goto free_resources;
+        }
+
         async_tx_ack(tx);
         addr = dma_map_single(dma_chan->device->dev, src, IOAT_TEST_SIZE,
                         DMA_TO_DEVICE);
@@ -680,19 +715,27 @@ static int ioat_dma_self_test(struct ioatdma_device *device)
         addr = dma_map_single(dma_chan->device->dev, dest, IOAT_TEST_SIZE,
                         DMA_FROM_DEVICE);
         ioat_set_dest(addr, tx, 0);
+        tx->callback = ioat_dma_test_callback;
+        tx->callback_param = (void *)0x8086;
         cookie = ioat_tx_submit(tx);
+        if (cookie < 0) {
+                dev_err(&device->pdev->dev,
+                        "Self-test setup failed, disabling\n");
+                err = -ENODEV;
+                goto free_resources;
+        }
         ioat_dma_memcpy_issue_pending(dma_chan);
         msleep(1);
 
         if (ioat_dma_is_complete(dma_chan, cookie, NULL, NULL) != DMA_SUCCESS) {
                 dev_err(&device->pdev->dev,
-                        "ioatdma: Self-test copy timed out, disabling\n");
+                        "Self-test copy timed out, disabling\n");
                 err = -ENODEV;
                 goto free_resources;
         }
         if (memcmp(src, dest, IOAT_TEST_SIZE)) {
                 dev_err(&device->pdev->dev,
-                        "ioatdma: Self-test copy failed compare, disabling\n");
+                        "Self-test copy failed compare, disabling\n");
                 err = -ENODEV;
                 goto free_resources;
         }
@@ -730,6 +773,9 @@ static int ioat_dma_setup_interrupts(struct ioatdma_device *device)
                 goto msi;
         if (!strcmp(ioat_interrupt_style, "intx"))
                 goto intx;
+        dev_err(&device->pdev->dev, "invalid ioat_interrupt_style %s\n",
+                ioat_interrupt_style);
+        goto err_no_irq;
 
 msix:
         /* The number of MSI-X vectors should equal the number of channels */
@@ -906,9 +952,9 @@ struct ioatdma_device *ioat_dma_probe(struct pci_dev *pdev,
         device->common.device_dependency_added = ioat_dma_dependency_added;
         device->common.dev = &pdev->dev;
         dev_err(&device->pdev->dev,
-                "ioatdma: Intel(R) I/OAT DMA Engine found,"
-                " %d channels, device version 0x%02x\n",
-                device->common.chancnt, device->version);
+                "Intel(R) I/OAT DMA Engine found,"
+                " %d channels, device version 0x%02x, driver version %s\n",
+                device->common.chancnt, device->version, IOAT_DMA_VERSION);
 
         err = ioat_dma_setup_interrupts(device);
         if (err)
@@ -931,9 +977,8 @@ err_completion_pool:
 err_dma_pool:
         kfree(device);
 err_kzalloc:
-        iounmap(iobase);
         dev_err(&device->pdev->dev,
-                "ioatdma: Intel(R) I/OAT DMA Engine initialization failed\n");
+                "Intel(R) I/OAT DMA Engine initialization failed\n");
         return NULL;
 }
 
@@ -942,13 +987,17 @@ void ioat_dma_remove(struct ioatdma_device *device)
         struct dma_chan *chan, *_chan;
         struct ioat_dma_chan *ioat_chan;
 
-        dma_async_device_unregister(&device->common);
-
         ioat_dma_remove_interrupts(device);
 
+        dma_async_device_unregister(&device->common);
+
         pci_pool_destroy(device->dma_pool);
         pci_pool_destroy(device->completion_pool);
 
+        iounmap(device->reg_base);
+        pci_release_regions(device->pdev);
+        pci_disable_device(device->pdev);
+
         list_for_each_entry_safe(chan, _chan,
                                  &device->common.channels, device_node) {
                 ioat_chan = to_ioat_chan(chan);
diff --git a/drivers/dma/ioatdma.h b/drivers/dma/ioatdma.h
index 2a319e124ece..5f9881e7b0ed 100644
--- a/drivers/dma/ioatdma.h
+++ b/drivers/dma/ioatdma.h
@@ -28,6 +28,8 @@
 #include <linux/cache.h>
 #include <linux/pci_ids.h>
 
+#define IOAT_DMA_VERSION "1.26"
+
 enum ioat_interrupt {
         none = 0,
         msix_multi_vector = 1,
@@ -122,9 +124,9 @@ struct ioat_desc_sw {
         struct ioat_dma_descriptor *hw;
         struct list_head node;
         int tx_cnt;
-        DECLARE_PCI_UNMAP_LEN(len)
-        DECLARE_PCI_UNMAP_ADDR(src)
-        DECLARE_PCI_UNMAP_ADDR(dst)
+        size_t len;
+        dma_addr_t src;
+        dma_addr_t dst;
         struct dma_async_tx_descriptor async_tx;
 };
 
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index aa875ca50d9b..3e63c1486770 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -1651,7 +1651,7 @@ static int adm1026_detect(struct i2c_adapter *adapter, int address,
                 break;
         default :
                 dev_err(&adapter->dev, ": Internal error, invalid "
-                        "kind (%d)!", kind);
+                        "kind (%d)!\n", kind);
                 err = -EFAULT;
                 goto exitfree;
         }
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index f207434730de..650b07d5b902 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -533,7 +533,7 @@ static void lm63_init_client(struct i2c_client *client)
 
         /* Start converting if needed */
         if (data->config & 0x40) { /* standby */
-                dev_dbg(&client->dev, "Switching to operational mode");
+                dev_dbg(&client->dev, "Switching to operational mode\n");
                 data->config &= 0xA7;
                 i2c_smbus_write_byte_data(client, LM63_REG_CONFIG1,
                                           data->config);
diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c
index e69416465e6d..7dfcc8dd316d 100644
--- a/drivers/hwmon/vt1211.c
+++ b/drivers/hwmon/vt1211.c
@@ -795,7 +795,7 @@ static ssize_t set_pwm_auto_point_pwm(struct device *dev,
 
         if ((val < 0) || (val > 255)) {
                 dev_err(dev, "pwm value %ld is out of range. "
-                        "Choose a value between 0 and 255." , val);
+                        "Choose a value between 0 and 255.\n" , val);
                 return -EINVAL;
         }
 
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
index b6f2ebf9f9cf..a9c01a6f0057 100644
--- a/drivers/hwmon/w83791d.c
+++ b/drivers/hwmon/w83791d.c
@@ -1096,7 +1096,7 @@ static int w83791d_detect(struct i2c_adapter *adapter, int address, int kind)
         if (kind == w83791d) {
                 client_name = "w83791d";
         } else {
-                dev_err(dev, "w83791d: Internal error: unknown kind (%d)?!?",
+                dev_err(dev, "w83791d: Internal error: unknown kind (%d)?!?\n",
                         kind);
                 goto error1;
         }
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index f836198b705c..007449d3e16e 100644
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -1385,8 +1385,8 @@ w83792d_detect(struct i2c_adapter *adapter, int address, int kind)
         if (kind == w83792d) {
                 client_name = "w83792d";
         } else {
-                dev_err(dev, "w83792d: Internal error: unknown"
-                                          " kind (%d)?!?", kind);
+                dev_err(dev, "w83792d: Internal error: unknown kind (%d)?!?\n",
+                        kind);
                 goto ERROR1;
         }
 
diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c
index 17cecf1ea797..be99c02ecac5 100644
--- a/drivers/i2c/busses/i2c-pmcmsp.c
+++ b/drivers/i2c/busses/i2c-pmcmsp.c
@@ -591,18 +591,18 @@ static int pmcmsptwi_master_xfer(struct i2c_adapter *adap,
         if (msg->flags & I2C_M_TEN)
                 pmcmsptwi_set_twi_config(&oldcfg, data);
 
-        dev_dbg(&adap->dev, "I2C %s of %d bytes ",
-                (msg->flags & I2C_M_RD) ? "read" : "write", msg->len);
+        dev_dbg(&adap->dev, "I2C %s of %d bytes %s\n",
+                (msg->flags & I2C_M_RD) ? "read" : "write", msg->len,
+                (ret == MSP_TWI_XFER_OK) ? "succeeded" : "failed");
+
         if (ret != MSP_TWI_XFER_OK) {
                 /*
                  * TODO: We could potentially loop and retry in the case
                  * of MSP_TWI_XFER_TIMEOUT.
                  */
-                dev_dbg(&adap->dev, "failed\n");
                 return -1;
         }
 
-        dev_dbg(&adap->dev, "succeeded\n");
         return 0;
 }
 
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 17376feb1acc..f8d0dff0de7e 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -575,7 +575,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
         else {
                 freq_mhz = PNX_DEFAULT_FREQ;
                 dev_info(&pdev->dev, "Setting bus frequency to default value: "
-                       "%d MHz", freq_mhz);
+                       "%d MHz\n", freq_mhz);
         }
 
         i2c_pnx->adapter->algo = &pnx_algorithm;
diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index 66436bae11ac..2dea0123a958 100644
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -1195,7 +1195,7 @@ static int menelaus_probe(struct i2c_client *client)
                 err = request_irq(client->irq, menelaus_irq, IRQF_DISABLED,
                                   DRIVER_NAME, menelaus);
                 if (err) {
-                        dev_dbg(&client->dev,  "can't get IRQ %d, err %d",
+                        dev_dbg(&client->dev,  "can't get IRQ %d, err %d\n",
                                         client->irq, err);
                         goto fail1;
                 }
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index a3409fdb307c..7a7dab890f6d 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -579,12 +579,12 @@ static ssize_t  ehca_show_##name(struct device *dev,                       \
                                                                            \
         rblock = ehca_alloc_fw_ctrlblock(GFP_KERNEL);                      \
         if (!rblock) {                                                     \
-                dev_err(dev, "Can't allocate rblock memory.");             \
+                dev_err(dev, "Can't allocate rblock memory.\n");           \
                 return 0;                                                  \
         }                                                                  \
                                                                            \
         if (hipz_h_query_hca(shca->ipz_hca_handle, rblock) != H_SUCCESS) { \
-                dev_err(dev, "Can't query device properties");             \
+                dev_err(dev, "Can't query device properties\n");           \
                 ehca_free_fw_ctrlblock(rblock);                            \
                 return 0;                                                  \
         }                                                                  \
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index 20896d5e5f0e..ec1b6cfefcd3 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -448,9 +448,8 @@ static int gameport_thread(void *nothing)
         set_freezable();
         do {
                 gameport_handle_event();
-                wait_event_interruptible(gameport_wait,
+                wait_event_freezable(gameport_wait,
                         kthread_should_stop() || !list_empty(&gameport_event_list));
-                try_to_freeze();
         } while (!kthread_should_stop());
 
         printk(KERN_DEBUG "gameport: kgameportd exiting\n");
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index b3bc15acd3f5..7f5293828fbf 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -387,9 +387,8 @@ static int serio_thread(void *nothing)
         set_freezable();
         do {
                 serio_handle_event();
-                wait_event_interruptible(serio_wait,
+                wait_event_freezable(serio_wait,
                         kthread_should_stop() || !list_empty(&serio_event_list));
-                try_to_freeze();
         } while (!kthread_should_stop());
 
         printk(KERN_DEBUG "serio: kseriod exiting\n");
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index 86aed64ec0fb..89373b01d8f5 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -333,10 +333,9 @@ static int ucb1400_ts_thread(void *_ucb)
                         timeout = msecs_to_jiffies(10);
                 }
 
-                wait_event_interruptible_timeout(ucb->ts_wait,
+                wait_event_freezable_timeout(ucb->ts_wait,
                         ucb->irq_pending || ucb->ts_restart || kthread_should_stop(),
                         timeout);
-                try_to_freeze();
         }
 
         /* Send the "pen off" if we are stopping with the pen still active */
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 6df336bdd571..acd417197d03 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -534,7 +534,8 @@ int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src,
                         n = RBUFSIZE - tail;
                 if (!n) {
                         dev_err(inbuf->cs->dev,
-                                "buffer overflow (%u bytes lost)", bytesleft);
+                                "buffer overflow (%u bytes lost)\n",
+                                bytesleft);
                         break;
                 }
                 if (n > bytesleft)
diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
index 7a69a18d07e2..4484a6417235 100644
--- a/drivers/isdn/hardware/avm/b1.c
+++ b/drivers/isdn/hardware/avm/b1.c
@@ -321,12 +321,15 @@ void b1_reset_ctr(struct capi_ctr *ctrl)
         avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata);
         avmcard *card = cinfo->card;
         unsigned int port = card->port;
+        unsigned long flags;
 
         b1_reset(port);
         b1_reset(port);
 
         memset(cinfo->version, 0, sizeof(cinfo->version));
+        spin_lock_irqsave(&card->lock, flags);
         capilib_release(&cinfo->ncci_head);
+        spin_unlock_irqrestore(&card->lock, flags);
         capi_ctr_reseted(ctrl);
 }
 
@@ -361,9 +364,8 @@ void b1_release_appl(struct capi_ctr *ctrl, u16 appl)
         unsigned int port = card->port;
         unsigned long flags;
 
-        capilib_release_appl(&cinfo->ncci_head, appl);
-
         spin_lock_irqsave(&card->lock, flags);
+        capilib_release_appl(&cinfo->ncci_head, appl);
         b1_put_byte(port, SEND_RELEASE);
         b1_put_word(port, appl);
         spin_unlock_irqrestore(&card->lock, flags);
@@ -380,27 +382,27 @@ u16 b1_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)
         u8 subcmd = CAPIMSG_SUBCOMMAND(skb->data);
         u16 dlen, retval;
 
+        spin_lock_irqsave(&card->lock, flags);
         if (CAPICMD(cmd, subcmd) == CAPI_DATA_B3_REQ) {
                 retval = capilib_data_b3_req(&cinfo->ncci_head,
                                              CAPIMSG_APPID(skb->data),
                                              CAPIMSG_NCCI(skb->data),
                                              CAPIMSG_MSGID(skb->data));
-                if (retval != CAPI_NOERROR) 
+                if (retval != CAPI_NOERROR) {
+                        spin_unlock_irqrestore(&card->lock, flags);
                         return retval;
+                }
 
                 dlen = CAPIMSG_DATALEN(skb->data);
 
-                spin_lock_irqsave(&card->lock, flags);
                 b1_put_byte(port, SEND_DATA_B3_REQ);
                 b1_put_slice(port, skb->data, len);
                 b1_put_slice(port, skb->data + len, dlen);
-                spin_unlock_irqrestore(&card->lock, flags);
         } else {
-                spin_lock_irqsave(&card->lock, flags);
                 b1_put_byte(port, SEND_MESSAGE);
                 b1_put_slice(port, skb->data, len);
-                spin_unlock_irqrestore(&card->lock, flags);
         }
+        spin_unlock_irqrestore(&card->lock, flags);
 
         dev_kfree_skb_any(skb);
         return CAPI_NOERROR;
@@ -534,17 +536,17 @@ irqreturn_t b1_interrupt(int interrupt, void *devptr)
 
                 ApplId = (unsigned) b1_get_word(card->port);
                 MsgLen = b1_get_slice(card->port, card->msgbuf);
-                spin_unlock_irqrestore(&card->lock, flags);
                 if (!(skb = alloc_skb(MsgLen, GFP_ATOMIC))) {
                         printk(KERN_ERR "%s: incoming packet dropped\n",
                                         card->name);
+                        spin_unlock_irqrestore(&card->lock, flags);
                 } else {
                         memcpy(skb_put(skb, MsgLen), card->msgbuf, MsgLen);
                         if (CAPIMSG_CMD(skb->data) == CAPI_DATA_B3_CONF)
                                 capilib_data_b3_conf(&cinfo->ncci_head, ApplId,
                                                      CAPIMSG_NCCI(skb->data),
                                                      CAPIMSG_MSGID(skb->data));
-
+                        spin_unlock_irqrestore(&card->lock, flags);
                         capi_ctr_handle_message(ctrl, ApplId, skb);
                 }
                 break;
@@ -554,21 +556,17 @@ irqreturn_t b1_interrupt(int interrupt, void *devptr)
                 ApplId = b1_get_word(card->port);
                 NCCI = b1_get_word(card->port);
                 WindowSize = b1_get_word(card->port);
-                spin_unlock_irqrestore(&card->lock, flags);
-
                 capilib_new_ncci(&cinfo->ncci_head, ApplId, NCCI, WindowSize);
-
+                spin_unlock_irqrestore(&card->lock, flags);
                 break;
 
         case RECEIVE_FREE_NCCI:
 
                 ApplId = b1_get_word(card->port);
                 NCCI = b1_get_word(card->port);
-                spin_unlock_irqrestore(&card->lock, flags);
-
                 if (NCCI != 0xffffffff)
                         capilib_free_ncci(&cinfo->ncci_head, ApplId, NCCI);
-               
+                spin_unlock_irqrestore(&card->lock, flags);
                 break;
 
         case RECEIVE_START:
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index d58f927e766a..8710cf6214d9 100644
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -727,6 +727,7 @@ static void c4_send_init(avmcard *card)
 {
         struct sk_buff *skb;
         void *p;
+        unsigned long flags;
 
         skb = alloc_skb(15, GFP_ATOMIC);
         if (!skb) {
@@ -744,12 +745,15 @@ static void c4_send_init(avmcard *card)
         skb_put(skb, (u8 *)p - (u8 *)skb->data);
 
         skb_queue_tail(&card->dma->send_queue, skb);
+        spin_lock_irqsave(&card->lock, flags);
         c4_dispatch_tx(card);
+        spin_unlock_irqrestore(&card->lock, flags);
 }
 
 static int queue_sendconfigword(avmcard *card, u32 val)
 {
         struct sk_buff *skb;
+        unsigned long flags;
         void *p;
 
         skb = alloc_skb(3+4, GFP_ATOMIC);
@@ -766,7 +770,9 @@ static int queue_sendconfigword(avmcard *card, u32 val)
         skb_put(skb, (u8 *)p - (u8 *)skb->data);
 
         skb_queue_tail(&card->dma->send_queue, skb);
+        spin_lock_irqsave(&card->lock, flags);
         c4_dispatch_tx(card);
+        spin_unlock_irqrestore(&card->lock, flags);
         return 0;
 }
 
@@ -986,7 +992,9 @@ static void c4_release_appl(struct capi_ctr *ctrl, u16 appl)
         struct sk_buff *skb;
         void *p;
 
+        spin_lock_irqsave(&card->lock, flags);
         capilib_release_appl(&cinfo->ncci_head, appl);
+        spin_unlock_irqrestore(&card->lock, flags);
 
         if (ctrl->cnr == card->cardnr) {
                 skb = alloc_skb(7, GFP_ATOMIC);
@@ -1019,7 +1027,8 @@ static u16 c4_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)
         u16 retval = CAPI_NOERROR;
         unsigned long flags;
 
-        if (CAPIMSG_CMD(skb->data) == CAPI_DATA_B3_REQ) {
+        spin_lock_irqsave(&card->lock, flags);
+        if (CAPIMSG_CMD(skb->data) == CAPI_DATA_B3_REQ) {
                 retval = capilib_data_b3_req(&cinfo->ncci_head,
                                              CAPIMSG_APPID(skb->data),
                                              CAPIMSG_NCCI(skb->data),
@@ -1027,10 +1036,9 @@ static u16 c4_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)
         }
         if (retval == CAPI_NOERROR) {
                 skb_queue_tail(&card->dma->send_queue, skb);
-                spin_lock_irqsave(&card->lock, flags);
                 c4_dispatch_tx(card);
-                spin_unlock_irqrestore(&card->lock, flags);
         }
+        spin_unlock_irqrestore(&card->lock, flags);
         return retval;
 }
 
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index b203640ef1c5..445f02665577 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -527,7 +527,8 @@ static int dvb_frontend_thread(void *data)
                 up(&fepriv->sem);           /* is locked when we enter the thread... */
 restart:
                 timeout = wait_event_interruptible_timeout(fepriv->wait_queue,
-                        dvb_frontend_should_wakeup(fe) || kthread_should_stop(),
+                        dvb_frontend_should_wakeup(fe) || kthread_should_stop()
+                                || freezing(current),
                         fepriv->delay);
 
                 if (kthread_should_stop() || dvb_frontend_is_exiting(fe)) {
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index 9eac65f34bff..dcf22a3b672a 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -144,7 +144,7 @@ const static unsigned int palette2pixelformat[] = {
         [VIDEO_PALETTE_YUV422P] = V4L2_PIX_FMT_YUV422P,
 };
 
-static unsigned int __attribute_pure__
+static unsigned int __pure
 palette_to_pixelformat(unsigned int palette)
 {
         if (palette < ARRAY_SIZE(palette2pixelformat))
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index b79a9cf2d162..21b921dd6aab 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -696,7 +696,7 @@ static int s3c24xx_nand_probe(struct platform_device *pdev,
 
         info->clk = clk_get(&pdev->dev, "nand");
         if (IS_ERR(info->clk)) {
-                dev_err(&pdev->dev, "failed to get clock");
+                dev_err(&pdev->dev, "failed to get clock\n");
                 err = -ENOENT;
                 goto exit_error;
         }
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index 9fe0517cf893..7495a9ee8f4b 100644
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -900,7 +900,7 @@ static int ax_probe(struct platform_device *pdev)
 
                 ax->map2 = ioremap(res->start, size);
                 if (ax->map2 == NULL) {
-                        dev_err(&pdev->dev, "cannot map reset register");
+                        dev_err(&pdev->dev, "cannot map reset register\n");
                         ret = -ENXIO;
                         goto exit_mem2;
                 }
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index db79602788e4..96cee4badd28 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6438,7 +6438,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         /* enable device (incl. PCI PM wakeup), and bus-mastering */
         rc = pci_enable_device(pdev);
         if (rc) {
-                dev_err(&pdev->dev, "Cannot enable PCI device, aborting.");
+                dev_err(&pdev->dev, "Cannot enable PCI device, aborting.\n");
                 goto err_out;
         }
 
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index fe5ffac7ac57..2809c99906e0 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -3218,7 +3218,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
         /* get adapter properties */
         ret = ehea_sense_adapter_attr(adapter);
         if (ret) {
-                dev_err(&dev->dev, "sense_adapter_attr failed: %d", ret);
+                dev_err(&dev->dev, "sense_adapter_attr failed: %d\n", ret);
                 goto out_free_ad;
         }
 
@@ -3226,7 +3226,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
                                       EHEA_NEQ, EHEA_MAX_ENTRIES_EQ, 1);
         if (!adapter->neq) {
                 ret = -EIO;
-                dev_err(&dev->dev, "NEQ creation failed");
+                dev_err(&dev->dev, "NEQ creation failed\n");
                 goto out_free_ad;
         }
 
@@ -3237,7 +3237,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
                                   ehea_interrupt_neq, IRQF_DISABLED,
                                   "ehea_neq", adapter);
         if (ret) {
-                dev_err(&dev->dev, "requesting NEQ IRQ failed");
+                dev_err(&dev->dev, "requesting NEQ IRQ failed\n");
                 goto out_kill_eq;
         }
 
@@ -3247,7 +3247,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
 
         ret = ehea_setup_ports(adapter);
         if (ret) {
-                dev_err(&dev->dev, "setup_ports failed");
+                dev_err(&dev->dev, "setup_ports failed\n");
                 goto out_rem_dev_sysfs;
         }
 
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 64c8151f2004..366e62a2b1e5 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -3058,7 +3058,8 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (status != 0) {
                 dac_enabled = 0;
                 dev_err(&pdev->dev,
-                        "64-bit pci address mask was refused, trying 32-bit");
+                        "64-bit pci address mask was refused, "
+                        "trying 32-bit\n");
                 status = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
         }
         if (status != 0) {
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 2a1d6d7ec351..601051c584e8 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -53,9 +53,6 @@ static char netxen_nic_driver_string[] = "NetXen Network Driver version "
 #define NETXEN_ADAPTER_UP_MAGIC 777
 #define NETXEN_NIC_PEG_TUNE 0
 
-#define DMA_32BIT_MASK  0x00000000ffffffffULL
-#define DMA_35BIT_MASK  0x00000007ffffffffULL
-
 /* Local functions to NetXen NIC driver */
 static int __devinit netxen_nic_probe(struct pci_dev *pdev,
                                       const struct pci_device_id *ent);
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 7967240534d5..70d7e478a3e0 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3961,7 +3961,7 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
         struct net_device *dev = alloc_etherdev(sizeof(*sky2));
 
         if (!dev) {
-                dev_err(&hw->pdev->dev, "etherdev alloc failed");
+                dev_err(&hw->pdev->dev, "etherdev alloc failed\n");
                 return NULL;
         }
 
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index 6240b978fe3d..f55a5951733a 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -114,8 +114,8 @@ static void mcs7830_async_cmd_callback(struct urb *urb)
         struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
 
         if (urb->status < 0)
-                printk(KERN_DEBUG "mcs7830_async_cmd_callback() failed with %d",
-                        urb->status);
+                printk(KERN_DEBUG "%s() failed with %d\n",
+                       __FUNCTION__, urb->status);
 
         kfree(req);
         usb_free_urb(urb);
@@ -129,15 +129,15 @@ static void mcs7830_set_reg_async(struct usbnet *dev, u16 index, u16 size, void
 
         urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!urb) {
-                dev_dbg(&dev->udev->dev, "Error allocating URB "
-                                "in write_cmd_async!");
+                dev_dbg(&dev->udev->dev,
+                        "Error allocating URB in write_cmd_async!\n");
                 return;
         }
 
         req = kmalloc(sizeof *req, GFP_ATOMIC);
         if (!req) {
-                dev_err(&dev->udev->dev, "Failed to allocate memory for "
-                                "control request");
+                dev_err(&dev->udev->dev,
+                        "Failed to allocate memory for control request\n");
                 goto out;
         }
         req->bRequestType = MCS7830_WR_BMREQ;
@@ -153,8 +153,8 @@ static void mcs7830_set_reg_async(struct usbnet *dev, u16 index, u16 size, void
 
         ret = usb_submit_urb(urb, GFP_ATOMIC);
         if (ret < 0) {
-                dev_err(&dev->udev->dev, "Error submitting the control "
-                                "message: ret=%d", ret);
+                dev_err(&dev->udev->dev,
+                        "Error submitting the control message: ret=%d\n", ret);
                 goto out;
         }
         return;
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 7fd505cc4f7a..2a8fc431099f 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1526,7 +1526,7 @@ static int xennet_connect(struct net_device *dev)
 
         if (!feature_rx_copy) {
                 dev_info(&dev->dev,
-                         "backend does not support copying recieve path");
+                         "backend does not support copying receive path\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 864f09fd9f86..b47bb2d7476a 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -12,6 +12,7 @@
  *
  */
 #include <linux/errno.h>
+#include <linux/module.h>
 #include <linux/device.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
@@ -94,3 +95,23 @@ int of_bus_type_init(struct bus_type *bus, const char *name)
         bus->resume = of_platform_device_resume;
         return bus_register(bus);
 }
+
+int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
+{
+        /* initialize common driver fields */
+        if (!drv->driver.name)
+                drv->driver.name = drv->name;
+        if (!drv->driver.owner)
+                drv->driver.owner = drv->owner;
+        drv->driver.bus = bus;
+
+        /* register with core */
+        return driver_register(&drv->driver);
+}
+EXPORT_SYMBOL(of_register_driver);
+
+void of_unregister_driver(struct of_platform_driver *drv)
+{
+        driver_unregister(&drv->driver);
+}
+EXPORT_SYMBOL(of_unregister_driver);
diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index ff9f34453530..5bbff2028f8f 100644
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -275,35 +275,6 @@ void parport_close(struct pardevice *dev)
         parport_unregister_device(dev);
 }
 
-/**
- *      parport_device_num - convert device coordinates
- *      @parport: parallel port number
- *      @mux: multiplexor port number (-1 for no multiplexor)
- *      @daisy: daisy chain address (-1 for no daisy chain address)
- *
- *      This tries to locate a device on the given parallel port,
- *      multiplexor port and daisy chain address, and returns its
- *      device number or %-ENXIO if no device with those coordinates
- *      exists.
- **/
-
-int parport_device_num(int parport, int mux, int daisy)
-{
-        int res = -ENXIO;
-        struct daisydev *dev;
-
-        spin_lock(&topology_lock);
-        dev = topology;
-        while (dev && dev->port->portnum != parport &&
-               dev->port->muxport != mux && dev->daisy != daisy)
-                dev = dev->next;
-        if (dev)
-                res = dev->devnum;
-        spin_unlock(&topology_lock);
-
-        return res;
-}
-
 /* Send a daisy-chain-style CPP command packet. */
 static int cpp_daisy(struct parport *port, int cmd)
 {
diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
index bdbdab9285ca..ed82e41210d1 100644
--- a/drivers/parport/procfs.c
+++ b/drivers/parport/procfs.c
@@ -237,7 +237,7 @@ static int do_hardware_modes (ctl_table *table, int write,
 #define PARPORT_PARPORT_DIR(CHILD) { .ctl_name = DEV_PARPORT, .procname = "parport", \
                                      .mode = 0555, .child = CHILD }
 #define PARPORT_DEV_DIR(CHILD) { .ctl_name = CTL_DEV, .procname = "dev", .mode = 0555, .child = CHILD }
-#define PARPORT_DEVICES_ROOT_DIR  { .ctl_name = DEV_PARPORT_DEVICES, .procname = "devices", \
+#define PARPORT_DEVICES_ROOT_DIR  {  .procname = "devices", \
                                     .mode = 0555, .child = NULL }
 
 static const unsigned long parport_min_timeslice_value =
@@ -266,7 +266,6 @@ static const struct parport_sysctl_table parport_sysctl_template = {
         .sysctl_header = NULL,
         {
                 {
-                        .ctl_name       = DEV_PARPORT_SPINTIME,
                         .procname       = "spintime",
                         .data           = NULL,
                         .maxlen         = sizeof(int),
@@ -276,7 +275,6 @@ static const struct parport_sysctl_table parport_sysctl_template = {
                         .extra2         = (void*) &parport_max_spintime_value
                 },
                 {
-                        .ctl_name       = DEV_PARPORT_BASE_ADDR,
                         .procname       = "base-addr",
                         .data           = NULL,
                         .maxlen         = 0,
@@ -284,7 +282,6 @@ static const struct parport_sysctl_table parport_sysctl_template = {
                         .proc_handler   = &do_hardware_base_addr
                 },
                 {
-                        .ctl_name       = DEV_PARPORT_IRQ,
                         .procname       = "irq",
                         .data           = NULL,
                         .maxlen         = 0,
@@ -292,7 +289,6 @@ static const struct parport_sysctl_table parport_sysctl_template = {
                         .proc_handler   = &do_hardware_irq
                 },
                 {
-                        .ctl_name       = DEV_PARPORT_DMA,
                         .procname       = "dma",
                         .data           = NULL,
                         .maxlen         = 0,
@@ -300,7 +296,6 @@ static const struct parport_sysctl_table parport_sysctl_template = {
                         .proc_handler   = &do_hardware_dma
                 },
                 {
-                        .ctl_name       = DEV_PARPORT_MODES,
                         .procname       = "modes",
                         .data           = NULL,
                         .maxlen         = 0,
@@ -310,7 +305,6 @@ static const struct parport_sysctl_table parport_sysctl_template = {
                 PARPORT_DEVICES_ROOT_DIR,
 #ifdef CONFIG_PARPORT_1284
                 {
-                        .ctl_name       = DEV_PARPORT_AUTOPROBE,
                         .procname       = "autoprobe",
                         .data           = NULL,
                         .maxlen         = 0,
@@ -318,7 +312,6 @@ static const struct parport_sysctl_table parport_sysctl_template = {
                         .proc_handler   = &do_autoprobe
                 },
                 {
-                        .ctl_name       = DEV_PARPORT_AUTOPROBE + 1,
                         .procname       = "autoprobe0",
                         .data           = NULL,
                         .maxlen         = 0,
@@ -326,7 +319,6 @@ static const struct parport_sysctl_table parport_sysctl_template = {
                         .proc_handler   =  &do_autoprobe
                 },
                 {
-                        .ctl_name       = DEV_PARPORT_AUTOPROBE + 2,
                         .procname       = "autoprobe1",
                         .data           = NULL,
                         .maxlen         = 0,
@@ -334,7 +326,6 @@ static const struct parport_sysctl_table parport_sysctl_template = {
                         .proc_handler   = &do_autoprobe
                 },
                 {
-                        .ctl_name       = DEV_PARPORT_AUTOPROBE + 3,
                         .procname       = "autoprobe2",
                         .data           = NULL,
                         .maxlen         = 0,
@@ -342,7 +333,6 @@ static const struct parport_sysctl_table parport_sysctl_template = {
                         .proc_handler   = &do_autoprobe
                 },
                 {
-                        .ctl_name       = DEV_PARPORT_AUTOPROBE + 4,
                         .procname       = "autoprobe3",
                         .data           = NULL,
                         .maxlen         = 0,
@@ -354,7 +344,6 @@ static const struct parport_sysctl_table parport_sysctl_template = {
         },
         {
                 {
-                        .ctl_name       = DEV_PARPORT_DEVICES_ACTIVE,
                         .procname       = "active",
                         .data           = NULL,
                         .maxlen         = 0,
@@ -393,7 +382,6 @@ parport_device_sysctl_template = {
         .sysctl_header = NULL,
         {
                 {
-                        .ctl_name       = DEV_PARPORT_DEVICE_TIMESLICE,
                         .procname       = "timeslice",
                         .data           = NULL,
                         .maxlen         = sizeof(int),
@@ -449,7 +437,6 @@ parport_default_sysctl_table = {
         .sysctl_header  = NULL,
         {
                 {
-                        .ctl_name       = DEV_PARPORT_DEFAULT_TIMESLICE,
                         .procname       = "timeslice",
                         .data           = &parport_default_timeslice,
                         .maxlen         = sizeof(parport_default_timeslice),
@@ -459,7 +446,6 @@ parport_default_sysctl_table = {
                         .extra2         = (void*) &parport_max_timeslice_value
                 },
                 {
-                        .ctl_name       = DEV_PARPORT_DEFAULT_SPINTIME,
                         .procname       = "spintime",
                         .data           = &parport_default_spintime,
                         .maxlen         = sizeof(parport_default_spintime),
@@ -502,7 +488,7 @@ int parport_proc_register(struct parport *port)
 
         t->device_dir[0].extra1 = port;
 
-        for (i = 0; i < 8; i++)
+        for (i = 0; i < 5; i++)
                 t->vars[i].extra1 = port;
 
         t->vars[0].data = &port->spintime;
@@ -512,7 +498,7 @@ int parport_proc_register(struct parport *port)
                 t->vars[6 + i].extra2 = &port->probe_info[i];
 
         t->port_dir[0].procname = port->name;
-        t->port_dir[0].ctl_name = port->number + 1; /* nb 0 isn't legal here */
+        t->port_dir[0].ctl_name = 0;
 
         t->port_dir[0].child = t->vars;
         t->parport_dir[0].child = t->port_dir;
@@ -551,26 +537,12 @@ int parport_device_proc_register(struct pardevice *device)
         t->dev_dir[0].child = t->parport_dir;
         t->parport_dir[0].child = t->port_dir;
         t->port_dir[0].procname = port->name;
-        t->port_dir[0].ctl_name = port->number + 1; /* nb 0 isn't legal here */
+        t->port_dir[0].ctl_name = 0;
         t->port_dir[0].child = t->devices_root_dir;
         t->devices_root_dir[0].child = t->device_dir;
 
-#ifdef CONFIG_PARPORT_1284
-
-        t->device_dir[0].ctl_name =
-                parport_device_num(port->number, port->muxport,
-                                   device->daisy)
-                + 1;  /* nb 0 isn't legal here */ 
-
-#else /* No IEEE 1284 support */
-
-        /* parport_device_num isn't available. */
-        t->device_dir[0].ctl_name = 1;
-        
-#endif /* IEEE 1284 support or not */
-
+        t->device_dir[0].ctl_name = 0;
         t->device_dir[0].procname = device->name;
-        t->device_dir[0].extra1 = device;
         t->device_dir[0].child = t->vars;
         t->vars[0].data = &device->timeslice;
 
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c
index be7021ee3611..bdb9b7285b3d 100644
--- a/drivers/power/ds2760_battery.c
+++ b/drivers/power/ds2760_battery.c
@@ -366,7 +366,7 @@ static int ds2760_battery_probe(struct platform_device *pdev)
 
         retval = power_supply_register(&pdev->dev, &di->bat);
         if (retval) {
-                dev_err(di->dev, "failed to register battery");
+                dev_err(di->dev, "failed to register battery\n");
                 goto batt_failed;
         }
 
diff --git a/drivers/ps3/ps3stor_lib.c b/drivers/ps3/ps3stor_lib.c
index 3a9824e3b251..55955f16ad91 100644
--- a/drivers/ps3/ps3stor_lib.c
+++ b/drivers/ps3/ps3stor_lib.c
@@ -66,7 +66,7 @@ static int ps3stor_probe_access(struct ps3_storage_device *dev)
         if (n > 1)
                 dev_info(&dev->sbd.core,
                          "%s:%u: %lu accessible regions found. Only the first "
-                         "one will be used",
+                         "one will be used\n",
                          __func__, __LINE__, n);
         dev->region_idx = __ffs(dev->accessible_regions);
         dev_info(&dev->sbd.core,
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index 6cad0841f3c4..2ae0e8304d3a 100644
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -200,9 +200,8 @@ void rtc_sysfs_add_device(struct rtc_device *rtc)
 
         err = device_create_file(&rtc->dev, &dev_attr_wakealarm);
         if (err)
-                dev_err(rtc->dev.parent, "failed to create "
-                                "alarm attribute, %d",
-                                err);
+                dev_err(rtc->dev.parent,
+                        "failed to create alarm attribute, %d\n", err);
 }
 
 void rtc_sysfs_del_device(struct rtc_device *rtc)
diff --git a/drivers/sbus/char/vfc.h b/drivers/sbus/char/vfc.h
index 63941a259b92..f1aa1389ea4a 100644
--- a/drivers/sbus/char/vfc.h
+++ b/drivers/sbus/char/vfc.h
@@ -126,7 +126,7 @@ struct vfc_dev {
         volatile struct vfc_regs __iomem *regs;
         struct vfc_regs *phys_regs;
         unsigned int control_reg;
-        struct semaphore device_lock_sem;
+        struct mutex device_lock_mtx;
         int instance;
         int busy;
         unsigned long which_io;
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index 9269f7fbd363..e7a1642b2aa4 100644
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -22,6 +22,7 @@
 #include <linux/fs.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
+#include <linux/mutex.h>
 #include <linux/mm.h>
 
 #include <asm/openprom.h>
@@ -54,12 +55,12 @@ static unsigned char saa9051_init_array[VFC_SAA9051_NR] = {
 
 void vfc_lock_device(struct vfc_dev *dev)
 {
-        down(&dev->device_lock_sem);
+        mutex_lock(&dev->device_lock_mtx);
 }
 
 void vfc_unlock_device(struct vfc_dev *dev)
 {
-        up(&dev->device_lock_sem);
+        mutex_unlock(&dev->device_lock_mtx);
 }
 
 
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index e5337ad4121e..ce348c5c706c 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -1243,7 +1243,8 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)
                                 memset(adaptermsg, 0, LPFC_MAX_ADPTMSG);
                                 memcpy(&adaptermsg[0], (uint8_t *) irsp,
                                        MAX_MSG_DATA);
-                                dev_warn(&((phba->pcidev)->dev), "lpfc%d: %s",
+                                dev_warn(&((phba->pcidev)->dev),
+                                         "lpfc%d: %s\n",
                                          phba->brd_no, adaptermsg);
                         } else {
                                 /* Unknown IOCB command */
@@ -1430,7 +1431,8 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,
                                 memset(adaptermsg, 0, LPFC_MAX_ADPTMSG);
                                 memcpy(&adaptermsg[0], (uint8_t *) irsp,
                                        MAX_MSG_DATA);
-                                dev_warn(&((phba->pcidev)->dev), "lpfc%d: %s",
+                                dev_warn(&((phba->pcidev)->dev),
+                                         "lpfc%d: %s\n",
                                          phba->brd_no, adaptermsg);
                         } else {
                                 /* Unknown IOCB command */
@@ -1681,7 +1683,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
                                         memcpy(&adaptermsg[0], (uint8_t *) irsp,
                                                MAX_MSG_DATA);
                                         dev_warn(&((phba->pcidev)->dev),
-                                                 "lpfc%d: %s",
+                                                 "lpfc%d: %s\n",
                                                  phba->brd_no, adaptermsg);
                                 } else {
                                         /* Unknown IOCB command */
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 03b68d4f3bd0..89460d27c689 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1286,7 +1286,7 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev,
 
         ret = scsi_init_shared_tag_map(host, MAX_SRBS);
         if (ret) {
-                dev_warn(&ha->pdev->dev, "scsi_init_shared_tag_map failed");
+                dev_warn(&ha->pdev->dev, "scsi_init_shared_tag_map failed\n");
                 goto probe_failed;
         }
 
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 68aa4da01865..103189095c80 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1959,12 +1959,11 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
 
         mutex_lock(&state->mutex);
 
-#ifdef CONFIG_DISABLE_CONSOLE_SUSPEND
-        if (uart_console(port)) {
+        if (!console_suspend_enabled && uart_console(port)) {
+                /* we're going to avoid suspending serial console */
                 mutex_unlock(&state->mutex);
                 return 0;
         }
-#endif
 
         tty_dev = device_find_child(port->dev, &match, serial_match_port);
         if (device_may_wakeup(tty_dev)) {
@@ -2016,12 +2015,11 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
 
         mutex_lock(&state->mutex);
 
-#ifdef CONFIG_DISABLE_CONSOLE_SUSPEND
-        if (uart_console(port)) {
+        if (!console_suspend_enabled && uart_console(port)) {
+                /* no need to resume serial console, it wasn't suspended */
                 mutex_unlock(&state->mutex);
                 return 0;
         }
-#endif
 
         if (!port->suspended) {
                 disable_irq_wake(port->irq);
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index 6cb71d74738f..2ef11bb70b2e 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -1070,7 +1070,7 @@ static int setup(struct spi_device *spi)
                 return -ENODEV;
         }
 
-        dev_dbg(&spi->dev, "setup spi chip %s, width is %d, dma is %d,",
+        dev_dbg(&spi->dev, "setup spi chip %s, width is %d, dma is %d\n",
                         spi->modalias, chip->width, chip->enable_dma);
         dev_dbg(&spi->dev, "ctl_reg is 0x%x, flag_reg is 0x%x\n",
                         chip->ctl_reg, chip->flag);
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 3b4650ae6f1a..7686ba34430f 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -1194,7 +1194,7 @@ static int setup(struct spi_device *spi)
                 chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL);
                 if (!chip) {
                         dev_err(&spi->dev,
-                                "setup - cannot allocate controller state");
+                                "setup - cannot allocate controller state\n");
                         return -ENOMEM;
                 }
                 chip->control = SPI_DEFAULT_CONTROL;
@@ -1206,7 +1206,7 @@ static int setup(struct spi_device *spi)
                         if (!chip_info) {
                                 dev_err(&spi->dev,
                                         "setup - "
-                                        "cannot allocate controller data");
+                                        "cannot allocate controller data\n");
                                 status = -ENOMEM;
                                 goto err_first_setup;
                         }
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index f51e22490edf..912d97aaf9bf 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -332,7 +332,7 @@ static void acm_read_bulk(struct urb *urb)
                 return;
 
         if (status)
-                dev_dbg(&acm->data->dev, "bulk rx status %d", status);
+                dev_dbg(&acm->data->dev, "bulk rx status %d\n", status);
 
         buf = rcv->buffer;
         buf->size = urb->actual_length;
@@ -831,13 +831,13 @@ static int acm_probe (struct usb_interface *intf,
         
         /* normal probing*/
         if (!buffer) {
-                err("Wierd descriptor references\n");
+                err("Weird descriptor references\n");
                 return -EINVAL;
         }
 
         if (!buflen) {
                 if (intf->cur_altsetting->endpoint->extralen && intf->cur_altsetting->endpoint->extra) {
-                        dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint");
+                        dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint\n");
                         buflen = intf->cur_altsetting->endpoint->extralen;
                         buffer = intf->cur_altsetting->endpoint->extra;
                 } else {
@@ -887,24 +887,24 @@ next_desc:
 
         if (!union_header) {
                 if (call_interface_num > 0) {
-                        dev_dbg(&intf->dev,"No union descriptor, using call management descriptor");
+                        dev_dbg(&intf->dev,"No union descriptor, using call management descriptor\n");
                         data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num));
                         control_interface = intf;
                 } else {
-                        dev_dbg(&intf->dev,"No union descriptor, giving up");
+                        dev_dbg(&intf->dev,"No union descriptor, giving up\n");
                         return -ENODEV;
                 }
         } else {
                 control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0);
                 data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0));
                 if (!control_interface || !data_interface) {
-                        dev_dbg(&intf->dev,"no interfaces");
+                        dev_dbg(&intf->dev,"no interfaces\n");
                         return -ENODEV;
                 }
         }
         
         if (data_interface_num != call_interface_num)
-                dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported.");
+                dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported.\n");
 
 skip_normal_probe:
 
@@ -912,7 +912,7 @@ skip_normal_probe:
         if (data_interface->cur_altsetting->desc.bInterfaceClass != CDC_DATA_INTERFACE_TYPE) {
                 if (control_interface->cur_altsetting->desc.bInterfaceClass == CDC_DATA_INTERFACE_TYPE) {
                         struct usb_interface *t;
-                        dev_dbg(&intf->dev,"Your device has switched interfaces.");
+                        dev_dbg(&intf->dev,"Your device has switched interfaces.\n");
 
                         t = control_interface;
                         control_interface = data_interface;
@@ -927,7 +927,7 @@ skip_normal_probe:
                 return -ENODEV;
         
         if (usb_interface_claimed(data_interface)) { /* valid in this context */
-                dev_dbg(&intf->dev,"The data interface isn't available");
+                dev_dbg(&intf->dev,"The data interface isn't available\n");
                 return -EBUSY;
         }
 
@@ -944,7 +944,7 @@ skip_normal_probe:
         if (!usb_endpoint_dir_in(epread)) {
                 /* descriptors are swapped */
                 struct usb_endpoint_descriptor *t;
-                dev_dbg(&intf->dev,"The data interface has switched endpoints");
+                dev_dbg(&intf->dev,"The data interface has switched endpoints\n");
                 
                 t = epread;
                 epread = epwrite;
@@ -959,7 +959,7 @@ skip_normal_probe:
         }
 
         if (!(acm = kzalloc(sizeof(struct acm), GFP_KERNEL))) {
-                dev_dbg(&intf->dev, "out of memory (acm kzalloc)");
+                dev_dbg(&intf->dev, "out of memory (acm kzalloc)\n");
                 goto alloc_fail;
         }
 
@@ -985,26 +985,26 @@ skip_normal_probe:
 
         buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma);
         if (!buf) {
-                dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)");
+                dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)\n");
                 goto alloc_fail2;
         }
         acm->ctrl_buffer = buf;
 
         if (acm_write_buffers_alloc(acm) < 0) {
-                dev_dbg(&intf->dev, "out of memory (write buffer alloc)");
+                dev_dbg(&intf->dev, "out of memory (write buffer alloc)\n");
                 goto alloc_fail4;
         }
 
         acm->ctrlurb = usb_alloc_urb(0, GFP_KERNEL);
         if (!acm->ctrlurb) {
-                dev_dbg(&intf->dev, "out of memory (ctrlurb kmalloc)");
+                dev_dbg(&intf->dev, "out of memory (ctrlurb kmalloc)\n");
                 goto alloc_fail5;
         }
         for (i = 0; i < num_rx_buf; i++) {
                 struct acm_ru *rcv = &(acm->ru[i]);
 
                 if (!(rcv->urb = usb_alloc_urb(0, GFP_KERNEL))) {
-                        dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)");
+                        dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)\n");
                         goto alloc_fail7;
                 }
 
@@ -1015,13 +1015,13 @@ skip_normal_probe:
                 struct acm_rb *buf = &(acm->rb[i]);
 
                 if (!(buf->base = usb_buffer_alloc(acm->dev, readsize, GFP_KERNEL, &buf->dma))) {
-                        dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)");
+                        dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)\n");
                         goto alloc_fail7;
                 }
         }
         acm->writeurb = usb_alloc_urb(0, GFP_KERNEL);
         if (!acm->writeurb) {
-                dev_dbg(&intf->dev, "out of memory (writeurb kmalloc)");
+                dev_dbg(&intf->dev, "out of memory (writeurb kmalloc)\n");
                 goto alloc_fail7;
         }
 
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c
index 7dc123d6b2d0..99e5a68a3f12 100644
--- a/drivers/usb/core/endpoint.c
+++ b/drivers/usb/core/endpoint.c
@@ -291,7 +291,7 @@ int usb_create_ep_files(struct device *parent,
 
         retval = endpoint_get_minor(ep_dev);
         if (retval) {
-                dev_err(parent, "can not allocate minor number for %s",
+                dev_err(parent, "can not allocate minor number for %s\n",
                         ep_dev->dev.bus_id);
                 goto error_register;
         }
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 60a8f55a0cc7..036c3dea855e 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2870,10 +2870,9 @@ static int hub_thread(void *__unused)
         set_freezable();
         do {
                 hub_events();
-                wait_event_interruptible(khubd_wait,
+                wait_event_freezable(khubd_wait,
                                 !list_empty(&hub_event_list) ||
                                 kthread_should_stop());
-                try_to_freeze();
         } while (!kthread_should_stop() || !list_empty(&hub_event_list));
 
         pr_debug("%s: khubd exiting\n", usbcore_name);
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index c021af390372..8dd5a6afd513 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1526,7 +1526,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
                 new_interfaces = kmalloc(nintf * sizeof(*new_interfaces),
                                 GFP_KERNEL);
                 if (!new_interfaces) {
-                        dev_err(&dev->dev, "Out of memory");
+                        dev_err(&dev->dev, "Out of memory\n");
                         return -ENOMEM;
                 }
 
@@ -1535,7 +1535,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
                                         sizeof(struct usb_interface),
                                         GFP_KERNEL);
                         if (!new_interfaces[n]) {
-                                dev_err(&dev->dev, "Out of memory");
+                                dev_err(&dev->dev, "Out of memory\n");
                                 ret = -ENOMEM;
 free_interfaces:
                                 while (--n >= 0)
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index 6829814b7aaf..44b79e8a6e25 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -358,7 +358,7 @@ static int usb_hcd_s3c2410_probe (const struct hc_driver *driver,
         hcd->rsrc_len   = dev->resource[0].end - dev->resource[0].start + 1;
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
-                dev_err(&dev->dev, "request_mem_region failed");
+                dev_err(&dev->dev, "request_mem_region failed\n");
                 retval = -EBUSY;
                 goto err_put;
         }
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index 5131cbfb2f52..c567aa7a41ea 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -805,7 +805,7 @@ static int adu_probe(struct usb_interface *interface,
         dev->minor = interface->minor;
 
         /* let the user know what node this device is now attached to */
-        dev_info(&interface->dev, "ADU%d %s now attached to /dev/usb/adutux%d",
+        dev_info(&interface->dev, "ADU%d %s now attached to /dev/usb/adutux%d\n",
                  udev->descriptor.idProduct, dev->serial_number,
                  (dev->minor - ADU_MINOR_BASE));
 exit:
@@ -851,7 +851,7 @@ static void adu_disconnect(struct usb_interface *interface)
                 mutex_unlock(&dev->mtx);
         }
 
-        dev_info(&interface->dev, "ADU device adutux%d now disconnected",
+        dev_info(&interface->dev, "ADU device adutux%d now disconnected\n",
                  (minor - ADU_MINOR_BASE));
 
         dbg(2," %s : leave", __FUNCTION__);
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index 46d9f27ec173..d372fbc4effb 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -216,7 +216,7 @@ static void iowarrior_callback(struct urb *urb)
 exit:
         retval = usb_submit_urb(urb, GFP_ATOMIC);
         if (retval)
-                dev_err(&dev->interface->dev, "%s - usb_submit_urb failed with result %d",
+                dev_err(&dev->interface->dev, "%s - usb_submit_urb failed with result %d\n",
                         __FUNCTION__, retval);
 
 }
@@ -451,7 +451,7 @@ static ssize_t iowarrior_write(struct file *file,
                 break;
         default:
                 /* what do we have here ? An unsupported Product-ID ? */
-                dev_err(&dev->interface->dev, "%s - not supported for product=0x%x",
+                dev_err(&dev->interface->dev, "%s - not supported for product=0x%x\n",
                         __FUNCTION__, dev->product_id);
                 retval = -EFAULT;
                 goto exit;
@@ -526,7 +526,7 @@ static int iowarrior_ioctl(struct inode *inode, struct file *file,
                 } else {
                         retval = -EINVAL;
                         dev_err(&dev->interface->dev,
-                                "ioctl 'IOW_WRITE' is not supported for product=0x%x.",
+                                "ioctl 'IOW_WRITE' is not supported for product=0x%x.\n",
                                 dev->product_id);
                 }
                 break;
@@ -752,7 +752,7 @@ static int iowarrior_probe(struct usb_interface *interface,
         /* allocate memory for our device state and intialize it */
         dev = kzalloc(sizeof(struct iowarrior), GFP_KERNEL);
         if (dev == NULL) {
-                dev_err(&interface->dev, "Out of memory");
+                dev_err(&interface->dev, "Out of memory\n");
                 return retval;
         }
 
diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c
index df0ebcdb9d6a..2ad09b1f4848 100644
--- a/drivers/usb/misc/phidgetmotorcontrol.c
+++ b/drivers/usb/misc/phidgetmotorcontrol.c
@@ -155,7 +155,7 @@ resubmit:
         retval = usb_submit_urb(urb, GFP_ATOMIC);
         if (retval)
                 dev_err(&mc->intf->dev,
-                        "can't resubmit intr, %s-%s/motorcontrol0, retval %d",
+                        "can't resubmit intr, %s-%s/motorcontrol0, retval %d\n",
                         mc->udev->bus->bus_name,
                         mc->udev->devpath, retval);
 }
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index e4c248c98e84..65257867b34b 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1071,7 +1071,7 @@ static ssize_t show_latency_timer(struct device *dev, struct device_attribute *a
                              (char*) &latency, 1, WDR_TIMEOUT);
 
         if (rv < 0) {
-                dev_err(dev, "Unable to read latency timer: %i", rv);
+                dev_err(dev, "Unable to read latency timer: %i\n", rv);
                 return -EIO;
         }
         return sprintf(buf, "%i\n", latency);
@@ -1098,7 +1098,7 @@ static ssize_t store_latency_timer(struct device *dev, struct device_attribute *
                              buf, 0, WDR_TIMEOUT);
 
         if (rv < 0) {
-                dev_err(dev, "Unable to write latency timer: %i", rv);
+                dev_err(dev, "Unable to write latency timer: %i\n", rv);
                 return -EIO;
         }
 
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index 2ecb1d2a034d..8dd3abc99d63 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -2882,7 +2882,7 @@ static int edge_startup (struct usb_serial *serial)
             (edge_serial->product_info.NumPorts != serial->num_ports)) {
                 dev_warn(&serial->dev->dev, "Device Reported %d serial ports "
                          "vs. core thinking we have %d ports, email "
-                         "greg@kroah.com this information.",
+                         "greg@kroah.com this information.\n",
                          edge_serial->product_info.NumPorts,
                          serial->num_ports);
         }
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index 1b94daa61584..cbe5530f3db2 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -227,7 +227,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp)
                                  0,
                                  100000);
         if (result < 0)
-                dev_err(&port->dev, "Init of modem failed (error = %d)", result);
+                dev_err(&port->dev, "Init of modem failed (error = %d)\n", result);
 
         /* reset the bulk pipes */
         usb_clear_halt(dev, usb_rcvbulkpipe(dev, port->bulk_in_endpointAddress));
@@ -255,7 +255,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp)
                                  0,
                                  100000);
         if (result < 0) 
-                dev_err(&port->dev, "Enabling bulk RxRead failed (error = %d)", result);
+                dev_err(&port->dev, "Enabling bulk RxRead failed (error = %d)\n", result);
 
         /*--4: setup the initial flowcontrol */
         dbg("%s:setting init flowcontrol (%s)",__FUNCTION__,buf_flow_init);
@@ -268,7 +268,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp)
                                  0x10,
                                  200000);
         if (result < 0)
-                dev_err(&port->dev, "initial flowcontrol failed (error = %d)", result);
+                dev_err(&port->dev, "initial flowcontrol failed (error = %d)\n", result);
 
 
         /*--5: raise the dtr */
@@ -282,7 +282,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp)
                                  0,
                                  200000);
         if (result < 0)
-                dev_err(&port->dev, "setting dtr failed (error = %d)", result);
+                dev_err(&port->dev, "setting dtr failed (error = %d)\n", result);
 
         /*--6: raise the rts */
         dbg("%s:raising rts",__FUNCTION__);
@@ -295,7 +295,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp)
                                  0,
                                  200000);
         if (result < 0)
-                dev_err(&port->dev, "setting dtr failed (error = %d)", result);
+                dev_err(&port->dev, "setting dtr failed (error = %d)\n", result);
         
         kfree(buf_flow_init);
         return 0;
@@ -322,7 +322,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp)
                                  0,
                                  200000);
         if (result < 0)
-                dev_err(&port->dev, "dropping dtr failed (error = %d)", result);
+                dev_err(&port->dev, "dropping dtr failed (error = %d)\n", result);
 
         /*--2: drop the rts */
         dbg("%s:dropping rts",__FUNCTION__);
@@ -334,7 +334,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp)
                                  0,
                                  200000);
         if (result < 0)
-                dev_err(&port->dev, "dropping rts failed (error = %d)", result);
+                dev_err(&port->dev, "dropping rts failed (error = %d)\n", result);
 
 
         /*--3: purge */
@@ -347,7 +347,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp)
                                  0,
                                  200000);
         if (result < 0)
-                dev_err(&port->dev, "purge failed (error = %d)", result);
+                dev_err(&port->dev, "purge failed (error = %d)\n", result);
 
 
         /* send RXBULK_off (tell modem to stop transmitting bulk data on rx chan) */
@@ -361,7 +361,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp)
                                  100000);
 
         if (result < 0)
-                dev_err(&port->dev, "Disabling bulk RxRead failed (error = %d)", result);
+                dev_err(&port->dev, "Disabling bulk RxRead failed (error = %d)\n", result);
 
         /* shutdown any in-flight urbs that we know about */
         usb_kill_urb(port->read_urb);
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 01e811becec4..e02c198016b0 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -478,7 +478,7 @@ static int mos7720_open(struct usb_serial_port *port, struct file * filp)
                 response = usb_submit_urb(port0->interrupt_in_urb, GFP_KERNEL);
                 if (response)
                         dev_err(&port->dev,
-                                "%s - Error %d submitting control urb",
+                                "%s - Error %d submitting control urb\n",
                                 __FUNCTION__, response);
         }
 
@@ -492,7 +492,7 @@ static int mos7720_open(struct usb_serial_port *port, struct file * filp)
         response = usb_submit_urb(port->read_urb, GFP_KERNEL);
         if (response)
                 dev_err(&port->dev,
-                        "%s - Error %d submitting read urb", __FUNCTION__, response);
+                        "%s - Error %d submitting read urb\n", __FUNCTION__, response);
 
         /* initialize our icount structure */
         memset(&(mos7720_port->icount), 0x00, sizeof(mos7720_port->icount));
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index d19861166b50..eea226ae37bd 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -256,7 +256,7 @@ static void setup_line(struct work_struct *work)
                                 100);
 
         if (result != OTI6858_CTRL_PKT_SIZE) {
-                dev_err(&port->dev, "%s(): error reading status", __FUNCTION__);
+                dev_err(&port->dev, "%s(): error reading status\n", __FUNCTION__);
                 kfree(new_setup);
                 /* we will try again */
                 schedule_delayed_work(&priv->delayed_setup_work, msecs_to_jiffies(2));
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 0bb8de4cc524..959b3e4e9077 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -48,7 +48,7 @@ enum devicetype {
 static int sierra_set_power_state(struct usb_device *udev, __u16 swiState)
 {
         int result;
-        dev_dbg(&udev->dev, "%s", "SET POWER STATE");
+        dev_dbg(&udev->dev, "%s", "SET POWER STATE\n");
         result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                         0x00,                   /* __u8 request      */
                         0x40,                   /* __u8 request type */
@@ -63,7 +63,7 @@ static int sierra_set_power_state(struct usb_device *udev, __u16 swiState)
 static int sierra_set_ms_mode(struct usb_device *udev, __u16 eSocMode)
 {
         int result;
-        dev_dbg(&udev->dev, "%s", "DEVICE MODE SWITCH");
+        dev_dbg(&udev->dev, "%s", "DEVICE MODE SWITCH\n");
         result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                         SWIMS_USB_REQUEST_SetMode,      /* __u8 request      */
                         SWIMS_USB_REQUEST_TYPE_SetMode, /* __u8 request type */
@@ -397,7 +397,7 @@ static void sierra_indat_callback(struct urb *urb)
                         err = usb_submit_urb(urb, GFP_ATOMIC);
                         if (err)
                                 dev_err(&port->dev, "resubmit read urb failed."
-                                        "(%d)", err);
+                                        "(%d)\n", err);
                 }
         }
         return;
@@ -525,7 +525,7 @@ static int sierra_open(struct usb_serial_port *port, struct file *filp)
 
                 result = usb_submit_urb(urb, GFP_KERNEL);
                 if (result) {
-                        dev_err(&port->dev, "submit urb %d failed (%d) %d",
+                        dev_err(&port->dev, "submit urb %d failed (%d) %d\n",
                                 i, result, urb->transfer_buffer_length);
                 }
         }
@@ -538,7 +538,7 @@ static int sierra_open(struct usb_serial_port *port, struct file *filp)
         if (port->interrupt_in_urb) {
                 result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
                 if (result)
-                        dev_err(&port->dev, "submit irq_in urb failed %d",
+                        dev_err(&port->dev, "submit irq_in urb failed %d\n",
                                 result);
         }
         return 0;
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 3451e8d03ab0..ac6114eea0c3 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -907,12 +907,9 @@ static int usb_stor_scan_thread(void * __us)
         if (delay_use > 0) {
                 printk(KERN_DEBUG "usb-storage: waiting for device "
                                 "to settle before scanning\n");
-retry:
-                wait_event_interruptible_timeout(us->delay_wait,
+                wait_event_freezable_timeout(us->delay_wait,
                                 test_bit(US_FLIDX_DISCONNECTING, &us->flags),
                                 delay_use * HZ);
-                if (try_to_freeze())
-                        goto retry;
         }
 
         /* If the device is still connected, perform the scanning */
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index 832e4613673a..62bd4441b5e0 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -457,7 +457,7 @@ static struct fb_ops au1100fb_ops =
 
 /* AU1100 LCD controller device driver */
 
-int au1100fb_drv_probe(struct device *dev)
+static int __init au1100fb_drv_probe(struct device *dev)
 {
         struct au1100fb_device *fbdev = NULL;
         struct resource *regs_res;
diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index f57d7b2758b7..d31b203bf654 100644
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -98,7 +98,7 @@ static inline void newport_init_cmap(void)
         }
 }
 
-static struct linux_logo *newport_show_logo(void)
+static const struct linux_logo *newport_show_logo(void)
 {
 #ifdef CONFIG_LOGO_SGI_CLUT224
         const struct linux_logo *logo = fb_find_logo(8);
@@ -108,8 +108,8 @@ static struct linux_logo *newport_show_logo(void)
 
         if (!logo)
                 return NULL;
-        *clut = logo->clut;
-        *data = logo->data;
+        clut = logo->clut;
+        data = logo->data;
 
         for (i = 0; i < logo->clutsize; i++) {
                 newport_bfwait(npregs);
diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
index 23a6bcc3e3ce..e92337bef50d 100644
--- a/drivers/video/gxt4500.c
+++ b/drivers/video/gxt4500.c
@@ -636,7 +636,7 @@ static int __devinit gxt4500_probe(struct pci_dev *pdev,
 
         info = framebuffer_alloc(sizeof(struct gxt4500_par), &pdev->dev);
         if (!info) {
-                dev_err(&pdev->dev, "gxt4500: cannot alloc FB info record");
+                dev_err(&pdev->dev, "gxt4500: cannot alloc FB info record\n");
                 goto err_free_fb;
         }
         par = info->par;
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index a9283bae7790..fc72684aae5a 100644
--- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c
@@ -78,10 +78,7 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
 #endif
 #ifdef CONFIG_LOGO_DEC_CLUT224
                 /* DEC Linux logo on MIPS/MIPS64 or ALPHA */
-#ifndef CONFIG_ALPHA
-                if (mips_machgroup == MACH_GROUP_DEC)
-#endif
-                        logo = &logo_dec_clut224;
+                logo = &logo_dec_clut224;
 #endif
 #ifdef CONFIG_LOGO_MAC_CLUT224
                 /* Macintosh Linux logo on m68k */
@@ -94,10 +91,7 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
 #endif
 #ifdef CONFIG_LOGO_SGI_CLUT224
                 /* SGI Linux logo on MIPS/MIPS64 and VISWS */
-#ifndef CONFIG_X86_VISWS
-                if (mips_machgroup == MACH_GROUP_SGI)
-#endif
-                        logo = &logo_sgi_clut224;
+                logo = &logo_sgi_clut224;
 #endif
 #ifdef CONFIG_LOGO_SUN_CLUT224
                 /* Sun Linux logo */
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 42f5d76a8777..8d81ef019c6c 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -510,7 +510,9 @@ int fb_find_mode(struct fb_var_screeninfo *var,
         default_bpp = 8;
 
     /* Did the user specify a video mode? */
-    if (mode_option || (mode_option = fb_mode_option)) {
+    if (!mode_option)
+        mode_option = fb_mode_option;
+    if (mode_option) {
         const char *name = mode_option;
         unsigned int namelen = strlen(name);
         int res_specified = 0, bpp_specified = 0, refresh_specified = 0;
diff --git a/drivers/video/omap/blizzard.c b/drivers/video/omap/blizzard.c
index e682940a97a4..4d8ad9cd0e19 100644
--- a/drivers/video/omap/blizzard.c
+++ b/drivers/video/omap/blizzard.c
@@ -225,7 +225,7 @@ static void blizzard_restart_sdram(void)
         while (!(blizzard_read_reg(BLIZZARD_MEM_BANK0_STATUS) & 0x01)) {
                 if (time_after(jiffies, tmo)) {
                         dev_err(blizzard.fbdev->dev,
-                                        "s1d1374x: SDRAM not ready");
+                                        "s1d1374x: SDRAM not ready\n");
                         break;
                 }
                 msleep(1);
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index f4c23434de6f..ab32ceb06178 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -880,19 +880,19 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev)
 static int get_dss_clocks(void)
 {
         if (IS_ERR((dispc.dss_ick = clk_get(dispc.fbdev->dev, "dss_ick")))) {
-                dev_err(dispc.fbdev->dev, "can't get dss_ick");
+                dev_err(dispc.fbdev->dev, "can't get dss_ick\n");
                 return PTR_ERR(dispc.dss_ick);
         }
 
         if (IS_ERR((dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck")))) {
-                dev_err(dispc.fbdev->dev, "can't get dss1_fck");
+                dev_err(dispc.fbdev->dev, "can't get dss1_fck\n");
                 clk_put(dispc.dss_ick);
                 return PTR_ERR(dispc.dss1_fck);
         }
 
         if (IS_ERR((dispc.dss_54m_fck =
                                 clk_get(dispc.fbdev->dev, "dss_54m_fck")))) {
-                dev_err(dispc.fbdev->dev, "can't get dss_54m_fck");
+                dev_err(dispc.fbdev->dev, "can't get dss_54m_fck\n");
                 clk_put(dispc.dss_ick);
                 clk_put(dispc.dss1_fck);
                 return PTR_ERR(dispc.dss_54m_fck);
diff --git a/drivers/video/omap/hwa742.c b/drivers/video/omap/hwa742.c
index dc48e02f215c..1e642b7a20fe 100644
--- a/drivers/video/omap/hwa742.c
+++ b/drivers/video/omap/hwa742.c
@@ -508,7 +508,7 @@ int hwa742_update_window_async(struct fb_info *fbi,
         if (unlikely(win->format &
             ~(0x03 | OMAPFB_FORMAT_FLAG_DOUBLE |
             OMAPFB_FORMAT_FLAG_TEARSYNC | OMAPFB_FORMAT_FLAG_FORCE_VSYNC))) {
-                dev_dbg(hwa742.fbdev->dev, "invalid window flag");
+                dev_dbg(hwa742.fbdev->dev, "invalid window flag\n");
                 r = -EINVAL;
                 goto out;
         }
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c
index 2b4269813b22..789cfd23c36b 100644
--- a/drivers/video/omap/rfbi.c
+++ b/drivers/video/omap/rfbi.c
@@ -84,12 +84,12 @@ static inline u32 rfbi_read_reg(int idx)
 static int rfbi_get_clocks(void)
 {
         if (IS_ERR((rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "dss_ick")))) {
-                dev_err(rfbi.fbdev->dev, "can't get dss_ick");
+                dev_err(rfbi.fbdev->dev, "can't get dss_ick\n");
                 return PTR_ERR(rfbi.dss_ick);
         }
 
         if (IS_ERR((rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck")))) {
-                dev_err(rfbi.fbdev->dev, "can't get dss1_fck");
+                dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n");
                 clk_put(rfbi.dss_ick);
                 return PTR_ERR(rfbi.dss1_fck);
         }
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index 4b696641ce33..5747997f8d7d 100644
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -307,7 +307,7 @@ static void ds1wm_search(void *data, u8 search_type,
                 rom_id |= (unsigned long long) r << (i * 4);
 
         }
-        dev_dbg(&ds1wm_data->pdev->dev, "found 0x%08llX", rom_id);
+        dev_dbg(&ds1wm_data->pdev->dev, "found 0x%08llX\n", rom_id);
 
         ds1wm_write_register(ds1wm_data, DS1WM_CMD, ~DS1WM_CMD_SRA);
         ds1wm_reset(ds1wm_data);
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index 0b769f7c4a48..4750de316ad3 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -185,13 +185,14 @@ static void otherend_changed(struct xenbus_watch *watch,
         if (!dev->otherend ||
             strncmp(dev->otherend, vec[XS_WATCH_PATH],
                     strlen(dev->otherend))) {
-                dev_dbg(&dev->dev, "Ignoring watch at %s", vec[XS_WATCH_PATH]);
+                dev_dbg(&dev->dev, "Ignoring watch at %s\n",
+                        vec[XS_WATCH_PATH]);
                 return;
         }
 
         state = xenbus_read_driver_state(dev->otherend);
 
-        dev_dbg(&dev->dev, "state is %d, (%s), %s, %s",
+        dev_dbg(&dev->dev, "state is %d, (%s), %s, %s\n",
                 state, xenbus_strstate(state), dev->otherend_watch.node,
                 vec[XS_WATCH_PATH]);
 
diff --git a/fs/Kconfig b/fs/Kconfig
index d8062745716a..e31f3691b151 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -140,6 +140,7 @@ config EXT4DEV_FS
         tristate "Ext4dev/ext4 extended fs support development (EXPERIMENTAL)"
         depends on EXPERIMENTAL
         select JBD2
+        select CRC16
         help
           Ext4dev is a predecessor filesystem of the next generation
           extended fs ext4, based on ext3 filesystem code. It will be
diff --git a/fs/aio.c b/fs/aio.c
index d02f43b50a3d..f12db415c0f6 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -710,18 +710,9 @@ static ssize_t aio_run_iocb(struct kiocb *iocb)
 
         /*
          * Now we are all set to call the retry method in async
-         * context. By setting this thread's io_wait context
-         * to point to the wait queue entry inside the currently
-         * running iocb for the duration of the retry, we ensure
-         * that async notification wakeups are queued by the
-         * operation instead of blocking waits, and when notified,
-         * cause the iocb to be kicked for continuation (through
-         * the aio_wake_function callback).
+         * context.
          */
-        BUG_ON(current->io_wait != NULL);
-        current->io_wait = &iocb->ki_wait;
         ret = retry(iocb);
-        current->io_wait = NULL;
 
         if (ret != -EIOCBRETRY && ret != -EIOCBQUEUED) {
                 BUG_ON(!list_empty(&iocb->ki_wait.task_list));
@@ -1508,10 +1499,7 @@ static ssize_t aio_setup_iocb(struct kiocb *kiocb)
  *      Simply triggers a retry of the operation via kick_iocb.
  *
  *      This callback is specified in the wait queue entry in
- *      a kiocb (current->io_wait points to this wait queue
- *      entry when an aio operation executes; it is used
- *      instead of a synchronous wait when an i/o blocking
- *      condition is encountered during aio).
+ *      a kiocb.
  *
  * Note:
  * This routine is executed with the wait queue lock held.
diff --git a/fs/attr.c b/fs/attr.c
index ae58bd3f875f..966b73e25f82 100644
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -103,12 +103,11 @@ EXPORT_SYMBOL(inode_setattr);
 int notify_change(struct dentry * dentry, struct iattr * attr)
 {
         struct inode *inode = dentry->d_inode;
-        mode_t mode;
+        mode_t mode = inode->i_mode;
         int error;
         struct timespec now;
         unsigned int ia_valid = attr->ia_valid;
 
-        mode = inode->i_mode;
         now = current_fs_time(inode->i_sb);
 
         attr->ia_ctime = now;
@@ -125,18 +124,25 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
                 if (error)
                         return error;
         }
+
+        /*
+         * We now pass ATTR_KILL_S*ID to the lower level setattr function so
+         * that the function has the ability to reinterpret a mode change
+         * that's due to these bits. This adds an implicit restriction that
+         * no function will ever call notify_change with both ATTR_MODE and
+         * ATTR_KILL_S*ID set.
+         */
+        if ((ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID)) &&
+            (ia_valid & ATTR_MODE))
+                BUG();
+
         if (ia_valid & ATTR_KILL_SUID) {
-                attr->ia_valid &= ~ATTR_KILL_SUID;
                 if (mode & S_ISUID) {
-                        if (!(ia_valid & ATTR_MODE)) {
-                                ia_valid = attr->ia_valid |= ATTR_MODE;
-                                attr->ia_mode = inode->i_mode;
-                        }
-                        attr->ia_mode &= ~S_ISUID;
+                        ia_valid = attr->ia_valid |= ATTR_MODE;
+                        attr->ia_mode = (inode->i_mode & ~S_ISUID);
                 }
         }
         if (ia_valid & ATTR_KILL_SGID) {
-                attr->ia_valid &= ~ ATTR_KILL_SGID;
                 if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) {
                         if (!(ia_valid & ATTR_MODE)) {
                                 ia_valid = attr->ia_valid |= ATTR_MODE;
@@ -145,7 +151,7 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
                         attr->ia_mode &= ~S_ISGID;
                 }
         }
-        if (!attr->ia_valid)
+        if (!(attr->ia_valid & ~(ATTR_KILL_SUID | ATTR_KILL_SGID)))
                 return 0;
 
         if (ia_valid & ATTR_SIZE)
diff --git a/fs/autofs/waitq.c b/fs/autofs/waitq.c
index 19a9cafb5ddf..be46805972f0 100644
--- a/fs/autofs/waitq.c
+++ b/fs/autofs/waitq.c
@@ -182,7 +182,7 @@ int autofs_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t wait_queue_toke
 {
         struct autofs_wait_queue *wq, **wql;
 
-        for ( wql = &sbi->queues ; (wq = *wql) != 0 ; wql = &wq->next ) {
+        for (wql = &sbi->queues; (wq = *wql) != NULL; wql = &wq->next) {
                 if ( wq->wait_queue_token == wait_queue_token )
                         break;
         }
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 0d041a9cb348..1fe28e4754c2 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -376,7 +376,7 @@ int autofs4_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t wait_queue_tok
         struct autofs_wait_queue *wq, **wql;
 
         mutex_lock(&sbi->wq_mutex);
-        for (wql = &sbi->queues ; (wq = *wql) != 0 ; wql = &wq->next) {
+        for (wql = &sbi->queues; (wq = *wql) != NULL; wql = &wq->next) {
                 if (wq->wait_queue_token == wait_queue_token)
                         break;
         }
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index dd4167762a8e..279f3c5e0ce3 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1538,6 +1538,11 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
         }
 
         time_buf.Attributes = 0;
+
+        /* skip mode change if it's just for clearing setuid/setgid */
+        if (attrs->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID))
+                attrs->ia_valid &= ~ATTR_MODE;
+
         if (attrs->ia_valid & ATTR_MODE) {
                 cFYI(1, ("Mode changed to 0x%x", attrs->ia_mode));
                 mode = attrs->ia_mode;
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 6dacd39bf048..a4284ccac1f9 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -3001,7 +3001,7 @@ static int __init init_sys32_ioctl(void)
         int i;
 
         for (i = 0; i < ARRAY_SIZE(ioctl_start); i++) {
-                if (ioctl_start[i].next != 0) {
+                if (ioctl_start[i].next) {
                         printk("ioctl translation %d bad\n",i);
                         return -1;
                 }
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
index 5c817bd08389..350680fd7da7 100644
--- a/fs/cramfs/inode.c
+++ b/fs/cramfs/inode.c
@@ -148,7 +148,7 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i
 {
         struct address_space *mapping = sb->s_bdev->bd_inode->i_mapping;
         struct page *pages[BLKS_PER_BUF];
-        unsigned i, blocknr, buffer, unread;
+        unsigned i, blocknr, buffer;
         unsigned long devsize;
         char *data;
 
@@ -175,7 +175,6 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i
         devsize = mapping->host->i_size >> PAGE_CACHE_SHIFT;
 
         /* Ok, read in BLKS_PER_BUF pages completely first. */
-        unread = 0;
         for (i = 0; i < BLKS_PER_BUF; i++) {
                 struct page *page = NULL;
 
@@ -362,7 +361,7 @@ static int cramfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
         if (offset & 3)
                 return -EINVAL;
 
-        buf = kmalloc(256, GFP_KERNEL);
+        buf = kmalloc(CRAMFS_MAXPATHLEN, GFP_KERNEL);
         if (!buf)
                 return -ENOMEM;
 
@@ -376,7 +375,7 @@ static int cramfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                 int namelen, error;
 
                 mutex_lock(&read_mutex);
-                de = cramfs_read(sb, OFFSET(inode) + offset, sizeof(*de)+256);
+                de = cramfs_read(sb, OFFSET(inode) + offset, sizeof(*de)+CRAMFS_MAXPATHLEN);
                 name = (char *)(de+1);
 
                 /*
@@ -426,7 +425,7 @@ static struct dentry * cramfs_lookup(struct inode *dir, struct dentry *dentry, s
                 char *name;
                 int namelen, retval;
 
-                de = cramfs_read(dir->i_sb, OFFSET(dir) + offset, sizeof(*de)+256);
+                de = cramfs_read(dir->i_sb, OFFSET(dir) + offset, sizeof(*de)+CRAMFS_MAXPATHLEN);
                 name = (char *)(de+1);
 
                 /* Try to take advantage of sorted directories */
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 5701f816faf4..0b1ab016fa2e 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -914,6 +914,14 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia)
                 if (rc < 0)
                         goto out;
         }
+
+        /*
+         * mode change is for clearing setuid/setgid bits. Allow lower fs
+         * to interpret this in its own way.
+         */
+        if (ia->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID))
+                ia->ia_valid &= ~ATTR_MODE;
+
         rc = notify_change(lower_dentry, ia);
 out:
         fsstack_copy_attr_all(inode, lower_inode, NULL);
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 77b9953624f4..de6189291954 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -463,7 +463,7 @@ static void ep_free(struct eventpoll *ep)
          * holding "epmutex" we can be sure that no file cleanup code will hit
          * us during this operation. So we can avoid the lock on "ep->lock".
          */
-        while ((rbp = rb_first(&ep->rbr)) != 0) {
+        while ((rbp = rb_first(&ep->rbr)) != NULL) {
                 epi = rb_entry(rbp, struct epitem, rbn);
                 ep_remove(ep, epi);
         }
diff --git a/fs/ext3/fsync.c b/fs/ext3/fsync.c
index dd1fd3c0fc05..a588e23841d4 100644
--- a/fs/ext3/fsync.c
+++ b/fs/ext3/fsync.c
@@ -47,7 +47,7 @@ int ext3_sync_file(struct file * file, struct dentry *dentry, int datasync)
         struct inode *inode = dentry->d_inode;
         int ret = 0;
 
-        J_ASSERT(ext3_journal_current_handle() == 0);
+        J_ASSERT(ext3_journal_current_handle() == NULL);
 
         /*
          * data=writeback:
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 2f2b6864db10..3dec003b773e 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -1028,7 +1028,7 @@ struct buffer_head *ext3_getblk(handle_t *handle, struct inode *inode,
                 }
                 if (buffer_new(&dummy)) {
                         J_ASSERT(create != 0);
-                        J_ASSERT(handle != 0);
+                        J_ASSERT(handle != NULL);
 
                         /*
                          * Now that we do not always journal data, we should
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
index 771f7ada15d9..44de1453c301 100644
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
@@ -245,10 +245,10 @@ static int setup_new_group_blocks(struct super_block *sb,
                         brelse(gdb);
                         goto exit_bh;
                 }
-                lock_buffer(bh);
-                memcpy(gdb->b_data, sbi->s_group_desc[i]->b_data, bh->b_size);
+                lock_buffer(gdb);
+                memcpy(gdb->b_data, sbi->s_group_desc[i]->b_data, gdb->b_size);
                 set_buffer_uptodate(gdb);
-                unlock_buffer(bh);
+                unlock_buffer(gdb);
                 ext3_journal_dirty_metadata(handle, gdb);
                 ext3_set_bit(bit, bh->b_data);
                 brelse(gdb);
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 141573de7a9a..81868c0bc40e 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1620,7 +1620,11 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
                 }
 
                 brelse (bh);
-                sb_set_blocksize(sb, blocksize);
+                if (!sb_set_blocksize(sb, blocksize)) {
+                        printk(KERN_ERR "EXT3-fs: bad blocksize %d.\n",
+                                blocksize);
+                        goto out_fail;
+                }
                 logic_sb_block = (sb_block * EXT3_MIN_BLOCK_SIZE) / blocksize;
                 offset = (sb_block * EXT3_MIN_BLOCK_SIZE) % blocksize;
                 bh = sb_bread(sb, logic_sb_block);
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index b74bf4368441..e906b65448e2 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -20,6 +20,7 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 
+#include "group.h"
 /*
  * balloc.c contains the blocks allocation and deallocation routines
  */
@@ -42,6 +43,94 @@ void ext4_get_group_no_and_offset(struct super_block *sb, ext4_fsblk_t blocknr,
 
 }
 
+/* Initializes an uninitialized block bitmap if given, and returns the
+ * number of blocks free in the group. */
+unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh,
+                                int block_group, struct ext4_group_desc *gdp)
+{
+        unsigned long start;
+        int bit, bit_max;
+        unsigned free_blocks, group_blocks;
+        struct ext4_sb_info *sbi = EXT4_SB(sb);
+
+        if (bh) {
+                J_ASSERT_BH(bh, buffer_locked(bh));
+
+                /* If checksum is bad mark all blocks used to prevent allocation
+                 * essentially implementing a per-group read-only flag. */
+                if (!ext4_group_desc_csum_verify(sbi, block_group, gdp)) {
+                        ext4_error(sb, __FUNCTION__,
+                                   "Checksum bad for group %u\n", block_group);
+                        gdp->bg_free_blocks_count = 0;
+                        gdp->bg_free_inodes_count = 0;
+                        gdp->bg_itable_unused = 0;
+                        memset(bh->b_data, 0xff, sb->s_blocksize);
+                        return 0;
+                }
+                memset(bh->b_data, 0, sb->s_blocksize);
+        }
+
+        /* Check for superblock and gdt backups in this group */
+        bit_max = ext4_bg_has_super(sb, block_group);
+
+        if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_META_BG) ||
+            block_group < le32_to_cpu(sbi->s_es->s_first_meta_bg) *
+                          sbi->s_desc_per_block) {
+                if (bit_max) {
+                        bit_max += ext4_bg_num_gdb(sb, block_group);
+                        bit_max +=
+                                le16_to_cpu(sbi->s_es->s_reserved_gdt_blocks);
+                }
+        } else { /* For META_BG_BLOCK_GROUPS */
+                int group_rel = (block_group -
+                                 le32_to_cpu(sbi->s_es->s_first_meta_bg)) %
+                                EXT4_DESC_PER_BLOCK(sb);
+                if (group_rel == 0 || group_rel == 1 ||
+                    (group_rel == EXT4_DESC_PER_BLOCK(sb) - 1))
+                        bit_max += 1;
+        }
+
+        if (block_group == sbi->s_groups_count - 1) {
+                /*
+                 * Even though mke2fs always initialize first and last group
+                 * if some other tool enabled the EXT4_BG_BLOCK_UNINIT we need
+                 * to make sure we calculate the right free blocks
+                 */
+                group_blocks = ext4_blocks_count(sbi->s_es) -
+                        le32_to_cpu(sbi->s_es->s_first_data_block) -
+                        (EXT4_BLOCKS_PER_GROUP(sb) * (sbi->s_groups_count -1));
+        } else {
+                group_blocks = EXT4_BLOCKS_PER_GROUP(sb);
+        }
+
+        free_blocks = group_blocks - bit_max;
+
+        if (bh) {
+                for (bit = 0; bit < bit_max; bit++)
+                        ext4_set_bit(bit, bh->b_data);
+
+                start = block_group * EXT4_BLOCKS_PER_GROUP(sb) +
+                        le32_to_cpu(sbi->s_es->s_first_data_block);
+
+                /* Set bits for block and inode bitmaps, and inode table */
+                ext4_set_bit(ext4_block_bitmap(sb, gdp) - start, bh->b_data);
+                ext4_set_bit(ext4_inode_bitmap(sb, gdp) - start, bh->b_data);
+                for (bit = (ext4_inode_table(sb, gdp) - start),
+                     bit_max = bit + sbi->s_itb_per_group; bit < bit_max; bit++)
+                        ext4_set_bit(bit, bh->b_data);
+
+                /*
+                 * Also if the number of blocks within the group is
+                 * less than the blocksize * 8 ( which is the size
+                 * of bitmap ), set rest of the block bitmap to 1
+                 */
+                mark_bitmap_end(group_blocks, sb->s_blocksize * 8, bh->b_data);
+        }
+
+        return free_blocks - sbi->s_itb_per_group - 2;
+}
+
+
 /*
  * The free blocks are managed by bitmaps.  A file system contains several
  * blocks groups.  Each group contains 1 bitmap block for blocks, 1 bitmap
@@ -119,7 +208,7 @@ block_in_use(ext4_fsblk_t block, struct super_block *sb, unsigned char *map)
  *
  * Return buffer_head on success or NULL in case of failure.
  */
-static struct buffer_head *
+struct buffer_head *
 read_block_bitmap(struct super_block *sb, unsigned int block_group)
 {
         int i;
@@ -127,11 +216,24 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
         struct buffer_head * bh = NULL;
         ext4_fsblk_t bitmap_blk;
 
-        desc = ext4_get_group_desc (sb, block_group, NULL);
+        desc = ext4_get_group_desc(sb, block_group, NULL);
         if (!desc)
                 return NULL;
         bitmap_blk = ext4_block_bitmap(sb, desc);
-        bh = sb_bread(sb, bitmap_blk);
+        if (desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
+                bh = sb_getblk(sb, bitmap_blk);
+                if (!buffer_uptodate(bh)) {
+                        lock_buffer(bh);
+                        if (!buffer_uptodate(bh)) {
+                                ext4_init_block_bitmap(sb, bh, block_group,
+                                                       desc);
+                                set_buffer_uptodate(bh);
+                        }
+                        unlock_buffer(bh);
+                }
+        } else {
+                bh = sb_bread(sb, bitmap_blk);
+        }
         if (!bh)
                 ext4_error (sb, __FUNCTION__,
                             "Cannot read block bitmap - "
@@ -627,6 +729,7 @@ do_more:
         desc->bg_free_blocks_count =
                 cpu_to_le16(le16_to_cpu(desc->bg_free_blocks_count) +
                         group_freed);
+        desc->bg_checksum = ext4_group_desc_csum(sbi, block_group, desc);
         spin_unlock(sb_bgl_lock(sbi, block_group));
         percpu_counter_add(&sbi->s_freeblocks_counter, count);
 
@@ -1685,8 +1788,11 @@ allocated:
                         ret_block, goal_hits, goal_attempts);
 
         spin_lock(sb_bgl_lock(sbi, group_no));
+        if (gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT))
+                gdp->bg_flags &= cpu_to_le16(~EXT4_BG_BLOCK_UNINIT);
         gdp->bg_free_blocks_count =
                         cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count)-num);
+        gdp->bg_checksum = ext4_group_desc_csum(sbi, group_no, gdp);
         spin_unlock(sb_bgl_lock(sbi, group_no));
         percpu_counter_sub(&sbi->s_freeblocks_counter, num);
 
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index 0fb1e62b20d0..f612bef98315 100644
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -47,9 +47,7 @@ const struct file_operations ext4_dir_operations = {
         .compat_ioctl   = ext4_compat_ioctl,
 #endif
         .fsync          = ext4_sync_file,       /* BKL held */
-#ifdef CONFIG_EXT4_INDEX
         .release        = ext4_release_dir,
-#endif
 };
 
 
@@ -107,7 +105,6 @@ static int ext4_readdir(struct file * filp,
 
         sb = inode->i_sb;
 
-#ifdef CONFIG_EXT4_INDEX
         if (EXT4_HAS_COMPAT_FEATURE(inode->i_sb,
                                     EXT4_FEATURE_COMPAT_DIR_INDEX) &&
             ((EXT4_I(inode)->i_flags & EXT4_INDEX_FL) ||
@@ -123,7 +120,6 @@ static int ext4_readdir(struct file * filp,
                  */
                 EXT4_I(filp->f_path.dentry->d_inode)->i_flags &= ~EXT4_INDEX_FL;
         }
-#endif
         stored = 0;
         offset = filp->f_pos & (sb->s_blocksize - 1);
 
@@ -232,7 +228,6 @@ out:
         return ret;
 }
 
-#ifdef CONFIG_EXT4_INDEX
 /*
  * These functions convert from the major/minor hash to an f_pos
  * value.
@@ -518,5 +513,3 @@ static int ext4_release_dir (struct inode * inode, struct file * filp)
 
         return 0;
 }
-
-#endif
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 78beb096f57d..85287742f2ae 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -33,7 +33,7 @@
 #include <linux/fs.h>
 #include <linux/time.h>
 #include <linux/ext4_jbd2.h>
-#include <linux/jbd.h>
+#include <linux/jbd2.h>
 #include <linux/highuid.h>
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
@@ -52,7 +52,7 @@ static ext4_fsblk_t ext_pblock(struct ext4_extent *ex)
 {
         ext4_fsblk_t block;
 
-        block = le32_to_cpu(ex->ee_start);
+        block = le32_to_cpu(ex->ee_start_lo);
         block |= ((ext4_fsblk_t) le16_to_cpu(ex->ee_start_hi) << 31) << 1;
         return block;
 }
@@ -65,7 +65,7 @@ static ext4_fsblk_t idx_pblock(struct ext4_extent_idx *ix)
 {
         ext4_fsblk_t block;
 
-        block = le32_to_cpu(ix->ei_leaf);
+        block = le32_to_cpu(ix->ei_leaf_lo);
         block |= ((ext4_fsblk_t) le16_to_cpu(ix->ei_leaf_hi) << 31) << 1;
         return block;
 }
@@ -77,7 +77,7 @@ static ext4_fsblk_t idx_pblock(struct ext4_extent_idx *ix)
  */
 static void ext4_ext_store_pblock(struct ext4_extent *ex, ext4_fsblk_t pb)
 {
-        ex->ee_start = cpu_to_le32((unsigned long) (pb & 0xffffffff));
+        ex->ee_start_lo = cpu_to_le32((unsigned long) (pb & 0xffffffff));
         ex->ee_start_hi = cpu_to_le16((unsigned long) ((pb >> 31) >> 1) & 0xffff);
 }
 
@@ -88,7 +88,7 @@ static void ext4_ext_store_pblock(struct ext4_extent *ex, ext4_fsblk_t pb)
  */
 static void ext4_idx_store_pblock(struct ext4_extent_idx *ix, ext4_fsblk_t pb)
 {
-        ix->ei_leaf = cpu_to_le32((unsigned long) (pb & 0xffffffff));
+        ix->ei_leaf_lo = cpu_to_le32((unsigned long) (pb & 0xffffffff));
         ix->ei_leaf_hi = cpu_to_le16((unsigned long) ((pb >> 31) >> 1) & 0xffff);
 }
 
@@ -1409,8 +1409,7 @@ has_space:
         eh->eh_entries = cpu_to_le16(le16_to_cpu(eh->eh_entries)+1);
         nearex = path[depth].p_ext;
         nearex->ee_block = newext->ee_block;
-        nearex->ee_start = newext->ee_start;
-        nearex->ee_start_hi = newext->ee_start_hi;
+        ext4_ext_store_pblock(nearex, ext_pblock(newext));
         nearex->ee_len = newext->ee_len;
 
 merge:
@@ -2177,7 +2176,6 @@ int ext4_ext_convert_to_initialized(handle_t *handle, struct inode *inode,
         }
         /* ex2: iblock to iblock + maxblocks-1 : initialised */
         ex2->ee_block = cpu_to_le32(iblock);
-        ex2->ee_start = cpu_to_le32(newblock);
         ext4_ext_store_pblock(ex2, newblock);
         ex2->ee_len = cpu_to_le16(allocated);
         if (ex2 != ex)
diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c
index 2a167d7131fa..8d50879d1c2c 100644
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@ -47,7 +47,7 @@ int ext4_sync_file(struct file * file, struct dentry *dentry, int datasync)
         struct inode *inode = dentry->d_inode;
         int ret = 0;
 
-        J_ASSERT(ext4_journal_current_handle() == 0);
+        J_ASSERT(ext4_journal_current_handle() == NULL);
 
         /*
          * data=writeback:
diff --git a/fs/ext4/group.h b/fs/ext4/group.h
new file mode 100644
index 000000000000..1577910bb58b
--- /dev/null
+++ b/fs/ext4/group.h
@@ -0,0 +1,27 @@
+/*
+ *  linux/fs/ext4/group.h
+ *
+ * Copyright (C) 2007 Cluster File Systems, Inc
+ *
+ * Author: Andreas Dilger <adilger@clusterfs.com>
+ */
+
+#ifndef _LINUX_EXT4_GROUP_H
+#define _LINUX_EXT4_GROUP_H
+
+extern __le16 ext4_group_desc_csum(struct ext4_sb_info *sbi, __u32 group,
+                                   struct ext4_group_desc *gdp);
+extern int ext4_group_desc_csum_verify(struct ext4_sb_info *sbi, __u32 group,
+                                       struct ext4_group_desc *gdp);
+struct buffer_head *read_block_bitmap(struct super_block *sb,
+                                      unsigned int block_group);
+extern unsigned ext4_init_block_bitmap(struct super_block *sb,
+                                       struct buffer_head *bh, int group,
+                                       struct ext4_group_desc *desc);
+#define ext4_free_blocks_after_init(sb, group, desc)                    \
+                ext4_init_block_bitmap(sb, NULL, group, desc)
+extern unsigned ext4_init_inode_bitmap(struct super_block *sb,
+                                       struct buffer_head *bh, int group,
+                                       struct ext4_group_desc *desc);
+extern void mark_bitmap_end(int start_bit, int end_bit, char *bitmap);
+#endif /* _LINUX_EXT4_GROUP_H */
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index d0c7793d9393..c61f37fd3f05 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -28,6 +28,7 @@
 
 #include "xattr.h"
 #include "acl.h"
+#include "group.h"
 
 /*
  * ialloc.c contains the inodes allocation and deallocation routines
@@ -43,6 +44,52 @@
  * the free blocks count in the block.
  */
 
+/*
+ * To avoid calling the atomic setbit hundreds or thousands of times, we only
+ * need to use it within a single byte (to ensure we get endianness right).
+ * We can use memset for the rest of the bitmap as there are no other users.
+ */
+void mark_bitmap_end(int start_bit, int end_bit, char *bitmap)
+{
+        int i;
+
+        if (start_bit >= end_bit)
+                return;
+
+        ext4_debug("mark end bits +%d through +%d used\n", start_bit, end_bit);
+        for (i = start_bit; i < ((start_bit + 7) & ~7UL); i++)
+                ext4_set_bit(i, bitmap);
+        if (i < end_bit)
+                memset(bitmap + (i >> 3), 0xff, (end_bit - i) >> 3);
+}
+
+/* Initializes an uninitialized inode bitmap */
+unsigned ext4_init_inode_bitmap(struct super_block *sb,
+                                struct buffer_head *bh, int block_group,
+                                struct ext4_group_desc *gdp)
+{
+        struct ext4_sb_info *sbi = EXT4_SB(sb);
+
+        J_ASSERT_BH(bh, buffer_locked(bh));
+
+        /* If checksum is bad mark all blocks and inodes use to prevent
+         * allocation, essentially implementing a per-group read-only flag. */
+        if (!ext4_group_desc_csum_verify(sbi, block_group, gdp)) {
+                ext4_error(sb, __FUNCTION__, "Checksum bad for group %u\n",
+                           block_group);
+                gdp->bg_free_blocks_count = 0;
+                gdp->bg_free_inodes_count = 0;
+                gdp->bg_itable_unused = 0;
+                memset(bh->b_data, 0xff, sb->s_blocksize);
+                return 0;
+        }
+
+        memset(bh->b_data, 0, (EXT4_INODES_PER_GROUP(sb) + 7) / 8);
+        mark_bitmap_end(EXT4_INODES_PER_GROUP(sb), EXT4_BLOCKS_PER_GROUP(sb),
+                        bh->b_data);
+
+        return EXT4_INODES_PER_GROUP(sb);
+}
 
 /*
  * Read the inode allocation bitmap for a given block_group, reading
@@ -59,8 +106,20 @@ read_inode_bitmap(struct super_block * sb, unsigned long block_group)
         desc = ext4_get_group_desc(sb, block_group, NULL);
         if (!desc)
                 goto error_out;
-
-        bh = sb_bread(sb, ext4_inode_bitmap(sb, desc));
+        if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
+                bh = sb_getblk(sb, ext4_inode_bitmap(sb, desc));
+                if (!buffer_uptodate(bh)) {
+                        lock_buffer(bh);
+                        if (!buffer_uptodate(bh)) {
+                                ext4_init_inode_bitmap(sb, bh, block_group,
+                                                       desc);
+                                set_buffer_uptodate(bh);
+                        }
+                        unlock_buffer(bh);
+                }
+        } else {
+                bh = sb_bread(sb, ext4_inode_bitmap(sb, desc));
+        }
         if (!bh)
                 ext4_error(sb, "read_inode_bitmap",
                             "Cannot read inode bitmap - "
@@ -169,6 +228,8 @@ void ext4_free_inode (handle_t *handle, struct inode * inode)
                         if (is_directory)
                                 gdp->bg_used_dirs_count = cpu_to_le16(
                                   le16_to_cpu(gdp->bg_used_dirs_count) - 1);
+                        gdp->bg_checksum = ext4_group_desc_csum(sbi,
+                                                        block_group, gdp);
                         spin_unlock(sb_bgl_lock(sbi, block_group));
                         percpu_counter_inc(&sbi->s_freeinodes_counter);
                         if (is_directory)
@@ -435,7 +496,7 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode * dir, int mode)
         struct ext4_sb_info *sbi;
         int err = 0;
         struct inode *ret;
-        int i;
+        int i, free = 0;
 
         /* Cannot create files in a deleted directory */
         if (!dir || !dir->i_nlink)
@@ -517,11 +578,13 @@ repeat_in_this_group:
         goto out;
 
 got:
-        ino += group * EXT4_INODES_PER_GROUP(sb) + 1;
-        if (ino < EXT4_FIRST_INO(sb) || ino > le32_to_cpu(es->s_inodes_count)) {
-                ext4_error (sb, "ext4_new_inode",
-                            "reserved inode or inode > inodes count - "
-                            "block_group = %d, inode=%lu", group, ino);
+        ino++;
+        if ((group == 0 && ino < EXT4_FIRST_INO(sb)) ||
+            ino > EXT4_INODES_PER_GROUP(sb)) {
+                ext4_error(sb, __FUNCTION__,
+                           "reserved inode or inode > inodes count - "
+                           "block_group = %d, inode=%lu", group,
+                           ino + group * EXT4_INODES_PER_GROUP(sb));
                 err = -EIO;
                 goto fail;
         }
@@ -529,13 +592,78 @@ got:
         BUFFER_TRACE(bh2, "get_write_access");
         err = ext4_journal_get_write_access(handle, bh2);
         if (err) goto fail;
+
+        /* We may have to initialize the block bitmap if it isn't already */
+        if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_GDT_CSUM) &&
+            gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
+                struct buffer_head *block_bh = read_block_bitmap(sb, group);
+
+                BUFFER_TRACE(block_bh, "get block bitmap access");
+                err = ext4_journal_get_write_access(handle, block_bh);
+                if (err) {
+                        brelse(block_bh);
+                        goto fail;
+                }
+
+                free = 0;
+                spin_lock(sb_bgl_lock(sbi, group));
+                /* recheck and clear flag under lock if we still need to */
+                if (gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
+                        gdp->bg_flags &= cpu_to_le16(~EXT4_BG_BLOCK_UNINIT);
+                        free = ext4_free_blocks_after_init(sb, group, gdp);
+                        gdp->bg_free_blocks_count = cpu_to_le16(free);
+                }
+                spin_unlock(sb_bgl_lock(sbi, group));
+
+                /* Don't need to dirty bitmap block if we didn't change it */
+                if (free) {
+                        BUFFER_TRACE(block_bh, "dirty block bitmap");
+                        err = ext4_journal_dirty_metadata(handle, block_bh);
+                }
+
+                brelse(block_bh);
+                if (err)
+                        goto fail;
+        }
+
         spin_lock(sb_bgl_lock(sbi, group));
+        /* If we didn't allocate from within the initialized part of the inode
+         * table then we need to initialize up to this inode. */
+        if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) {
+                if (gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
+                        gdp->bg_flags &= cpu_to_le16(~EXT4_BG_INODE_UNINIT);
+
+                        /* When marking the block group with
+                         * ~EXT4_BG_INODE_UNINIT we don't want to depend
+                         * on the value of bg_itable_unsed even though
+                         * mke2fs could have initialized the same for us.
+                         * Instead we calculated the value below
+                         */
+
+                        free = 0;
+                } else {
+                        free = EXT4_INODES_PER_GROUP(sb) -
+                                le16_to_cpu(gdp->bg_itable_unused);
+                }
+
+                /*
+                 * Check the relative inode number against the last used
+                 * relative inode number in this group. if it is greater
+                 * we need to  update the bg_itable_unused count
+                 *
+                 */
+                if (ino > free)
+                        gdp->bg_itable_unused =
+                                cpu_to_le16(EXT4_INODES_PER_GROUP(sb) - ino);
+        }
+
         gdp->bg_free_inodes_count =
                 cpu_to_le16(le16_to_cpu(gdp->bg_free_inodes_count) - 1);
         if (S_ISDIR(mode)) {
                 gdp->bg_used_dirs_count =
                         cpu_to_le16(le16_to_cpu(gdp->bg_used_dirs_count) + 1);
         }
+        gdp->bg_checksum = ext4_group_desc_csum(sbi, group, gdp);
         spin_unlock(sb_bgl_lock(sbi, group));
         BUFFER_TRACE(bh2, "call ext4_journal_dirty_metadata");
         err = ext4_journal_dirty_metadata(handle, bh2);
@@ -557,7 +685,7 @@ got:
                 inode->i_gid = current->fsgid;
         inode->i_mode = mode;
 
-        inode->i_ino = ino;
+        inode->i_ino = ino + group * EXT4_INODES_PER_GROUP(sb);
         /* This is the optimal IO size (for stat), not the fs block size */
         inode->i_blocks = 0;
         inode->i_mtime = inode->i_atime = inode->i_ctime = ei->i_crtime =
@@ -573,11 +701,6 @@ got:
         /* dirsync only applies to directories */
         if (!S_ISDIR(mode))
                 ei->i_flags &= ~EXT4_DIRSYNC_FL;
-#ifdef EXT4_FRAGMENTS
-        ei->i_faddr = 0;
-        ei->i_frag_no = 0;
-        ei->i_frag_size = 0;
-#endif
         ei->i_file_acl = 0;
         ei->i_dir_acl = 0;
         ei->i_dtime = 0;
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 0df2b1e06d0b..5489703d9573 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1027,7 +1027,7 @@ struct buffer_head *ext4_getblk(handle_t *handle, struct inode *inode,
                 }
                 if (buffer_new(&dummy)) {
                         J_ASSERT(create != 0);
-                        J_ASSERT(handle != 0);
+                        J_ASSERT(handle != NULL);
 
                         /*
                          * Now that we do not always journal data, we should
@@ -2711,11 +2711,6 @@ void ext4_read_inode(struct inode * inode)
         }
         inode->i_blocks = le32_to_cpu(raw_inode->i_blocks);
         ei->i_flags = le32_to_cpu(raw_inode->i_flags);
-#ifdef EXT4_FRAGMENTS
-        ei->i_faddr = le32_to_cpu(raw_inode->i_faddr);
-        ei->i_frag_no = raw_inode->i_frag;
-        ei->i_frag_size = raw_inode->i_fsize;
-#endif
         ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl);
         if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=
             cpu_to_le32(EXT4_OS_HURD))
@@ -2860,11 +2855,6 @@ static int ext4_do_update_inode(handle_t *handle,
         raw_inode->i_blocks = cpu_to_le32(inode->i_blocks);
         raw_inode->i_dtime = cpu_to_le32(ei->i_dtime);
         raw_inode->i_flags = cpu_to_le32(ei->i_flags);
-#ifdef EXT4_FRAGMENTS
-        raw_inode->i_faddr = cpu_to_le32(ei->i_faddr);
-        raw_inode->i_frag = ei->i_frag_no;
-        raw_inode->i_fsize = ei->i_frag_size;
-#endif
         if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=
             cpu_to_le32(EXT4_OS_HURD))
                 raw_inode->i_file_acl_high =
@@ -3243,12 +3233,14 @@ int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode)
                                                       iloc, handle);
                         if (ret) {
                                 EXT4_I(inode)->i_state |= EXT4_STATE_NO_EXPAND;
-                                if (mnt_count != sbi->s_es->s_mnt_count) {
+                                if (mnt_count !=
+                                        le16_to_cpu(sbi->s_es->s_mnt_count)) {
                                         ext4_warning(inode->i_sb, __FUNCTION__,
                                         "Unable to expand inode %lu. Delete"
                                         " some EAs or run e2fsck.",
                                         inode->i_ino);
-                                        mnt_count = sbi->s_es->s_mnt_count;
+                                        mnt_count =
+                                          le16_to_cpu(sbi->s_es->s_mnt_count);
                                 }
                         }
                 }
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 5fdb862e71c4..94ee6f315dc1 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -144,7 +144,6 @@ struct dx_map_entry
         u16 size;
 };
 
-#ifdef CONFIG_EXT4_INDEX
 static inline unsigned dx_get_block (struct dx_entry *entry);
 static void dx_set_block (struct dx_entry *entry, unsigned value);
 static inline unsigned dx_get_hash (struct dx_entry *entry);
@@ -766,8 +765,6 @@ static void dx_insert_block(struct dx_frame *frame, u32 hash, u32 block)
         dx_set_block(new, block);
         dx_set_count(entries, count + 1);
 }
-#endif
-
 
 static void ext4_update_dx_flag(struct inode *inode)
 {
@@ -869,7 +866,6 @@ static struct buffer_head * ext4_find_entry (struct dentry *dentry,
         name = dentry->d_name.name;
         if (namelen > EXT4_NAME_LEN)
                 return NULL;
-#ifdef CONFIG_EXT4_INDEX
         if (is_dx(dir)) {
                 bh = ext4_dx_find_entry(dentry, res_dir, &err);
                 /*
@@ -881,7 +877,6 @@ static struct buffer_head * ext4_find_entry (struct dentry *dentry,
                         return bh;
                 dxtrace(printk("ext4_find_entry: dx failed, falling back\n"));
         }
-#endif
         nblocks = dir->i_size >> EXT4_BLOCK_SIZE_BITS(sb);
         start = EXT4_I(dir)->i_dir_start_lookup;
         if (start >= nblocks)
@@ -957,7 +952,6 @@ cleanup_and_exit:
         return ret;
 }
 
-#ifdef CONFIG_EXT4_INDEX
 static struct buffer_head * ext4_dx_find_entry(struct dentry *dentry,
                        struct ext4_dir_entry_2 **res_dir, int *err)
 {
@@ -1025,7 +1019,6 @@ errout:
         dx_release (frames);
         return NULL;
 }
-#endif
 
 static struct dentry *ext4_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd)
 {
@@ -1121,7 +1114,6 @@ static inline void ext4_set_de_type(struct super_block *sb,
                 de->file_type = ext4_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
 }
 
-#ifdef CONFIG_EXT4_INDEX
 /*
  * Move count entries from end of map between two memory locations.
  * Returns pointer to last entry moved.
@@ -1266,8 +1258,6 @@ errout:
         *error = err;
         return NULL;
 }
-#endif
-
 
 /*
  * Add a new entry into a directory (leaf) block.  If de is non-NULL,
@@ -1364,7 +1354,6 @@ static int add_dirent_to_buf(handle_t *handle, struct dentry *dentry,
         return 0;
 }
 
-#ifdef CONFIG_EXT4_INDEX
 /*
  * This converts a one block unindexed directory to a 3 block indexed
  * directory, and adds the dentry to the indexed directory.
@@ -1443,7 +1432,6 @@ static int make_indexed_dir(handle_t *handle, struct dentry *dentry,
 
         return add_dirent_to_buf(handle, dentry, inode, de, bh);
 }
-#endif
 
 /*
  *      ext4_add_entry()
@@ -1464,9 +1452,7 @@ static int ext4_add_entry (handle_t *handle, struct dentry *dentry,
         struct ext4_dir_entry_2 *de;
         struct super_block * sb;
         int     retval;
-#ifdef CONFIG_EXT4_INDEX
         int     dx_fallback=0;
-#endif
         unsigned blocksize;
         u32 block, blocks;
 
@@ -1474,7 +1460,6 @@ static int ext4_add_entry (handle_t *handle, struct dentry *dentry,
         blocksize = sb->s_blocksize;
         if (!dentry->d_name.len)
                 return -EINVAL;
-#ifdef CONFIG_EXT4_INDEX
         if (is_dx(dir)) {
                 retval = ext4_dx_add_entry(handle, dentry, inode);
                 if (!retval || (retval != ERR_BAD_DX_DIR))
@@ -1483,7 +1468,6 @@ static int ext4_add_entry (handle_t *handle, struct dentry *dentry,
                 dx_fallback++;
                 ext4_mark_inode_dirty(handle, dir);
         }
-#endif
         blocks = dir->i_size >> sb->s_blocksize_bits;
         for (block = 0, offset = 0; block < blocks; block++) {
                 bh = ext4_bread(handle, dir, block, 0, &retval);
@@ -1493,11 +1477,9 @@ static int ext4_add_entry (handle_t *handle, struct dentry *dentry,
                 if (retval != -ENOSPC)
                         return retval;
 
-#ifdef CONFIG_EXT4_INDEX
                 if (blocks == 1 && !dx_fallback &&
                     EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_DIR_INDEX))
                         return make_indexed_dir(handle, dentry, inode, bh);
-#endif
                 brelse(bh);
         }
         bh = ext4_append(handle, dir, &block, &retval);
@@ -1509,7 +1491,6 @@ static int ext4_add_entry (handle_t *handle, struct dentry *dentry,
         return add_dirent_to_buf(handle, dentry, inode, de, bh);
 }
 
-#ifdef CONFIG_EXT4_INDEX
 /*
  * Returns 0 for success, or a negative error value
  */
@@ -1644,7 +1625,6 @@ cleanup:
         dx_release(frames);
         return err;
 }
-#endif
 
 /*
  * ext4_delete_entry deletes a directory entry by merging it with the
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 472fc0d3e1c0..bd8a52bb3999 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 
+#include "group.h"
 
 #define outside(b, first, last) ((b) < (first) || (b) >= (last))
 #define inside(b, first, last)  ((b) >= (first) && (b) < (last))
@@ -140,22 +141,29 @@ static struct buffer_head *bclean(handle_t *handle, struct super_block *sb,
 }
 
 /*
- * To avoid calling the atomic setbit hundreds or thousands of times, we only
- * need to use it within a single byte (to ensure we get endianness right).
- * We can use memset for the rest of the bitmap as there are no other users.
+ * If we have fewer than thresh credits, extend by EXT4_MAX_TRANS_DATA.
+ * If that fails, restart the transaction & regain write access for the
+ * buffer head which is used for block_bitmap modifications.
  */
-static void mark_bitmap_end(int start_bit, int end_bit, char *bitmap)
+static int extend_or_restart_transaction(handle_t *handle, int thresh,
+                                         struct buffer_head *bh)
 {
-        int i;
+        int err;
+
+        if (handle->h_buffer_credits >= thresh)
+                return 0;
 
-        if (start_bit >= end_bit)
-                return;
+        err = ext4_journal_extend(handle, EXT4_MAX_TRANS_DATA);
+        if (err < 0)
+                return err;
+        if (err) {
+                if ((err = ext4_journal_restart(handle, EXT4_MAX_TRANS_DATA)))
+                        return err;
+                if ((err = ext4_journal_get_write_access(handle, bh)))
+                        return err;
+        }
 
-        ext4_debug("mark end bits +%d through +%d used\n", start_bit, end_bit);
-        for (i = start_bit; i < ((start_bit + 7) & ~7UL); i++)
-                ext4_set_bit(i, bitmap);
-        if (i < end_bit)
-                memset(bitmap + (i >> 3), 0xff, (end_bit - i) >> 3);
+        return 0;
 }
 
 /*
@@ -180,8 +188,9 @@ static int setup_new_group_blocks(struct super_block *sb,
         int i;
         int err = 0, err2;
 
-        handle = ext4_journal_start_sb(sb, reserved_gdb + gdblocks +
-                                       2 + sbi->s_itb_per_group);
+        /* This transaction may be extended/restarted along the way */
+        handle = ext4_journal_start_sb(sb, EXT4_MAX_TRANS_DATA);
+
         if (IS_ERR(handle))
                 return PTR_ERR(handle);
 
@@ -208,6 +217,9 @@ static int setup_new_group_blocks(struct super_block *sb,
 
                 ext4_debug("update backup group %#04lx (+%d)\n", block, bit);
 
+                if ((err = extend_or_restart_transaction(handle, 1, bh)))
+                        goto exit_bh;
+
                 gdb = sb_getblk(sb, block);
                 if (!gdb) {
                         err = -EIO;
@@ -217,10 +229,10 @@ static int setup_new_group_blocks(struct super_block *sb,
                         brelse(gdb);
                         goto exit_bh;
                 }
-                lock_buffer(bh);
-                memcpy(gdb->b_data, sbi->s_group_desc[i]->b_data, bh->b_size);
+                lock_buffer(gdb);
+                memcpy(gdb->b_data, sbi->s_group_desc[i]->b_data, gdb->b_size);
                 set_buffer_uptodate(gdb);
-                unlock_buffer(bh);
+                unlock_buffer(gdb);
                 ext4_journal_dirty_metadata(handle, gdb);
                 ext4_set_bit(bit, bh->b_data);
                 brelse(gdb);
@@ -233,6 +245,9 @@ static int setup_new_group_blocks(struct super_block *sb,
 
                 ext4_debug("clear reserved block %#04lx (+%d)\n", block, bit);
 
+                if ((err = extend_or_restart_transaction(handle, 1, bh)))
+                        goto exit_bh;
+
                 if (IS_ERR(gdb = bclean(handle, sb, block))) {
                         err = PTR_ERR(bh);
                         goto exit_bh;
@@ -254,6 +269,10 @@ static int setup_new_group_blocks(struct super_block *sb,
                 struct buffer_head *it;
 
                 ext4_debug("clear inode block %#04lx (+%d)\n", block, bit);
+
+                if ((err = extend_or_restart_transaction(handle, 1, bh)))
+                        goto exit_bh;
+
                 if (IS_ERR(it = bclean(handle, sb, block))) {
                         err = PTR_ERR(it);
                         goto exit_bh;
@@ -262,6 +281,10 @@ static int setup_new_group_blocks(struct super_block *sb,
                 brelse(it);
                 ext4_set_bit(bit, bh->b_data);
         }
+
+        if ((err = extend_or_restart_transaction(handle, 2, bh)))
+                goto exit_bh;
+
         mark_bitmap_end(input->blocks_count, EXT4_BLOCKS_PER_GROUP(sb),
                         bh->b_data);
         ext4_journal_dirty_metadata(handle, bh);
@@ -289,7 +312,6 @@ exit_journal:
         return err;
 }
 
-
 /*
  * Iterate through the groups which hold BACKUP superblock/GDT copies in an
  * ext4 filesystem.  The counters should be initialized to 1, 5, and 7 before
@@ -842,6 +864,7 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input)
         ext4_inode_table_set(sb, gdp, input->inode_table); /* LV FIXME */
         gdp->bg_free_blocks_count = cpu_to_le16(input->free_blocks_count);
         gdp->bg_free_inodes_count = cpu_to_le16(EXT4_INODES_PER_GROUP(sb));
+        gdp->bg_checksum = ext4_group_desc_csum(sbi, input->group, gdp);
 
         /*
          * Make the new blocks and inodes valid next.  We do this before
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4c8d31c61454..b11e9e2bcd01 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -37,12 +37,14 @@
 #include <linux/quotaops.h>
 #include <linux/seq_file.h>
 #include <linux/log2.h>
+#include <linux/crc16.h>
 
 #include <asm/uaccess.h>
 
 #include "xattr.h"
 #include "acl.h"
 #include "namei.h"
+#include "group.h"
 
 static int ext4_load_journal(struct super_block *, struct ext4_super_block *,
                              unsigned long journal_devnum);
@@ -68,31 +70,31 @@ static void ext4_write_super_lockfs(struct super_block *sb);
 ext4_fsblk_t ext4_block_bitmap(struct super_block *sb,
                                struct ext4_group_desc *bg)
 {
-        return le32_to_cpu(bg->bg_block_bitmap) |
+        return le32_to_cpu(bg->bg_block_bitmap_lo) |
                 (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ?
-                 (ext4_fsblk_t)le32_to_cpu(bg->bg_block_bitmap_hi) << 32 : 0);
+                (ext4_fsblk_t)le32_to_cpu(bg->bg_block_bitmap_hi) << 32 : 0);
 }
 
 ext4_fsblk_t ext4_inode_bitmap(struct super_block *sb,
                                struct ext4_group_desc *bg)
 {
-        return le32_to_cpu(bg->bg_inode_bitmap) |
+        return le32_to_cpu(bg->bg_inode_bitmap_lo) |
                 (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ?
-                 (ext4_fsblk_t)le32_to_cpu(bg->bg_inode_bitmap_hi) << 32 : 0);
+                (ext4_fsblk_t)le32_to_cpu(bg->bg_inode_bitmap_hi) << 32 : 0);
 }
 
 ext4_fsblk_t ext4_inode_table(struct super_block *sb,
                               struct ext4_group_desc *bg)
 {
-        return le32_to_cpu(bg->bg_inode_table) |
+        return le32_to_cpu(bg->bg_inode_table_lo) |
                 (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ?
-                 (ext4_fsblk_t)le32_to_cpu(bg->bg_inode_table_hi) << 32 : 0);
+                (ext4_fsblk_t)le32_to_cpu(bg->bg_inode_table_hi) << 32 : 0);
 }
 
 void ext4_block_bitmap_set(struct super_block *sb,
                            struct ext4_group_desc *bg, ext4_fsblk_t blk)
 {
-        bg->bg_block_bitmap = cpu_to_le32((u32)blk);
+        bg->bg_block_bitmap_lo = cpu_to_le32((u32)blk);
         if (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT)
                 bg->bg_block_bitmap_hi = cpu_to_le32(blk >> 32);
 }
@@ -100,7 +102,7 @@ void ext4_block_bitmap_set(struct super_block *sb,
 void ext4_inode_bitmap_set(struct super_block *sb,
                            struct ext4_group_desc *bg, ext4_fsblk_t blk)
 {
-        bg->bg_inode_bitmap  = cpu_to_le32((u32)blk);
+        bg->bg_inode_bitmap_lo  = cpu_to_le32((u32)blk);
         if (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT)
                 bg->bg_inode_bitmap_hi = cpu_to_le32(blk >> 32);
 }
@@ -108,7 +110,7 @@ void ext4_inode_bitmap_set(struct super_block *sb,
 void ext4_inode_table_set(struct super_block *sb,
                           struct ext4_group_desc *bg, ext4_fsblk_t blk)
 {
-        bg->bg_inode_table = cpu_to_le32((u32)blk);
+        bg->bg_inode_table_lo = cpu_to_le32((u32)blk);
         if (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT)
                 bg->bg_inode_table_hi = cpu_to_le32(blk >> 32);
 }
@@ -1037,7 +1039,7 @@ static int parse_options (char *options, struct super_block *sb,
                         if (option < 0)
                                 return 0;
                         if (option == 0)
-                                option = JBD_DEFAULT_MAX_COMMIT_AGE;
+                                option = JBD2_DEFAULT_MAX_COMMIT_AGE;
                         sbi->s_commit_interval = HZ * option;
                         break;
                 case Opt_data_journal:
@@ -1308,6 +1310,43 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es,
         return res;
 }
 
+__le16 ext4_group_desc_csum(struct ext4_sb_info *sbi, __u32 block_group,
+                            struct ext4_group_desc *gdp)
+{
+        __u16 crc = 0;
+
+        if (sbi->s_es->s_feature_ro_compat &
+            cpu_to_le32(EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) {
+                int offset = offsetof(struct ext4_group_desc, bg_checksum);
+                __le32 le_group = cpu_to_le32(block_group);
+
+                crc = crc16(~0, sbi->s_es->s_uuid, sizeof(sbi->s_es->s_uuid));
+                crc = crc16(crc, (__u8 *)&le_group, sizeof(le_group));
+                crc = crc16(crc, (__u8 *)gdp, offset);
+                offset += sizeof(gdp->bg_checksum); /* skip checksum */
+                /* for checksum of struct ext4_group_desc do the rest...*/
+                if ((sbi->s_es->s_feature_incompat &
+                     cpu_to_le32(EXT4_FEATURE_INCOMPAT_64BIT)) &&
+                    offset < le16_to_cpu(sbi->s_es->s_desc_size))
+                        crc = crc16(crc, (__u8 *)gdp + offset,
+                                    le16_to_cpu(sbi->s_es->s_desc_size) -
+                                        offset);
+        }
+
+        return cpu_to_le16(crc);
+}
+
+int ext4_group_desc_csum_verify(struct ext4_sb_info *sbi, __u32 block_group,
+                                struct ext4_group_desc *gdp)
+{
+        if ((sbi->s_es->s_feature_ro_compat &
+             cpu_to_le32(EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) &&
+            (gdp->bg_checksum != ext4_group_desc_csum(sbi, block_group, gdp)))
+                return 0;
+
+        return 1;
+}
+
 /* Called at mount-time, super-block is locked */
 static int ext4_check_descriptors (struct super_block * sb)
 {
@@ -1319,13 +1358,17 @@ static int ext4_check_descriptors (struct super_block * sb)
         ext4_fsblk_t inode_table;
         struct ext4_group_desc * gdp = NULL;
         int desc_block = 0;
+        int flexbg_flag = 0;
         int i;
 
+        if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG))
+                flexbg_flag = 1;
+
         ext4_debug ("Checking group descriptors");
 
         for (i = 0; i < sbi->s_groups_count; i++)
         {
-                if (i == sbi->s_groups_count - 1)
+                if (i == sbi->s_groups_count - 1 || flexbg_flag)
                         last_block = ext4_blocks_count(sbi->s_es) - 1;
                 else
                         last_block = first_block +
@@ -1362,7 +1405,16 @@ static int ext4_check_descriptors (struct super_block * sb)
                                     i, inode_table);
                         return 0;
                 }
-                first_block += EXT4_BLOCKS_PER_GROUP(sb);
+                if (!ext4_group_desc_csum_verify(sbi, i, gdp)) {
+                        ext4_error(sb, __FUNCTION__,
+                                   "Checksum for group %d failed (%u!=%u)\n", i,
+                                   le16_to_cpu(ext4_group_desc_csum(sbi, i,
+                                                                    gdp)),
+                                   le16_to_cpu(gdp->bg_checksum));
+                        return 0;
+                }
+                if (!flexbg_flag)
+                        first_block += EXT4_BLOCKS_PER_GROUP(sb);
                 gdp = (struct ext4_group_desc *)
                         ((__u8 *)gdp + EXT4_DESC_SIZE(sb));
         }
@@ -1726,14 +1778,6 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
                 if (sbi->s_inode_size > EXT4_GOOD_OLD_INODE_SIZE)
                         sb->s_time_gran = 1 << (EXT4_EPOCH_BITS - 2);
         }
-        sbi->s_frag_size = EXT4_MIN_FRAG_SIZE <<
-                                   le32_to_cpu(es->s_log_frag_size);
-        if (blocksize != sbi->s_frag_size) {
-                printk(KERN_ERR
-                       "EXT4-fs: fragsize %lu != blocksize %u (unsupported)\n",
-                       sbi->s_frag_size, blocksize);
-                goto failed_mount;
-        }
         sbi->s_desc_size = le16_to_cpu(es->s_desc_size);
         if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_64BIT)) {
                 if (sbi->s_desc_size < EXT4_MIN_DESC_SIZE_64BIT ||
@@ -1747,7 +1791,6 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
         } else
                 sbi->s_desc_size = EXT4_MIN_DESC_SIZE;
         sbi->s_blocks_per_group = le32_to_cpu(es->s_blocks_per_group);
-        sbi->s_frags_per_group = le32_to_cpu(es->s_frags_per_group);
         sbi->s_inodes_per_group = le32_to_cpu(es->s_inodes_per_group);
         if (EXT4_INODE_SIZE(sb) == 0)
                 goto cantfind_ext4;
@@ -1771,12 +1814,6 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
                         sbi->s_blocks_per_group);
                 goto failed_mount;
         }
-        if (sbi->s_frags_per_group > blocksize * 8) {
-                printk (KERN_ERR
-                        "EXT4-fs: #fragments per group too big: %lu\n",
-                        sbi->s_frags_per_group);
-                goto failed_mount;
-        }
         if (sbi->s_inodes_per_group > blocksize * 8) {
                 printk (KERN_ERR
                         "EXT4-fs: #inodes per group too big: %lu\n",
@@ -2630,7 +2667,7 @@ static int ext4_statfs (struct dentry * dentry, struct kstatfs * buf)
 
         if (test_opt(sb, MINIX_DF)) {
                 sbi->s_overhead_last = 0;
-        } else if (sbi->s_blocks_last != le32_to_cpu(es->s_blocks_count)) {
+        } else if (sbi->s_blocks_last != ext4_blocks_count(es)) {
                 unsigned long ngroups = sbi->s_groups_count, i;
                 ext4_fsblk_t overhead = 0;
                 smp_rmb();
@@ -2665,14 +2702,14 @@ static int ext4_statfs (struct dentry * dentry, struct kstatfs * buf)
                 overhead += ngroups * (2 + sbi->s_itb_per_group);
                 sbi->s_overhead_last = overhead;
                 smp_wmb();
-                sbi->s_blocks_last = le32_to_cpu(es->s_blocks_count);
+                sbi->s_blocks_last = ext4_blocks_count(es);
         }
 
         buf->f_type = EXT4_SUPER_MAGIC;
         buf->f_bsize = sb->s_blocksize;
         buf->f_blocks = ext4_blocks_count(es) - sbi->s_overhead_last;
         buf->f_bfree = percpu_counter_sum_positive(&sbi->s_freeblocks_counter);
-        es->s_free_blocks_count = cpu_to_le32(buf->f_bfree);
+        ext4_free_blocks_count_set(es, buf->f_bfree);
         buf->f_bavail = buf->f_bfree - ext4_r_blocks_count(es);
         if (buf->f_bfree < ext4_r_blocks_count(es))
                 buf->f_bavail = 0;
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index b10d68fffb55..86387302c2a9 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -750,12 +750,11 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,
                 }
         } else {
                 /* Allocate a buffer where we construct the new block. */
-                s->base = kmalloc(sb->s_blocksize, GFP_KERNEL);
+                s->base = kzalloc(sb->s_blocksize, GFP_KERNEL);
                 /* assert(header == s->base) */
                 error = -ENOMEM;
                 if (s->base == NULL)
                         goto cleanup;
-                memset(s->base, 0, sb->s_blocksize);
                 header(s->base)->h_magic = cpu_to_le32(EXT4_XATTR_MAGIC);
                 header(s->base)->h_blocks = cpu_to_le32(1);
                 header(s->base)->h_refcount = cpu_to_le32(1);
@@ -1121,7 +1120,7 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
         int total_ino, total_blk;
         void *base, *start, *end;
         int extra_isize = 0, error = 0, tried_min_extra_isize = 0;
-        int s_min_extra_isize = EXT4_SB(inode->i_sb)->s_es->s_min_extra_isize;
+        int s_min_extra_isize = le16_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_min_extra_isize);
 
         down_write(&EXT4_I(inode)->xattr_sem);
 retry:
@@ -1293,7 +1292,7 @@ retry:
 
                 i.name = b_entry_name;
                 i.value = buffer;
-                i.value_len = cpu_to_le32(size);
+                i.value_len = size;
                 error = ext4_xattr_block_find(inode, &i, bs);
                 if (error)
                         goto cleanup;
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index d1acab931330..3763757f9fe7 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -63,13 +63,21 @@ static u64 time_to_jiffies(unsigned long sec, unsigned long nsec)
  * Set dentry and possibly attribute timeouts from the lookup/mk*
  * replies
  */
-static void fuse_change_timeout(struct dentry *entry, struct fuse_entry_out *o)
+static void fuse_change_entry_timeout(struct dentry *entry,
+                                      struct fuse_entry_out *o)
 {
         fuse_dentry_settime(entry,
                 time_to_jiffies(o->entry_valid, o->entry_valid_nsec));
-        if (entry->d_inode)
-                get_fuse_inode(entry->d_inode)->i_time =
-                        time_to_jiffies(o->attr_valid, o->attr_valid_nsec);
+}
+
+static u64 attr_timeout(struct fuse_attr_out *o)
+{
+        return time_to_jiffies(o->attr_valid, o->attr_valid_nsec);
+}
+
+static u64 entry_attr_timeout(struct fuse_entry_out *o)
+{
+        return time_to_jiffies(o->attr_valid, o->attr_valid_nsec);
 }
 
 /*
@@ -108,13 +116,19 @@ static void fuse_lookup_init(struct fuse_req *req, struct inode *dir,
                              struct dentry *entry,
                              struct fuse_entry_out *outarg)
 {
+        struct fuse_conn *fc = get_fuse_conn(dir);
+
+        memset(outarg, 0, sizeof(struct fuse_entry_out));
         req->in.h.opcode = FUSE_LOOKUP;
         req->in.h.nodeid = get_node_id(dir);
         req->in.numargs = 1;
         req->in.args[0].size = entry->d_name.len + 1;
         req->in.args[0].value = entry->d_name.name;
         req->out.numargs = 1;
-        req->out.args[0].size = sizeof(struct fuse_entry_out);
+        if (fc->minor < 9)
+                req->out.args[0].size = FUSE_COMPAT_ENTRY_OUT_SIZE;
+        else
+                req->out.args[0].size = sizeof(struct fuse_entry_out);
         req->out.args[0].value = outarg;
 }
 
@@ -140,6 +154,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd)
                 struct fuse_req *req;
                 struct fuse_req *forget_req;
                 struct dentry *parent;
+                u64 attr_version;
 
                 /* For negative dentries, always do a fresh lookup */
                 if (!inode)
@@ -156,6 +171,10 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd)
                         return 0;
                 }
 
+                spin_lock(&fc->lock);
+                attr_version = fc->attr_version;
+                spin_unlock(&fc->lock);
+
                 parent = dget_parent(entry);
                 fuse_lookup_init(req, parent->d_inode, entry, &outarg);
                 request_send(fc, req);
@@ -180,8 +199,10 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd)
                 if (err || (outarg.attr.mode ^ inode->i_mode) & S_IFMT)
                         return 0;
 
-                fuse_change_attributes(inode, &outarg.attr);
-                fuse_change_timeout(entry, &outarg);
+                fuse_change_attributes(inode, &outarg.attr,
+                                       entry_attr_timeout(&outarg),
+                                       attr_version);
+                fuse_change_entry_timeout(entry, &outarg);
         }
         return 1;
 }
@@ -228,6 +249,7 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
         struct fuse_conn *fc = get_fuse_conn(dir);
         struct fuse_req *req;
         struct fuse_req *forget_req;
+        u64 attr_version;
 
         if (entry->d_name.len > FUSE_NAME_MAX)
                 return ERR_PTR(-ENAMETOOLONG);
@@ -242,6 +264,10 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
                 return ERR_PTR(PTR_ERR(forget_req));
         }
 
+        spin_lock(&fc->lock);
+        attr_version = fc->attr_version;
+        spin_unlock(&fc->lock);
+
         fuse_lookup_init(req, dir, entry, &outarg);
         request_send(fc, req);
         err = req->out.h.error;
@@ -253,7 +279,8 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
                 err = -EIO;
         if (!err && outarg.nodeid) {
                 inode = fuse_iget(dir->i_sb, outarg.nodeid, outarg.generation,
-                                  &outarg.attr);
+                                  &outarg.attr, entry_attr_timeout(&outarg),
+                                  attr_version);
                 if (!inode) {
                         fuse_send_forget(fc, forget_req, outarg.nodeid, 1);
                         return ERR_PTR(-ENOMEM);
@@ -276,7 +303,7 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
 
         entry->d_op = &fuse_dentry_operations;
         if (!err)
-                fuse_change_timeout(entry, &outarg);
+                fuse_change_entry_timeout(entry, &outarg);
         else
                 fuse_invalidate_entry_cache(entry);
         return NULL;
@@ -335,6 +362,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode,
 
         flags &= ~O_NOCTTY;
         memset(&inarg, 0, sizeof(inarg));
+        memset(&outentry, 0, sizeof(outentry));
         inarg.flags = flags;
         inarg.mode = mode;
         req->in.h.opcode = FUSE_CREATE;
@@ -345,7 +373,10 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode,
         req->in.args[1].size = entry->d_name.len + 1;
         req->in.args[1].value = entry->d_name.name;
         req->out.numargs = 2;
-        req->out.args[0].size = sizeof(outentry);
+        if (fc->minor < 9)
+                req->out.args[0].size = FUSE_COMPAT_ENTRY_OUT_SIZE;
+        else
+                req->out.args[0].size = sizeof(outentry);
         req->out.args[0].value = &outentry;
         req->out.args[1].size = sizeof(outopen);
         req->out.args[1].value = &outopen;
@@ -363,7 +394,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode,
 
         fuse_put_request(fc, req);
         inode = fuse_iget(dir->i_sb, outentry.nodeid, outentry.generation,
-                          &outentry.attr);
+                          &outentry.attr, entry_attr_timeout(&outentry), 0);
         if (!inode) {
                 flags &= ~(O_CREAT | O_EXCL | O_TRUNC);
                 ff->fh = outopen.fh;
@@ -373,7 +404,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode,
         }
         fuse_put_request(fc, forget_req);
         d_instantiate(entry, inode);
-        fuse_change_timeout(entry, &outentry);
+        fuse_change_entry_timeout(entry, &outentry);
         file = lookup_instantiate_filp(nd, entry, generic_file_open);
         if (IS_ERR(file)) {
                 ff->fh = outopen.fh;
@@ -410,9 +441,13 @@ static int create_new_entry(struct fuse_conn *fc, struct fuse_req *req,
                 return PTR_ERR(forget_req);
         }
 
+        memset(&outarg, 0, sizeof(outarg));
         req->in.h.nodeid = get_node_id(dir);
         req->out.numargs = 1;
-        req->out.args[0].size = sizeof(outarg);
+        if (fc->minor < 9)
+                req->out.args[0].size = FUSE_COMPAT_ENTRY_OUT_SIZE;
+        else
+                req->out.args[0].size = sizeof(outarg);
         req->out.args[0].value = &outarg;
         request_send(fc, req);
         err = req->out.h.error;
@@ -428,7 +463,7 @@ static int create_new_entry(struct fuse_conn *fc, struct fuse_req *req,
                 goto out_put_forget_req;
 
         inode = fuse_iget(dir->i_sb, outarg.nodeid, outarg.generation,
-                          &outarg.attr);
+                          &outarg.attr, entry_attr_timeout(&outarg), 0);
         if (!inode) {
                 fuse_send_forget(fc, forget_req, outarg.nodeid, 1);
                 return -ENOMEM;
@@ -451,7 +486,7 @@ static int create_new_entry(struct fuse_conn *fc, struct fuse_req *req,
         } else
                 d_instantiate(entry, inode);
 
-        fuse_change_timeout(entry, &outarg);
+        fuse_change_entry_timeout(entry, &outarg);
         fuse_invalidate_attr(dir);
         return 0;
 
@@ -663,52 +698,84 @@ static int fuse_link(struct dentry *entry, struct inode *newdir,
         return err;
 }
 
-static int fuse_do_getattr(struct inode *inode)
+static void fuse_fillattr(struct inode *inode, struct fuse_attr *attr,
+                          struct kstat *stat)
+{
+        stat->dev = inode->i_sb->s_dev;
+        stat->ino = attr->ino;
+        stat->mode = (inode->i_mode & S_IFMT) | (attr->mode & 07777);
+        stat->nlink = attr->nlink;
+        stat->uid = attr->uid;
+        stat->gid = attr->gid;
+        stat->rdev = inode->i_rdev;
+        stat->atime.tv_sec = attr->atime;
+        stat->atime.tv_nsec = attr->atimensec;
+        stat->mtime.tv_sec = attr->mtime;
+        stat->mtime.tv_nsec = attr->mtimensec;
+        stat->ctime.tv_sec = attr->ctime;
+        stat->ctime.tv_nsec = attr->ctimensec;
+        stat->size = attr->size;
+        stat->blocks = attr->blocks;
+        stat->blksize = (1 << inode->i_blkbits);
+}
+
+static int fuse_do_getattr(struct inode *inode, struct kstat *stat,
+                           struct file *file)
 {
         int err;
-        struct fuse_attr_out arg;
+        struct fuse_getattr_in inarg;
+        struct fuse_attr_out outarg;
         struct fuse_conn *fc = get_fuse_conn(inode);
-        struct fuse_req *req = fuse_get_req(fc);
+        struct fuse_req *req;
+        u64 attr_version;
+
+        req = fuse_get_req(fc);
         if (IS_ERR(req))
                 return PTR_ERR(req);
 
+        spin_lock(&fc->lock);
+        attr_version = fc->attr_version;
+        spin_unlock(&fc->lock);
+
+        memset(&inarg, 0, sizeof(inarg));
+        memset(&outarg, 0, sizeof(outarg));
+        /* Directories have separate file-handle space */
+        if (file && S_ISREG(inode->i_mode)) {
+                struct fuse_file *ff = file->private_data;
+
+                inarg.getattr_flags |= FUSE_GETATTR_FH;
+                inarg.fh = ff->fh;
+        }
         req->in.h.opcode = FUSE_GETATTR;
         req->in.h.nodeid = get_node_id(inode);
+        req->in.numargs = 1;
+        req->in.args[0].size = sizeof(inarg);
+        req->in.args[0].value = &inarg;
         req->out.numargs = 1;
-        req->out.args[0].size = sizeof(arg);
-        req->out.args[0].value = &arg;
+        if (fc->minor < 9)
+                req->out.args[0].size = FUSE_COMPAT_ATTR_OUT_SIZE;
+        else
+                req->out.args[0].size = sizeof(outarg);
+        req->out.args[0].value = &outarg;
         request_send(fc, req);
         err = req->out.h.error;
         fuse_put_request(fc, req);
         if (!err) {
-                if ((inode->i_mode ^ arg.attr.mode) & S_IFMT) {
+                if ((inode->i_mode ^ outarg.attr.mode) & S_IFMT) {
                         make_bad_inode(inode);
                         err = -EIO;
                 } else {
-                        struct fuse_inode *fi = get_fuse_inode(inode);
-                        fuse_change_attributes(inode, &arg.attr);
-                        fi->i_time = time_to_jiffies(arg.attr_valid,
-                                                     arg.attr_valid_nsec);
+                        fuse_change_attributes(inode, &outarg.attr,
+                                               attr_timeout(&outarg),
+                                               attr_version);
+                        if (stat)
+                                fuse_fillattr(inode, &outarg.attr, stat);
                 }
         }
         return err;
 }
 
 /*
- * Check if attributes are still valid, and if not send a GETATTR
- * request to refresh them.
- */
-static int fuse_refresh_attributes(struct inode *inode)
-{
-        struct fuse_inode *fi = get_fuse_inode(inode);
-
-        if (fi->i_time < get_jiffies_64())
-                return fuse_do_getattr(inode);
-        else
-                return 0;
-}
-
-/*
  * Calling into a user-controlled filesystem gives the filesystem
  * daemon ptrace-like capabilities over the requester process.  This
  * means, that the filesystem daemon is able to record the exact
@@ -721,7 +788,7 @@ static int fuse_refresh_attributes(struct inode *inode)
  * for which the owner of the mount has ptrace privilege.  This
  * excludes processes started by other users, suid or sgid processes.
  */
-static int fuse_allow_task(struct fuse_conn *fc, struct task_struct *task)
+int fuse_allow_task(struct fuse_conn *fc, struct task_struct *task)
 {
         if (fc->flags & FUSE_ALLOW_OTHER)
                 return 1;
@@ -795,11 +862,14 @@ static int fuse_permission(struct inode *inode, int mask, struct nameidata *nd)
          */
         if ((fc->flags & FUSE_DEFAULT_PERMISSIONS) ||
             ((mask & MAY_EXEC) && S_ISREG(inode->i_mode))) {
-                err = fuse_refresh_attributes(inode);
-                if (err)
-                        return err;
+                struct fuse_inode *fi = get_fuse_inode(inode);
+                if (fi->i_time < get_jiffies_64()) {
+                        err = fuse_do_getattr(inode, NULL, NULL);
+                        if (err)
+                                return err;
 
-                refreshed = true;
+                        refreshed = true;
+                }
         }
 
         if (fc->flags & FUSE_DEFAULT_PERMISSIONS) {
@@ -809,7 +879,7 @@ static int fuse_permission(struct inode *inode, int mask, struct nameidata *nd)
                    attributes.  This is also needed, because the root
                    node will at first have no permissions */
                 if (err == -EACCES && !refreshed) {
-                        err = fuse_do_getattr(inode);
+                        err = fuse_do_getattr(inode, NULL, NULL);
                         if (!err)
                                 err = generic_permission(inode, mask, NULL);
                 }
@@ -825,7 +895,7 @@ static int fuse_permission(struct inode *inode, int mask, struct nameidata *nd)
                         if (refreshed)
                                 return -EACCES;
 
-                        err = fuse_do_getattr(inode);
+                        err = fuse_do_getattr(inode, NULL, NULL);
                         if (!err && !(inode->i_mode & S_IXUGO))
                                 return -EACCES;
                 }
@@ -962,6 +1032,20 @@ static int fuse_dir_fsync(struct file *file, struct dentry *de, int datasync)
         return file ? fuse_fsync_common(file, de, datasync, 1) : 0;
 }
 
+static bool update_mtime(unsigned ivalid)
+{
+        /* Always update if mtime is explicitly set  */
+        if (ivalid & ATTR_MTIME_SET)
+                return true;
+
+        /* If it's an open(O_TRUNC) or an ftruncate(), don't update */
+        if ((ivalid & ATTR_SIZE) && (ivalid & (ATTR_OPEN | ATTR_FILE)))
+                return false;
+
+        /* In all other cases update */
+        return true;
+}
+
 static void iattr_to_fattr(struct iattr *iattr, struct fuse_setattr_in *arg)
 {
         unsigned ivalid = iattr->ia_valid;
@@ -974,16 +1058,19 @@ static void iattr_to_fattr(struct iattr *iattr, struct fuse_setattr_in *arg)
                 arg->valid |= FATTR_GID,    arg->gid = iattr->ia_gid;
         if (ivalid & ATTR_SIZE)
                 arg->valid |= FATTR_SIZE,   arg->size = iattr->ia_size;
-        /* You can only _set_ these together (they may change by themselves) */
-        if ((ivalid & (ATTR_ATIME | ATTR_MTIME)) == (ATTR_ATIME | ATTR_MTIME)) {
-                arg->valid |= FATTR_ATIME | FATTR_MTIME;
+        if (ivalid & ATTR_ATIME) {
+                arg->valid |= FATTR_ATIME;
                 arg->atime = iattr->ia_atime.tv_sec;
-                arg->mtime = iattr->ia_mtime.tv_sec;
+                arg->atimensec = iattr->ia_atime.tv_nsec;
+                if (!(ivalid & ATTR_ATIME_SET))
+                        arg->valid |= FATTR_ATIME_NOW;
         }
-        if (ivalid & ATTR_FILE) {
-                struct fuse_file *ff = iattr->ia_file->private_data;
-                arg->valid |= FATTR_FH;
-                arg->fh = ff->fh;
+        if ((ivalid & ATTR_MTIME) && update_mtime(ivalid)) {
+                arg->valid |= FATTR_MTIME;
+                arg->mtime = iattr->ia_mtime.tv_sec;
+                arg->mtimensec = iattr->ia_mtime.tv_nsec;
+                if (!(ivalid & ATTR_MTIME_SET))
+                        arg->valid |= FATTR_MTIME_NOW;
         }
 }
 
@@ -995,22 +1082,28 @@ static void iattr_to_fattr(struct iattr *iattr, struct fuse_setattr_in *arg)
  * vmtruncate() doesn't allow for this case, so do the rlimit checking
  * and the actual truncation by hand.
  */
-static int fuse_setattr(struct dentry *entry, struct iattr *attr)
+static int fuse_do_setattr(struct dentry *entry, struct iattr *attr,
+                           struct file *file)
 {
         struct inode *inode = entry->d_inode;
         struct fuse_conn *fc = get_fuse_conn(inode);
-        struct fuse_inode *fi = get_fuse_inode(inode);
         struct fuse_req *req;
         struct fuse_setattr_in inarg;
         struct fuse_attr_out outarg;
         int err;
 
+        if (!fuse_allow_task(fc, current))
+                return -EACCES;
+
         if (fc->flags & FUSE_DEFAULT_PERMISSIONS) {
                 err = inode_change_ok(inode, attr);
                 if (err)
                         return err;
         }
 
+        if ((attr->ia_valid & ATTR_OPEN) && fc->atomic_o_trunc)
+                return 0;
+
         if (attr->ia_valid & ATTR_SIZE) {
                 unsigned long limit;
                 if (IS_SWAPFILE(inode))
@@ -1027,14 +1120,28 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
                 return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
+        memset(&outarg, 0, sizeof(outarg));
         iattr_to_fattr(attr, &inarg);
+        if (file) {
+                struct fuse_file *ff = file->private_data;
+                inarg.valid |= FATTR_FH;
+                inarg.fh = ff->fh;
+        }
+        if (attr->ia_valid & ATTR_SIZE) {
+                /* For mandatory locking in truncate */
+                inarg.valid |= FATTR_LOCKOWNER;
+                inarg.lock_owner = fuse_lock_owner_id(fc, current->files);
+        }
         req->in.h.opcode = FUSE_SETATTR;
         req->in.h.nodeid = get_node_id(inode);
         req->in.numargs = 1;
         req->in.args[0].size = sizeof(inarg);
         req->in.args[0].value = &inarg;
         req->out.numargs = 1;
-        req->out.args[0].size = sizeof(outarg);
+        if (fc->minor < 9)
+                req->out.args[0].size = FUSE_COMPAT_ATTR_OUT_SIZE;
+        else
+                req->out.args[0].size = sizeof(outarg);
         req->out.args[0].value = &outarg;
         request_send(fc, req);
         err = req->out.h.error;
@@ -1050,11 +1157,18 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
                 return -EIO;
         }
 
-        fuse_change_attributes(inode, &outarg.attr);
-        fi->i_time = time_to_jiffies(outarg.attr_valid, outarg.attr_valid_nsec);
+        fuse_change_attributes(inode, &outarg.attr, attr_timeout(&outarg), 0);
         return 0;
 }
 
+static int fuse_setattr(struct dentry *entry, struct iattr *attr)
+{
+        if (attr->ia_valid & ATTR_FILE)
+                return fuse_do_setattr(entry, attr, attr->ia_file);
+        else
+                return fuse_do_setattr(entry, attr, NULL);
+}
+
 static int fuse_getattr(struct vfsmount *mnt, struct dentry *entry,
                         struct kstat *stat)
 {
@@ -1066,8 +1180,10 @@ static int fuse_getattr(struct vfsmount *mnt, struct dentry *entry,
         if (!fuse_allow_task(fc, current))
                 return -EACCES;
 
-        err = fuse_refresh_attributes(inode);
-        if (!err) {
+        if (fi->i_time < get_jiffies_64())
+                err = fuse_do_getattr(inode, stat, NULL);
+        else {
+                err = 0;
                 generic_fillattr(inode, stat);
                 stat->mode = fi->orig_i_mode;
         }
@@ -1172,6 +1288,9 @@ static ssize_t fuse_listxattr(struct dentry *entry, char *list, size_t size)
         struct fuse_getxattr_out outarg;
         ssize_t ret;
 
+        if (!fuse_allow_task(fc, current))
+                return -EACCES;
+
         if (fc->no_listxattr)
                 return -EOPNOTSUPP;
 
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index c4b98c03a46e..0fcdba9d47c0 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -28,7 +28,9 @@ static int fuse_send_open(struct inode *inode, struct file *file, int isdir,
                 return PTR_ERR(req);
 
         memset(&inarg, 0, sizeof(inarg));
-        inarg.flags = file->f_flags & ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
+        inarg.flags = file->f_flags & ~(O_CREAT | O_EXCL | O_NOCTTY);
+        if (!fc->atomic_o_trunc)
+                inarg.flags &= ~O_TRUNC;
         req->in.h.opcode = isdir ? FUSE_OPENDIR : FUSE_OPEN;
         req->in.h.nodeid = get_node_id(inode);
         req->in.numargs = 1;
@@ -54,6 +56,7 @@ struct fuse_file *fuse_file_alloc(void)
                         kfree(ff);
                         ff = NULL;
                 }
+                INIT_LIST_HEAD(&ff->write_entry);
                 atomic_set(&ff->count, 0);
         }
         return ff;
@@ -148,12 +151,18 @@ int fuse_release_common(struct inode *inode, struct file *file, int isdir)
 {
         struct fuse_file *ff = file->private_data;
         if (ff) {
+                struct fuse_conn *fc = get_fuse_conn(inode);
+
                 fuse_release_fill(ff, get_node_id(inode), file->f_flags,
                                   isdir ? FUSE_RELEASEDIR : FUSE_RELEASE);
 
                 /* Hold vfsmount and dentry until release is finished */
                 ff->reserved_req->vfsmount = mntget(file->f_path.mnt);
                 ff->reserved_req->dentry = dget(file->f_path.dentry);
+
+                spin_lock(&fc->lock);
+                list_del(&ff->write_entry);
+                spin_unlock(&fc->lock);
                 /*
                  * Normally this will send the RELEASE request,
                  * however if some asynchronous READ or WRITE requests
@@ -180,7 +189,7 @@ static int fuse_release(struct inode *inode, struct file *file)
  * Scramble the ID space with XTEA, so that the value of the files_struct
  * pointer is not exposed to userspace.
  */
-static u64 fuse_lock_owner_id(struct fuse_conn *fc, fl_owner_t id)
+u64 fuse_lock_owner_id(struct fuse_conn *fc, fl_owner_t id)
 {
         u32 *k = fc->scramble_key;
         u64 v = (unsigned long) id;
@@ -299,11 +308,19 @@ void fuse_read_fill(struct fuse_req *req, struct fuse_file *ff,
 }
 
 static size_t fuse_send_read(struct fuse_req *req, struct file *file,
-                             struct inode *inode, loff_t pos, size_t count)
+                             struct inode *inode, loff_t pos, size_t count,
+                             fl_owner_t owner)
 {
         struct fuse_conn *fc = get_fuse_conn(inode);
         struct fuse_file *ff = file->private_data;
+
         fuse_read_fill(req, ff, inode, pos, count, FUSE_READ);
+        if (owner != NULL) {
+                struct fuse_read_in *inarg = &req->misc.read_in;
+
+                inarg->read_flags |= FUSE_READ_LOCKOWNER;
+                inarg->lock_owner = fuse_lock_owner_id(fc, owner);
+        }
         request_send(fc, req);
         return req->out.args[0].size;
 }
@@ -327,7 +344,8 @@ static int fuse_readpage(struct file *file, struct page *page)
         req->out.page_zeroing = 1;
         req->num_pages = 1;
         req->pages[0] = page;
-        fuse_send_read(req, file, inode, page_offset(page), PAGE_CACHE_SIZE);
+        fuse_send_read(req, file, inode, page_offset(page), PAGE_CACHE_SIZE,
+                       NULL);
         err = req->out.h.error;
         fuse_put_request(fc, req);
         if (!err)
@@ -434,30 +452,47 @@ out:
         return err;
 }
 
-static size_t fuse_send_write(struct fuse_req *req, struct file *file,
-                              struct inode *inode, loff_t pos, size_t count)
+static void fuse_write_fill(struct fuse_req *req, struct fuse_file *ff,
+                            struct inode *inode, loff_t pos, size_t count,
+                            int writepage)
 {
         struct fuse_conn *fc = get_fuse_conn(inode);
-        struct fuse_file *ff = file->private_data;
-        struct fuse_write_in inarg;
-        struct fuse_write_out outarg;
+        struct fuse_write_in *inarg = &req->misc.write.in;
+        struct fuse_write_out *outarg = &req->misc.write.out;
 
-        memset(&inarg, 0, sizeof(struct fuse_write_in));
-        inarg.fh = ff->fh;
-        inarg.offset = pos;
-        inarg.size = count;
+        memset(inarg, 0, sizeof(struct fuse_write_in));
+        inarg->fh = ff->fh;
+        inarg->offset = pos;
+        inarg->size = count;
+        inarg->write_flags = writepage ? FUSE_WRITE_CACHE : 0;
         req->in.h.opcode = FUSE_WRITE;
         req->in.h.nodeid = get_node_id(inode);
         req->in.argpages = 1;
         req->in.numargs = 2;
-        req->in.args[0].size = sizeof(struct fuse_write_in);
-        req->in.args[0].value = &inarg;
+        if (fc->minor < 9)
+                req->in.args[0].size = FUSE_COMPAT_WRITE_IN_SIZE;
+        else
+                req->in.args[0].size = sizeof(struct fuse_write_in);
+        req->in.args[0].value = inarg;
         req->in.args[1].size = count;
         req->out.numargs = 1;
         req->out.args[0].size = sizeof(struct fuse_write_out);
-        req->out.args[0].value = &outarg;
+        req->out.args[0].value = outarg;
+}
+
+static size_t fuse_send_write(struct fuse_req *req, struct file *file,
+                              struct inode *inode, loff_t pos, size_t count,
+                              fl_owner_t owner)
+{
+        struct fuse_conn *fc = get_fuse_conn(inode);
+        fuse_write_fill(req, file->private_data, inode, pos, count, 0);
+        if (owner != NULL) {
+                struct fuse_write_in *inarg = &req->misc.write.in;
+                inarg->write_flags |= FUSE_WRITE_LOCKOWNER;
+                inarg->lock_owner = fuse_lock_owner_id(fc, owner);
+        }
         request_send(fc, req);
-        return outarg.size;
+        return req->misc.write.out.size;
 }
 
 static int fuse_write_begin(struct file *file, struct address_space *mapping,
@@ -478,6 +513,7 @@ static int fuse_buffered_write(struct file *file, struct inode *inode,
         int err;
         size_t nres;
         struct fuse_conn *fc = get_fuse_conn(inode);
+        struct fuse_inode *fi = get_fuse_inode(inode);
         unsigned offset = pos & (PAGE_CACHE_SIZE - 1);
         struct fuse_req *req;
 
@@ -491,7 +527,7 @@ static int fuse_buffered_write(struct file *file, struct inode *inode,
         req->num_pages = 1;
         req->pages[0] = page;
         req->page_offset = offset;
-        nres = fuse_send_write(req, file, inode, pos, count);
+        nres = fuse_send_write(req, file, inode, pos, count, NULL);
         err = req->out.h.error;
         fuse_put_request(fc, req);
         if (!err && !nres)
@@ -499,6 +535,7 @@ static int fuse_buffered_write(struct file *file, struct inode *inode,
         if (!err) {
                 pos += nres;
                 spin_lock(&fc->lock);
+                fi->attr_version = ++fc->attr_version;
                 if (pos > inode->i_size)
                         i_size_write(inode, pos);
                 spin_unlock(&fc->lock);
@@ -591,9 +628,11 @@ static ssize_t fuse_direct_io(struct file *file, const char __user *buf,
                 nbytes = (req->num_pages << PAGE_SHIFT) - req->page_offset;
                 nbytes = min(count, nbytes);
                 if (write)
-                        nres = fuse_send_write(req, file, inode, pos, nbytes);
+                        nres = fuse_send_write(req, file, inode, pos, nbytes,
+                                               current->files);
                 else
-                        nres = fuse_send_read(req, file, inode, pos, nbytes);
+                        nres = fuse_send_read(req, file, inode, pos, nbytes,
+                                              current->files);
                 fuse_release_user_pages(req, !write);
                 if (req->out.h.error) {
                         if (!res)
@@ -695,7 +734,8 @@ static int convert_fuse_file_lock(const struct fuse_file_lock *ffl,
 }
 
 static void fuse_lk_fill(struct fuse_req *req, struct file *file,
-                         const struct file_lock *fl, int opcode, pid_t pid)
+                         const struct file_lock *fl, int opcode, pid_t pid,
+                         int flock)
 {
         struct inode *inode = file->f_path.dentry->d_inode;
         struct fuse_conn *fc = get_fuse_conn(inode);
@@ -708,6 +748,8 @@ static void fuse_lk_fill(struct fuse_req *req, struct file *file,
         arg->lk.end = fl->fl_end;
         arg->lk.type = fl->fl_type;
         arg->lk.pid = pid;
+        if (flock)
+                arg->lk_flags |= FUSE_LK_FLOCK;
         req->in.h.opcode = opcode;
         req->in.h.nodeid = get_node_id(inode);
         req->in.numargs = 1;
@@ -727,7 +769,7 @@ static int fuse_getlk(struct file *file, struct file_lock *fl)
         if (IS_ERR(req))
                 return PTR_ERR(req);
 
-        fuse_lk_fill(req, file, fl, FUSE_GETLK, 0);
+        fuse_lk_fill(req, file, fl, FUSE_GETLK, 0, 0);
         req->out.numargs = 1;
         req->out.args[0].size = sizeof(outarg);
         req->out.args[0].value = &outarg;
@@ -740,7 +782,7 @@ static int fuse_getlk(struct file *file, struct file_lock *fl)
         return err;
 }
 
-static int fuse_setlk(struct file *file, struct file_lock *fl)
+static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
 {
         struct inode *inode = file->f_path.dentry->d_inode;
         struct fuse_conn *fc = get_fuse_conn(inode);
@@ -757,7 +799,7 @@ static int fuse_setlk(struct file *file, struct file_lock *fl)
         if (IS_ERR(req))
                 return PTR_ERR(req);
 
-        fuse_lk_fill(req, file, fl, opcode, pid);
+        fuse_lk_fill(req, file, fl, opcode, pid, flock);
         request_send(fc, req);
         err = req->out.h.error;
         /* locking is restartable */
@@ -783,8 +825,25 @@ static int fuse_file_lock(struct file *file, int cmd, struct file_lock *fl)
                 if (fc->no_lock)
                         err = posix_lock_file_wait(file, fl);
                 else
-                        err = fuse_setlk(file, fl);
+                        err = fuse_setlk(file, fl, 0);
+        }
+        return err;
+}
+
+static int fuse_file_flock(struct file *file, int cmd, struct file_lock *fl)
+{
+        struct inode *inode = file->f_path.dentry->d_inode;
+        struct fuse_conn *fc = get_fuse_conn(inode);
+        int err;
+
+        if (fc->no_lock) {
+                err = flock_lock_file_wait(file, fl);
+        } else {
+                /* emulate flock with POSIX locks */
+                fl->fl_owner = (fl_owner_t) file;
+                err = fuse_setlk(file, fl, 1);
         }
+
         return err;
 }
 
@@ -836,6 +895,7 @@ static const struct file_operations fuse_file_operations = {
         .release        = fuse_release,
         .fsync          = fuse_fsync,
         .lock           = fuse_file_lock,
+        .flock          = fuse_file_flock,
         .splice_read    = generic_file_splice_read,
 };
 
@@ -848,6 +908,7 @@ static const struct file_operations fuse_direct_io_file_operations = {
         .release        = fuse_release,
         .fsync          = fuse_fsync,
         .lock           = fuse_file_lock,
+        .flock          = fuse_file_flock,
         /* no mmap and splice_read */
 };
 
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index 1764506fdd11..6c5461de1a5f 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -67,6 +67,12 @@ struct fuse_inode {
         /** The sticky bit in inode->i_mode may have been removed, so
             preserve the original mode */
         mode_t orig_i_mode;
+
+        /** Version of last attribute change */
+        u64 attr_version;
+
+        /** Files usable in writepage.  Protected by fc->lock */
+        struct list_head write_files;
 };
 
 /** FUSE specific file data */
@@ -79,6 +85,9 @@ struct fuse_file {
 
         /** Refcount */
         atomic_t count;
+
+        /** Entry on inode's write_files list */
+        struct list_head write_entry;
 };
 
 /** One input argument of a request */
@@ -210,6 +219,10 @@ struct fuse_req {
                 struct fuse_init_in init_in;
                 struct fuse_init_out init_out;
                 struct fuse_read_in read_in;
+                struct {
+                        struct fuse_write_in in;
+                        struct fuse_write_out out;
+                } write;
                 struct fuse_lk_in lk_in;
         } misc;
 
@@ -317,6 +330,9 @@ struct fuse_conn {
         /** Do readpages asynchronously?  Only set in INIT */
         unsigned async_read : 1;
 
+        /** Do not send separate SETATTR request before open(O_TRUNC)  */
+        unsigned atomic_o_trunc : 1;
+
         /*
          * The following bitfields are only for optimization purposes
          * and hence races in setting them will not cause malfunction
@@ -387,6 +403,9 @@ struct fuse_conn {
 
         /** Reserved request for the DESTROY message */
         struct fuse_req *destroy_req;
+
+        /** Version counter for attribute changes */
+        u64 attr_version;
 };
 
 static inline struct fuse_conn *get_fuse_conn_super(struct super_block *sb)
@@ -416,7 +435,8 @@ extern const struct file_operations fuse_dev_operations;
  * Get a filled in inode
  */
 struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
-                        int generation, struct fuse_attr *attr);
+                        int generation, struct fuse_attr *attr,
+                        u64 attr_valid, u64 attr_version);
 
 /**
  * Send FORGET command
@@ -477,7 +497,8 @@ void fuse_init_symlink(struct inode *inode);
 /**
  * Change attributes of an inode
  */
-void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr);
+void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,
+                            u64 attr_valid, u64 attr_version);
 
 /**
  * Initialize the client device
@@ -565,3 +586,10 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc);
  * Is file type valid?
  */
 int fuse_valid_type(int m);
+
+/**
+ * Is task allowed to perform filesystem operation?
+ */
+int fuse_allow_task(struct fuse_conn *fc, struct task_struct *task);
+
+u64 fuse_lock_owner_id(struct fuse_conn *fc, fl_owner_t id);
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index fd0735715c14..9a68d6970845 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -56,6 +56,7 @@ static struct inode *fuse_alloc_inode(struct super_block *sb)
         fi->i_time = 0;
         fi->nodeid = 0;
         fi->nlookup = 0;
+        INIT_LIST_HEAD(&fi->write_files);
         fi->forget_req = fuse_request_alloc();
         if (!fi->forget_req) {
                 kmem_cache_free(fuse_inode_cachep, inode);
@@ -68,6 +69,7 @@ static struct inode *fuse_alloc_inode(struct super_block *sb)
 static void fuse_destroy_inode(struct inode *inode)
 {
         struct fuse_inode *fi = get_fuse_inode(inode);
+        BUG_ON(!list_empty(&fi->write_files));
         if (fi->forget_req)
                 fuse_request_free(fi->forget_req);
         kmem_cache_free(fuse_inode_cachep, inode);
@@ -117,12 +119,22 @@ static void fuse_truncate(struct address_space *mapping, loff_t offset)
         unmap_mapping_range(mapping, offset + PAGE_SIZE - 1, 0, 1);
 }
 
-void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr)
+
+void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,
+                            u64 attr_valid, u64 attr_version)
 {
         struct fuse_conn *fc = get_fuse_conn(inode);
         struct fuse_inode *fi = get_fuse_inode(inode);
         loff_t oldsize;
 
+        spin_lock(&fc->lock);
+        if (attr_version != 0 && fi->attr_version > attr_version) {
+                spin_unlock(&fc->lock);
+                return;
+        }
+        fi->attr_version = ++fc->attr_version;
+        fi->i_time = attr_valid;
+
         inode->i_ino     = attr->ino;
         inode->i_mode    = (inode->i_mode & S_IFMT) | (attr->mode & 07777);
         inode->i_nlink   = attr->nlink;
@@ -136,6 +148,11 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr)
         inode->i_ctime.tv_sec   = attr->ctime;
         inode->i_ctime.tv_nsec  = attr->ctimensec;
 
+        if (attr->blksize != 0)
+                inode->i_blkbits = ilog2(attr->blksize);
+        else
+                inode->i_blkbits = inode->i_sb->s_blocksize_bits;
+
         /*
          * Don't set the sticky bit in i_mode, unless we want the VFS
          * to check permissions.  This prevents failures due to the
@@ -145,7 +162,6 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr)
         if (!(fc->flags & FUSE_DEFAULT_PERMISSIONS))
                 inode->i_mode &= ~S_ISVTX;
 
-        spin_lock(&fc->lock);
         oldsize = inode->i_size;
         i_size_write(inode, attr->size);
         spin_unlock(&fc->lock);
@@ -194,7 +210,8 @@ static int fuse_inode_set(struct inode *inode, void *_nodeidp)
 }
 
 struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
-                        int generation, struct fuse_attr *attr)
+                        int generation, struct fuse_attr *attr,
+                        u64 attr_valid, u64 attr_version)
 {
         struct inode *inode;
         struct fuse_inode *fi;
@@ -222,7 +239,8 @@ struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
         spin_lock(&fc->lock);
         fi->nlookup ++;
         spin_unlock(&fc->lock);
-        fuse_change_attributes(inode, attr);
+        fuse_change_attributes(inode, attr, attr_valid, attr_version);
+
         return inode;
 }
 
@@ -287,6 +305,11 @@ static int fuse_statfs(struct dentry *dentry, struct kstatfs *buf)
         struct fuse_statfs_out outarg;
         int err;
 
+        if (!fuse_allow_task(fc, current)) {
+                buf->f_type = FUSE_SUPER_MAGIC;
+                return 0;
+        }
+
         req = fuse_get_req(fc);
         if (IS_ERR(req))
                 return PTR_ERR(req);
@@ -452,6 +475,7 @@ static struct fuse_conn *new_conn(void)
                 }
                 fc->reqctr = 0;
                 fc->blocked = 1;
+                fc->attr_version = 1;
                 get_random_bytes(&fc->scramble_key, sizeof(fc->scramble_key));
         }
 out:
@@ -483,7 +507,7 @@ static struct inode *get_root_inode(struct super_block *sb, unsigned mode)
         attr.mode = mode;
         attr.ino = FUSE_ROOT_ID;
         attr.nlink = 1;
-        return fuse_iget(sb, 1, 0, &attr);
+        return fuse_iget(sb, 1, 0, &attr, 0, 0);
 }
 
 static const struct super_operations fuse_super_operations = {
@@ -514,6 +538,8 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req)
                                 fc->async_read = 1;
                         if (!(arg->flags & FUSE_POSIX_LOCKS))
                                 fc->no_lock = 1;
+                        if (arg->flags & FUSE_ATOMIC_O_TRUNC)
+                                fc->atomic_o_trunc = 1;
                 } else {
                         ra_pages = fc->max_read / PAGE_CACHE_SIZE;
                         fc->no_lock = 1;
@@ -536,7 +562,8 @@ static void fuse_send_init(struct fuse_conn *fc, struct fuse_req *req)
         arg->major = FUSE_KERNEL_VERSION;
         arg->minor = FUSE_KERNEL_MINOR_VERSION;
         arg->max_readahead = fc->bdi.ra_pages * PAGE_CACHE_SIZE;
-        arg->flags |= FUSE_ASYNC_READ | FUSE_POSIX_LOCKS;
+        arg->flags |= FUSE_ASYNC_READ | FUSE_POSIX_LOCKS | FUSE_FILE_OPS |
+                FUSE_ATOMIC_O_TRUNC;
         req->in.h.opcode = FUSE_INIT;
         req->in.numargs = 1;
         req->in.args[0].size = sizeof(*arg);
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index a003d50edcdb..a263d82761df 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -375,7 +375,7 @@ void journal_commit_transaction(journal_t *journal)
                         struct buffer_head *bh = jh2bh(jh);
 
                         jbd_lock_bh_state(bh);
-                        jbd_slab_free(jh->b_committed_data, bh->b_size);
+                        jbd_free(jh->b_committed_data, bh->b_size);
                         jh->b_committed_data = NULL;
                         jbd_unlock_bh_state(bh);
                 }
@@ -792,14 +792,14 @@ restart_loop:
                  * Otherwise, we can just throw away the frozen data now.
                  */
                 if (jh->b_committed_data) {
-                        jbd_slab_free(jh->b_committed_data, bh->b_size);
+                        jbd_free(jh->b_committed_data, bh->b_size);
                         jh->b_committed_data = NULL;
                         if (jh->b_frozen_data) {
                                 jh->b_committed_data = jh->b_frozen_data;
                                 jh->b_frozen_data = NULL;
                         }
                 } else if (jh->b_frozen_data) {
-                        jbd_slab_free(jh->b_frozen_data, bh->b_size);
+                        jbd_free(jh->b_frozen_data, bh->b_size);
                         jh->b_frozen_data = NULL;
                 }
 
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index a6be78c05dce..5d9fec0b7ebd 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -83,7 +83,6 @@ EXPORT_SYMBOL(journal_force_commit);
 
 static int journal_convert_superblock_v1(journal_t *, journal_superblock_t *);
 static void __journal_abort_soft (journal_t *journal, int errno);
-static int journal_create_jbd_slab(size_t slab_size);
 
 /*
  * Helper function used to manage commit timeouts
@@ -218,7 +217,7 @@ static int journal_start_thread(journal_t *journal)
         if (IS_ERR(t))
                 return PTR_ERR(t);
 
-        wait_event(journal->j_wait_done_commit, journal->j_task != 0);
+        wait_event(journal->j_wait_done_commit, journal->j_task != NULL);
         return 0;
 }
 
@@ -230,7 +229,8 @@ static void journal_kill_thread(journal_t *journal)
         while (journal->j_task) {
                 wake_up(&journal->j_wait_commit);
                 spin_unlock(&journal->j_state_lock);
-                wait_event(journal->j_wait_done_commit, journal->j_task == 0);
+                wait_event(journal->j_wait_done_commit,
+                                journal->j_task == NULL);
                 spin_lock(&journal->j_state_lock);
         }
         spin_unlock(&journal->j_state_lock);
@@ -334,10 +334,10 @@ repeat:
                 char *tmp;
 
                 jbd_unlock_bh_state(bh_in);
-                tmp = jbd_slab_alloc(bh_in->b_size, GFP_NOFS);
+                tmp = jbd_alloc(bh_in->b_size, GFP_NOFS);
                 jbd_lock_bh_state(bh_in);
                 if (jh_in->b_frozen_data) {
-                        jbd_slab_free(tmp, bh_in->b_size);
+                        jbd_free(tmp, bh_in->b_size);
                         goto repeat;
                 }
 
@@ -654,7 +654,7 @@ static journal_t * journal_init_common (void)
         journal_t *journal;
         int err;
 
-        journal = jbd_kmalloc(sizeof(*journal), GFP_KERNEL);
+        journal = kmalloc(sizeof(*journal), GFP_KERNEL);
         if (!journal)
                 goto fail;
         memset(journal, 0, sizeof(*journal));
@@ -1095,13 +1095,6 @@ int journal_load(journal_t *journal)
                 }
         }
 
-        /*
-         * Create a slab for this blocksize
-         */
-        err = journal_create_jbd_slab(be32_to_cpu(sb->s_blocksize));
-        if (err)
-                return err;
-
         /* Let the recovery code check whether it needs to recover any
          * data from the journal. */
         if (journal_recover(journal))
@@ -1615,86 +1608,6 @@ int journal_blocks_per_page(struct inode *inode)
 }
 
 /*
- * Simple support for retrying memory allocations.  Introduced to help to
- * debug different VM deadlock avoidance strategies.
- */
-void * __jbd_kmalloc (const char *where, size_t size, gfp_t flags, int retry)
-{
-        return kmalloc(size, flags | (retry ? __GFP_NOFAIL : 0));
-}
-
-/*
- * jbd slab management: create 1k, 2k, 4k, 8k slabs as needed
- * and allocate frozen and commit buffers from these slabs.
- *
- * Reason for doing this is to avoid, SLAB_DEBUG - since it could
- * cause bh to cross page boundary.
- */
-
-#define JBD_MAX_SLABS 5
-#define JBD_SLAB_INDEX(size)  (size >> 11)
-
-static struct kmem_cache *jbd_slab[JBD_MAX_SLABS];
-static const char *jbd_slab_names[JBD_MAX_SLABS] = {
-        "jbd_1k", "jbd_2k", "jbd_4k", NULL, "jbd_8k"
-};
-
-static void journal_destroy_jbd_slabs(void)
-{
-        int i;
-
-        for (i = 0; i < JBD_MAX_SLABS; i++) {
-                if (jbd_slab[i])
-                        kmem_cache_destroy(jbd_slab[i]);
-                jbd_slab[i] = NULL;
-        }
-}
-
-static int journal_create_jbd_slab(size_t slab_size)
-{
-        int i = JBD_SLAB_INDEX(slab_size);
-
-        BUG_ON(i >= JBD_MAX_SLABS);
-
-        /*
-         * Check if we already have a slab created for this size
-         */
-        if (jbd_slab[i])
-                return 0;
-
-        /*
-         * Create a slab and force alignment to be same as slabsize -
-         * this will make sure that allocations won't cross the page
-         * boundary.
-         */
-        jbd_slab[i] = kmem_cache_create(jbd_slab_names[i],
-                                slab_size, slab_size, 0, NULL);
-        if (!jbd_slab[i]) {
-                printk(KERN_EMERG "JBD: no memory for jbd_slab cache\n");
-                return -ENOMEM;
-        }
-        return 0;
-}
-
-void * jbd_slab_alloc(size_t size, gfp_t flags)
-{
-        int idx;
-
-        idx = JBD_SLAB_INDEX(size);
-        BUG_ON(jbd_slab[idx] == NULL);
-        return kmem_cache_alloc(jbd_slab[idx], flags | __GFP_NOFAIL);
-}
-
-void jbd_slab_free(void *ptr,  size_t size)
-{
-        int idx;
-
-        idx = JBD_SLAB_INDEX(size);
-        BUG_ON(jbd_slab[idx] == NULL);
-        kmem_cache_free(jbd_slab[idx], ptr);
-}
-
-/*
  * Journal_head storage management
  */
 static struct kmem_cache *journal_head_cache;
@@ -1739,14 +1652,14 @@ static struct journal_head *journal_alloc_journal_head(void)
         atomic_inc(&nr_journal_heads);
 #endif
         ret = kmem_cache_alloc(journal_head_cache, GFP_NOFS);
-        if (ret == 0) {
+        if (ret == NULL) {
                 jbd_debug(1, "out of memory for journal_head\n");
                 if (time_after(jiffies, last_warning + 5*HZ)) {
                         printk(KERN_NOTICE "ENOMEM in %s, retrying.\n",
                                __FUNCTION__);
                         last_warning = jiffies;
                 }
-                while (ret == 0) {
+                while (ret == NULL) {
                         yield();
                         ret = kmem_cache_alloc(journal_head_cache, GFP_NOFS);
                 }
@@ -1881,13 +1794,13 @@ static void __journal_remove_journal_head(struct buffer_head *bh)
                                 printk(KERN_WARNING "%s: freeing "
                                                 "b_frozen_data\n",
                                                 __FUNCTION__);
-                                jbd_slab_free(jh->b_frozen_data, bh->b_size);
+                                jbd_free(jh->b_frozen_data, bh->b_size);
                         }
                         if (jh->b_committed_data) {
                                 printk(KERN_WARNING "%s: freeing "
                                                 "b_committed_data\n",
                                                 __FUNCTION__);
-                                jbd_slab_free(jh->b_committed_data, bh->b_size);
+                                jbd_free(jh->b_committed_data, bh->b_size);
                         }
                         bh->b_private = NULL;
                         jh->b_bh = NULL;        /* debug, really */
@@ -2042,7 +1955,6 @@ static void journal_destroy_caches(void)
         journal_destroy_revoke_caches();
         journal_destroy_journal_head_cache();
         journal_destroy_handle_cache();
-        journal_destroy_jbd_slabs();
 }
 
 static int __init journal_init(void)
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c
index 8df5bac0b7a5..9841b1e5af03 100644
--- a/fs/jbd/transaction.c
+++ b/fs/jbd/transaction.c
@@ -96,8 +96,8 @@ static int start_this_handle(journal_t *journal, handle_t *handle)
 
 alloc_transaction:
         if (!journal->j_running_transaction) {
-                new_transaction = jbd_kmalloc(sizeof(*new_transaction),
-                                                GFP_NOFS);
+                new_transaction = kmalloc(sizeof(*new_transaction),
+                                                GFP_NOFS|__GFP_NOFAIL);
                 if (!new_transaction) {
                         ret = -ENOMEM;
                         goto out;
@@ -675,7 +675,7 @@ repeat:
                                 JBUFFER_TRACE(jh, "allocate memory for buffer");
                                 jbd_unlock_bh_state(bh);
                                 frozen_buffer =
-                                        jbd_slab_alloc(jh2bh(jh)->b_size,
+                                        jbd_alloc(jh2bh(jh)->b_size,
                                                          GFP_NOFS);
                                 if (!frozen_buffer) {
                                         printk(KERN_EMERG
@@ -735,7 +735,7 @@ done:
 
 out:
         if (unlikely(frozen_buffer))    /* It's usually NULL */
-                jbd_slab_free(frozen_buffer, bh->b_size);
+                jbd_free(frozen_buffer, bh->b_size);
 
         JBUFFER_TRACE(jh, "exit");
         return error;
@@ -888,7 +888,7 @@ int journal_get_undo_access(handle_t *handle, struct buffer_head *bh)
 
 repeat:
         if (!jh->b_committed_data) {
-                committed_data = jbd_slab_alloc(jh2bh(jh)->b_size, GFP_NOFS);
+                committed_data = jbd_alloc(jh2bh(jh)->b_size, GFP_NOFS);
                 if (!committed_data) {
                         printk(KERN_EMERG "%s: No memory for committed data\n",
                                 __FUNCTION__);
@@ -915,7 +915,7 @@ repeat:
 out:
         journal_put_journal_head(jh);
         if (unlikely(committed_data))
-                jbd_slab_free(committed_data, bh->b_size);
+                jbd_free(committed_data, bh->b_size);
         return err;
 }
 
@@ -1172,7 +1172,7 @@ int journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
         }
 
         /* That test should have eliminated the following case: */
-        J_ASSERT_JH(jh, jh->b_frozen_data == 0);
+        J_ASSERT_JH(jh, jh->b_frozen_data == NULL);
 
         JBUFFER_TRACE(jh, "file as BJ_Metadata");
         spin_lock(&journal->j_list_lock);
@@ -1522,7 +1522,7 @@ static void __journal_temp_unlink_buffer(struct journal_head *jh)
 
         J_ASSERT_JH(jh, jh->b_jlist < BJ_Types);
         if (jh->b_jlist != BJ_None)
-                J_ASSERT_JH(jh, transaction != 0);
+                J_ASSERT_JH(jh, transaction != NULL);
 
         switch (jh->b_jlist) {
         case BJ_None:
@@ -1591,11 +1591,11 @@ __journal_try_to_free_buffer(journal_t *journal, struct buffer_head *bh)
         if (buffer_locked(bh) || buffer_dirty(bh))
                 goto out;
 
-        if (jh->b_next_transaction != 0)
+        if (jh->b_next_transaction != NULL)
                 goto out;
 
         spin_lock(&journal->j_list_lock);
-        if (jh->b_transaction != 0 && jh->b_cp_transaction == 0) {
+        if (jh->b_transaction != NULL && jh->b_cp_transaction == NULL) {
                 if (jh->b_jlist == BJ_SyncData || jh->b_jlist == BJ_Locked) {
                         /* A written-back ordered data buffer */
                         JBUFFER_TRACE(jh, "release data");
@@ -1603,7 +1603,7 @@ __journal_try_to_free_buffer(journal_t *journal, struct buffer_head *bh)
                         journal_remove_journal_head(bh);
                         __brelse(bh);
                 }
-        } else if (jh->b_cp_transaction != 0 && jh->b_transaction == 0) {
+        } else if (jh->b_cp_transaction != NULL && jh->b_transaction == NULL) {
                 /* written-back checkpointed metadata buffer */
                 if (jh->b_jlist == BJ_None) {
                         JBUFFER_TRACE(jh, "remove from checkpoint list");
@@ -1963,7 +1963,7 @@ void __journal_file_buffer(struct journal_head *jh,
 
         J_ASSERT_JH(jh, jh->b_jlist < BJ_Types);
         J_ASSERT_JH(jh, jh->b_transaction == transaction ||
-                                jh->b_transaction == 0);
+                                jh->b_transaction == NULL);
 
         if (jh->b_transaction && jh->b_jlist == jlist)
                 return;
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index c0f59d1b13dc..6986f334c643 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -278,7 +278,7 @@ static inline void write_tag_block(int tag_bytes, journal_block_tag_t *tag,
                                    unsigned long long block)
 {
         tag->t_blocknr = cpu_to_be32(block & (u32)~0);
-        if (tag_bytes > JBD_TAG_SIZE32)
+        if (tag_bytes > JBD2_TAG_SIZE32)
                 tag->t_blocknr_high = cpu_to_be32((block >> 31) >> 1);
 }
 
@@ -384,7 +384,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
                         struct buffer_head *bh = jh2bh(jh);
 
                         jbd_lock_bh_state(bh);
-                        jbd2_slab_free(jh->b_committed_data, bh->b_size);
+                        jbd2_free(jh->b_committed_data, bh->b_size);
                         jh->b_committed_data = NULL;
                         jbd_unlock_bh_state(bh);
                 }
@@ -475,7 +475,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
         spin_unlock(&journal->j_list_lock);
 
         if (err)
-                __jbd2_journal_abort_hard(journal);
+                jbd2_journal_abort(journal, err);
 
         jbd2_journal_write_revoke_records(journal, commit_transaction);
 
@@ -533,7 +533,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
 
                         descriptor = jbd2_journal_get_descriptor_buffer(journal);
                         if (!descriptor) {
-                                __jbd2_journal_abort_hard(journal);
+                                jbd2_journal_abort(journal, -EIO);
                                 continue;
                         }
 
@@ -566,7 +566,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
                    and repeat this loop: we'll fall into the
                    refile-on-abort condition above. */
                 if (err) {
-                        __jbd2_journal_abort_hard(journal);
+                        jbd2_journal_abort(journal, err);
                         continue;
                 }
 
@@ -757,7 +757,7 @@ wait_for_iobuf:
                 err = -EIO;
 
         if (err)
-                __jbd2_journal_abort_hard(journal);
+                jbd2_journal_abort(journal, err);
 
         /* End of a transaction!  Finally, we can do checkpoint
            processing: any buffers committed as a result of this
@@ -801,14 +801,14 @@ restart_loop:
                  * Otherwise, we can just throw away the frozen data now.
                  */
                 if (jh->b_committed_data) {
-                        jbd2_slab_free(jh->b_committed_data, bh->b_size);
+                        jbd2_free(jh->b_committed_data, bh->b_size);
                         jh->b_committed_data = NULL;
                         if (jh->b_frozen_data) {
                                 jh->b_committed_data = jh->b_frozen_data;
                                 jh->b_frozen_data = NULL;
                         }
                 } else if (jh->b_frozen_data) {
-                        jbd2_slab_free(jh->b_frozen_data, bh->b_size);
+                        jbd2_free(jh->b_frozen_data, bh->b_size);
                         jh->b_frozen_data = NULL;
                 }
 
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index f37324aee817..6ddc5531587c 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -84,7 +84,6 @@ EXPORT_SYMBOL(jbd2_journal_force_commit);
 
 static int journal_convert_superblock_v1(journal_t *, journal_superblock_t *);
 static void __journal_abort_soft (journal_t *journal, int errno);
-static int jbd2_journal_create_jbd_slab(size_t slab_size);
 
 /*
  * Helper function used to manage commit timeouts
@@ -335,10 +334,10 @@ repeat:
                 char *tmp;
 
                 jbd_unlock_bh_state(bh_in);
-                tmp = jbd2_slab_alloc(bh_in->b_size, GFP_NOFS);
+                tmp = jbd2_alloc(bh_in->b_size, GFP_NOFS);
                 jbd_lock_bh_state(bh_in);
                 if (jh_in->b_frozen_data) {
-                        jbd2_slab_free(tmp, bh_in->b_size);
+                        jbd2_free(tmp, bh_in->b_size);
                         goto repeat;
                 }
 
@@ -655,10 +654,9 @@ static journal_t * journal_init_common (void)
         journal_t *journal;
         int err;
 
-        journal = jbd_kmalloc(sizeof(*journal), GFP_KERNEL);
+        journal = kzalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL);
         if (!journal)
                 goto fail;
-        memset(journal, 0, sizeof(*journal));
 
         init_waitqueue_head(&journal->j_wait_transaction_locked);
         init_waitqueue_head(&journal->j_wait_logspace);
@@ -672,7 +670,7 @@ static journal_t * journal_init_common (void)
         spin_lock_init(&journal->j_list_lock);
         spin_lock_init(&journal->j_state_lock);
 
-        journal->j_commit_interval = (HZ * JBD_DEFAULT_MAX_COMMIT_AGE);
+        journal->j_commit_interval = (HZ * JBD2_DEFAULT_MAX_COMMIT_AGE);
 
         /* The journal is marked for error until we succeed with recovery! */
         journal->j_flags = JBD2_ABORT;
@@ -1096,13 +1094,6 @@ int jbd2_journal_load(journal_t *journal)
                 }
         }
 
-        /*
-         * Create a slab for this blocksize
-         */
-        err = jbd2_journal_create_jbd_slab(be32_to_cpu(sb->s_blocksize));
-        if (err)
-                return err;
-
         /* Let the recovery code check whether it needs to recover any
          * data from the journal. */
         if (jbd2_journal_recover(journal))
@@ -1621,89 +1612,9 @@ int jbd2_journal_blocks_per_page(struct inode *inode)
 size_t journal_tag_bytes(journal_t *journal)
 {
         if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_64BIT))
-                return JBD_TAG_SIZE64;
+                return JBD2_TAG_SIZE64;
         else
-                return JBD_TAG_SIZE32;
-}
-
-/*
- * Simple support for retrying memory allocations.  Introduced to help to
- * debug different VM deadlock avoidance strategies.
- */
-void * __jbd2_kmalloc (const char *where, size_t size, gfp_t flags, int retry)
-{
-        return kmalloc(size, flags | (retry ? __GFP_NOFAIL : 0));
-}
-
-/*
- * jbd slab management: create 1k, 2k, 4k, 8k slabs as needed
- * and allocate frozen and commit buffers from these slabs.
- *
- * Reason for doing this is to avoid, SLAB_DEBUG - since it could
- * cause bh to cross page boundary.
- */
-
-#define JBD_MAX_SLABS 5
-#define JBD_SLAB_INDEX(size)  (size >> 11)
-
-static struct kmem_cache *jbd_slab[JBD_MAX_SLABS];
-static const char *jbd_slab_names[JBD_MAX_SLABS] = {
-        "jbd2_1k", "jbd2_2k", "jbd2_4k", NULL, "jbd2_8k"
-};
-
-static void jbd2_journal_destroy_jbd_slabs(void)
-{
-        int i;
-
-        for (i = 0; i < JBD_MAX_SLABS; i++) {
-                if (jbd_slab[i])
-                        kmem_cache_destroy(jbd_slab[i]);
-                jbd_slab[i] = NULL;
-        }
-}
-
-static int jbd2_journal_create_jbd_slab(size_t slab_size)
-{
-        int i = JBD_SLAB_INDEX(slab_size);
-
-        BUG_ON(i >= JBD_MAX_SLABS);
-
-        /*
-         * Check if we already have a slab created for this size
-         */
-        if (jbd_slab[i])
-                return 0;
-
-        /*
-         * Create a slab and force alignment to be same as slabsize -
-         * this will make sure that allocations won't cross the page
-         * boundary.
-         */
-        jbd_slab[i] = kmem_cache_create(jbd_slab_names[i],
-                                slab_size, slab_size, 0, NULL);
-        if (!jbd_slab[i]) {
-                printk(KERN_EMERG "JBD: no memory for jbd_slab cache\n");
-                return -ENOMEM;
-        }
-        return 0;
-}
-
-void * jbd2_slab_alloc(size_t size, gfp_t flags)
-{
-        int idx;
-
-        idx = JBD_SLAB_INDEX(size);
-        BUG_ON(jbd_slab[idx] == NULL);
-        return kmem_cache_alloc(jbd_slab[idx], flags | __GFP_NOFAIL);
-}
-
-void jbd2_slab_free(void *ptr,  size_t size)
-{
-        int idx;
-
-        idx = JBD_SLAB_INDEX(size);
-        BUG_ON(jbd_slab[idx] == NULL);
-        kmem_cache_free(jbd_slab[idx], ptr);
+                return JBD2_TAG_SIZE32;
 }
 
 /*
@@ -1770,7 +1681,7 @@ static void journal_free_journal_head(struct journal_head *jh)
 {
 #ifdef CONFIG_JBD2_DEBUG
         atomic_dec(&nr_journal_heads);
-        memset(jh, JBD_POISON_FREE, sizeof(*jh));
+        memset(jh, JBD2_POISON_FREE, sizeof(*jh));
 #endif
         kmem_cache_free(jbd2_journal_head_cache, jh);
 }
@@ -1893,13 +1804,13 @@ static void __journal_remove_journal_head(struct buffer_head *bh)
                                 printk(KERN_WARNING "%s: freeing "
                                                 "b_frozen_data\n",
                                                 __FUNCTION__);
-                                jbd2_slab_free(jh->b_frozen_data, bh->b_size);
+                                jbd2_free(jh->b_frozen_data, bh->b_size);
                         }
                         if (jh->b_committed_data) {
                                 printk(KERN_WARNING "%s: freeing "
                                                 "b_committed_data\n",
                                                 __FUNCTION__);
-                                jbd2_slab_free(jh->b_committed_data, bh->b_size);
+                                jbd2_free(jh->b_committed_data, bh->b_size);
                         }
                         bh->b_private = NULL;
                         jh->b_bh = NULL;        /* debug, really */
@@ -1953,16 +1864,14 @@ void jbd2_journal_put_journal_head(struct journal_head *jh)
 /*
  * debugfs tunables
  */
-#if defined(CONFIG_JBD2_DEBUG)
-u8 jbd2_journal_enable_debug;
+#ifdef CONFIG_JBD2_DEBUG
+u8 jbd2_journal_enable_debug __read_mostly;
 EXPORT_SYMBOL(jbd2_journal_enable_debug);
-#endif
-
-#if defined(CONFIG_JBD2_DEBUG) && defined(CONFIG_DEBUG_FS)
 
 #define JBD2_DEBUG_NAME "jbd2-debug"
 
-struct dentry *jbd2_debugfs_dir, *jbd2_debug;
+static struct dentry *jbd2_debugfs_dir;
+static struct dentry *jbd2_debug;
 
 static void __init jbd2_create_debugfs_entry(void)
 {
@@ -1975,24 +1884,18 @@ static void __init jbd2_create_debugfs_entry(void)
 
 static void __exit jbd2_remove_debugfs_entry(void)
 {
-        if (jbd2_debug)
-                debugfs_remove(jbd2_debug);
-        if (jbd2_debugfs_dir)
-                debugfs_remove(jbd2_debugfs_dir);
+        debugfs_remove(jbd2_debug);
+        debugfs_remove(jbd2_debugfs_dir);
 }
 
 #else
 
 static void __init jbd2_create_debugfs_entry(void)
 {
-        do {
-        } while (0);
 }
 
 static void __exit jbd2_remove_debugfs_entry(void)
 {
-        do {
-        } while (0);
 }
 
 #endif
@@ -2040,7 +1943,6 @@ static void jbd2_journal_destroy_caches(void)
         jbd2_journal_destroy_revoke_caches();
         jbd2_journal_destroy_jbd2_journal_head_cache();
         jbd2_journal_destroy_handle_cache();
-        jbd2_journal_destroy_jbd_slabs();
 }
 
 static int __init journal_init(void)
diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c
index b50be8a044eb..d0ce627539ef 100644
--- a/fs/jbd2/recovery.c
+++ b/fs/jbd2/recovery.c
@@ -311,7 +311,7 @@ int jbd2_journal_skip_recovery(journal_t *journal)
 static inline unsigned long long read_tag_block(int tag_bytes, journal_block_tag_t *tag)
 {
         unsigned long long block = be32_to_cpu(tag->t_blocknr);
-        if (tag_bytes > JBD_TAG_SIZE32)
+        if (tag_bytes > JBD2_TAG_SIZE32)
                 block |= (u64)be32_to_cpu(tag->t_blocknr_high) << 32;
         return block;
 }
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c
index 01d88975e0c5..3595fd432d5b 100644
--- a/fs/jbd2/revoke.c
+++ b/fs/jbd2/revoke.c
@@ -352,7 +352,7 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr,
                 if (bh)
                         BUFFER_TRACE(bh, "found on hash");
         }
-#ifdef JBD_EXPENSIVE_CHECKING
+#ifdef JBD2_EXPENSIVE_CHECKING
         else {
                 struct buffer_head *bh2;
 
@@ -453,7 +453,7 @@ int jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)
                 }
         }
 
-#ifdef JBD_EXPENSIVE_CHECKING
+#ifdef JBD2_EXPENSIVE_CHECKING
         /* There better not be one left behind by now! */
         record = find_revoke_record(journal, bh->b_blocknr);
         J_ASSERT_JH(jh, record == NULL);
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index 7946ff43fc40..b1fcf2b3dca3 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -96,13 +96,12 @@ static int start_this_handle(journal_t *journal, handle_t *handle)
 
 alloc_transaction:
         if (!journal->j_running_transaction) {
-                new_transaction = jbd_kmalloc(sizeof(*new_transaction),
-                                                GFP_NOFS);
+                new_transaction = kzalloc(sizeof(*new_transaction),
+                                                GFP_NOFS|__GFP_NOFAIL);
                 if (!new_transaction) {
                         ret = -ENOMEM;
                         goto out;
                 }
-                memset(new_transaction, 0, sizeof(*new_transaction));
         }
 
         jbd_debug(3, "New handle %p going live.\n", handle);
@@ -236,7 +235,7 @@ out:
 /* Allocate a new handle.  This should probably be in a slab... */
 static handle_t *new_handle(int nblocks)
 {
-        handle_t *handle = jbd_alloc_handle(GFP_NOFS);
+        handle_t *handle = jbd2_alloc_handle(GFP_NOFS);
         if (!handle)
                 return NULL;
         memset(handle, 0, sizeof(*handle));
@@ -282,7 +281,7 @@ handle_t *jbd2_journal_start(journal_t *journal, int nblocks)
 
         err = start_this_handle(journal, handle);
         if (err < 0) {
-                jbd_free_handle(handle);
+                jbd2_free_handle(handle);
                 current->journal_info = NULL;
                 handle = ERR_PTR(err);
         }
@@ -668,7 +667,7 @@ repeat:
                                 JBUFFER_TRACE(jh, "allocate memory for buffer");
                                 jbd_unlock_bh_state(bh);
                                 frozen_buffer =
-                                        jbd2_slab_alloc(jh2bh(jh)->b_size,
+                                        jbd2_alloc(jh2bh(jh)->b_size,
                                                          GFP_NOFS);
                                 if (!frozen_buffer) {
                                         printk(KERN_EMERG
@@ -728,7 +727,7 @@ done:
 
 out:
         if (unlikely(frozen_buffer))    /* It's usually NULL */
-                jbd2_slab_free(frozen_buffer, bh->b_size);
+                jbd2_free(frozen_buffer, bh->b_size);
 
         JBUFFER_TRACE(jh, "exit");
         return error;
@@ -881,7 +880,7 @@ int jbd2_journal_get_undo_access(handle_t *handle, struct buffer_head *bh)
 
 repeat:
         if (!jh->b_committed_data) {
-                committed_data = jbd2_slab_alloc(jh2bh(jh)->b_size, GFP_NOFS);
+                committed_data = jbd2_alloc(jh2bh(jh)->b_size, GFP_NOFS);
                 if (!committed_data) {
                         printk(KERN_EMERG "%s: No memory for committed data\n",
                                 __FUNCTION__);
@@ -908,7 +907,7 @@ repeat:
 out:
         jbd2_journal_put_journal_head(jh);
         if (unlikely(committed_data))
-                jbd2_slab_free(committed_data, bh->b_size);
+                jbd2_free(committed_data, bh->b_size);
         return err;
 }
 
@@ -1411,7 +1410,7 @@ int jbd2_journal_stop(handle_t *handle)
                 spin_unlock(&journal->j_state_lock);
         }
 
-        jbd_free_handle(handle);
+        jbd2_free_handle(handle);
         return err;
 }
 
diff --git a/fs/namei.c b/fs/namei.c
index 464eeccb675b..1e5c71669164 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1659,8 +1659,10 @@ int may_open(struct nameidata *nd, int acc_mode, int flag)
                 error = locks_verify_locked(inode);
                 if (!error) {
                         DQUOT_INIT(inode);
-                        
-                        error = do_truncate(dentry, 0, ATTR_MTIME|ATTR_CTIME, NULL);
+
+                        error = do_truncate(dentry, 0,
+                                            ATTR_MTIME|ATTR_CTIME|ATTR_OPEN,
+                                            NULL);
                 }
                 put_write_access(inode);
                 if (error)
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 6c22453d77ae..6d2f2a3eccf8 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -357,6 +357,10 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
 
         nfs_inc_stats(inode, NFSIOS_VFSSETATTR);
 
+        /* skip mode change if it's just for clearing setuid/setgid */
+        if (attr->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID))
+                attr->ia_valid &= ~ATTR_MODE;
+
         if (attr->ia_valid & ATTR_SIZE) {
                 if (!S_ISREG(inode->i_mode) || attr->ia_size == i_size_read(inode))
                         attr->ia_valid &= ~ATTR_SIZE;
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 819545d21670..46934c97f8f7 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -364,14 +364,23 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
         if (iap->ia_valid & ATTR_MODE) {
                 iap->ia_mode &= S_IALLUGO;
                 imode = iap->ia_mode |= (imode & ~S_IALLUGO);
+                /* if changing uid/gid revoke setuid/setgid in mode */
+                if ((iap->ia_valid & ATTR_UID) && iap->ia_uid != inode->i_uid) {
+                        iap->ia_valid |= ATTR_KILL_PRIV;
+                        iap->ia_mode &= ~S_ISUID;
+                }
+                if ((iap->ia_valid & ATTR_GID) && iap->ia_gid != inode->i_gid)
+                        iap->ia_mode &= ~S_ISGID;
+        } else {
+                /*
+                 * Revoke setuid/setgid bit on chown/chgrp
+                 */
+                if ((iap->ia_valid & ATTR_UID) && iap->ia_uid != inode->i_uid)
+                        iap->ia_valid |= ATTR_KILL_SUID | ATTR_KILL_PRIV;
+                if ((iap->ia_valid & ATTR_GID) && iap->ia_gid != inode->i_gid)
+                        iap->ia_valid |= ATTR_KILL_SGID;
         }
 
-        /* Revoke setuid/setgid bit on chown/chgrp */
-        if ((iap->ia_valid & ATTR_UID) && iap->ia_uid != inode->i_uid)
-                iap->ia_valid |= ATTR_KILL_SUID | ATTR_KILL_PRIV;
-        if ((iap->ia_valid & ATTR_GID) && iap->ia_gid != inode->i_gid)
-                iap->ia_valid |= ATTR_KILL_SGID;
-
         /* Change the attributes. */
 
         iap->ia_valid |= ATTR_CTIME;
diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
index e7905816c4ca..64965e1c21c4 100644
--- a/fs/nls/nls_base.c
+++ b/fs/nls/nls_base.c
@@ -111,7 +111,7 @@ utf8_wctomb(__u8 *s, wchar_t wc, int maxlen)
         int c, nc;
         const struct utf8_table *t;
   
-        if (s == 0)
+        if (!s)
                 return 0;
   
         l = wc;
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 9ea12004fa57..0804289d355d 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -3061,7 +3061,11 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)
 {
         struct inode *inode = dentry->d_inode;
         int error;
-        unsigned int ia_valid = attr->ia_valid;
+        unsigned int ia_valid;
+
+        /* must be turned off for recursive notify_change calls */
+        ia_valid = attr->ia_valid &= ~(ATTR_KILL_SUID|ATTR_KILL_SGID);
+
         reiserfs_write_lock(inode->i_sb);
         if (attr->ia_valid & ATTR_SIZE) {
                 /* version 2 items will be caught by the s_maxbytes check
diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h
index 9e71201000d5..381b4f5b4d5d 100644
--- a/include/asm-alpha/bitops.h
+++ b/include/asm-alpha/bitops.h
@@ -2,6 +2,7 @@
 #define _ALPHA_BITOPS_H
 
 #include <asm/compiler.h>
+#include <asm/barrier.h>
 
 /*
  * Copyright 1994, Linus Torvalds.
@@ -69,6 +70,13 @@ clear_bit(unsigned long nr, volatile void * addr)
         :"Ir" (1UL << (nr & 31)), "m" (*m));
 }
 
+static inline void
+clear_bit_unlock(unsigned long nr, volatile void * addr)
+{
+        smp_mb();
+        clear_bit(nr, addr);
+}
+
 /*
  * WARNING: non atomic version.
  */
@@ -81,6 +89,13 @@ __clear_bit(unsigned long nr, volatile void * addr)
 }
 
 static inline void
+__clear_bit_unlock(unsigned long nr, volatile void * addr)
+{
+        smp_mb();
+        __clear_bit(nr, addr);
+}
+
+static inline void
 change_bit(unsigned long nr, volatile void * addr)
 {
         unsigned long temp;
@@ -117,6 +132,36 @@ test_and_set_bit(unsigned long nr, volatile void *addr)
         int *m = ((int *) addr) + (nr >> 5);
 
         __asm__ __volatile__(
+#ifdef CONFIG_SMP
+        "       mb\n"
+#endif
+        "1:     ldl_l %0,%4\n"
+        "       and %0,%3,%2\n"
+        "       bne %2,2f\n"
+        "       xor %0,%3,%0\n"
+        "       stl_c %0,%1\n"
+        "       beq %0,3f\n"
+        "2:\n"
+#ifdef CONFIG_SMP
+        "       mb\n"
+#endif
+        ".subsection 2\n"
+        "3:     br 1b\n"
+        ".previous"
+        :"=&r" (temp), "=m" (*m), "=&r" (oldbit)
+        :"Ir" (1UL << (nr & 31)), "m" (*m) : "memory");
+
+        return oldbit != 0;
+}
+
+static inline int
+test_and_set_bit_lock(unsigned long nr, volatile void *addr)
+{
+        unsigned long oldbit;
+        unsigned long temp;
+        int *m = ((int *) addr) + (nr >> 5);
+
+        __asm__ __volatile__(
         "1:     ldl_l %0,%4\n"
         "       and %0,%3,%2\n"
         "       bne %2,2f\n"
@@ -158,6 +203,9 @@ test_and_clear_bit(unsigned long nr, volatile void * addr)
         int *m = ((int *) addr) + (nr >> 5);
 
         __asm__ __volatile__(
+#ifdef CONFIG_SMP
+        "       mb\n"
+#endif
         "1:     ldl_l %0,%4\n"
         "       and %0,%3,%2\n"
         "       beq %2,2f\n"
@@ -199,6 +247,9 @@ test_and_change_bit(unsigned long nr, volatile void * addr)
         int *m = ((int *) addr) + (nr >> 5);
 
         __asm__ __volatile__(
+#ifdef CONFIG_SMP
+        "       mb\n"
+#endif
         "1:     ldl_l %0,%4\n"
         "       and %0,%3,%2\n"
         "       xor %0,%3,%0\n"
diff --git a/include/asm-arm/arch-pxa/pm.h b/include/asm-arm/arch-pxa/pm.h
index 6903db7fae15..9d9f4b54b2ce 100644
--- a/include/asm-arm/arch-pxa/pm.h
+++ b/include/asm-arm/arch-pxa/pm.h
@@ -7,6 +7,8 @@
  *
  */
 
+#include <linux/suspend.h>
+
 struct pxa_cpu_pm_fns {
         int     save_size;
         void    (*save)(unsigned long *);
diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h
index b41831b6432f..52fe05895deb 100644
--- a/include/asm-arm/bitops.h
+++ b/include/asm-arm/bitops.h
@@ -286,6 +286,7 @@ static inline int constant_fls(int x)
 
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 
 /*
  * Ext2 is defined to use little-endian byte ordering.
diff --git a/include/asm-avr32/bitops.h b/include/asm-avr32/bitops.h
index 5299f8c8e11d..f3faddfd46a8 100644
--- a/include/asm-avr32/bitops.h
+++ b/include/asm-avr32/bitops.h
@@ -288,6 +288,7 @@ static inline int ffs(unsigned long word)
 #include <asm-generic/bitops/fls64.h>
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 
 #include <asm-generic/bitops/ext2-non-atomic.h>
 #include <asm-generic/bitops/ext2-atomic.h>
diff --git a/include/asm-blackfin/bitops.h b/include/asm-blackfin/bitops.h
index 27c2d0e48e1b..03ecedc1f2a7 100644
--- a/include/asm-blackfin/bitops.h
+++ b/include/asm-blackfin/bitops.h
@@ -199,6 +199,7 @@ static __inline__ int __test_bit(int nr, const void *addr)
 
 #include <asm-generic/bitops/find.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 
 #include <asm-generic/bitops/ext2-atomic.h>
 #include <asm-generic/bitops/ext2-non-atomic.h>
diff --git a/include/asm-blackfin/processor.h b/include/asm-blackfin/processor.h
index 6bb3e0d4705d..c571e958558c 100644
--- a/include/asm-blackfin/processor.h
+++ b/include/asm-blackfin/processor.h
@@ -104,13 +104,13 @@ unsigned long get_wchan(struct task_struct *p);
 #define cpu_relax()     barrier()
 
 /* Get the Silicon Revision of the chip */
-static inline __attribute_pure__ uint32_t bfin_revid(void)
+static inline uint32_t __pure bfin_revid(void)
 {
         /* stored in the upper 4 bits */
         return bfin_read_CHIPID() >> 28;
 }
 
-static inline __attribute_pure__ uint32_t bfin_compiled_revid(void)
+static inline uint32_t __pure bfin_compiled_revid(void)
 {
 #if defined(CONFIG_BF_REV_0_0)
         return 0;
diff --git a/include/asm-cris/bitops.h b/include/asm-cris/bitops.h
index a569065113d9..617151b9b72b 100644
--- a/include/asm-cris/bitops.h
+++ b/include/asm-cris/bitops.h
@@ -154,6 +154,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
 #include <asm-generic/bitops/fls64.h>
 #include <asm-generic/bitops/hweight.h>
 #include <asm-generic/bitops/find.h>
+#include <asm-generic/bitops/lock.h>
 
 #include <asm-generic/bitops/ext2-non-atomic.h>
 
diff --git a/include/asm-frv/bitops.h b/include/asm-frv/bitops.h
index f8560edf59ff..8dba74b1a254 100644
--- a/include/asm-frv/bitops.h
+++ b/include/asm-frv/bitops.h
@@ -302,6 +302,7 @@ int __ilog2_u64(u64 n)
 
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 
 #include <asm-generic/bitops/ext2-non-atomic.h>
 
diff --git a/include/asm-generic/bitops.h b/include/asm-generic/bitops.h
index 1f9d99193df8..e022a0f59e6b 100644
--- a/include/asm-generic/bitops.h
+++ b/include/asm-generic/bitops.h
@@ -22,6 +22,7 @@
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/ffs.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 
 #include <asm-generic/bitops/ext2-non-atomic.h>
 #include <asm-generic/bitops/ext2-atomic.h>
diff --git a/include/asm-generic/bitops/lock.h b/include/asm-generic/bitops/lock.h
new file mode 100644
index 000000000000..308a9e22c802
--- /dev/null
+++ b/include/asm-generic/bitops/lock.h
@@ -0,0 +1,45 @@
+#ifndef _ASM_GENERIC_BITOPS_LOCK_H_
+#define _ASM_GENERIC_BITOPS_LOCK_H_
+
+/**
+ * test_and_set_bit_lock - Set a bit and return its old value, for lock
+ * @nr: Bit to set
+ * @addr: Address to count from
+ *
+ * This operation is atomic and provides acquire barrier semantics.
+ * It can be used to implement bit locks.
+ */
+#define test_and_set_bit_lock(nr, addr) test_and_set_bit(nr, addr)
+
+/**
+ * clear_bit_unlock - Clear a bit in memory, for unlock
+ * @nr: the bit to set
+ * @addr: the address to start counting from
+ *
+ * This operation is atomic and provides release barrier semantics.
+ */
+#define clear_bit_unlock(nr, addr)      \
+do {                                    \
+        smp_mb__before_clear_bit();     \
+        clear_bit(nr, addr);            \
+} while (0)
+
+/**
+ * __clear_bit_unlock - Clear a bit in memory, for unlock
+ * @nr: the bit to set
+ * @addr: the address to start counting from
+ *
+ * This operation is like clear_bit_unlock, however it is not atomic.
+ * It does provide release barrier semantics so it can be used to unlock
+ * a bit lock, however it would only be used if no other CPU can modify
+ * any bits in the memory until the lock is released (a good example is
+ * if the bit lock itself protects access to the other bits in the word).
+ */
+#define __clear_bit_unlock(nr, addr)    \
+do {                                    \
+        smp_mb();                       \
+        __clear_bit(nr, addr);          \
+} while (0)
+
+#endif /* _ASM_GENERIC_BITOPS_LOCK_H_ */
+
diff --git a/include/asm-h8300/bitops.h b/include/asm-h8300/bitops.h
index d76299c98b81..e64ad315656d 100644
--- a/include/asm-h8300/bitops.h
+++ b/include/asm-h8300/bitops.h
@@ -194,6 +194,7 @@ static __inline__ unsigned long __ffs(unsigned long word)
 #include <asm-generic/bitops/find.h>
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 #include <asm-generic/bitops/ext2-non-atomic.h>
 #include <asm-generic/bitops/ext2-atomic.h>
 #include <asm-generic/bitops/minix.h>
diff --git a/include/asm-ia64/bitops.h b/include/asm-ia64/bitops.h
index 6cc517e212a9..2144f1a8ed6f 100644
--- a/include/asm-ia64/bitops.h
+++ b/include/asm-ia64/bitops.h
@@ -94,6 +94,38 @@ clear_bit (int nr, volatile void *addr)
 }
 
 /**
+ * clear_bit_unlock - Clears a bit in memory with release
+ * @nr: Bit to clear
+ * @addr: Address to start counting from
+ *
+ * clear_bit_unlock() is atomic and may not be reordered.  It does
+ * contain a memory barrier suitable for unlock type operations.
+ */
+static __inline__ void
+clear_bit_unlock (int nr, volatile void *addr)
+{
+        __u32 mask, old, new;
+        volatile __u32 *m;
+        CMPXCHG_BUGCHECK_DECL
+
+        m = (volatile __u32 *) addr + (nr >> 5);
+        mask = ~(1 << (nr & 31));
+        do {
+                CMPXCHG_BUGCHECK(m);
+                old = *m;
+                new = old & mask;
+        } while (cmpxchg_rel(m, old, new) != old);
+}
+
+/**
+ * __clear_bit_unlock - Non-atomically clear a bit with release
+ *
+ * This is like clear_bit_unlock, but the implementation may use a non-atomic
+ * store (this one uses an atomic, however).
+ */
+#define __clear_bit_unlock clear_bit_unlock
+
+/**
  * __clear_bit - Clears a bit in memory (non-atomic version)
  */
 static __inline__ void
@@ -170,6 +202,15 @@ test_and_set_bit (int nr, volatile void *addr)
 }
 
 /**
+ * test_and_set_bit_lock - Set a bit and return its old value for lock
+ * @nr: Bit to set
+ * @addr: Address to count from
+ *
+ * This is the same as test_and_set_bit on ia64
+ */
+#define test_and_set_bit_lock test_and_set_bit
+
+/**
  * __test_and_set_bit - Set a bit and return its old value
  * @nr: Bit to set
  * @addr: Address to count from
diff --git a/include/asm-m32r/bitops.h b/include/asm-m32r/bitops.h
index 66ab672162cd..313a02c4a889 100644
--- a/include/asm-m32r/bitops.h
+++ b/include/asm-m32r/bitops.h
@@ -255,6 +255,7 @@ static __inline__ int test_and_change_bit(int nr, volatile void * addr)
 #include <asm-generic/bitops/find.h>
 #include <asm-generic/bitops/ffs.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 
 #endif /* __KERNEL__ */
 
diff --git a/include/asm-m68k/bitops.h b/include/asm-m68k/bitops.h
index 1a61fdb56aaf..da151f70cdc6 100644
--- a/include/asm-m68k/bitops.h
+++ b/include/asm-m68k/bitops.h
@@ -314,6 +314,7 @@ static inline int fls(int x)
 #include <asm-generic/bitops/fls64.h>
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 
 /* Bitmap functions for the minix filesystem */
 
diff --git a/include/asm-m68knommu/bitops.h b/include/asm-m68knommu/bitops.h
index 7d6075d9b5cb..b8b2770d6870 100644
--- a/include/asm-m68knommu/bitops.h
+++ b/include/asm-m68knommu/bitops.h
@@ -160,6 +160,7 @@ static __inline__ int __test_bit(int nr, const volatile unsigned long * addr)
 
 #include <asm-generic/bitops/find.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 
 static __inline__ int ext2_set_bit(int nr, volatile void * addr)
 {
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h
index 899357a72ac4..77ed0c79830b 100644
--- a/include/asm-mips/bitops.h
+++ b/include/asm-mips/bitops.h
@@ -172,6 +172,20 @@ static inline void clear_bit(unsigned long nr, volatile unsigned long *addr)
 }
 
 /*
+ * clear_bit_unlock - Clears a bit in memory
+ * @nr: Bit to clear
+ * @addr: Address to start counting from
+ *
+ * clear_bit() is atomic and implies release semantics before the memory
+ * operation. It can be used for an unlock.
+ */
+static inline void clear_bit_unlock(unsigned long nr, volatile unsigned long *addr)
+{
+        smp_mb__before_clear_bit();
+        clear_bit(nr, addr);
+}
+
+/*
  * change_bit - Toggle a bit in memory
  * @nr: Bit to change
  * @addr: Address to start counting from
@@ -240,6 +254,8 @@ static inline int test_and_set_bit(unsigned long nr,
         unsigned short bit = nr & SZLONG_MASK;
         unsigned long res;
 
+        smp_llsc_mb();
+
         if (cpu_has_llsc && R10000_LLSC_WAR) {
                 unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);
                 unsigned long temp;
@@ -295,6 +311,73 @@ static inline int test_and_set_bit(unsigned long nr,
 }
 
 /*
+ * test_and_set_bit_lock - Set a bit and return its old value
+ * @nr: Bit to set
+ * @addr: Address to count from
+ *
+ * This operation is atomic and implies acquire ordering semantics
+ * after the memory operation.
+ */
+static inline int test_and_set_bit_lock(unsigned long nr,
+        volatile unsigned long *addr)
+{
+        unsigned short bit = nr & SZLONG_MASK;
+        unsigned long res;
+
+        if (cpu_has_llsc && R10000_LLSC_WAR) {
+                unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);
+                unsigned long temp;
+
+                __asm__ __volatile__(
+                "       .set    mips3                                   \n"
+                "1:     " __LL "%0, %1          # test_and_set_bit      \n"
+                "       or      %2, %0, %3                              \n"
+                "       " __SC  "%2, %1                                 \n"
+                "       beqzl   %2, 1b                                  \n"
+                "       and     %2, %0, %3                              \n"
+                "       .set    mips0                                   \n"
+                : "=&r" (temp), "=m" (*m), "=&r" (res)
+                : "r" (1UL << bit), "m" (*m)
+                : "memory");
+        } else if (cpu_has_llsc) {
+                unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);
+                unsigned long temp;
+
+                __asm__ __volatile__(
+                "       .set    push                                    \n"
+                "       .set    noreorder                               \n"
+                "       .set    mips3                                   \n"
+                "1:     " __LL "%0, %1          # test_and_set_bit      \n"
+                "       or      %2, %0, %3                              \n"
+                "       " __SC  "%2, %1                                 \n"
+                "       beqz    %2, 2f                                  \n"
+                "        and    %2, %0, %3                              \n"
+                "       .subsection 2                                   \n"
+                "2:     b       1b                                      \n"
+                "        nop                                            \n"
+                "       .previous                                       \n"
+                "       .set    pop                                     \n"
+                : "=&r" (temp), "=m" (*m), "=&r" (res)
+                : "r" (1UL << bit), "m" (*m)
+                : "memory");
+        } else {
+                volatile unsigned long *a = addr;
+                unsigned long mask;
+                unsigned long flags;
+
+                a += nr >> SZLONG_LOG;
+                mask = 1UL << bit;
+                raw_local_irq_save(flags);
+                res = (mask & *a);
+                *a |= mask;
+                raw_local_irq_restore(flags);
+        }
+
+        smp_llsc_mb();
+
+        return res != 0;
+}
+/*
  * test_and_clear_bit - Clear a bit and return its old value
  * @nr: Bit to clear
  * @addr: Address to count from
@@ -308,6 +391,8 @@ static inline int test_and_clear_bit(unsigned long nr,
         unsigned short bit = nr & SZLONG_MASK;
         unsigned long res;
 
+        smp_llsc_mb();
+
         if (cpu_has_llsc && R10000_LLSC_WAR) {
                 unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);
                 unsigned long temp;
@@ -396,6 +481,8 @@ static inline int test_and_change_bit(unsigned long nr,
         unsigned short bit = nr & SZLONG_MASK;
         unsigned long res;
 
+        smp_llsc_mb();
+
         if (cpu_has_llsc && R10000_LLSC_WAR) {
                 unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);
                 unsigned long temp;
@@ -453,6 +540,21 @@ static inline int test_and_change_bit(unsigned long nr,
 #include <asm-generic/bitops/non-atomic.h>
 
 /*
+ * __clear_bit_unlock - Clears a bit in memory
+ * @nr: Bit to clear
+ * @addr: Address to start counting from
+ *
+ * __clear_bit() is non-atomic and implies release semantics before the memory
+ * operation. It can be used for an unlock if no other CPUs can concurrently
+ * modify other bits in the word.
+ */
+static inline void __clear_bit_unlock(unsigned long nr, volatile unsigned long *addr)
+{
+        smp_mb();
+        __clear_bit(nr, addr);
+}
+
+/*
  * Return the bit position (0..63) of the most significant 1 bit in a word
  * Returns -1 if no 1 bit exists
  */
diff --git a/include/asm-parisc/bitops.h b/include/asm-parisc/bitops.h
index 015cb0d379bd..03ae287baf89 100644
--- a/include/asm-parisc/bitops.h
+++ b/include/asm-parisc/bitops.h
@@ -208,6 +208,7 @@ static __inline__ int fls(int x)
 
 #include <asm-generic/bitops/fls64.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 #include <asm-generic/bitops/sched.h>
 
 #endif /* __KERNEL__ */
diff --git a/include/asm-powerpc/bitops.h b/include/asm-powerpc/bitops.h
index 8144a2788db6..e85c3e078ba2 100644
--- a/include/asm-powerpc/bitops.h
+++ b/include/asm-powerpc/bitops.h
@@ -86,6 +86,24 @@ static __inline__ void clear_bit(int nr, volatile unsigned long *addr)
         : "cc" );
 }
 
+static __inline__ void clear_bit_unlock(int nr, volatile unsigned long *addr)
+{
+        unsigned long old;
+        unsigned long mask = BITOP_MASK(nr);
+        unsigned long *p = ((unsigned long *)addr) + BITOP_WORD(nr);
+
+        __asm__ __volatile__(
+        LWSYNC_ON_SMP
+"1:"    PPC_LLARX "%0,0,%3      # clear_bit_unlock\n"
+        "andc   %0,%0,%2\n"
+        PPC405_ERR77(0,%3)
+        PPC_STLCX "%0,0,%3\n"
+        "bne-   1b"
+        : "=&r" (old), "+m" (*p)
+        : "r" (mask), "r" (p)
+        : "cc", "memory");
+}
+
 static __inline__ void change_bit(int nr, volatile unsigned long *addr)
 {
         unsigned long old;
@@ -125,6 +143,27 @@ static __inline__ int test_and_set_bit(unsigned long nr,
         return (old & mask) != 0;
 }
 
+static __inline__ int test_and_set_bit_lock(unsigned long nr,
+                                       volatile unsigned long *addr)
+{
+        unsigned long old, t;
+        unsigned long mask = BITOP_MASK(nr);
+        unsigned long *p = ((unsigned long *)addr) + BITOP_WORD(nr);
+
+        __asm__ __volatile__(
+"1:"    PPC_LLARX "%0,0,%3              # test_and_set_bit_lock\n"
+        "or     %1,%0,%2 \n"
+        PPC405_ERR77(0,%3)
+        PPC_STLCX "%1,0,%3 \n"
+        "bne-   1b"
+        ISYNC_ON_SMP
+        : "=&r" (old), "=&r" (t)
+        : "r" (mask), "r" (p)
+        : "cc", "memory");
+
+        return (old & mask) != 0;
+}
+
 static __inline__ int test_and_clear_bit(unsigned long nr,
                                          volatile unsigned long *addr)
 {
@@ -185,6 +224,12 @@ static __inline__ void set_bits(unsigned long mask, unsigned long *addr)
 
 #include <asm-generic/bitops/non-atomic.h>
 
+static __inline__ void __clear_bit_unlock(int nr, volatile unsigned long *addr)
+{
+        __asm__ __volatile__(LWSYNC_ON_SMP "" ::: "memory");
+        __clear_bit(nr, addr);
+}
+
 /*
  * Return the zero-based bit position (LE, not IBM bit numbering) of
  * the most significant 1-bit in a double word.
diff --git a/include/asm-powerpc/mpc52xx.h b/include/asm-powerpc/mpc52xx.h
index 24751df791ac..568135fe52ea 100644
--- a/include/asm-powerpc/mpc52xx.h
+++ b/include/asm-powerpc/mpc52xx.h
@@ -18,6 +18,8 @@
 #include <asm/prom.h>
 #endif /* __ASSEMBLY__ */
 
+#include <linux/suspend.h>
+
 
 /* ======================================================================== */
 /* Structures mapping of some unit register set                             */
@@ -267,9 +269,9 @@ extern int mpc52xx_set_wakeup_gpio(u8 pin, u8 level);
 extern int __init lite5200_pm_init(void);
 
 /* lite5200 calls mpc5200 suspend functions, so here they are */
-extern int mpc52xx_pm_prepare(suspend_state_t);
+extern int mpc52xx_pm_prepare(void);
 extern int mpc52xx_pm_enter(suspend_state_t);
-extern int mpc52xx_pm_finish(suspend_state_t);
+extern void mpc52xx_pm_finish(void);
 extern char saved_sram[0x4000]; /* reuse buffer from mpc52xx suspend */
 #endif
 #endif /* CONFIG_PM */
diff --git a/include/asm-powerpc/paca.h b/include/asm-powerpc/paca.h
index fcd7b428ed0b..98c6bd5756b7 100644
--- a/include/asm-powerpc/paca.h
+++ b/include/asm-powerpc/paca.h
@@ -114,6 +114,9 @@ struct paca_struct {
         u64 user_time;                  /* accumulated usermode TB ticks */
         u64 system_time;                /* accumulated system TB ticks */
         u64 startpurr;                  /* PURR/TB value snapshot */
+        u64 startspurr;                 /* SPURR value snapshot */
+        u64 purrdelta;                  /* FIXME: document */
+        u64 spurrdelta;                 /* FIXME: document */
 };
 
 extern struct paca_struct paca[];
diff --git a/include/asm-ppc/time.h b/include/asm-ppc/time.h
index f7eadf6ac806..81dbcd43a501 100644
--- a/include/asm-ppc/time.h
+++ b/include/asm-ppc/time.h
@@ -57,7 +57,7 @@ static __inline__ void set_dec(unsigned int val)
 /* Accessor functions for the timebase (RTC on 601) registers. */
 /* If one day CONFIG_POWER is added just define __USE_RTC as 1 */
 #ifdef CONFIG_6xx
-extern __inline__ int __attribute_pure__ __USE_RTC(void) {
+extern __inline__ int __pure __USE_RTC(void) {
         return (mfspr(SPRN_PVR)>>16) == 1;
 }
 #else
diff --git a/include/asm-s390/bitops.h b/include/asm-s390/bitops.h
index f79c9b792af1..d756b34d25f3 100644
--- a/include/asm-s390/bitops.h
+++ b/include/asm-s390/bitops.h
@@ -746,6 +746,7 @@ static inline int sched_find_first_bit(unsigned long *b)
 #include <asm-generic/bitops/fls64.h>
 
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 
 /*
  * ATTENTION: intel byte ordering convention for ext2 and minix !!
diff --git a/include/asm-sh/bitops.h b/include/asm-sh/bitops.h
index 1c16792cee1d..9d7021723a25 100644
--- a/include/asm-sh/bitops.h
+++ b/include/asm-sh/bitops.h
@@ -137,6 +137,7 @@ static inline unsigned long __ffs(unsigned long word)
 #include <asm-generic/bitops/find.h>
 #include <asm-generic/bitops/ffs.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/ext2-non-atomic.h>
 #include <asm-generic/bitops/ext2-atomic.h>
diff --git a/include/asm-sh64/bitops.h b/include/asm-sh64/bitops.h
index f3bdcdb5d046..444d5ea92ce9 100644
--- a/include/asm-sh64/bitops.h
+++ b/include/asm-sh64/bitops.h
@@ -136,6 +136,7 @@ static __inline__ unsigned long ffz(unsigned long word)
 #include <asm-generic/bitops/__ffs.h>
 #include <asm-generic/bitops/find.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/ffs.h>
 #include <asm-generic/bitops/ext2-non-atomic.h>
diff --git a/include/asm-sparc/bitops.h b/include/asm-sparc/bitops.h
index 329e696e7751..00bd0a679d70 100644
--- a/include/asm-sparc/bitops.h
+++ b/include/asm-sparc/bitops.h
@@ -96,6 +96,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr)
 #include <asm-generic/bitops/fls.h>
 #include <asm-generic/bitops/fls64.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 #include <asm-generic/bitops/find.h>
 #include <asm-generic/bitops/ext2-non-atomic.h>
 #include <asm-generic/bitops/ext2-atomic.h>
diff --git a/include/asm-sparc/ioctls.h b/include/asm-sparc/ioctls.h
index bdf77b0dfd8e..058c2064f706 100644
--- a/include/asm-sparc/ioctls.h
+++ b/include/asm-sparc/ioctls.h
@@ -15,6 +15,10 @@
 #define TCSETS          _IOW('T', 9, struct termios)
 #define TCSETSW         _IOW('T', 10, struct termios)
 #define TCSETSF         _IOW('T', 11, struct termios)
+#define TCGETS2         _IOR('T', 12, struct termios2)
+#define TCSETS2         _IOW('T', 13, struct termios2)
+#define TCSETSW2        _IOW('T', 14, struct termios2)
+#define TCSETSF2        _IOW('T', 15, struct termios2)
 
 /* Note that all the ioctls that are not available in Linux have a 
  * double underscore on the front to: a) avoid some programs to
diff --git a/include/asm-sparc/of_platform.h b/include/asm-sparc/of_platform.h
index 64a230064ef2..d638737ff13c 100644
--- a/include/asm-sparc/of_platform.h
+++ b/include/asm-sparc/of_platform.h
@@ -18,12 +18,9 @@
 
 extern struct bus_type ebus_bus_type;
 extern struct bus_type sbus_bus_type;
-extern struct bus_type of_platform_bus_type;
+
 #define of_bus_type     of_platform_bus_type    /* for compatibility */
 
-extern int of_register_driver(struct of_platform_driver *drv,
-                              struct bus_type *bus);
-extern void of_unregister_driver(struct of_platform_driver *drv);
 extern struct of_device *of_platform_device_create(struct device_node *np,
                                                    const char *bus_id,
                                                    struct device *parent,
diff --git a/include/asm-sparc/termbits.h b/include/asm-sparc/termbits.h
index 5eb00a105d7c..90cf2210118b 100644
--- a/include/asm-sparc/termbits.h
+++ b/include/asm-sparc/termbits.h
@@ -31,6 +31,18 @@ struct termios {
 #endif
 };
 
+struct termios2 {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        cc_t _x_cc[2];                  /* padding to match ktermios */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 struct ktermios {
         tcflag_t c_iflag;               /* input mode flags */
         tcflag_t c_oflag;               /* output mode flags */
@@ -160,6 +172,7 @@ struct ktermios {
 #define CLOCAL    0x00000800
 #define CBAUDEX   0x00001000
 /* We'll never see these speeds with the Zilogs, but for completeness... */
+#define  BOTHER   0x00001000
 #define  B57600   0x00001001
 #define  B115200  0x00001002
 #define  B230400  0x00001003
@@ -189,6 +202,8 @@ struct ktermios {
 #define CMSPAR    0x40000000  /* mark or space (stick) parity */
 #define CRTSCTS   0x80000000  /* flow control */
 
+#define IBSHIFT   16            /* Shift from CBAUD to CIBAUD */
+
 /* c_lflag bits */
 #define ISIG    0x00000001
 #define ICANON  0x00000002
diff --git a/include/asm-sparc/termios.h b/include/asm-sparc/termios.h
index d767f206ab33..4333232abb9f 100644
--- a/include/asm-sparc/termios.h
+++ b/include/asm-sparc/termios.h
@@ -108,13 +108,55 @@ struct winsize {
 
 #define user_termios_to_kernel_termios(k, u) \
 ({ \
+        int err; \
+        err  = get_user((k)->c_iflag, &(u)->c_iflag); \
+        err |= get_user((k)->c_oflag, &(u)->c_oflag); \
+        err |= get_user((k)->c_cflag, &(u)->c_cflag); \
+        err |= get_user((k)->c_lflag, &(u)->c_lflag); \
+        err |= get_user((k)->c_line,  &(u)->c_line); \
+        err |= copy_from_user((k)->c_cc, (u)->c_cc, NCCS); \
+        if ((k)->c_lflag & ICANON) { \
+                err |= get_user((k)->c_cc[VEOF], &(u)->c_cc[VEOF]); \
+                err |= get_user((k)->c_cc[VEOL], &(u)->c_cc[VEOL]); \
+        } else { \
+                err |= get_user((k)->c_cc[VMIN],  &(u)->c_cc[_VMIN]); \
+                err |= get_user((k)->c_cc[VTIME], &(u)->c_cc[_VTIME]); \
+        } \
+        err |= get_user((k)->c_ispeed,  &(u)->c_ispeed); \
+        err |= get_user((k)->c_ospeed,  &(u)->c_ospeed); \
+        err; \
+})
+
+#define kernel_termios_to_user_termios(u, k) \
+({ \
+        int err; \
+        err  = put_user((k)->c_iflag, &(u)->c_iflag); \
+        err |= put_user((k)->c_oflag, &(u)->c_oflag); \
+        err |= put_user((k)->c_cflag, &(u)->c_cflag); \
+        err |= put_user((k)->c_lflag, &(u)->c_lflag); \
+        err |= put_user((k)->c_line, &(u)->c_line); \
+        err |= copy_to_user((u)->c_cc, (k)->c_cc, NCCS); \
+        if (!((k)->c_lflag & ICANON)) { \
+                err |= put_user((k)->c_cc[VMIN],  &(u)->c_cc[_VMIN]); \
+                err |= put_user((k)->c_cc[VTIME], &(u)->c_cc[_VTIME]); \
+        } else { \
+                err |= put_user((k)->c_cc[VEOF], &(u)->c_cc[VEOF]); \
+                err |= put_user((k)->c_cc[VEOL], &(u)->c_cc[VEOL]); \
+        } \
+        err |= put_user((k)->c_ispeed, &(u)->c_ispeed); \
+        err |= put_user((k)->c_ospeed, &(u)->c_ospeed); \
+        err; \
+})
+
+#define user_termios_to_kernel_termios_1(k, u) \
+({ \
         get_user((k)->c_iflag, &(u)->c_iflag); \
         get_user((k)->c_oflag, &(u)->c_oflag); \
         get_user((k)->c_cflag, &(u)->c_cflag); \
         get_user((k)->c_lflag, &(u)->c_lflag); \
         get_user((k)->c_line,  &(u)->c_line); \
         copy_from_user((k)->c_cc, (u)->c_cc, NCCS); \
-        if((k)->c_lflag & ICANON) { \
+        if ((k)->c_lflag & ICANON) { \
                 get_user((k)->c_cc[VEOF], &(u)->c_cc[VEOF]); \
                 get_user((k)->c_cc[VEOL], &(u)->c_cc[VEOL]); \
         } else { \
@@ -124,7 +166,7 @@ struct winsize {
         0; \
 })
 
-#define kernel_termios_to_user_termios(u, k) \
+#define kernel_termios_to_user_termios_1(u, k) \
 ({ \
         put_user((k)->c_iflag, &(u)->c_iflag); \
         put_user((k)->c_oflag, &(u)->c_oflag); \
@@ -132,7 +174,7 @@ struct winsize {
         put_user((k)->c_lflag, &(u)->c_lflag); \
         put_user((k)->c_line, &(u)->c_line); \
         copy_to_user((u)->c_cc, (k)->c_cc, NCCS); \
-        if(!((k)->c_lflag & ICANON)) { \
+        if (!((k)->c_lflag & ICANON)) { \
                 put_user((k)->c_cc[VMIN],  &(u)->c_cc[_VMIN]); \
                 put_user((k)->c_cc[VTIME], &(u)->c_cc[_VTIME]); \
         } else { \
diff --git a/include/asm-sparc64/backoff.h b/include/asm-sparc64/backoff.h
new file mode 100644
index 000000000000..0e32f8b62fd2
--- /dev/null
+++ b/include/asm-sparc64/backoff.h
@@ -0,0 +1,28 @@
+#ifndef _SPARC64_BACKOFF_H
+#define _SPARC64_BACKOFF_H
+
+#define BACKOFF_LIMIT   (4 * 1024)
+
+#ifdef CONFIG_SMP
+
+#define BACKOFF_SETUP(reg)      \
+        mov     1, reg
+
+#define BACKOFF_SPIN(reg, tmp, label)   \
+        mov     reg, tmp; \
+88:     brnz,pt tmp, 88b; \
+         sub    tmp, 1, tmp; \
+        cmp     reg, BACKOFF_LIMIT; \
+        bg,pn   %xcc, label; \
+         nop; \
+        ba,pt   %xcc, label; \
+         sllx   reg, 1, reg;
+
+#else
+
+#define BACKOFF_SETUP(reg)
+#define BACKOFF_SPIN(reg, tmp, label)
+
+#endif
+
+#endif /* _SPARC64_BACKOFF_H */
diff --git a/include/asm-sparc64/bitops.h b/include/asm-sparc64/bitops.h
index 3d5e1af84723..dd4bfe993b61 100644
--- a/include/asm-sparc64/bitops.h
+++ b/include/asm-sparc64/bitops.h
@@ -81,6 +81,7 @@ static inline unsigned int hweight8(unsigned int w)
 #include <asm-generic/bitops/hweight.h>
 
 #endif
+#include <asm-generic/bitops/lock.h>
 #endif /* __KERNEL__ */
 
 #include <asm-generic/bitops/find.h>
diff --git a/include/asm-sparc64/ioctls.h b/include/asm-sparc64/ioctls.h
index 2223b6d0e5ed..083c9a0f37de 100644
--- a/include/asm-sparc64/ioctls.h
+++ b/include/asm-sparc64/ioctls.h
@@ -16,6 +16,10 @@
 #define TCSETS          _IOW('T', 9, struct termios)
 #define TCSETSW         _IOW('T', 10, struct termios)
 #define TCSETSF         _IOW('T', 11, struct termios)
+#define TCGETS2         _IOR('T', 12, struct termios2)
+#define TCSETS2         _IOW('T', 13, struct termios2)
+#define TCSETSW2        _IOW('T', 14, struct termios2)
+#define TCSETSF2        _IOW('T', 15, struct termios2)
 
 /* Note that all the ioctls that are not available in Linux have a 
  * double underscore on the front to: a) avoid some programs to
diff --git a/include/asm-sparc64/of_platform.h b/include/asm-sparc64/of_platform.h
index f7c1f17c7d52..f15cfa723916 100644
--- a/include/asm-sparc64/of_platform.h
+++ b/include/asm-sparc64/of_platform.h
@@ -19,12 +19,9 @@
 extern struct bus_type isa_bus_type;
 extern struct bus_type ebus_bus_type;
 extern struct bus_type sbus_bus_type;
-extern struct bus_type of_platform_bus_type;
+
 #define of_bus_type     of_platform_bus_type    /* for compatibility */
 
-extern int of_register_driver(struct of_platform_driver *drv,
-                              struct bus_type *bus);
-extern void of_unregister_driver(struct of_platform_driver *drv);
 extern struct of_device *of_platform_device_create(struct device_node *np,
                                                    const char *bus_id,
                                                    struct device *parent,
diff --git a/include/asm-sparc64/termbits.h b/include/asm-sparc64/termbits.h
index 705cd44b4173..ebe31c152f16 100644
--- a/include/asm-sparc64/termbits.h
+++ b/include/asm-sparc64/termbits.h
@@ -5,8 +5,6 @@
 
 typedef unsigned char   cc_t;
 typedef unsigned int    speed_t;
-
-/* XXX is this right for sparc64?  it was an unsigned long... XXX */
 typedef unsigned int    tcflag_t;
 
 #define NCC 8
@@ -33,6 +31,18 @@ struct termios {
 #endif
 };
 
+struct termios2 {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        cc_t _x_cc[2];                  /* padding to match ktermios */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 struct ktermios {
         tcflag_t c_iflag;               /* input mode flags */
         tcflag_t c_oflag;               /* output mode flags */
@@ -161,6 +171,7 @@ struct ktermios {
 #define HUPCL     0x00000400
 #define CLOCAL    0x00000800
 #define CBAUDEX   0x00001000
+#define  BOTHER   0x00001000
 #define  B57600   0x00001001
 #define  B115200  0x00001002
 #define  B230400  0x00001003
@@ -190,6 +201,8 @@ struct ktermios {
 #define CMSPAR    0x40000000  /* mark or space (stick) parity */
 #define CRTSCTS   0x80000000  /* flow control */
 
+#define IBSHIFT   16            /* Shift from CBAUD to CIBAUD */
+
 /* c_lflag bits */
 #define ISIG    0x00000001
 #define ICANON  0x00000002
diff --git a/include/asm-sparc64/termios.h b/include/asm-sparc64/termios.h
index f05d390993d5..ef527211f8a8 100644
--- a/include/asm-sparc64/termios.h
+++ b/include/asm-sparc64/termios.h
@@ -123,6 +123,8 @@ struct winsize {
                 err |= get_user((k)->c_cc[VMIN],  &(u)->c_cc[_VMIN]); \
                 err |= get_user((k)->c_cc[VTIME], &(u)->c_cc[_VTIME]); \
         } \
+        err |= get_user((k)->c_ispeed,  &(u)->c_ispeed); \
+        err |= get_user((k)->c_ospeed,  &(u)->c_ospeed); \
         err; \
 })
 
@@ -142,6 +144,46 @@ struct winsize {
                 err |= put_user((k)->c_cc[VEOF], &(u)->c_cc[VEOF]); \
                 err |= put_user((k)->c_cc[VEOL], &(u)->c_cc[VEOL]); \
         } \
+        err |= put_user((k)->c_ispeed, &(u)->c_ispeed); \
+        err |= put_user((k)->c_ospeed, &(u)->c_ospeed); \
+        err; \
+})
+
+#define user_termios_to_kernel_termios_1(k, u) \
+({ \
+        int err; \
+        err  = get_user((k)->c_iflag, &(u)->c_iflag); \
+        err |= get_user((k)->c_oflag, &(u)->c_oflag); \
+        err |= get_user((k)->c_cflag, &(u)->c_cflag); \
+        err |= get_user((k)->c_lflag, &(u)->c_lflag); \
+        err |= get_user((k)->c_line,  &(u)->c_line); \
+        err |= copy_from_user((k)->c_cc, (u)->c_cc, NCCS); \
+        if((k)->c_lflag & ICANON) { \
+                err |= get_user((k)->c_cc[VEOF], &(u)->c_cc[VEOF]); \
+                err |= get_user((k)->c_cc[VEOL], &(u)->c_cc[VEOL]); \
+        } else { \
+                err |= get_user((k)->c_cc[VMIN],  &(u)->c_cc[_VMIN]); \
+                err |= get_user((k)->c_cc[VTIME], &(u)->c_cc[_VTIME]); \
+        } \
+        err; \
+})
+
+#define kernel_termios_to_user_termios_1(u, k) \
+({ \
+        int err; \
+        err  = put_user((k)->c_iflag, &(u)->c_iflag); \
+        err |= put_user((k)->c_oflag, &(u)->c_oflag); \
+        err |= put_user((k)->c_cflag, &(u)->c_cflag); \
+        err |= put_user((k)->c_lflag, &(u)->c_lflag); \
+        err |= put_user((k)->c_line, &(u)->c_line); \
+        err |= copy_to_user((u)->c_cc, (k)->c_cc, NCCS); \
+        if(!((k)->c_lflag & ICANON)) { \
+                err |= put_user((k)->c_cc[VMIN],  &(u)->c_cc[_VMIN]); \
+                err |= put_user((k)->c_cc[VTIME], &(u)->c_cc[_VTIME]); \
+        } else { \
+                err |= put_user((k)->c_cc[VEOF], &(u)->c_cc[VEOF]); \
+                err |= put_user((k)->c_cc[VEOL], &(u)->c_cc[VEOL]); \
+        } \
         err; \
 })
 
diff --git a/include/asm-v850/bitops.h b/include/asm-v850/bitops.h
index 1fa99baf4e25..8eafdb1c08ba 100644
--- a/include/asm-v850/bitops.h
+++ b/include/asm-v850/bitops.h
@@ -145,6 +145,7 @@ static inline int __test_bit (int nr, const void *addr)
 #include <asm-generic/bitops/find.h>
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 
 #include <asm-generic/bitops/ext2-non-atomic.h>
 #define ext2_set_bit_atomic(l,n,a)      test_and_set_bit(n,a)
diff --git a/include/asm-x86/bitops_32.h b/include/asm-x86/bitops_32.h
index a20fe9822f60..c96641f75022 100644
--- a/include/asm-x86/bitops_32.h
+++ b/include/asm-x86/bitops_32.h
@@ -402,6 +402,7 @@ static inline int fls(int x)
 }
 
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 
 #endif /* __KERNEL__ */
 
diff --git a/include/asm-x86/bitops_64.h b/include/asm-x86/bitops_64.h
index 1d7d9b4bcacb..525edf2ce5c2 100644
--- a/include/asm-x86/bitops_64.h
+++ b/include/asm-x86/bitops_64.h
@@ -408,6 +408,7 @@ static __inline__ int fls(int x)
 #define ARCH_HAS_FAST_MULTIPLIER 1
 
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 
 #endif /* __KERNEL__ */
 
diff --git a/include/asm-x86/suspend_64.h b/include/asm-x86/suspend_64.h
index b897e8cb55fb..9440a7a1b99a 100644
--- a/include/asm-x86/suspend_64.h
+++ b/include/asm-x86/suspend_64.h
@@ -53,3 +53,5 @@ extern unsigned long saved_rdi;
 
 /* routines for saving/restoring kernel state */
 extern int acpi_save_state_mem(void);
+extern char core_restore_code;
+extern char restore_registers;
diff --git a/include/asm-xtensa/bitops.h b/include/asm-xtensa/bitops.h
index 1c1e0d933eea..78db04cf6e48 100644
--- a/include/asm-xtensa/bitops.h
+++ b/include/asm-xtensa/bitops.h
@@ -108,6 +108,7 @@ static inline int fls (unsigned int x)
 #endif
 
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/minix.h>
 
diff --git a/include/linux/aio.h b/include/linux/aio.h
index d10e608f232d..7ef8de662001 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -232,18 +232,6 @@ int FASTCALL(io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
                 __put_ioctx(kioctx);                                    \
 } while (0)
 
-#define in_aio() (unlikely(!is_sync_wait(current->io_wait)))
-
-/* may be used for debugging */
-#define warn_if_async()                                                 \
-do {                                                                    \
-        if (in_aio()) {                                                 \
-                printk(KERN_ERR "%s(%s:%d) called in async context!\n", \
-                        __FUNCTION__, __FILE__, __LINE__);              \
-                dump_stack();                                           \
-        }                                                               \
-} while (0)
-
 #define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait)
 
 #include <linux/aio_abi.h>
diff --git a/include/linux/bit_spinlock.h b/include/linux/bit_spinlock.h
index 6b20af0bbb79..7113a32a86ea 100644
--- a/include/linux/bit_spinlock.h
+++ b/include/linux/bit_spinlock.h
@@ -18,7 +18,7 @@ static inline void bit_spin_lock(int bitnum, unsigned long *addr)
          */
         preempt_disable();
 #if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
-        while (test_and_set_bit(bitnum, addr)) {
+        while (unlikely(test_and_set_bit_lock(bitnum, addr))) {
                 while (test_bit(bitnum, addr)) {
                         preempt_enable();
                         cpu_relax();
@@ -36,7 +36,7 @@ static inline int bit_spin_trylock(int bitnum, unsigned long *addr)
 {
         preempt_disable();
 #if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
-        if (test_and_set_bit(bitnum, addr)) {
+        if (unlikely(test_and_set_bit_lock(bitnum, addr))) {
                 preempt_enable();
                 return 0;
         }
@@ -50,10 +50,28 @@ static inline int bit_spin_trylock(int bitnum, unsigned long *addr)
  */
 static inline void bit_spin_unlock(int bitnum, unsigned long *addr)
 {
+#ifdef CONFIG_DEBUG_SPINLOCK
+        BUG_ON(!test_bit(bitnum, addr));
+#endif
 #if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
+        clear_bit_unlock(bitnum, addr);
+#endif
+        preempt_enable();
+        __release(bitlock);
+}
+
+/*
+ *  bit-based spin_unlock()
+ *  non-atomic version, which can be used eg. if the bit lock itself is
+ *  protecting the rest of the flags in the word.
+ */
+static inline void __bit_spin_unlock(int bitnum, unsigned long *addr)
+{
+#ifdef CONFIG_DEBUG_SPINLOCK
         BUG_ON(!test_bit(bitnum, addr));
-        smp_mb__before_clear_bit();
-        clear_bit(bitnum, addr);
+#endif
+#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
+        __clear_bit_unlock(bitnum, addr);
 #endif
         preempt_enable();
         __release(bitlock);
diff --git a/include/linux/capability.h b/include/linux/capability.h
index 8961e7fb755c..7a8d7ade28a0 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -310,10 +310,6 @@ typedef __u32 kernel_cap_t;
 #define CAP_SETFCAP          31
 
 #ifdef __KERNEL__
-/*
- * Bounding set
- */
-extern kernel_cap_t cap_bset;
 
 /*
  * Internal kernel functions only
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 16ea3374dddf..107787aacb64 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -221,10 +221,15 @@ extern void clocksource_resume(void);
 
 #ifdef CONFIG_GENERIC_TIME_VSYSCALL
 extern void update_vsyscall(struct timespec *ts, struct clocksource *c);
+extern void update_vsyscall_tz(void);
 #else
 static inline void update_vsyscall(struct timespec *ts, struct clocksource *c)
 {
 }
+
+static inline void update_vsyscall_tz(void)
+{
+}
 #endif
 
 #endif /* _LINUX_CLOCKSOURCE_H */
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index acd583384bd9..fe23792f05c1 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -36,10 +36,20 @@
 #define __weak                          __attribute__((weak))
 #define __naked                         __attribute__((naked))
 #define __noreturn                      __attribute__((noreturn))
+
+/*
+ * From the GCC manual:
+ *
+ * Many functions have no effects except the return value and their
+ * return value depends only on the parameters and/or global
+ * variables.  Such a function can be subject to common subexpression
+ * elimination and loop optimization just as an arithmetic operator
+ * would be.
+ * [...]
+ */
 #define __pure                          __attribute__((pure))
 #define __aligned(x)                    __attribute__((aligned(x)))
 #define __printf(a,b)                   __attribute__((format(printf,a,b)))
 #define  noinline                       __attribute__((noinline))
-#define __attribute_pure__              __attribute__((pure))
 #define __attribute_const__             __attribute__((__const__))
 #define __maybe_unused                  __attribute__((unused))
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 86f9a3a6137d..c811c8b979ac 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -132,20 +132,6 @@ extern void __chk_io_ptr(const volatile void __iomem *);
 # define __maybe_unused         /* unimplemented */
 #endif
 
-/*
- * From the GCC manual:
- *
- * Many functions have no effects except the return value and their
- * return value depends only on the parameters and/or global
- * variables.  Such a function can be subject to common subexpression
- * elimination and loop optimization just as an arithmetic operator
- * would be.
- * [...]
- */
-#ifndef __attribute_pure__
-# define __attribute_pure__     /* unimplemented */
-#endif
-
 #ifndef noinline
 #define noinline
 #endif
diff --git a/include/linux/console.h b/include/linux/console.h
index 0a4542ddb73d..a5f88a6a259d 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -122,14 +122,11 @@ extern void console_stop(struct console *);
 extern void console_start(struct console *);
 extern int is_console_locked(void);
 
-#ifndef CONFIG_DISABLE_CONSOLE_SUSPEND
+extern int console_suspend_enabled;
+
 /* Suspend and resume console messages over PM events */
 extern void suspend_console(void);
 extern void resume_console(void);
-#else
-static inline void suspend_console(void) {}
-static inline void resume_console(void) {}
-#endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */
 
 int mda_console_init(void);
 void prom_con_init(void);
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 0ad72c4cf312..b79c57569367 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -119,8 +119,9 @@ static inline void cpuhotplug_mutex_unlock(struct mutex *cpu_hp_mutex)
 #define lock_cpu_hotplug()      do { } while (0)
 #define unlock_cpu_hotplug()    do { } while (0)
 #define hotcpu_notifier(fn, pri)        do { (void)(fn); } while (0)
-#define register_hotcpu_notifier(nb)    do { (void)(nb); } while (0)
-#define unregister_hotcpu_notifier(nb)  do { (void)(nb); } while (0)
+/* These aren't inline functions due to a GCC bug. */
+#define register_hotcpu_notifier(nb)    ({ (void)(nb); 0; })
+#define unregister_hotcpu_notifier(nb)  ({ (void)(nb); })
 
 /* CPUs don't go offline once they're online w/o CONFIG_HOTPLUG_CPU */
 static inline int cpu_is_offline(int cpu) { return 0; }
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h
index 72aa00cc4b2d..8f3dcd30828f 100644
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
@@ -512,11 +512,11 @@ struct cyclades_card {
     void __iomem *base_addr;
     void __iomem *ctl_addr;
     int irq;
-    int num_chips;      /* 0 if card absent, -1 if Z/PCI, else Y */
-    int first_line;     /* minor number of first channel on card */
-    int nports;         /* Number of ports in the card */
-    int bus_index;      /* address shift - 0 for ISA, 1 for PCI */
-    int intr_enabled;   /* FW Interrupt flag - 0 disabled, 1 enabled */
+    unsigned int num_chips;     /* 0 if card absent, -1 if Z/PCI, else Y */
+    unsigned int first_line;    /* minor number of first channel on card */
+    unsigned int nports;        /* Number of ports in the card */
+    int bus_index;              /* address shift - 0 for ISA, 1 for PCI */
+    int intr_enabled;           /* FW Interrupt flag - 0 disabled, 1 enabled */
     spinlock_t card_lock;
     struct cyclades_port *ports;
 };
@@ -566,10 +566,9 @@ struct cyclades_port {
         int                     rtsdtr_inv;
         int                     chip_rev;
         int                     custom_divisor;
-        int                     x_char; /* to be pushed out ASAP */
+        u8                      x_char; /* to be pushed out ASAP */
         int                     close_delay;
         unsigned short          closing_wait;
-        unsigned long           event;
         int                     count;  /* # of fd on device */
         int                     breakon;
         int                     breakoff;
@@ -584,7 +583,6 @@ struct cyclades_port {
         struct cyclades_monitor mon;
         struct cyclades_idle_stats      idle_stats;
         struct cyclades_icount  icount;
-        struct work_struct      tqueue;
         wait_queue_head_t       open_wait;
         wait_queue_head_t       close_wait;
         struct completion       shutdown_wait;
@@ -592,19 +590,6 @@ struct cyclades_port {
         int throttle;
 };
 
-/*
- * Events are used to schedule things to happen at timer-interrupt
- * time, instead of at cy interrupt time.
- */
-#define Cy_EVENT_READ_PROCESS           0
-#define Cy_EVENT_WRITE_WAKEUP           1
-#define Cy_EVENT_HANGUP                 2
-#define Cy_EVENT_BREAK                  3
-#define Cy_EVENT_OPEN_WAKEUP            4
-#define Cy_EVENT_SHUTDOWN_WAKEUP        5
-#define Cy_EVENT_DELTA_WAKEUP           6
-#define Cy_EVENT_Z_RX_FULL              7
-
 #define CLOSING_WAIT_DELAY      30*HZ
 #define CY_CLOSING_WAIT_NONE    65535
 #define CY_CLOSING_WAIT_INF     0
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 0ebfafbd338c..101a2d4636be 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -13,16 +13,26 @@ enum dma_data_direction {
         DMA_NONE = 3,
 };
 
-#define DMA_64BIT_MASK  0xffffffffffffffffULL
-#define DMA_48BIT_MASK  0x0000ffffffffffffULL
-#define DMA_40BIT_MASK  0x000000ffffffffffULL
-#define DMA_39BIT_MASK  0x0000007fffffffffULL
-#define DMA_32BIT_MASK  0x00000000ffffffffULL
-#define DMA_31BIT_MASK  0x000000007fffffffULL
-#define DMA_30BIT_MASK  0x000000003fffffffULL
-#define DMA_29BIT_MASK  0x000000001fffffffULL
-#define DMA_28BIT_MASK  0x000000000fffffffULL
-#define DMA_24BIT_MASK  0x0000000000ffffffULL
+#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
+
+/*
+ * NOTE: do not use the below macros in new code and do not add new definitions
+ * here.
+ *
+ * Instead, just open-code DMA_BIT_MASK(n) within your driver
+ */
+#define DMA_64BIT_MASK  DMA_BIT_MASK(64)
+#define DMA_48BIT_MASK  DMA_BIT_MASK(48)
+#define DMA_47BIT_MASK  DMA_BIT_MASK(47)
+#define DMA_40BIT_MASK  DMA_BIT_MASK(40)
+#define DMA_39BIT_MASK  DMA_BIT_MASK(39)
+#define DMA_35BIT_MASK  DMA_BIT_MASK(35)
+#define DMA_32BIT_MASK  DMA_BIT_MASK(32)
+#define DMA_31BIT_MASK  DMA_BIT_MASK(31)
+#define DMA_30BIT_MASK  DMA_BIT_MASK(30)
+#define DMA_29BIT_MASK  DMA_BIT_MASK(29)
+#define DMA_28BIT_MASK  DMA_BIT_MASK(28)
+#define DMA_24BIT_MASK  DMA_BIT_MASK(24)
 
 #define DMA_MASK_NONE   0x0ULL
 
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 589b0b355d84..64134456ed8c 100644
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -72,8 +72,8 @@
  * Macro-instructions used to manage several block sizes
  */
 #define EXT3_MIN_BLOCK_SIZE             1024
-#define EXT3_MAX_BLOCK_SIZE             4096
-#define EXT3_MIN_BLOCK_LOG_SIZE           10
+#define EXT3_MAX_BLOCK_SIZE             65536
+#define EXT3_MIN_BLOCK_LOG_SIZE         10
 #ifdef __KERNEL__
 # define EXT3_BLOCK_SIZE(s)             ((s)->s_blocksize)
 #else
diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h
index cdee7aaa57aa..97dd409d5f4a 100644
--- a/include/linux/ext4_fs.h
+++ b/include/linux/ext4_fs.h
@@ -36,10 +36,6 @@
 /*max window size: 1024(direct blocks) + 3([t,d]indirect blocks) */
 #define EXT4_MAX_RESERVE_BLOCKS         1027
 #define EXT4_RESERVE_WINDOW_NOT_ALLOCATED 0
-/*
- * Always enable hashed directories
- */
-#define CONFIG_EXT4_INDEX
 
 /*
  * Debug code
@@ -105,37 +101,29 @@
 #define EXT4_BLOCK_ALIGN(size, blkbits)         ALIGN((size), (1 << (blkbits)))
 
 /*
- * Macro-instructions used to manage fragments
- */
-#define EXT4_MIN_FRAG_SIZE              1024
-#define EXT4_MAX_FRAG_SIZE              4096
-#define EXT4_MIN_FRAG_LOG_SIZE            10
-#ifdef __KERNEL__
-# define EXT4_FRAG_SIZE(s)              (EXT4_SB(s)->s_frag_size)
-# define EXT4_FRAGS_PER_BLOCK(s)        (EXT4_SB(s)->s_frags_per_block)
-#else
-# define EXT4_FRAG_SIZE(s)              (EXT4_MIN_FRAG_SIZE << (s)->s_log_frag_size)
-# define EXT4_FRAGS_PER_BLOCK(s)        (EXT4_BLOCK_SIZE(s) / EXT4_FRAG_SIZE(s))
-#endif
-
-/*
  * Structure of a blocks group descriptor
  */
 struct ext4_group_desc
 {
-        __le32  bg_block_bitmap;                /* Blocks bitmap block */
-        __le32  bg_inode_bitmap;                /* Inodes bitmap block */
-        __le32  bg_inode_table;         /* Inodes table block */
+        __le32  bg_block_bitmap_lo;     /* Blocks bitmap block */
+        __le32  bg_inode_bitmap_lo;     /* Inodes bitmap block */
+        __le32  bg_inode_table_lo;      /* Inodes table block */
         __le16  bg_free_blocks_count;   /* Free blocks count */
         __le16  bg_free_inodes_count;   /* Free inodes count */
         __le16  bg_used_dirs_count;     /* Directories count */
-        __u16   bg_flags;
-        __u32   bg_reserved[3];
+        __le16  bg_flags;               /* EXT4_BG_flags (INODE_UNINIT, etc) */
+        __u32   bg_reserved[2];         /* Likely block/inode bitmap checksum */
+        __le16  bg_itable_unused;       /* Unused inodes count */
+        __le16  bg_checksum;            /* crc16(sb_uuid+group+desc) */
         __le32  bg_block_bitmap_hi;     /* Blocks bitmap block MSB */
         __le32  bg_inode_bitmap_hi;     /* Inodes bitmap block MSB */
         __le32  bg_inode_table_hi;      /* Inodes table block MSB */
 };
 
+#define EXT4_BG_INODE_UNINIT    0x0001 /* Inode table/bitmap not in use */
+#define EXT4_BG_BLOCK_UNINIT    0x0002 /* Block bitmap not in use */
+#define EXT4_BG_INODE_ZEROED    0x0004 /* On-disk itable initialized to zero */
+
 #ifdef __KERNEL__
 #include <linux/ext4_fs_i.h>
 #include <linux/ext4_fs_sb.h>
@@ -311,27 +299,24 @@ struct ext4_inode {
         __le32  i_generation;   /* File version (for NFS) */
         __le32  i_file_acl;     /* File ACL */
         __le32  i_dir_acl;      /* Directory ACL */
-        __le32  i_faddr;        /* Fragment address */
+        __le32  i_obso_faddr;   /* Obsoleted fragment address */
         union {
                 struct {
-                        __u8    l_i_frag;       /* Fragment number */
-                        __u8    l_i_fsize;      /* Fragment size */
+                        __le16  l_i_reserved1;  /* Obsoleted fragment number/size which are removed in ext4 */
                         __le16  l_i_file_acl_high;
                         __le16  l_i_uid_high;   /* these 2 fields */
                         __le16  l_i_gid_high;   /* were reserved2[0] */
                         __u32   l_i_reserved2;
                 } linux2;
                 struct {
-                        __u8    h_i_frag;       /* Fragment number */
-                        __u8    h_i_fsize;      /* Fragment size */
+                        __le16  h_i_reserved1;  /* Obsoleted fragment number/size which are removed in ext4 */
                         __u16   h_i_mode_high;
                         __u16   h_i_uid_high;
                         __u16   h_i_gid_high;
                         __u32   h_i_author;
                 } hurd2;
                 struct {
-                        __u8    m_i_frag;       /* Fragment number */
-                        __u8    m_i_fsize;      /* Fragment size */
+                        __le16  h_i_reserved1;  /* Obsoleted fragment number/size which are removed in ext4 */
                         __le16  m_i_file_acl_high;
                         __u32   m_i_reserved2[2];
                 } masix2;
@@ -419,8 +404,6 @@ do {									       \
 
 #if defined(__KERNEL__) || defined(__linux__)
 #define i_reserved1     osd1.linux1.l_i_reserved1
-#define i_frag          osd2.linux2.l_i_frag
-#define i_fsize         osd2.linux2.l_i_fsize
 #define i_file_acl_high osd2.linux2.l_i_file_acl_high
 #define i_uid_low       i_uid
 #define i_gid_low       i_gid
@@ -431,8 +414,6 @@ do {									       \
 #elif defined(__GNU__)
 
 #define i_translator    osd1.hurd1.h_i_translator
-#define i_frag          osd2.hurd2.h_i_frag;
-#define i_fsize         osd2.hurd2.h_i_fsize;
 #define i_uid_high      osd2.hurd2.h_i_uid_high
 #define i_gid_high      osd2.hurd2.h_i_gid_high
 #define i_author        osd2.hurd2.h_i_author
@@ -440,8 +421,6 @@ do {									       \
 #elif defined(__masix__)
 
 #define i_reserved1     osd1.masix1.m_i_reserved1
-#define i_frag          osd2.masix2.m_i_frag
-#define i_fsize         osd2.masix2.m_i_fsize
 #define i_file_acl_high osd2.masix2.m_i_file_acl_high
 #define i_reserved2     osd2.masix2.m_i_reserved2
 
@@ -522,15 +501,15 @@ do {									       \
  */
 struct ext4_super_block {
 /*00*/  __le32  s_inodes_count;         /* Inodes count */
-        __le32  s_blocks_count;         /* Blocks count */
-        __le32  s_r_blocks_count;       /* Reserved blocks count */
-        __le32  s_free_blocks_count;    /* Free blocks count */
+        __le32  s_blocks_count_lo;      /* Blocks count */
+        __le32  s_r_blocks_count_lo;    /* Reserved blocks count */
+        __le32  s_free_blocks_count_lo; /* Free blocks count */
 /*10*/  __le32  s_free_inodes_count;    /* Free inodes count */
         __le32  s_first_data_block;     /* First Data Block */
         __le32  s_log_block_size;       /* Block size */
-        __le32  s_log_frag_size;        /* Fragment size */
+        __le32  s_obso_log_frag_size;   /* Obsoleted fragment size */
 /*20*/  __le32  s_blocks_per_group;     /* # Blocks per group */
-        __le32  s_frags_per_group;      /* # Fragments per group */
+        __le32  s_obso_frags_per_group; /* Obsoleted fragments per group */
         __le32  s_inodes_per_group;     /* # Inodes per group */
         __le32  s_mtime;                /* Mount time */
 /*30*/  __le32  s_wtime;                /* Write time */
@@ -595,13 +574,13 @@ struct ext4_super_block {
 /*150*/ __le32  s_blocks_count_hi;      /* Blocks count */
         __le32  s_r_blocks_count_hi;    /* Reserved blocks count */
         __le32  s_free_blocks_count_hi; /* Free blocks count */
-        __u16   s_min_extra_isize;      /* All inodes have at least # bytes */
-        __u16   s_want_extra_isize;     /* New inodes should reserve # bytes */
-        __u32   s_flags;                /* Miscellaneous flags */
-        __u16   s_raid_stride;          /* RAID stride */
-        __u16   s_mmp_interval;         /* # seconds to wait in MMP checking */
-        __u64   s_mmp_block;            /* Block for multi-mount protection */
-        __u32   s_raid_stripe_width;    /* blocks on all data disks (N*stride)*/
+        __le16  s_min_extra_isize;      /* All inodes have at least # bytes */
+        __le16  s_want_extra_isize;     /* New inodes should reserve # bytes */
+        __le32  s_flags;                /* Miscellaneous flags */
+        __le16  s_raid_stride;          /* RAID stride */
+        __le16  s_mmp_interval;         /* # seconds to wait in MMP checking */
+        __le64  s_mmp_block;            /* Block for multi-mount protection */
+        __le32  s_raid_stripe_width;    /* blocks on all data disks (N*stride)*/
         __u32   s_reserved[163];        /* Padding to the end of the block */
 };
 
@@ -692,6 +671,7 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)
 #define EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER     0x0001
 #define EXT4_FEATURE_RO_COMPAT_LARGE_FILE       0x0002
 #define EXT4_FEATURE_RO_COMPAT_BTREE_DIR        0x0004
+#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM         0x0010
 #define EXT4_FEATURE_RO_COMPAT_DIR_NLINK        0x0020
 #define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE      0x0040
 
@@ -702,15 +682,18 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)
 #define EXT4_FEATURE_INCOMPAT_META_BG           0x0010
 #define EXT4_FEATURE_INCOMPAT_EXTENTS           0x0040 /* extents support */
 #define EXT4_FEATURE_INCOMPAT_64BIT             0x0080
+#define EXT4_FEATURE_INCOMPAT_FLEX_BG           0x0200
 
 #define EXT4_FEATURE_COMPAT_SUPP        EXT2_FEATURE_COMPAT_EXT_ATTR
 #define EXT4_FEATURE_INCOMPAT_SUPP      (EXT4_FEATURE_INCOMPAT_FILETYPE| \
                                          EXT4_FEATURE_INCOMPAT_RECOVER| \
                                          EXT4_FEATURE_INCOMPAT_META_BG| \
                                          EXT4_FEATURE_INCOMPAT_EXTENTS| \
-                                         EXT4_FEATURE_INCOMPAT_64BIT)
+                                         EXT4_FEATURE_INCOMPAT_64BIT| \
+                                         EXT4_FEATURE_INCOMPAT_FLEX_BG)
 #define EXT4_FEATURE_RO_COMPAT_SUPP     (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
                                          EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
+                                         EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
                                          EXT4_FEATURE_RO_COMPAT_DIR_NLINK | \
                                          EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE | \
                                          EXT4_FEATURE_RO_COMPAT_BTREE_DIR)
@@ -789,17 +772,11 @@ struct ext4_dir_entry_2 {
  * (c) Daniel Phillips, 2001
  */
 
-#ifdef CONFIG_EXT4_INDEX
-  #define is_dx(dir) (EXT4_HAS_COMPAT_FEATURE(dir->i_sb, \
-                                              EXT4_FEATURE_COMPAT_DIR_INDEX) && \
+#define is_dx(dir) (EXT4_HAS_COMPAT_FEATURE(dir->i_sb, \
+                                      EXT4_FEATURE_COMPAT_DIR_INDEX) && \
                       (EXT4_I(dir)->i_flags & EXT4_INDEX_FL))
 #define EXT4_DIR_LINK_MAX(dir) (!is_dx(dir) && (dir)->i_nlink >= EXT4_LINK_MAX)
 #define EXT4_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2 || (dir)->i_nlink == 1)
-#else
-  #define is_dx(dir) 0
-#define EXT4_DIR_LINK_MAX(dir) ((dir)->i_nlink >= EXT4_LINK_MAX)
-#define EXT4_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2)
-#endif
 
 /* Legal values for the dx_root hash_version field: */
 
@@ -1004,39 +981,39 @@ extern void ext4_inode_table_set(struct super_block *sb,
 static inline ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es)
 {
         return ((ext4_fsblk_t)le32_to_cpu(es->s_blocks_count_hi) << 32) |
-                le32_to_cpu(es->s_blocks_count);
+                le32_to_cpu(es->s_blocks_count_lo);
 }
 
 static inline ext4_fsblk_t ext4_r_blocks_count(struct ext4_super_block *es)
 {
         return ((ext4_fsblk_t)le32_to_cpu(es->s_r_blocks_count_hi) << 32) |
-                le32_to_cpu(es->s_r_blocks_count);
+                le32_to_cpu(es->s_r_blocks_count_lo);
 }
 
 static inline ext4_fsblk_t ext4_free_blocks_count(struct ext4_super_block *es)
 {
         return ((ext4_fsblk_t)le32_to_cpu(es->s_free_blocks_count_hi) << 32) |
-                le32_to_cpu(es->s_free_blocks_count);
+                le32_to_cpu(es->s_free_blocks_count_lo);
 }
 
 static inline void ext4_blocks_count_set(struct ext4_super_block *es,
                                          ext4_fsblk_t blk)
 {
-        es->s_blocks_count = cpu_to_le32((u32)blk);
+        es->s_blocks_count_lo = cpu_to_le32((u32)blk);
         es->s_blocks_count_hi = cpu_to_le32(blk >> 32);
 }
 
 static inline void ext4_free_blocks_count_set(struct ext4_super_block *es,
                                               ext4_fsblk_t blk)
 {
-        es->s_free_blocks_count = cpu_to_le32((u32)blk);
+        es->s_free_blocks_count_lo = cpu_to_le32((u32)blk);
         es->s_free_blocks_count_hi = cpu_to_le32(blk >> 32);
 }
 
 static inline void ext4_r_blocks_count_set(struct ext4_super_block *es,
                                            ext4_fsblk_t blk)
 {
-        es->s_r_blocks_count = cpu_to_le32((u32)blk);
+        es->s_r_blocks_count_lo = cpu_to_le32((u32)blk);
         es->s_r_blocks_count_hi = cpu_to_le32(blk >> 32);
 }
 
diff --git a/include/linux/ext4_fs_extents.h b/include/linux/ext4_fs_extents.h
index 81406f3655d4..d2045a26195d 100644
--- a/include/linux/ext4_fs_extents.h
+++ b/include/linux/ext4_fs_extents.h
@@ -74,7 +74,7 @@ struct ext4_extent {
         __le32  ee_block;       /* first logical block extent covers */
         __le16  ee_len;         /* number of blocks covered by extent */
         __le16  ee_start_hi;    /* high 16 bits of physical block */
-        __le32  ee_start;       /* low 32 bits of physical block */
+        __le32  ee_start_lo;    /* low 32 bits of physical block */
 };
 
 /*
@@ -83,7 +83,7 @@ struct ext4_extent {
  */
 struct ext4_extent_idx {
         __le32  ei_block;       /* index covers logical blocks from 'block' */
-        __le32  ei_leaf;        /* pointer to the physical block of the next *
+        __le32  ei_leaf_lo;     /* pointer to the physical block of the next *
                                  * level. leaf or next index could be there */
         __le16  ei_leaf_hi;     /* high 16 bits of physical block */
         __u16   ei_unused;
diff --git a/include/linux/ext4_fs_i.h b/include/linux/ext4_fs_i.h
index 1a511e9905aa..86ddfe2089f3 100644
--- a/include/linux/ext4_fs_i.h
+++ b/include/linux/ext4_fs_i.h
@@ -78,11 +78,6 @@ struct ext4_ext_cache {
 struct ext4_inode_info {
         __le32  i_data[15];     /* unconverted */
         __u32   i_flags;
-#ifdef EXT4_FRAGMENTS
-        __u32   i_faddr;
-        __u8    i_frag_no;
-        __u8    i_frag_size;
-#endif
         ext4_fsblk_t    i_file_acl;
         __u32   i_dir_acl;
         __u32   i_dtime;
diff --git a/include/linux/ext4_fs_sb.h b/include/linux/ext4_fs_sb.h
index 0a8e47d47c91..b40e827cd495 100644
--- a/include/linux/ext4_fs_sb.h
+++ b/include/linux/ext4_fs_sb.h
@@ -28,11 +28,8 @@
  * third extended-fs super-block data in memory
  */
 struct ext4_sb_info {
-        unsigned long s_frag_size;      /* Size of a fragment in bytes */
         unsigned long s_desc_size;      /* Size of a group descriptor in bytes */
-        unsigned long s_frags_per_block;/* Number of fragments per block */
         unsigned long s_inodes_per_block;/* Number of inodes per block */
-        unsigned long s_frags_per_group;/* Number of fragments in a group */
         unsigned long s_blocks_per_group;/* Number of blocks in a group */
         unsigned long s_inodes_per_group;/* Number of inodes in a group */
         unsigned long s_itb_per_group;  /* Number of inode table blocks per group */
diff --git a/include/linux/ext4_jbd2.h b/include/linux/ext4_jbd2.h
index d716e6392cf6..38c71d3c8dbf 100644
--- a/include/linux/ext4_jbd2.h
+++ b/include/linux/ext4_jbd2.h
@@ -12,8 +12,8 @@
  * Ext4-specific journaling extensions.
  */
 
-#ifndef _LINUX_EXT4_JBD_H
-#define _LINUX_EXT4_JBD_H
+#ifndef _LINUX_EXT4_JBD2_H
+#define _LINUX_EXT4_JBD2_H
 
 #include <linux/fs.h>
 #include <linux/jbd2.h>
@@ -228,4 +228,4 @@ static inline int ext4_should_writeback_data(struct inode *inode)
         return 0;
 }
 
-#endif  /* _LINUX_EXT4_JBD_H */
+#endif  /* _LINUX_EXT4_JBD2_H */
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
index efded00ad08c..08934995c7ab 100644
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@@ -4,6 +4,7 @@
 #define FREEZER_H_INCLUDED
 
 #include <linux/sched.h>
+#include <linux/wait.h>
 
 #ifdef CONFIG_PM_SLEEP
 /*
@@ -126,6 +127,36 @@ static inline void set_freezable(void)
         current->flags &= ~PF_NOFREEZE;
 }
 
+/*
+ * Freezer-friendly wrappers around wait_event_interruptible() and
+ * wait_event_interruptible_timeout(), originally defined in <linux/wait.h>
+ */
+
+#define wait_event_freezable(wq, condition)                             \
+({                                                                      \
+        int __retval;                                                   \
+        do {                                                            \
+                __retval = wait_event_interruptible(wq,                 \
+                                (condition) || freezing(current));      \
+                if (__retval && !freezing(current))                     \
+                        break;                                          \
+                else if (!(condition))                                  \
+                        __retval = -ERESTARTSYS;                        \
+        } while (try_to_freeze());                                      \
+        __retval;                                                       \
+})
+
+
+#define wait_event_freezable_timeout(wq, condition, timeout)            \
+({                                                                      \
+        long __retval = timeout;                                        \
+        do {                                                            \
+                __retval = wait_event_interruptible_timeout(wq,         \
+                                (condition) || freezing(current),       \
+                                __retval);                              \
+        } while (try_to_freeze());                                      \
+        __retval;                                                       \
+})
 #else /* !CONFIG_PM_SLEEP */
 static inline int frozen(struct task_struct *p) { return 0; }
 static inline int freezing(struct task_struct *p) { return 0; }
@@ -143,6 +174,13 @@ static inline void freezer_do_not_count(void) {}
 static inline void freezer_count(void) {}
 static inline int freezer_should_skip(struct task_struct *p) { return 0; }
 static inline void set_freezable(void) {}
+
+#define wait_event_freezable(wq, condition)                             \
+                wait_event_interruptible(wq, condition)
+
+#define wait_event_freezable_timeout(wq, condition, timeout)            \
+                wait_event_interruptible_timeout(wq, condition, timeout)
+
 #endif /* !CONFIG_PM_SLEEP */
 
 #endif  /* FREEZER_H_INCLUDED */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index e3fc5dbb2246..6a4d170ad9a5 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -330,6 +330,7 @@ typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
 #define ATTR_KILL_SGID  4096
 #define ATTR_FILE       8192
 #define ATTR_KILL_PRIV  16384
+#define ATTR_OPEN       32768   /* Truncating from open(O_TRUNC) */
 
 /*
  * This is the Inode Attributes structure, used for notify_change().  It
diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 9fbe9d258e22..d0c437028c80 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -6,7 +6,17 @@
     See the file COPYING.
 */
 
-/* This file defines the kernel interface of FUSE */
+/*
+ * This file defines the kernel interface of FUSE
+ *
+ * Protocol changelog:
+ *
+ * 7.9:
+ *  - new fuse_getattr_in input argument of GETATTR
+ *  - add lk_flags in fuse_lk_in
+ *  - add lock_owner field to fuse_setattr_in, fuse_read_in and fuse_write_in
+ *  - add blksize field to fuse_attr
+ */
 
 #include <asm/types.h>
 #include <linux/major.h>
@@ -15,7 +25,7 @@
 #define FUSE_KERNEL_VERSION 7
 
 /** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 8
+#define FUSE_KERNEL_MINOR_VERSION 9
 
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1
@@ -44,6 +54,8 @@ struct fuse_attr {
         __u32   uid;
         __u32   gid;
         __u32   rdev;
+        __u32   blksize;
+        __u32   padding;
 };
 
 struct fuse_kstatfs {
@@ -76,6 +88,9 @@ struct fuse_file_lock {
 #define FATTR_ATIME     (1 << 4)
 #define FATTR_MTIME     (1 << 5)
 #define FATTR_FH        (1 << 6)
+#define FATTR_ATIME_NOW (1 << 7)
+#define FATTR_MTIME_NOW (1 << 8)
+#define FATTR_LOCKOWNER (1 << 9)
 
 /**
  * Flags returned by the OPEN request
@@ -91,12 +106,38 @@ struct fuse_file_lock {
  */
 #define FUSE_ASYNC_READ         (1 << 0)
 #define FUSE_POSIX_LOCKS        (1 << 1)
+#define FUSE_FILE_OPS           (1 << 2)
+#define FUSE_ATOMIC_O_TRUNC     (1 << 3)
 
 /**
  * Release flags
  */
 #define FUSE_RELEASE_FLUSH      (1 << 0)
 
+/**
+ * Getattr flags
+ */
+#define FUSE_GETATTR_FH         (1 << 0)
+
+/**
+ * Lock flags
+ */
+#define FUSE_LK_FLOCK           (1 << 0)
+
+/**
+ * WRITE flags
+ *
+ * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed
+ * FUSE_WRITE_LOCKOWNER: lock_owner field is valid
+ */
+#define FUSE_WRITE_CACHE        (1 << 0)
+#define FUSE_WRITE_LOCKOWNER    (1 << 1)
+
+/**
+ * Read flags
+ */
+#define FUSE_READ_LOCKOWNER     (1 << 1)
+
 enum fuse_opcode {
         FUSE_LOOKUP        = 1,
         FUSE_FORGET        = 2,  /* no reply */
@@ -139,6 +180,8 @@ enum fuse_opcode {
 /* The read buffer is required to be at least 8k, but may be much larger */
 #define FUSE_MIN_READ_BUFFER 8192
 
+#define FUSE_COMPAT_ENTRY_OUT_SIZE 120
+
 struct fuse_entry_out {
         __u64   nodeid;         /* Inode ID */
         __u64   generation;     /* Inode generation: nodeid:gen must
@@ -154,6 +197,14 @@ struct fuse_forget_in {
         __u64   nlookup;
 };
 
+struct fuse_getattr_in {
+        __u32   getattr_flags;
+        __u32   dummy;
+        __u64   fh;
+};
+
+#define FUSE_COMPAT_ATTR_OUT_SIZE 96
+
 struct fuse_attr_out {
         __u64   attr_valid;     /* Cache timeout for the attributes */
         __u32   attr_valid_nsec;
@@ -184,7 +235,7 @@ struct fuse_setattr_in {
         __u32   padding;
         __u64   fh;
         __u64   size;
-        __u64   unused1;
+        __u64   lock_owner;
         __u64   atime;
         __u64   mtime;
         __u64   unused2;
@@ -227,14 +278,18 @@ struct fuse_read_in {
         __u64   fh;
         __u64   offset;
         __u32   size;
-        __u32   padding;
+        __u32   read_flags;
+        __u64   lock_owner;
 };
 
+#define FUSE_COMPAT_WRITE_IN_SIZE 24
+
 struct fuse_write_in {
         __u64   fh;
         __u64   offset;
         __u32   size;
         __u32   write_flags;
+        __u64   lock_owner;
 };
 
 struct fuse_write_out {
@@ -273,6 +328,8 @@ struct fuse_lk_in {
         __u64   fh;
         __u64   owner;
         struct fuse_file_lock lk;
+        __u32   lk_flags;
+        __u32   padding;
 };
 
 struct fuse_lk_out {
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h
index 7a9db390c56a..c5bd28b69aec 100644
--- a/include/linux/ipmi.h
+++ b/include/linux/ipmi.h
@@ -365,6 +365,16 @@ int ipmi_request_supply_msgs(ipmi_user_t          user,
                              int                  priority);
 
 /*
+ * Poll the IPMI interface for the user.  This causes the IPMI code to
+ * do an immediate check for information from the driver and handle
+ * anything that is immediately pending.  This will not block in any
+ * way.  This is useful if you need to implement polling from the user
+ * for things like modifying the watchdog timeout when a panic occurs
+ * or disabling the watchdog timer on a reboot.
+ */
+void ipmi_poll_interface(ipmi_user_t user);
+
+/*
  * When commands come in to the SMS, the user can register to receive
  * them.  Only one user can be listening on a specific netfn/cmd/chan tuple
  * at a time, you will get an EBUSY error if the command is already
diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h
index c0633108d05d..efa292a52e7e 100644
--- a/include/linux/ipmi_smi.h
+++ b/include/linux/ipmi_smi.h
@@ -148,26 +148,46 @@ struct ipmi_device_id {
 
 /* Take a pointer to a raw data buffer and a length and extract device
    id information from it.  The first byte of data must point to the
-   byte from the get device id response after the completion code.
-   The caller is responsible for making sure the length is at least
-   11 and the command completed without error. */
-static inline void ipmi_demangle_device_id(unsigned char *data,
-                                           unsigned int  data_len,
-                                           struct ipmi_device_id *id)
+   netfn << 2, the data should be of the format:
+      netfn << 2, cmd, completion code, data
+   as normally comes from a device interface. */
+static inline int ipmi_demangle_device_id(const unsigned char *data,
+                                          unsigned int data_len,
+                                          struct ipmi_device_id *id)
 {
+        if (data_len < 9)
+                return -EINVAL;
+        if (data[0] != IPMI_NETFN_APP_RESPONSE << 2 ||
+            data[1] != IPMI_GET_DEVICE_ID_CMD)
+                /* Strange, didn't get the response we expected. */
+                return -EINVAL;
+        if (data[2] != 0)
+                /* That's odd, it shouldn't be able to fail. */
+                return -EINVAL;
+
+        data += 3;
+        data_len -= 3;
         id->device_id = data[0];
         id->device_revision = data[1];
         id->firmware_revision_1 = data[2];
         id->firmware_revision_2 = data[3];
         id->ipmi_version = data[4];
         id->additional_device_support = data[5];
-        id->manufacturer_id = data[6] | (data[7] << 8) | (data[8] << 16);
-        id->product_id = data[9] | (data[10] << 8);
+        if (data_len >= 6) {
+                id->manufacturer_id = (data[6] | (data[7] << 8) |
+                                       (data[8] << 16));
+                id->product_id = data[9] | (data[10] << 8);
+        } else {
+                id->manufacturer_id = 0;
+                id->product_id = 0;
+        }
         if (data_len >= 15) {
                 memcpy(id->aux_firmware_revision, data+11, 4);
                 id->aux_firmware_revision_set = 1;
         } else
                 id->aux_firmware_revision_set = 0;
+
+        return 0;
 }
 
 /* Add a low-level interface to the IPMI driver.  Note that if the
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index 72f522372924..a3abf51e488f 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -72,14 +72,15 @@ extern int journal_enable_debug;
 #define jbd_debug(f, a...)      /**/
 #endif
 
-extern void * __jbd_kmalloc (const char *where, size_t size, gfp_t flags, int retry);
-extern void * jbd_slab_alloc(size_t size, gfp_t flags);
-extern void jbd_slab_free(void *ptr, size_t size);
-
-#define jbd_kmalloc(size, flags) \
-        __jbd_kmalloc(__FUNCTION__, (size), (flags), journal_oom_retry)
-#define jbd_rep_kmalloc(size, flags) \
-        __jbd_kmalloc(__FUNCTION__, (size), (flags), 1)
+static inline void *jbd_alloc(size_t size, gfp_t flags)
+{
+        return (void *)__get_free_pages(flags, get_order(size));
+}
+
+static inline void jbd_free(void *ptr, size_t size)
+{
+        free_pages((unsigned long)ptr, get_order(size));
+};
 
 #define JFS_MIN_JOURNAL_BLOCKS 1024
 
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 260d6d76c5f3..06ef11457051 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -13,8 +13,8 @@
  * filesystem journaling support.
  */
 
-#ifndef _LINUX_JBD_H
-#define _LINUX_JBD_H
+#ifndef _LINUX_JBD2_H
+#define _LINUX_JBD2_H
 
 /* Allow this file to be included directly into e2fsprogs */
 #ifndef __KERNEL__
@@ -37,26 +37,26 @@
 #define journal_oom_retry 1
 
 /*
- * Define JBD_PARANIOD_IOFAIL to cause a kernel BUG() if ext3 finds
+ * Define JBD2_PARANIOD_IOFAIL to cause a kernel BUG() if ext4 finds
  * certain classes of error which can occur due to failed IOs.  Under
- * normal use we want ext3 to continue after such errors, because
+ * normal use we want ext4 to continue after such errors, because
  * hardware _can_ fail, but for debugging purposes when running tests on
  * known-good hardware we may want to trap these errors.
  */
-#undef JBD_PARANOID_IOFAIL
+#undef JBD2_PARANOID_IOFAIL
 
 /*
  * The default maximum commit age, in seconds.
  */
-#define JBD_DEFAULT_MAX_COMMIT_AGE 5
+#define JBD2_DEFAULT_MAX_COMMIT_AGE 5
 
 #ifdef CONFIG_JBD2_DEBUG
 /*
- * Define JBD_EXPENSIVE_CHECKING to enable more expensive internal
+ * Define JBD2_EXPENSIVE_CHECKING to enable more expensive internal
  * consistency checks.  By default we don't do this unless
  * CONFIG_JBD2_DEBUG is on.
  */
-#define JBD_EXPENSIVE_CHECKING
+#define JBD2_EXPENSIVE_CHECKING
 extern u8 jbd2_journal_enable_debug;
 
 #define jbd_debug(n, f, a...)                                           \
@@ -71,14 +71,15 @@ extern u8 jbd2_journal_enable_debug;
 #define jbd_debug(f, a...)      /**/
 #endif
 
-extern void * __jbd2_kmalloc (const char *where, size_t size, gfp_t flags, int retry);
-extern void * jbd2_slab_alloc(size_t size, gfp_t flags);
-extern void jbd2_slab_free(void *ptr, size_t size);
+static inline void *jbd2_alloc(size_t size, gfp_t flags)
+{
+        return (void *)__get_free_pages(flags, get_order(size));
+}
 
-#define jbd_kmalloc(size, flags) \
-        __jbd2_kmalloc(__FUNCTION__, (size), (flags), journal_oom_retry)
-#define jbd_rep_kmalloc(size, flags) \
-        __jbd2_kmalloc(__FUNCTION__, (size), (flags), 1)
+static inline void jbd2_free(void *ptr, size_t size)
+{
+        free_pages((unsigned long)ptr, get_order(size));
+};
 
 #define JBD2_MIN_JOURNAL_BLOCKS 1024
 
@@ -162,8 +163,8 @@ typedef struct journal_block_tag_s
         __be32          t_blocknr_high; /* most-significant high 32bits. */
 } journal_block_tag_t;
 
-#define JBD_TAG_SIZE32 (offsetof(journal_block_tag_t, t_blocknr_high))
-#define JBD_TAG_SIZE64 (sizeof(journal_block_tag_t))
+#define JBD2_TAG_SIZE32 (offsetof(journal_block_tag_t, t_blocknr_high))
+#define JBD2_TAG_SIZE64 (sizeof(journal_block_tag_t))
 
 /*
  * The revoke descriptor: used on disk to describe a series of blocks to
@@ -255,8 +256,8 @@ typedef struct journal_superblock_s
 #include <linux/fs.h>
 #include <linux/sched.h>
 
-#define JBD_ASSERTIONS
-#ifdef JBD_ASSERTIONS
+#define JBD2_ASSERTIONS
+#ifdef JBD2_ASSERTIONS
 #define J_ASSERT(assert)                                                \
 do {                                                                    \
         if (!(assert)) {                                                \
@@ -283,9 +284,9 @@ void buffer_assertion_failure(struct buffer_head *bh);
 
 #else
 #define J_ASSERT(assert)        do { } while (0)
-#endif          /* JBD_ASSERTIONS */
+#endif          /* JBD2_ASSERTIONS */
 
-#if defined(JBD_PARANOID_IOFAIL)
+#if defined(JBD2_PARANOID_IOFAIL)
 #define J_EXPECT(expr, why...)          J_ASSERT(expr)
 #define J_EXPECT_BH(bh, expr, why...)   J_ASSERT_BH(bh, expr)
 #define J_EXPECT_JH(jh, expr, why...)   J_ASSERT_JH(jh, expr)
@@ -959,12 +960,12 @@ void jbd2_journal_put_journal_head(struct journal_head *jh);
  */
 extern struct kmem_cache *jbd2_handle_cache;
 
-static inline handle_t *jbd_alloc_handle(gfp_t gfp_flags)
+static inline handle_t *jbd2_alloc_handle(gfp_t gfp_flags)
 {
         return kmem_cache_alloc(jbd2_handle_cache, gfp_flags);
 }
 
-static inline void jbd_free_handle(handle_t *handle)
+static inline void jbd2_free_handle(handle_t *handle)
 {
         kmem_cache_free(jbd2_handle_cache, handle);
 }
@@ -1103,4 +1104,4 @@ extern int jbd_blocks_per_page(struct inode *inode);
 
 #endif  /* __KERNEL__ */
 
-#endif  /* _LINUX_JBD_H */
+#endif  /* _LINUX_JBD2_H */
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index 12bf44f083f5..e8ffce898bf9 100644
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -53,7 +53,9 @@ static inline int kstat_irqs(int irq)
 }
 
 extern void account_user_time(struct task_struct *, cputime_t);
+extern void account_user_time_scaled(struct task_struct *, cputime_t);
 extern void account_system_time(struct task_struct *, int, cputime_t);
+extern void account_system_time_scaled(struct task_struct *, cputime_t);
 extern void account_steal_time(struct task_struct *, cputime_t);
 
 #endif /* _LINUX_KERNEL_STAT_H */
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 448f70b30a0c..a8efcfeea732 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -48,6 +48,10 @@ struct of_platform_driver
 #define to_of_platform_driver(drv) \
         container_of(drv,struct of_platform_driver, driver)
 
+extern int of_register_driver(struct of_platform_driver *drv,
+                              struct bus_type *bus);
+extern void of_unregister_driver(struct of_platform_driver *drv);
+
 #include <asm/of_platform.h>
 
 extern struct of_device *of_find_device_by_node(struct device_node *np);
diff --git a/include/linux/parport.h b/include/linux/parport.h
index 9cdd6943e01b..ec3f76598327 100644
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -510,7 +510,6 @@ extern struct pardevice *parport_open (int devnum, const char *name,
                                        int flags, void *handle);
 extern void parport_close (struct pardevice *dev);
 extern ssize_t parport_device_id (int devnum, char *buffer, size_t len);
-extern int parport_device_num (int parport, int mux, int daisy);
 extern void parport_daisy_deselect_all (struct parport *port);
 extern int parport_daisy_select (struct parport *port, int daisy, int mode);
 
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 48b71badfb4c..09a309b7b5d2 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -104,104 +104,6 @@ extern void (*pm_idle)(void);
 extern void (*pm_power_off)(void);
 extern void (*pm_power_off_prepare)(void);
 
-typedef int __bitwise suspend_state_t;
-
-#define PM_SUSPEND_ON           ((__force suspend_state_t) 0)
-#define PM_SUSPEND_STANDBY      ((__force suspend_state_t) 1)
-#define PM_SUSPEND_MEM          ((__force suspend_state_t) 3)
-#define PM_SUSPEND_MAX          ((__force suspend_state_t) 4)
-
-/**
- * struct pm_ops - Callbacks for managing platform dependent system sleep
- *      states.
- *
- * @valid: Callback to determine if given system sleep state is supported by
- *      the platform.
- *      Valid (ie. supported) states are advertised in /sys/power/state.  Note
- *      that it still may be impossible to enter given system sleep state if the
- *      conditions aren't right.
- *      There is the %pm_valid_only_mem function available that can be assigned
- *      to this if the platform only supports mem sleep.
- *
- * @set_target: Tell the platform which system sleep state is going to be
- *      entered.
- *      @set_target() is executed right prior to suspending devices.  The
- *      information conveyed to the platform code by @set_target() should be
- *      disregarded by the platform as soon as @finish() is executed and if
- *      @prepare() fails.  If @set_target() fails (ie. returns nonzero),
- *      @prepare(), @enter() and @finish() will not be called by the PM core.
- *      This callback is optional.  However, if it is implemented, the argument
- *      passed to @prepare(), @enter() and @finish() is meaningless and should
- *      be ignored.
- *
- * @prepare: Prepare the platform for entering the system sleep state indicated
- *      by @set_target() or represented by the argument if @set_target() is not
- *      implemented.
- *      @prepare() is called right after devices have been suspended (ie. the
- *      appropriate .suspend() method has been executed for each device) and
- *      before the nonboot CPUs are disabled (it is executed with IRQs enabled).
- *      This callback is optional.  It returns 0 on success or a negative
- *      error code otherwise, in which case the system cannot enter the desired
- *      sleep state (@enter() and @finish() will not be called in that case).
- *
- * @enter: Enter the system sleep state indicated by @set_target() or
- *      represented by the argument if @set_target() is not implemented.
- *      This callback is mandatory.  It returns 0 on success or a negative
- *      error code otherwise, in which case the system cannot enter the desired
- *      sleep state.
- *
- * @finish: Called when the system has just left a sleep state, right after
- *      the nonboot CPUs have been enabled and before devices are resumed (it is
- *      executed with IRQs enabled).  If @set_target() is not implemented, the
- *      argument represents the sleep state being left.
- *      This callback is optional, but should be implemented by the platforms
- *      that implement @prepare().  If implemented, it is always called after
- *      @enter() (even if @enter() fails).
- */
-struct pm_ops {
-        int (*valid)(suspend_state_t state);
-        int (*set_target)(suspend_state_t state);
-        int (*prepare)(suspend_state_t state);
-        int (*enter)(suspend_state_t state);
-        int (*finish)(suspend_state_t state);
-};
-
-#ifdef CONFIG_SUSPEND
-extern struct pm_ops *pm_ops;
-
-/**
- * pm_set_ops - set platform dependent power management ops
- * @pm_ops: The new power management operations to set.
- */
-extern void pm_set_ops(struct pm_ops *pm_ops);
-extern int pm_valid_only_mem(suspend_state_t state);
-
-/**
- * arch_suspend_disable_irqs - disable IRQs for suspend
- *
- * Disables IRQs (in the default case). This is a weak symbol in the common
- * code and thus allows architectures to override it if more needs to be
- * done. Not called for suspend to disk.
- */
-extern void arch_suspend_disable_irqs(void);
-
-/**
- * arch_suspend_enable_irqs - enable IRQs after suspend
- *
- * Enables IRQs (in the default case). This is a weak symbol in the common
- * code and thus allows architectures to override it if more needs to be
- * done. Not called for suspend to disk.
- */
-extern void arch_suspend_enable_irqs(void);
-
-extern int pm_suspend(suspend_state_t state);
-#else /* !CONFIG_SUSPEND */
-#define suspend_valid_only_mem  NULL
-
-static inline void pm_set_ops(struct pm_ops *pm_ops) {}
-static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
-#endif /* !CONFIG_SUSPEND */
-
 /*
  * Device power management
  */
diff --git a/include/linux/poison.h b/include/linux/poison.h
index d93c300a3449..a9c31be7052c 100644
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -36,7 +36,8 @@
  */
 
 /********** fs/jbd/journal.c **********/
-#define JBD_POISON_FREE 0x5b
+#define JBD_POISON_FREE         0x5b
+#define JBD2_POISON_FREE        0x5c
 
 /********** drivers/base/dmapool.c **********/
 #define POOL_POISON_FREED       0xa7    /* !inuse */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index c204ab0d4df1..7accc04e23ab 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -991,7 +991,7 @@ struct task_struct {
         int __user *clear_child_tid;            /* CLONE_CHILD_CLEARTID */
 
         unsigned int rt_priority;
-        cputime_t utime, stime;
+        cputime_t utime, stime, utimescaled, stimescaled;
         cputime_t gtime;
         unsigned long nvcsw, nivcsw; /* context switch counts */
         struct timespec start_time;             /* monotonic time */
@@ -1110,13 +1110,6 @@ struct task_struct {
 
         unsigned long ptrace_message;
         siginfo_t *last_siginfo; /* For ptrace use.  */
-/*
- * current io wait handle: wait queue entry to use for io waits
- * If this thread is processing aio, this points at the waitqueue
- * inside the currently handled kiocb. It may be NULL (i.e. default
- * to a stack based synchronous wait) if its doing sync IO.
- */
-        wait_queue_t *io_wait;
 #ifdef CONFIG_TASK_XACCT
 /* i/o counters(bytes read/written, #syscalls */
         u64 rchar, wchar, syscr, syscw;
diff --git a/include/linux/security.h b/include/linux/security.h
index 9b0b63c50f44..ff3f857f6957 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -34,6 +34,13 @@
 #include <linux/xfrm.h>
 #include <net/flow.h>
 
+/*
+ * Bounding set
+ */
+extern kernel_cap_t cap_bset;
+
+extern unsigned securebits;
+
 struct ctl_table;
 
 /*
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 388cace9751f..4360e0816956 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -1,5 +1,5 @@
-#ifndef _LINUX_SWSUSP_H
-#define _LINUX_SWSUSP_H
+#ifndef _LINUX_SUSPEND_H
+#define _LINUX_SUSPEND_H
 
 #if defined(CONFIG_X86) || defined(CONFIG_FRV) || defined(CONFIG_PPC32) || defined(CONFIG_PPC64)
 #include <asm/suspend.h>
@@ -9,6 +9,108 @@
 #include <linux/init.h>
 #include <linux/pm.h>
 #include <linux/mm.h>
+#include <asm/errno.h>
+
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)
+extern int pm_prepare_console(void);
+extern void pm_restore_console(void);
+#else
+static inline int pm_prepare_console(void) { return 0; }
+static inline void pm_restore_console(void) {}
+#endif
+
+typedef int __bitwise suspend_state_t;
+
+#define PM_SUSPEND_ON           ((__force suspend_state_t) 0)
+#define PM_SUSPEND_STANDBY      ((__force suspend_state_t) 1)
+#define PM_SUSPEND_MEM          ((__force suspend_state_t) 3)
+#define PM_SUSPEND_MAX          ((__force suspend_state_t) 4)
+
+/**
+ * struct platform_suspend_ops - Callbacks for managing platform dependent
+ *      system sleep states.
+ *
+ * @valid: Callback to determine if given system sleep state is supported by
+ *      the platform.
+ *      Valid (ie. supported) states are advertised in /sys/power/state.  Note
+ *      that it still may be impossible to enter given system sleep state if the
+ *      conditions aren't right.
+ *      There is the %suspend_valid_only_mem function available that can be
+ *      assigned to this if the platform only supports mem sleep.
+ *
+ * @set_target: Tell the platform which system sleep state is going to be
+ *      entered.
+ *      @set_target() is executed right prior to suspending devices.  The
+ *      information conveyed to the platform code by @set_target() should be
+ *      disregarded by the platform as soon as @finish() is executed and if
+ *      @prepare() fails.  If @set_target() fails (ie. returns nonzero),
+ *      @prepare(), @enter() and @finish() will not be called by the PM core.
+ *      This callback is optional.  However, if it is implemented, the argument
+ *      passed to @enter() is meaningless and should be ignored.
+ *
+ * @prepare: Prepare the platform for entering the system sleep state indicated
+ *      by @set_target().
+ *      @prepare() is called right after devices have been suspended (ie. the
+ *      appropriate .suspend() method has been executed for each device) and
+ *      before the nonboot CPUs are disabled (it is executed with IRQs enabled).
+ *      This callback is optional.  It returns 0 on success or a negative
+ *      error code otherwise, in which case the system cannot enter the desired
+ *      sleep state (@enter() and @finish() will not be called in that case).
+ *
+ * @enter: Enter the system sleep state indicated by @set_target() or
+ *      represented by the argument if @set_target() is not implemented.
+ *      This callback is mandatory.  It returns 0 on success or a negative
+ *      error code otherwise, in which case the system cannot enter the desired
+ *      sleep state.
+ *
+ * @finish: Called when the system has just left a sleep state, right after
+ *      the nonboot CPUs have been enabled and before devices are resumed (it is
+ *      executed with IRQs enabled).
+ *      This callback is optional, but should be implemented by the platforms
+ *      that implement @prepare().  If implemented, it is always called after
+ *      @enter() (even if @enter() fails).
+ */
+struct platform_suspend_ops {
+        int (*valid)(suspend_state_t state);
+        int (*set_target)(suspend_state_t state);
+        int (*prepare)(void);
+        int (*enter)(suspend_state_t state);
+        void (*finish)(void);
+};
+
+#ifdef CONFIG_SUSPEND
+/**
+ * suspend_set_ops - set platform dependent suspend operations
+ * @ops: The new suspend operations to set.
+ */
+extern void suspend_set_ops(struct platform_suspend_ops *ops);
+extern int suspend_valid_only_mem(suspend_state_t state);
+
+/**
+ * arch_suspend_disable_irqs - disable IRQs for suspend
+ *
+ * Disables IRQs (in the default case). This is a weak symbol in the common
+ * code and thus allows architectures to override it if more needs to be
+ * done. Not called for suspend to disk.
+ */
+extern void arch_suspend_disable_irqs(void);
+
+/**
+ * arch_suspend_enable_irqs - enable IRQs after suspend
+ *
+ * Enables IRQs (in the default case). This is a weak symbol in the common
+ * code and thus allows architectures to override it if more needs to be
+ * done. Not called for suspend to disk.
+ */
+extern void arch_suspend_enable_irqs(void);
+
+extern int pm_suspend(suspend_state_t state);
+#else /* !CONFIG_SUSPEND */
+#define suspend_valid_only_mem  NULL
+
+static inline void suspend_set_ops(struct platform_suspend_ops *ops) {}
+static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
+#endif /* !CONFIG_SUSPEND */
 
 /* struct pbe is used for creating lists of pages that should be restored
  * atomically during the resume from disk, because the page frames they have
@@ -24,32 +126,57 @@ struct pbe {
 extern void drain_local_pages(void);
 extern void mark_free_pages(struct zone *zone);
 
-#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)
-extern int pm_prepare_console(void);
-extern void pm_restore_console(void);
-#else
-static inline int pm_prepare_console(void) { return 0; }
-static inline void pm_restore_console(void) {}
-#endif
-
 /**
- * struct hibernation_ops - hibernation platform support
+ * struct platform_hibernation_ops - hibernation platform support
  *
  * The methods in this structure allow a platform to override the default
  * mechanism of shutting down the machine during a hibernation transition.
  *
  * All three methods must be assigned.
  *
- * @prepare: prepare system for hibernation
- * @enter: shut down system after state has been saved to disk
- * @finish: finish/clean up after state has been reloaded
- * @pre_restore: prepare system for the restoration from a hibernation image
- * @restore_cleanup: clean up after a failing image restoration
+ * @start: Tell the platform driver that we're starting hibernation.
+ *      Called right after shrinking memory and before freezing devices.
+ *
+ * @pre_snapshot: Prepare the platform for creating the hibernation image.
+ *      Called right after devices have been frozen and before the nonboot
+ *      CPUs are disabled (runs with IRQs on).
+ *
+ * @finish: Restore the previous state of the platform after the hibernation
+ *      image has been created *or* put the platform into the normal operation
+ *      mode after the hibernation (the same method is executed in both cases).
+ *      Called right after the nonboot CPUs have been enabled and before
+ *      thawing devices (runs with IRQs on).
+ *
+ * @prepare: Prepare the platform for entering the low power state.
+ *      Called right after the hibernation image has been saved and before
+ *      devices are prepared for entering the low power state.
+ *
+ * @enter: Put the system into the low power state after the hibernation image
+ *      has been saved to disk.
+ *      Called after the nonboot CPUs have been disabled and all of the low
+ *      level devices have been shut down (runs with IRQs off).
+ *
+ * @leave: Perform the first stage of the cleanup after the system sleep state
+ *      indicated by @set_target() has been left.
+ *      Called right after the control has been passed from the boot kernel to
+ *      the image kernel, before the nonboot CPUs are enabled and before devices
+ *      are resumed.  Executed with interrupts disabled.
+ *
+ * @pre_restore: Prepare system for the restoration from a hibernation image.
+ *      Called right after devices have been frozen and before the nonboot
+ *      CPUs are disabled (runs with IRQs on).
+ *
+ * @restore_cleanup: Clean up after a failing image restoration.
+ *      Called right after the nonboot CPUs have been enabled and before
+ *      thawing devices (runs with IRQs on).
  */
-struct hibernation_ops {
+struct platform_hibernation_ops {
+        int (*start)(void);
+        int (*pre_snapshot)(void);
+        void (*finish)(void);
         int (*prepare)(void);
         int (*enter)(void);
-        void (*finish)(void);
+        void (*leave)(void);
         int (*pre_restore)(void);
         void (*restore_cleanup)(void);
 };
@@ -70,14 +197,14 @@ extern void swsusp_set_page_free(struct page *);
 extern void swsusp_unset_page_free(struct page *);
 extern unsigned long get_safe_page(gfp_t gfp_mask);
 
-extern void hibernation_set_ops(struct hibernation_ops *ops);
+extern void hibernation_set_ops(struct platform_hibernation_ops *ops);
 extern int hibernate(void);
 #else /* CONFIG_HIBERNATION */
 static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
 static inline void swsusp_set_page_free(struct page *p) {}
 static inline void swsusp_unset_page_free(struct page *p) {}
 
-static inline void hibernation_set_ops(struct hibernation_ops *ops) {}
+static inline void hibernation_set_ops(struct platform_hibernation_ops *ops) {}
 static inline int hibernate(void) { return -ENOSYS; }
 #endif /* CONFIG_HIBERNATION */
 
@@ -130,4 +257,4 @@ static inline void register_nosave_region_late(unsigned long b, unsigned long e)
 }
 #endif
 
-#endif /* _LINUX_SWSUSP_H */
+#endif /* _LINUX_SUSPEND_H */
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 483050c924c3..e99171f01b4c 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -238,6 +238,7 @@ enum
         NET_LLC=18,
         NET_NETFILTER=19,
         NET_DCCP=20,
+        NET_IRDA=412,
 };
 
 /* /proc/sys/kernel/random */
@@ -795,6 +796,25 @@ enum {
         NET_BRIDGE_NF_FILTER_PPPOE_TAGGED = 5,
 };
 
+/* proc/sys/net/irda */
+enum {
+        NET_IRDA_DISCOVERY=1,
+        NET_IRDA_DEVNAME=2,
+        NET_IRDA_DEBUG=3,
+        NET_IRDA_FAST_POLL=4,
+        NET_IRDA_DISCOVERY_SLOTS=5,
+        NET_IRDA_DISCOVERY_TIMEOUT=6,
+        NET_IRDA_SLOT_TIMEOUT=7,
+        NET_IRDA_MAX_BAUD_RATE=8,
+        NET_IRDA_MIN_TX_TURN_TIME=9,
+        NET_IRDA_MAX_TX_DATA_SIZE=10,
+        NET_IRDA_MAX_TX_WINDOW=11,
+        NET_IRDA_MAX_NOREPLY_TIME=12,
+        NET_IRDA_WARN_NOREPLY_TIME=13,
+        NET_IRDA_LAP_KEEPALIVE_TIME=14,
+};
+
+
 /* CTL_FS names: */
 enum
 {
@@ -937,41 +957,42 @@ extern int sysctl_perm(struct ctl_table *table, int op);
 
 typedef struct ctl_table ctl_table;
 
-typedef int ctl_handler (ctl_table *table, int __user *name, int nlen,
+typedef int ctl_handler (struct ctl_table *table, int __user *name, int nlen,
                          void __user *oldval, size_t __user *oldlenp,
                          void __user *newval, size_t newlen);
 
-typedef int proc_handler (ctl_table *ctl, int write, struct file * filp,
+typedef int proc_handler (struct ctl_table *ctl, int write, struct file * filp,
                           void __user *buffer, size_t *lenp, loff_t *ppos);
 
-extern int proc_dostring(ctl_table *, int, struct file *,
+extern int proc_dostring(struct ctl_table *, int, struct file *,
                          void __user *, size_t *, loff_t *);
-extern int proc_dointvec(ctl_table *, int, struct file *,
+extern int proc_dointvec(struct ctl_table *, int, struct file *,
                          void __user *, size_t *, loff_t *);
-extern int proc_dointvec_bset(ctl_table *, int, struct file *,
+extern int proc_dointvec_bset(struct ctl_table *, int, struct file *,
                               void __user *, size_t *, loff_t *);
-extern int proc_dointvec_minmax(ctl_table *, int, struct file *,
+extern int proc_dointvec_minmax(struct ctl_table *, int, struct file *,
                                 void __user *, size_t *, loff_t *);
-extern int proc_dointvec_jiffies(ctl_table *, int, struct file *,
+extern int proc_dointvec_jiffies(struct ctl_table *, int, struct file *,
                                  void __user *, size_t *, loff_t *);
-extern int proc_dointvec_userhz_jiffies(ctl_table *, int, struct file *,
+extern int proc_dointvec_userhz_jiffies(struct ctl_table *, int, struct file *,
                                         void __user *, size_t *, loff_t *);
-extern int proc_dointvec_ms_jiffies(ctl_table *, int, struct file *,
+extern int proc_dointvec_ms_jiffies(struct ctl_table *, int, struct file *,
                                     void __user *, size_t *, loff_t *);
-extern int proc_doulongvec_minmax(ctl_table *, int, struct file *,
+extern int proc_doulongvec_minmax(struct ctl_table *, int, struct file *,
                                   void __user *, size_t *, loff_t *);
-extern int proc_doulongvec_ms_jiffies_minmax(ctl_table *table, int,
+extern int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int,
                                       struct file *, void __user *, size_t *, loff_t *);
 
 extern int do_sysctl (int __user *name, int nlen,
                       void __user *oldval, size_t __user *oldlenp,
                       void __user *newval, size_t newlen);
 
-extern int do_sysctl_strategy (ctl_table *table, 
+extern int do_sysctl_strategy (struct ctl_table *table,
                                int __user *name, int nlen,
                                void __user *oldval, size_t __user *oldlenp,
                                void __user *newval, size_t newlen);
 
+extern ctl_handler sysctl_data;
 extern ctl_handler sysctl_string;
 extern ctl_handler sysctl_intvec;
 extern ctl_handler sysctl_jiffies;
@@ -980,7 +1001,7 @@ extern ctl_handler sysctl_ms_jiffies;
 
 /*
  * Register a set of sysctl names by calling register_sysctl_table
- * with an initialised array of ctl_table's.  An entry with zero
+ * with an initialised array of struct ctl_table's.  An entry with zero
  * ctl_name and NULL procname terminates the table.  table->de will be
  * set up by the registration and need not be initialised in advance.
  *
@@ -1026,8 +1047,8 @@ struct ctl_table
         void *data;
         int maxlen;
         mode_t mode;
-        ctl_table *child;
-        ctl_table *parent;              /* Automatically set */
+        struct ctl_table *child;
+        struct ctl_table *parent;       /* Automatically set */
         proc_handler *proc_handler;     /* Callback for text formatting */
         ctl_handler *strategy;          /* Callback function for all r/w */
         void *extra1;
@@ -1035,18 +1056,19 @@ struct ctl_table
 };
 
 /* struct ctl_table_header is used to maintain dynamic lists of
-   ctl_table trees. */
+   struct ctl_table trees. */
 struct ctl_table_header
 {
-        ctl_table *ctl_table;
+        struct ctl_table *ctl_table;
         struct list_head ctl_entry;
         int used;
         struct completion *unregistering;
 };
 
-struct ctl_table_header * register_sysctl_table(ctl_table * table);
+struct ctl_table_header *register_sysctl_table(struct ctl_table * table);
 
 void unregister_sysctl_table(struct ctl_table_header * table);
+int sysctl_check_table(struct ctl_table *table);
 
 #else /* __KERNEL__ */
 
diff --git a/include/linux/taskstats.h b/include/linux/taskstats.h
index dce1ed204972..5d69c0744fff 100644
--- a/include/linux/taskstats.h
+++ b/include/linux/taskstats.h
@@ -31,7 +31,7 @@
  */
 
 
-#define TASKSTATS_VERSION       5
+#define TASKSTATS_VERSION       6
 #define TS_COMM_LEN             32      /* should be >= TASK_COMM_LEN
                                          * in linux/sched.h */
 
@@ -152,6 +152,11 @@ struct taskstats {
 
         __u64  nvcsw;                   /* voluntary_ctxt_switches */
         __u64  nivcsw;                  /* nonvoluntary_ctxt_switches */
+
+        /* time accounting for SMT machines */
+        __u64   ac_utimescaled;         /* utime scaled on frequency etc */
+        __u64   ac_stimescaled;         /* stime scaled on frequency etc */
+        __u64   cpu_scaled_run_real_total; /* scaled cpu_run_real_total */
 };
 
 
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index ed652f40f075..3ac5904d1b12 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -57,7 +57,7 @@ identify_ramdisk_image(int fd, int start_block)
         unsigned char *buf;
 
         buf = kmalloc(size, GFP_KERNEL);
-        if (buf == 0)
+        if (!buf)
                 return -1;
 
         minixsb = (struct minix_super_block *) buf;
@@ -407,12 +407,12 @@ static int __init crd_load(int in_fd, int out_fd)
         crd_infd = in_fd;
         crd_outfd = out_fd;
         inbuf = kmalloc(INBUFSIZ, GFP_KERNEL);
-        if (inbuf == 0) {
+        if (!inbuf) {
                 printk(KERN_ERR "RAMDISK: Couldn't allocate gzip buffer\n");
                 return -1;
         }
         window = kmalloc(WSIZE, GFP_KERNEL);
-        if (window == 0) {
+        if (!window) {
                 printk(KERN_ERR "RAMDISK: Couldn't allocate gzip window\n");
                 kfree(inbuf);
                 return -1;
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 774843cff756..20f1fed8fa48 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -44,12 +44,6 @@
 #define STATE_PENDING   1
 #define STATE_READY     2
 
-/* used by sysctl */
-#define FS_MQUEUE       1
-#define CTL_QUEUESMAX   2
-#define CTL_MSGMAX      3
-#define CTL_MSGSIZEMAX  4
-
 /* default values */
 #define DFLT_QUEUESMAX  256     /* max number of message queues */
 #define DFLT_MSGMAX     10      /* max number of messages in each queue */
@@ -1196,7 +1190,6 @@ static int msg_maxsize_limit_max = INT_MAX;
 
 static ctl_table mq_sysctls[] = {
         {
-                .ctl_name       = CTL_QUEUESMAX,
                 .procname       = "queues_max",
                 .data           = &queues_max,
                 .maxlen         = sizeof(int),
@@ -1204,7 +1197,6 @@ static ctl_table mq_sysctls[] = {
                 .proc_handler   = &proc_dointvec,
         },
         {
-                .ctl_name       = CTL_MSGMAX,
                 .procname       = "msg_max",
                 .data           = &msg_max,
                 .maxlen         = sizeof(int),
@@ -1214,7 +1206,6 @@ static ctl_table mq_sysctls[] = {
                 .extra2         = &msg_max_limit_max,
         },
         {
-                .ctl_name       = CTL_MSGSIZEMAX,
                 .procname       = "msgsize_max",
                 .data           = &msgsize_max,
                 .maxlen         = sizeof(int),
@@ -1228,7 +1219,6 @@ static ctl_table mq_sysctls[] = {
 
 static ctl_table mq_sysctl_dir[] = {
         {
-                .ctl_name       = FS_MQUEUE,
                 .procname       = "mqueue",
                 .mode           = 0555,
                 .child          = mq_sysctls,
diff --git a/kernel/Makefile b/kernel/Makefile
index 2a999836ca18..d63fbb18798a 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -9,7 +9,7 @@ obj-y     = sched.o fork.o exec_domain.o panic.o printk.o profile.o \
             rcupdate.o extable.o params.o posix-timers.o \
             kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
             hrtimer.o rwsem.o latency.o nsproxy.o srcu.o die_notifier.o \
-            utsname.o
+            utsname.o sysctl_check.o
 
 obj-$(CONFIG_STACKTRACE) += stacktrace.o
 obj-y += time/
diff --git a/kernel/acct.c b/kernel/acct.c
index 24f0f8b2ba72..fce53d8df8a7 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -329,16 +329,16 @@ static comp_t encode_comp_t(unsigned long value)
         }
 
         /*
-         * If we need to round up, do it (and handle overflow correctly).
-         */
+         * If we need to round up, do it (and handle overflow correctly).
+         */
         if (rnd && (++value > MAXFRACT)) {
                 value >>= EXPSIZE;
                 exp++;
         }
 
         /*
-         * Clean it up and polish it off.
-         */
+         * Clean it up and polish it off.
+         */
         exp <<= MANTSIZE;               /* Shift the exponent into place */
         exp += value;                   /* and add on the mantissa. */
         return exp;
@@ -361,30 +361,30 @@ static comp_t encode_comp_t(unsigned long value)
 
 static comp2_t encode_comp2_t(u64 value)
 {
-        int exp, rnd;
-
-        exp = (value > (MAXFRACT2>>1));
-        rnd = 0;
-        while (value > MAXFRACT2) {
-                rnd = value & 1;
-                value >>= 1;
-                exp++;
-        }
-
-        /*
-         * If we need to round up, do it (and handle overflow correctly).
-         */
-        if (rnd && (++value > MAXFRACT2)) {
-                value >>= 1;
-                exp++;
-        }
-
-        if (exp > MAXEXP2) {
-                /* Overflow. Return largest representable number instead. */
-                return (1ul << (MANTSIZE2+EXPSIZE2-1)) - 1;
-        } else {
-                return (value & (MAXFRACT2>>1)) | (exp << (MANTSIZE2-1));
-        }
+        int exp, rnd;
+
+        exp = (value > (MAXFRACT2>>1));
+        rnd = 0;
+        while (value > MAXFRACT2) {
+                rnd = value & 1;
+                value >>= 1;
+                exp++;
+        }
+
+        /*
+         * If we need to round up, do it (and handle overflow correctly).
+         */
+        if (rnd && (++value > MAXFRACT2)) {
+                value >>= 1;
+                exp++;
+        }
+
+        if (exp > MAXEXP2) {
+                /* Overflow. Return largest representable number instead. */
+                return (1ul << (MANTSIZE2+EXPSIZE2-1)) - 1;
+        } else {
+                return (value & (MAXFRACT2>>1)) | (exp << (MANTSIZE2-1));
+        }
 }
 #endif
 
@@ -501,14 +501,14 @@ static void do_acct_process(struct file *file)
         ac.ac_swaps = encode_comp_t(0);
 
         /*
-         * Kernel segment override to datasegment and write it
-         * to the accounting file.
-         */
+         * Kernel segment override to datasegment and write it
+         * to the accounting file.
+         */
         fs = get_fs();
         set_fs(KERNEL_DS);
         /*
-         * Accounting records are not subject to resource limits.
-         */
+         * Accounting records are not subject to resource limits.
+         */
         flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
         current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
         file->f_op->write(file, (char *)&ac,
diff --git a/kernel/audit.c b/kernel/audit.c
index 2924251a6547..6977ea57a7e2 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -664,11 +664,11 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                                 if (sid) {
                                         if (selinux_sid_to_string(
                                                         sid, &ctx, &len)) {
-                                                audit_log_format(ab, 
+                                                audit_log_format(ab,
                                                         " ssid=%u", sid);
                                                 /* Maybe call audit_panic? */
                                         } else
-                                                audit_log_format(ab, 
+                                                audit_log_format(ab,
                                                         " subj=%s", ctx);
                                         kfree(ctx);
                                 }
@@ -769,7 +769,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                 sig_data->pid = audit_sig_pid;
                 memcpy(sig_data->ctx, ctx, len);
                 kfree(ctx);
-                audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_SIGNAL_INFO, 
+                audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_SIGNAL_INFO,
                                 0, 0, sig_data, sizeof(*sig_data) + len);
                 kfree(sig_data);
                 break;
@@ -1005,7 +1005,7 @@ unsigned int audit_serial(void)
         return ret;
 }
 
-static inline void audit_get_stamp(struct audit_context *ctx, 
+static inline void audit_get_stamp(struct audit_context *ctx,
                                    struct timespec *t, unsigned int *serial)
 {
         if (ctx)
@@ -1056,7 +1056,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
         if (gfp_mask & __GFP_WAIT)
                 reserve = 0;
         else
-                reserve = 5; /* Allow atomic callers to go up to five 
+                reserve = 5; /* Allow atomic callers to go up to five
                                 entries over the normal backlog limit */
 
         while (audit_backlog_limit
@@ -1319,7 +1319,7 @@ void audit_log_d_path(struct audit_buffer *ab, const char *prefix,
         if (IS_ERR(p)) { /* Should never happen since we send PATH_MAX */
                 /* FIXME: can we save some information here? */
                 audit_log_format(ab, "<too long>");
-        } else 
+        } else
                 audit_log_untrustedstring(ab, p);
         kfree(path);
 }
@@ -1365,7 +1365,7 @@ void audit_log_end(struct audit_buffer *ab)
  * audit_log_vformat, and audit_log_end.  It may be called
  * in any context.
  */
-void audit_log(struct audit_context *ctx, gfp_t gfp_mask, int type, 
+void audit_log(struct audit_context *ctx, gfp_t gfp_mask, int type,
                const char *fmt, ...)
 {
         struct audit_buffer *ab;
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 359645cff5b2..df66a21fb360 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -1498,7 +1498,7 @@ int audit_receive_filter(int type, int pid, int uid, int seq, void *data,
                  * auditctl to read from it... which isn't ever going to
                  * happen if we're actually running in the context of auditctl
                  * trying to _send_ the stuff */
-                 
+
                 dest = kmalloc(sizeof(struct audit_netlink_list), GFP_KERNEL);
                 if (!dest)
                         return -ENOMEM;
@@ -1678,7 +1678,7 @@ int audit_filter_type(int type)
 {
         struct audit_entry *e;
         int result = 0;
-        
+
         rcu_read_lock();
         if (list_empty(&audit_filter_list[AUDIT_FILTER_TYPE]))
                 goto unlock_and_return;
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 938e60a61882..e19b5a33aede 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -320,7 +320,7 @@ static int audit_filter_rules(struct task_struct *tsk,
                         result = audit_comparator(tsk->personality, f->op, f->val);
                         break;
                 case AUDIT_ARCH:
-                        if (ctx)
+                        if (ctx)
                                 result = audit_comparator(ctx->arch, f->op, f->val);
                         break;
 
@@ -898,7 +898,7 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
         if (context->personality != PER_LINUX)
                 audit_log_format(ab, " per=%lx", context->personality);
         if (context->return_valid)
-                audit_log_format(ab, " success=%s exit=%ld", 
+                audit_log_format(ab, " success=%s exit=%ld",
                                  (context->return_valid==AUDITSC_SUCCESS)?"yes":"no",
                                  context->return_code);
 
@@ -1135,8 +1135,8 @@ void audit_free(struct task_struct *tsk)
                 return;
 
         /* Check for system calls that do not go through the exit
-         * function (e.g., exit_group), then free context block. 
-         * We use GFP_ATOMIC here because we might be doing this 
+         * function (e.g., exit_group), then free context block.
+         * We use GFP_ATOMIC here because we might be doing this
          * in the context of the idle thread */
         /* that can happen only if we are called from do_exit() */
         if (context->in_syscall && context->auditable)
@@ -1316,7 +1316,7 @@ void __audit_getname(const char *name)
                 context->pwdmnt = mntget(current->fs->pwdmnt);
                 read_unlock(&current->fs->lock);
         }
-                
+
 }
 
 /* audit_putname - intercept a putname request
diff --git a/kernel/capability.c b/kernel/capability.c
index 4e350a36ed6a..cbc5fd60c0f3 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -3,9 +3,9 @@
  *
  * Copyright (C) 1997  Andrew Main <zefram@fysh.org>
  *
- * Integrated into 2.1.97+,  Andrew G. Morgan <morgan@transmeta.com>
+ * Integrated into 2.1.97+,  Andrew G. Morgan <morgan@kernel.org>
  * 30 May 2002: Cleanup, Robert M. Love <rml@tech9.net>
- */ 
+ */
 
 #include <linux/capability.h>
 #include <linux/mm.h>
@@ -14,9 +14,6 @@
 #include <linux/syscalls.h>
 #include <asm/uaccess.h>
 
-unsigned securebits = SECUREBITS_DEFAULT; /* systemwide security settings */
-kernel_cap_t cap_bset = CAP_INIT_EFF_SET;
-
 /*
  * This lock protects task->cap_* for all tasks including current.
  * Locking rule: acquire this prior to tasklist_lock.
@@ -40,49 +37,49 @@ static DEFINE_SPINLOCK(task_capability_lock);
  */
 asmlinkage long sys_capget(cap_user_header_t header, cap_user_data_t dataptr)
 {
-     int ret = 0;
-     pid_t pid;
-     __u32 version;
-     struct task_struct *target;
-     struct __user_cap_data_struct data;
-
-     if (get_user(version, &header->version))
-             return -EFAULT;
-
-     if (version != _LINUX_CAPABILITY_VERSION) {
-             if (put_user(_LINUX_CAPABILITY_VERSION, &header->version))
-                     return -EFAULT; 
-             return -EINVAL;
-     }
+        int ret = 0;
+        pid_t pid;
+        __u32 version;
+        struct task_struct *target;
+        struct __user_cap_data_struct data;
+
+        if (get_user(version, &header->version))
+                return -EFAULT;
+
+        if (version != _LINUX_CAPABILITY_VERSION) {
+                if (put_user(_LINUX_CAPABILITY_VERSION, &header->version))
+                        return -EFAULT;
+                return -EINVAL;
+        }
 
-     if (get_user(pid, &header->pid))
-             return -EFAULT;
+        if (get_user(pid, &header->pid))
+                return -EFAULT;
 
-     if (pid < 0) 
-             return -EINVAL;
+        if (pid < 0)
+                return -EINVAL;
 
-     spin_lock(&task_capability_lock);
-     read_lock(&tasklist_lock); 
+        spin_lock(&task_capability_lock);
+        read_lock(&tasklist_lock);
 
-     if (pid && pid != current->pid) {
-             target = find_task_by_pid(pid);
-             if (!target) {
-                  ret = -ESRCH;
-                  goto out;
-             }
-     } else
-             target = current;
+        if (pid && pid != current->pid) {
+                target = find_task_by_pid(pid);
+                if (!target) {
+                        ret = -ESRCH;
+                        goto out;
+                }
+        } else
+                target = current;
 
-     ret = security_capget(target, &data.effective, &data.inheritable, &data.permitted);
+        ret = security_capget(target, &data.effective, &data.inheritable, &data.permitted);
 
 out:
-     read_unlock(&tasklist_lock); 
-     spin_unlock(&task_capability_lock);
+        read_unlock(&tasklist_lock);
+        spin_unlock(&task_capability_lock);
 
-     if (!ret && copy_to_user(dataptr, &data, sizeof data))
-          return -EFAULT; 
+        if (!ret && copy_to_user(dataptr, &data, sizeof data))
+                return -EFAULT;
 
-     return ret;
+        return ret;
 }
 
 /*
@@ -115,7 +112,7 @@ static inline int cap_set_pg(int pgrp_nr, kernel_cap_t *effective,
         } while_each_pid_task(pgrp, PIDTYPE_PGID, g);
 
         if (!found)
-             ret = 0;
+                ret = 0;
         return ret;
 }
 
@@ -169,68 +166,68 @@ static inline int cap_set_all(kernel_cap_t *effective,
  */
 asmlinkage long sys_capset(cap_user_header_t header, const cap_user_data_t data)
 {
-     kernel_cap_t inheritable, permitted, effective;
-     __u32 version;
-     struct task_struct *target;
-     int ret;
-     pid_t pid;
-
-     if (get_user(version, &header->version))
-             return -EFAULT; 
-
-     if (version != _LINUX_CAPABILITY_VERSION) {
-             if (put_user(_LINUX_CAPABILITY_VERSION, &header->version))
-                     return -EFAULT; 
-             return -EINVAL;
-     }
-
-     if (get_user(pid, &header->pid))
-             return -EFAULT; 
-
-     if (pid && pid != current->pid && !capable(CAP_SETPCAP))
-             return -EPERM;
-
-     if (copy_from_user(&effective, &data->effective, sizeof(effective)) ||
-         copy_from_user(&inheritable, &data->inheritable, sizeof(inheritable)) ||
-         copy_from_user(&permitted, &data->permitted, sizeof(permitted)))
-             return -EFAULT; 
-
-     spin_lock(&task_capability_lock);
-     read_lock(&tasklist_lock);
-
-     if (pid > 0 && pid != current->pid) {
-          target = find_task_by_pid(pid);
-          if (!target) {
-               ret = -ESRCH;
-               goto out;
-          }
-     } else
-               target = current;
-
-     ret = 0;
-
-     /* having verified that the proposed changes are legal,
-           we now put them into effect. */
-     if (pid < 0) {
-             if (pid == -1)  /* all procs other than current and init */
-                     ret = cap_set_all(&effective, &inheritable, &permitted);
-
-             else            /* all procs in process group */
-                     ret = cap_set_pg(-pid, &effective, &inheritable,
-                                                        &permitted);
-     } else {
-             ret = security_capset_check(target, &effective, &inheritable,
-                                                        &permitted);
-             if (!ret)
-                     security_capset_set(target, &effective, &inheritable,
-                                                        &permitted);
-     }
+        kernel_cap_t inheritable, permitted, effective;
+        __u32 version;
+        struct task_struct *target;
+        int ret;
+        pid_t pid;
+
+        if (get_user(version, &header->version))
+                return -EFAULT;
+
+        if (version != _LINUX_CAPABILITY_VERSION) {
+                if (put_user(_LINUX_CAPABILITY_VERSION, &header->version))
+                        return -EFAULT;
+                return -EINVAL;
+        }
+
+        if (get_user(pid, &header->pid))
+                return -EFAULT;
+
+        if (pid && pid != current->pid && !capable(CAP_SETPCAP))
+                return -EPERM;
+
+        if (copy_from_user(&effective, &data->effective, sizeof(effective)) ||
+            copy_from_user(&inheritable, &data->inheritable, sizeof(inheritable)) ||
+            copy_from_user(&permitted, &data->permitted, sizeof(permitted)))
+                return -EFAULT;
+
+        spin_lock(&task_capability_lock);
+        read_lock(&tasklist_lock);
+
+        if (pid > 0 && pid != current->pid) {
+                target = find_task_by_pid(pid);
+                if (!target) {
+                        ret = -ESRCH;
+                        goto out;
+                }
+        } else
+                target = current;
+
+        ret = 0;
+
+        /* having verified that the proposed changes are legal,
+           we now put them into effect. */
+        if (pid < 0) {
+                if (pid == -1)  /* all procs other than current and init */
+                        ret = cap_set_all(&effective, &inheritable, &permitted);
+
+                else            /* all procs in process group */
+                        ret = cap_set_pg(-pid, &effective, &inheritable,
+                                         &permitted);
+        } else {
+                ret = security_capset_check(target, &effective, &inheritable,
+                                            &permitted);
+                if (!ret)
+                        security_capset_set(target, &effective, &inheritable,
+                                            &permitted);
+        }
 
 out:
-     read_unlock(&tasklist_lock);
-     spin_unlock(&task_capability_lock);
+        read_unlock(&tasklist_lock);
+        spin_unlock(&task_capability_lock);
 
-     return ret;
+        return ret;
 }
 
 int __capable(struct task_struct *t, int cap)
diff --git a/kernel/compat.c b/kernel/compat.c
index 3bae3742c2aa..b78328af19ad 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -247,8 +247,8 @@ asmlinkage long compat_sys_setrlimit(unsigned int resource,
         int ret;
         mm_segment_t old_fs = get_fs ();
 
-        if (resource >= RLIM_NLIMITS) 
-                return -EINVAL; 
+        if (resource >= RLIM_NLIMITS)
+                return -EINVAL;
 
         if (!access_ok(VERIFY_READ, rlim, sizeof(*rlim)) ||
             __get_user(r.rlim_cur, &rlim->rlim_cur) ||
@@ -477,21 +477,21 @@ asmlinkage long compat_sys_sched_getaffinity(compat_pid_t pid, unsigned int len,
 
 int get_compat_itimerspec(struct itimerspec *dst,
                           const struct compat_itimerspec __user *src)
-{ 
+{
         if (get_compat_timespec(&dst->it_interval, &src->it_interval) ||
             get_compat_timespec(&dst->it_value, &src->it_value))
                 return -EFAULT;
         return 0;
-} 
+}
 
 int put_compat_itimerspec(struct compat_itimerspec __user *dst,
                           const struct itimerspec *src)
-{ 
+{
         if (put_compat_timespec(&src->it_interval, &dst->it_interval) ||
             put_compat_timespec(&src->it_value, &dst->it_value))
                 return -EFAULT;
         return 0;
-} 
+}
 
 long compat_sys_timer_create(clockid_t which_clock,
                         struct compat_sigevent __user *timer_event_spec,
@@ -512,9 +512,9 @@ long compat_sys_timer_create(clockid_t which_clock,
 }
 
 long compat_sys_timer_settime(timer_t timer_id, int flags,
-                          struct compat_itimerspec __user *new, 
+                          struct compat_itimerspec __user *new,
                           struct compat_itimerspec __user *old)
-{ 
+{
         long err;
         mm_segment_t oldfs;
         struct itimerspec newts, oldts;
@@ -522,58 +522,58 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
         if (!new)
                 return -EINVAL;
         if (get_compat_itimerspec(&newts, new))
-                return -EFAULT; 
+                return -EFAULT;
         oldfs = get_fs();
         set_fs(KERNEL_DS);
         err = sys_timer_settime(timer_id, flags,
                                 (struct itimerspec __user *) &newts,
                                 (struct itimerspec __user *) &oldts);
-        set_fs(oldfs); 
+        set_fs(oldfs);
         if (!err && old && put_compat_itimerspec(old, &oldts))
                 return -EFAULT;
         return err;
-} 
+}
 
 long compat_sys_timer_gettime(timer_t timer_id,
                 struct compat_itimerspec __user *setting)
-{ 
+{
         long err;
         mm_segment_t oldfs;
-        struct itimerspec ts; 
+        struct itimerspec ts;
 
         oldfs = get_fs();
         set_fs(KERNEL_DS);
         err = sys_timer_gettime(timer_id,
-                                (struct itimerspec __user *) &ts); 
-        set_fs(oldfs); 
+                                (struct itimerspec __user *) &ts);
+        set_fs(oldfs);
         if (!err && put_compat_itimerspec(setting, &ts))
                 return -EFAULT;
         return err;
-} 
+}
 
 long compat_sys_clock_settime(clockid_t which_clock,
                 struct compat_timespec __user *tp)
 {
         long err;
         mm_segment_t oldfs;
-        struct timespec ts; 
+        struct timespec ts;
 
         if (get_compat_timespec(&ts, tp))
-                return -EFAULT; 
+                return -EFAULT;
         oldfs = get_fs();
-        set_fs(KERNEL_DS);      
+        set_fs(KERNEL_DS);
         err = sys_clock_settime(which_clock,
                                 (struct timespec __user *) &ts);
         set_fs(oldfs);
         return err;
-} 
+}
 
 long compat_sys_clock_gettime(clockid_t which_clock,
                 struct compat_timespec __user *tp)
 {
         long err;
         mm_segment_t oldfs;
-        struct timespec ts; 
+        struct timespec ts;
 
         oldfs = get_fs();
         set_fs(KERNEL_DS);
@@ -581,16 +581,16 @@ long compat_sys_clock_gettime(clockid_t which_clock,
                                 (struct timespec __user *) &ts);
         set_fs(oldfs);
         if (!err && put_compat_timespec(&ts, tp))
-                return -EFAULT; 
+                return -EFAULT;
         return err;
-} 
+}
 
 long compat_sys_clock_getres(clockid_t which_clock,
                 struct compat_timespec __user *tp)
 {
         long err;
         mm_segment_t oldfs;
-        struct timespec ts; 
+        struct timespec ts;
 
         oldfs = get_fs();
         set_fs(KERNEL_DS);
@@ -598,9 +598,9 @@ long compat_sys_clock_getres(clockid_t which_clock,
                                (struct timespec __user *) &ts);
         set_fs(oldfs);
         if (!err && tp && put_compat_timespec(&ts, tp))
-                return -EFAULT; 
+                return -EFAULT;
         return err;
-} 
+}
 
 static long compat_clock_nanosleep_restart(struct restart_block *restart)
 {
@@ -632,10 +632,10 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
 {
         long err;
         mm_segment_t oldfs;
-        struct timespec in, out; 
+        struct timespec in, out;
         struct restart_block *restart;
 
-        if (get_compat_timespec(&in, rqtp)) 
+        if (get_compat_timespec(&in, rqtp))
                 return -EFAULT;
 
         oldfs = get_fs();
@@ -654,8 +654,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
                 restart->fn = compat_clock_nanosleep_restart;
                 restart->arg1 = (unsigned long) rmtp;
         }
-        return err;     
-} 
+        return err;
+}
 
 /*
  * We currently only need the following fields from the sigevent
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 38033db8d8ec..a21f71af9d81 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -150,6 +150,7 @@ static int _cpu_down(unsigned int cpu, int tasks_frozen)
         err = __raw_notifier_call_chain(&cpu_chain, CPU_DOWN_PREPARE | mod,
                                         hcpu, -1, &nr_calls);
         if (err == NOTIFY_BAD) {
+                nr_calls--;
                 __raw_notifier_call_chain(&cpu_chain, CPU_DOWN_FAILED | mod,
                                           hcpu, nr_calls, NULL);
                 printk("%s: attempt to take down CPU %u failed\n",
@@ -233,6 +234,7 @@ static int __cpuinit _cpu_up(unsigned int cpu, int tasks_frozen)
         ret = __raw_notifier_call_chain(&cpu_chain, CPU_UP_PREPARE | mod, hcpu,
                                                         -1, &nr_calls);
         if (ret == NOTIFY_BAD) {
+                nr_calls--;
                 printk("%s: attempt to bring up CPU %u failed\n",
                                 __FUNCTION__, cpu);
                 ret = -EINVAL;
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 2eb2e50db0d6..64950fa5d321 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -2431,12 +2431,12 @@ int __cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask)
         node = zone_to_nid(z);
         if (node_isset(node, current->mems_allowed))
                 return 1;
-        /*
-         * Allow tasks that have access to memory reserves because they have
-         * been OOM killed to get memory anywhere.
-         */
-        if (unlikely(test_thread_flag(TIF_MEMDIE)))
-                return 1;
+        /*
+         * Allow tasks that have access to memory reserves because they have
+         * been OOM killed to get memory anywhere.
+         */
+        if (unlikely(test_thread_flag(TIF_MEMDIE)))
+                return 1;
         return 0;
 }
 
diff --git a/kernel/delayacct.c b/kernel/delayacct.c
index 09e9574eeb26..10e43fd8b721 100644
--- a/kernel/delayacct.c
+++ b/kernel/delayacct.c
@@ -115,6 +115,12 @@ int __delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk)
         tmp += timespec_to_ns(&ts);
         d->cpu_run_real_total = (tmp < (s64)d->cpu_run_real_total) ? 0 : tmp;
 
+        tmp = (s64)d->cpu_scaled_run_real_total;
+        cputime_to_timespec(tsk->utimescaled + tsk->stimescaled, &ts);
+        tmp += timespec_to_ns(&ts);
+        d->cpu_scaled_run_real_total =
+                (tmp < (s64)d->cpu_scaled_run_real_total) ? 0 : tmp;
+
         /*
          * No locking available for sched_info (and too expensive to add one)
          * Mitigate by taking snapshot of values
diff --git a/kernel/dma.c b/kernel/dma.c
index 937b13ca33ba..6a82bb716dac 100644
--- a/kernel/dma.c
+++ b/kernel/dma.c
@@ -20,7 +20,7 @@
 #include <asm/dma.h>
 #include <asm/system.h>
 
- 
+
 
 /* A note on resource allocation:
  *
@@ -95,7 +95,7 @@ void free_dma(unsigned int dmanr)
         if (xchg(&dma_chan_busy[dmanr].lock, 0) == 0) {
                 printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr);
                 return;
-        }       
+        }
 
 } /* free_dma */
 
@@ -121,8 +121,8 @@ static int proc_dma_show(struct seq_file *m, void *v)
 
         for (i = 0 ; i < MAX_DMA_CHANNELS ; i++) {
                 if (dma_chan_busy[i].lock) {
-                    seq_printf(m, "%2d: %s\n", i,
-                               dma_chan_busy[i].device_id);
+                        seq_printf(m, "%2d: %s\n", i,
+                                   dma_chan_busy[i].device_id);
                 }
         }
         return 0;
diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c
index 3c2eaea66b1e..a9e6bad9f706 100644
--- a/kernel/exec_domain.c
+++ b/kernel/exec_domain.c
@@ -57,7 +57,7 @@ lookup_exec_domain(u_long personality)
 {
         struct exec_domain *    ep;
         u_long                  pers = personality(personality);
-                
+
         read_lock(&exec_domains_lock);
         for (ep = exec_domains; ep; ep = ep->next) {
                 if (pers >= ep->pers_low && pers <= ep->pers_high)
diff --git a/kernel/fork.c b/kernel/fork.c
index 490495a39c7e..2ce28f165e31 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -268,7 +268,7 @@ static inline int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
                         get_file(file);
                         if (tmp->vm_flags & VM_DENYWRITE)
                                 atomic_dec(&inode->i_writecount);
-      
+
                         /* insert tmp into the share list, just after mpnt */
                         spin_lock(&file->f_mapping->i_mmap_lock);
                         tmp->vm_truncate_count = mpnt->vm_truncate_count;
@@ -331,7 +331,7 @@ static inline void mm_free_pgd(struct mm_struct * mm)
 #define mm_free_pgd(mm)
 #endif /* CONFIG_MMU */
 
- __cacheline_aligned_in_smp DEFINE_SPINLOCK(mmlist_lock);
+__cacheline_aligned_in_smp DEFINE_SPINLOCK(mmlist_lock);
 
 #define allocate_mm()   (kmem_cache_alloc(mm_cachep, GFP_KERNEL))
 #define free_mm(mm)     (kmem_cache_free(mm_cachep, (mm)))
@@ -738,8 +738,8 @@ static struct files_struct *dup_fd(struct files_struct *oldf, int *errorp)
         /* compute the remainder to be cleared */
         size = (new_fdt->max_fds - open_files) * sizeof(struct file *);
 
-        /* This is long word aligned thus could use a optimized version */ 
-        memset(new_fds, 0, size); 
+        /* This is long word aligned thus could use a optimized version */
+        memset(new_fds, 0, size);
 
         if (new_fdt->max_fds > open_files) {
                 int left = (new_fdt->max_fds-open_files)/8;
@@ -942,6 +942,7 @@ static inline void copy_flags(unsigned long clone_flags, struct task_struct *p)
         if (!(clone_flags & CLONE_PTRACE))
                 p->ptrace = 0;
         p->flags = new_flags;
+        clear_freeze_flag(p);
 }
 
 asmlinkage long sys_set_tid_address(int __user *tidptr)
@@ -1058,6 +1059,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
         p->utime = cputime_zero;
         p->stime = cputime_zero;
         p->gtime = cputime_zero;
+        p->utimescaled = cputime_zero;
+        p->stimescaled = cputime_zero;
 
 #ifdef CONFIG_TASK_XACCT
         p->rchar = 0;           /* I/O counter: bytes read */
@@ -1068,12 +1071,12 @@ static struct task_struct *copy_process(unsigned long clone_flags,
         task_io_accounting_init(p);
         acct_clear_integrals(p);
 
-        p->it_virt_expires = cputime_zero;
+        p->it_virt_expires = cputime_zero;
         p->it_prof_expires = cputime_zero;
-        p->it_sched_expires = 0;
-        INIT_LIST_HEAD(&p->cpu_timers[0]);
-        INIT_LIST_HEAD(&p->cpu_timers[1]);
-        INIT_LIST_HEAD(&p->cpu_timers[2]);
+        p->it_sched_expires = 0;
+        INIT_LIST_HEAD(&p->cpu_timers[0]);
+        INIT_LIST_HEAD(&p->cpu_timers[1]);
+        INIT_LIST_HEAD(&p->cpu_timers[2]);
 
         p->lock_depth = -1;             /* -1 = no lock */
         do_posix_clock_monotonic_gettime(&p->start_time);
@@ -1083,7 +1086,6 @@ static struct task_struct *copy_process(unsigned long clone_flags,
         p->security = NULL;
 #endif
         p->io_context = NULL;
-        p->io_wait = NULL;
         p->audit_context = NULL;
         cpuset_fork(p);
 #ifdef CONFIG_NUMA
@@ -1239,7 +1241,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
          * A fatal signal pending means that current will exit, so the new
          * thread can't slip out of an OOM kill (or normal SIGKILL).
          */
-        recalc_sigpending();
+        recalc_sigpending();
         if (signal_pending(current)) {
                 spin_unlock(&current->sighand->siglock);
                 write_unlock_irq(&tasklist_lock);
diff --git a/kernel/futex.c b/kernel/futex.c
index d725676d84f3..e45a65e41686 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -293,7 +293,7 @@ EXPORT_SYMBOL_GPL(get_futex_key_refs);
  */
 void drop_futex_key_refs(union futex_key *key)
 {
-        if (key->both.ptr == 0)
+        if (!key->both.ptr)
                 return;
         switch (key->both.offset & (FUT_OFF_INODE|FUT_OFF_MMSHARED)) {
                 case FUT_OFF_INODE:
@@ -1046,7 +1046,7 @@ static int unqueue_me(struct futex_q *q)
  retry:
         lock_ptr = q->lock_ptr;
         barrier();
-        if (lock_ptr != 0) {
+        if (lock_ptr != NULL) {
                 spin_lock(lock_ptr);
                 /*
                  * q->lock_ptr can change between reading it and
diff --git a/kernel/itimer.c b/kernel/itimer.c
index 3205e8e114fa..2fab344dbf56 100644
--- a/kernel/itimer.c
+++ b/kernel/itimer.c
@@ -130,7 +130,7 @@ asmlinkage long sys_getitimer(int which, struct itimerval __user *value)
 enum hrtimer_restart it_real_fn(struct hrtimer *timer)
 {
         struct signal_struct *sig =
-            container_of(timer, struct signal_struct, real_timer);
+                container_of(timer, struct signal_struct, real_timer);
 
         send_group_sig_info(SIGALRM, SEND_SIG_PRIV, sig->tsk);
 
@@ -291,6 +291,6 @@ asmlinkage long sys_setitimer(int which,
                 return error;
 
         if (copy_to_user(ovalue, &get_buffer, sizeof(get_buffer)))
-                return -EFAULT; 
+                return -EFAULT;
         return 0;
 }
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 7885269b0da2..e9f1b4ea504d 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -785,7 +785,7 @@ static int kimage_load_normal_segment(struct kimage *image,
                 size_t uchunk, mchunk;
 
                 page = kimage_alloc_page(image, GFP_HIGHUSER, maddr);
-                if (page == 0) {
+                if (!page) {
                         result  = -ENOMEM;
                         goto out;
                 }
@@ -844,7 +844,7 @@ static int kimage_load_crash_segment(struct kimage *image,
                 size_t uchunk, mchunk;
 
                 page = pfn_to_page(maddr >> PAGE_SHIFT);
-                if (page == 0) {
+                if (!page) {
                         result  = -ENOMEM;
                         goto out;
                 }
diff --git a/kernel/module.c b/kernel/module.c
index a389b423c279..7734595bd329 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -105,7 +105,7 @@ void __module_put_and_exit(struct module *mod, long code)
         do_exit(code);
 }
 EXPORT_SYMBOL(__module_put_and_exit);
-        
+
 /* Find a module section: 0 means not found. */
 static unsigned int find_sec(Elf_Ehdr *hdr,
                              Elf_Shdr *sechdrs,
@@ -179,7 +179,7 @@ static unsigned long __find_symbol(const char *name,
         struct module *mod;
         const struct kernel_symbol *ks;
 
-        /* Core kernel first. */ 
+        /* Core kernel first. */
         *owner = NULL;
         ks = lookup_symbol(name, __start___ksymtab, __stop___ksymtab);
         if (ks) {
@@ -231,7 +231,7 @@ static unsigned long __find_symbol(const char *name,
                 return ks->value;
         }
 
-        /* Now try modules. */ 
+        /* Now try modules. */
         list_for_each_entry(mod, &modules, list) {
                 *owner = mod;
                 ks = lookup_symbol(name, mod->syms, mod->syms + mod->num_syms);
@@ -285,7 +285,7 @@ static unsigned long __find_symbol(const char *name,
                 }
         }
         DEBUGP("Failed to find symbol %s\n", name);
-        return 0;
+        return 0;
 }
 
 /* Search for module by name: must hold module_mutex. */
@@ -441,7 +441,7 @@ static int percpu_modinit(void)
         }
 
         return 0;
-}       
+}
 __initcall(percpu_modinit);
 #else /* ... !CONFIG_SMP */
 static inline void *percpu_modalloc(unsigned long size, unsigned long align,
@@ -483,8 +483,8 @@ static int modinfo_##field##_exists(struct module *mod)               \
 }                                                                     \
 static void free_modinfo_##field(struct module *mod)                  \
 {                                                                     \
-        kfree(mod->field);                                            \
-        mod->field = NULL;                                            \
+        kfree(mod->field);                                            \
+        mod->field = NULL;                                            \
 }                                                                     \
 static struct module_attribute modinfo_##field = {                    \
         .attr = { .name = __stringify(field), .mode = 0444 },         \
@@ -990,7 +990,7 @@ static void add_sect_attrs(struct module *mod, unsigned int nsect,
         struct module_sect_attrs *sect_attrs;
         struct module_sect_attr *sattr;
         struct attribute **gattr;
-        
+
         /* Count loaded sections and allocate structures */
         for (i = 0; i < nsect; i++)
                 if (sechdrs[i].sh_flags & SHF_ALLOC)
@@ -1348,14 +1348,14 @@ static int verify_export_symbols(struct module *mod)
         const unsigned long *crc;
 
         for (i = 0; i < mod->num_syms; i++)
-                if (__find_symbol(mod->syms[i].name, &owner, &crc, 1)) {
+                if (__find_symbol(mod->syms[i].name, &owner, &crc, 1)) {
                         name = mod->syms[i].name;
                         ret = -ENOEXEC;
                         goto dup;
                 }
 
         for (i = 0; i < mod->num_gpl_syms; i++)
-                if (__find_symbol(mod->gpl_syms[i].name, &owner, &crc, 1)) {
+                if (__find_symbol(mod->gpl_syms[i].name, &owner, &crc, 1)) {
                         name = mod->gpl_syms[i].name;
                         ret = -ENOEXEC;
                         goto dup;
@@ -1929,7 +1929,7 @@ static struct module *load_module(void __user *umod,
                 mod->unused_crcs = (void *)sechdrs[unusedgplcrcindex].sh_addr;
 
 #ifdef CONFIG_MODVERSIONS
-        if ((mod->num_syms && !crcindex) || 
+        if ((mod->num_syms && !crcindex) ||
             (mod->num_gpl_syms && !gplcrcindex) ||
             (mod->num_gpl_future_syms && !gplfuturecrcindex) ||
             (mod->num_unused_syms && !unusedcrcindex) ||
@@ -2016,7 +2016,7 @@ static struct module *load_module(void __user *umod,
         if (err < 0)
                 goto arch_cleanup;
 
-        err = mod_sysfs_setup(mod, 
+        err = mod_sysfs_setup(mod,
                               (struct kernel_param *)
                               sechdrs[setupindex].sh_addr,
                               sechdrs[setupindex].sh_size
@@ -2028,8 +2028,8 @@ static struct module *load_module(void __user *umod,
 
         /* Size of section 0 is 0, so this works well if no unwind info. */
         mod->unwind_info = unwind_add_table(mod,
-                                            (void *)sechdrs[unwindex].sh_addr,
-                                            sechdrs[unwindex].sh_size);
+                                            (void *)sechdrs[unwindex].sh_addr,
+                                            sechdrs[unwindex].sh_size);
 
         /* Get rid of temporary copy */
         vfree(hdr);
@@ -2146,7 +2146,7 @@ static inline int within(unsigned long addr, void *start, unsigned long size)
  */
 static inline int is_arm_mapping_symbol(const char *str)
 {
-        return str[0] == '$' && strchr("atd", str[1]) 
+        return str[0] == '$' && strchr("atd", str[1])
                && (str[2] == '\0' || str[2] == '.');
 }
 
@@ -2161,11 +2161,11 @@ static const char *get_ksymbol(struct module *mod,
         /* At worse, next value is at end of module */
         if (within(addr, mod->module_init, mod->init_size))
                 nextval = (unsigned long)mod->module_init+mod->init_text_size;
-        else 
+        else
                 nextval = (unsigned long)mod->module_core+mod->core_text_size;
 
         /* Scan for closest preceeding symbol, and next symbol. (ELF
-           starts real symbols at 1). */
+           starts real symbols at 1). */
         for (i = 1; i < mod->num_symtab; i++) {
                 if (mod->symtab[i].st_shndx == SHN_UNDEF)
                         continue;
@@ -2407,7 +2407,7 @@ const struct exception_table_entry *search_module_extables(unsigned long addr)
         list_for_each_entry(mod, &modules, list) {
                 if (mod->num_exentries == 0)
                         continue;
-                                
+
                 e = search_extable(mod->extable,
                                    mod->extable + mod->num_exentries - 1,
                                    addr);
@@ -2417,7 +2417,7 @@ const struct exception_table_entry *search_module_extables(unsigned long addr)
         preempt_enable();
 
         /* Now, if we found one, we are running inside it now, hence
-           we cannot unload the module, hence no refcnt needed. */
+           we cannot unload the module, hence no refcnt needed. */
         return e;
 }
 
diff --git a/kernel/panic.c b/kernel/panic.c
index f64f4c1ac11f..3886bd8230fe 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -56,14 +56,14 @@ EXPORT_SYMBOL(panic_blink);
  *
  *      This function never returns.
  */
- 
+
 NORET_TYPE void panic(const char * fmt, ...)
 {
         long i;
         static char buf[1024];
         va_list args;
 #if defined(CONFIG_S390)
-        unsigned long caller = (unsigned long) __builtin_return_address(0);
+        unsigned long caller = (unsigned long) __builtin_return_address(0);
 #endif
 
         /*
@@ -128,7 +128,7 @@ NORET_TYPE void panic(const char * fmt, ...)
         }
 #endif
 #if defined(CONFIG_S390)
-        disabled_wait(caller);
+        disabled_wait(caller);
 #endif
         local_irq_enable();
         for (i = 0;;) {
@@ -154,7 +154,7 @@ EXPORT_SYMBOL(panic);
  *
  *      The string is overwritten by the next call to print_taint().
  */
- 
+
 const char *print_tainted(void)
 {
         static char buf[20];
@@ -164,7 +164,7 @@ const char *print_tainted(void)
                         tainted & TAINT_FORCED_MODULE ? 'F' : ' ',
                         tainted & TAINT_UNSAFE_SMP ? 'S' : ' ',
                         tainted & TAINT_FORCED_RMMOD ? 'R' : ' ',
-                        tainted & TAINT_MACHINE_CHECK ? 'M' : ' ',
+                        tainted & TAINT_MACHINE_CHECK ? 'M' : ' ',
                         tainted & TAINT_BAD_PAGE ? 'B' : ' ',
                         tainted & TAINT_USER ? 'U' : ' ',
                         tainted & TAINT_DIE ? 'D' : ' ');
diff --git a/kernel/params.c b/kernel/params.c
index 1d6aca288cdc..16f269e9ddc9 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -592,11 +592,17 @@ static void __init param_sysfs_builtin(void)
 
         for (i=0; i < __stop___param - __start___param; i++) {
                 char *dot;
+                size_t kplen;
 
                 kp = &__start___param[i];
+                kplen = strlen(kp->name);
 
                 /* We do not handle args without periods. */
-                dot = memchr(kp->name, '.', MAX_KBUILD_MODNAME);
+                if (kplen > MAX_KBUILD_MODNAME) {
+                        DEBUGP("kernel parameter name is too long: %s\n", kp->name);
+                        continue;
+                }
+                dot = memchr(kp->name, '.', kplen);
                 if (!dot) {
                         DEBUGP("couldn't find period in %s\n", kp->name);
                         continue;
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 14b0e10dc95c..8e186c678149 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -44,17 +44,6 @@ config PM_VERBOSE
         ---help---
         This option enables verbose messages from the Power Management code.
 
-config DISABLE_CONSOLE_SUSPEND
-        bool "Keep console(s) enabled during suspend/resume (DANGEROUS)"
-        depends on PM_DEBUG && PM_SLEEP
-        default n
-        ---help---
-        This option turns off the console suspend mechanism that prevents
-        debug messages from reaching the console during the suspend/resume
-        operations.  This may be helpful when debugging device drivers'
-        suspend/resume routines, but may itself lead to problems, for example
-        if netconsole is used.
-
 config PM_TRACE
         bool "Suspend/resume event tracing"
         depends on PM_DEBUG && X86 && PM_SLEEP && EXPERIMENTAL
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index eb72255b5c86..8b15f777010a 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -45,17 +45,18 @@ enum {
 
 static int hibernation_mode = HIBERNATION_SHUTDOWN;
 
-static struct hibernation_ops *hibernation_ops;
+static struct platform_hibernation_ops *hibernation_ops;
 
 /**
  * hibernation_set_ops - set the global hibernate operations
  * @ops: the hibernation operations to use in subsequent hibernation transitions
  */
 
-void hibernation_set_ops(struct hibernation_ops *ops)
+void hibernation_set_ops(struct platform_hibernation_ops *ops)
 {
-        if (ops && !(ops->prepare && ops->enter && ops->finish
-            && ops->pre_restore && ops->restore_cleanup)) {
+        if (ops && !(ops->start && ops->pre_snapshot && ops->finish
+            && ops->prepare && ops->enter && ops->pre_restore
+            && ops->restore_cleanup)) {
                 WARN_ON(1);
                 return;
         }
@@ -69,16 +70,37 @@ void hibernation_set_ops(struct hibernation_ops *ops)
         mutex_unlock(&pm_mutex);
 }
 
+/**
+ *      platform_start - tell the platform driver that we're starting
+ *      hibernation
+ */
+
+static int platform_start(int platform_mode)
+{
+        return (platform_mode && hibernation_ops) ?
+                hibernation_ops->start() : 0;
+}
 
 /**
- *      platform_prepare - prepare the machine for hibernation using the
+ *      platform_pre_snapshot - prepare the machine for hibernation using the
  *      platform driver if so configured and return an error code if it fails
  */
 
-static int platform_prepare(int platform_mode)
+static int platform_pre_snapshot(int platform_mode)
 {
         return (platform_mode && hibernation_ops) ?
-                hibernation_ops->prepare() : 0;
+                hibernation_ops->pre_snapshot() : 0;
+}
+
+/**
+ *      platform_leave - prepare the machine for switching to the normal mode
+ *      of operation using the platform driver (called with interrupts disabled)
+ */
+
+static void platform_leave(int platform_mode)
+{
+        if (platform_mode && hibernation_ops)
+                hibernation_ops->leave();
 }
 
 /**
@@ -118,6 +140,51 @@ static void platform_restore_cleanup(int platform_mode)
 }
 
 /**
+ *      create_image - freeze devices that need to be frozen with interrupts
+ *      off, create the hibernation image and thaw those devices.  Control
+ *      reappears in this routine after a restore.
+ */
+
+int create_image(int platform_mode)
+{
+        int error;
+
+        error = arch_prepare_suspend();
+        if (error)
+                return error;
+
+        local_irq_disable();
+        /* At this point, device_suspend() has been called, but *not*
+         * device_power_down(). We *must* call device_power_down() now.
+         * Otherwise, drivers for some devices (e.g. interrupt controllers)
+         * become desynchronized with the actual state of the hardware
+         * at resume time, and evil weirdness ensues.
+         */
+        error = device_power_down(PMSG_FREEZE);
+        if (error) {
+                printk(KERN_ERR "Some devices failed to power down, "
+                        KERN_ERR "aborting suspend\n");
+                goto Enable_irqs;
+        }
+
+        save_processor_state();
+        error = swsusp_arch_suspend();
+        if (error)
+                printk(KERN_ERR "Error %d while creating the image\n", error);
+        /* Restore control flow magically appears here */
+        restore_processor_state();
+        if (!in_suspend)
+                platform_leave(platform_mode);
+        /* NOTE:  device_power_up() is just a resume() for devices
+         * that suspended with irqs off ... no overall powerup.
+         */
+        device_power_up();
+ Enable_irqs:
+        local_irq_enable();
+        return error;
+}
+
+/**
  *      hibernation_snapshot - quiesce devices and create the hibernation
  *      snapshot image.
  *      @platform_mode - if set, use the platform driver, if available, to
@@ -135,12 +202,16 @@ int hibernation_snapshot(int platform_mode)
         if (error)
                 return error;
 
+        error = platform_start(platform_mode);
+        if (error)
+                return error;
+
         suspend_console();
         error = device_suspend(PMSG_FREEZE);
         if (error)
                 goto Resume_console;
 
-        error = platform_prepare(platform_mode);
+        error = platform_pre_snapshot(platform_mode);
         if (error)
                 goto Resume_devices;
 
@@ -148,7 +219,7 @@ int hibernation_snapshot(int platform_mode)
         if (!error) {
                 if (hibernation_mode != HIBERNATION_TEST) {
                         in_suspend = 1;
-                        error = swsusp_suspend();
+                        error = create_image(platform_mode);
                         /* Control returns here after successful restore */
                 } else {
                         printk("swsusp debug: Waiting for 5 seconds.\n");
@@ -207,21 +278,50 @@ int hibernation_platform_enter(void)
 {
         int error;
 
-        if (hibernation_ops) {
-                kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
-                /*
-                 * We have cancelled the power transition by running
-                 * hibernation_ops->finish() before saving the image, so we
-                 * should let the firmware know that we're going to enter the
-                 * sleep state after all
-                 */
-                error = hibernation_ops->prepare();
-                sysdev_shutdown();
-                if (!error)
-                        error = hibernation_ops->enter();
-        } else {
-                error = -ENOSYS;
+        if (!hibernation_ops)
+                return -ENOSYS;
+
+        /*
+         * We have cancelled the power transition by running
+         * hibernation_ops->finish() before saving the image, so we should let
+         * the firmware know that we're going to enter the sleep state after all
+         */
+        error = hibernation_ops->start();
+        if (error)
+                return error;
+
+        suspend_console();
+        error = device_suspend(PMSG_SUSPEND);
+        if (error)
+                goto Resume_console;
+
+        error = hibernation_ops->prepare();
+        if (error)
+                goto Resume_devices;
+
+        error = disable_nonboot_cpus();
+        if (error)
+                goto Finish;
+
+        local_irq_disable();
+        error = device_power_down(PMSG_SUSPEND);
+        if (!error) {
+                hibernation_ops->enter();
+                /* We should never get here */
+                while (1);
         }
+        local_irq_enable();
+
+        /*
+         * We don't need to reenable the nonboot CPUs or resume consoles, since
+         * the system is going to be halted anyway.
+         */
+ Finish:
+        hibernation_ops->finish();
+ Resume_devices:
+        device_resume();
+ Resume_console:
+        resume_console();
         return error;
 }
 
@@ -238,14 +338,14 @@ static void power_down(void)
         case HIBERNATION_TEST:
         case HIBERNATION_TESTPROC:
                 break;
-        case HIBERNATION_SHUTDOWN:
-                kernel_power_off();
-                break;
         case HIBERNATION_REBOOT:
                 kernel_restart(NULL);
                 break;
         case HIBERNATION_PLATFORM:
                 hibernation_platform_enter();
+        case HIBERNATION_SHUTDOWN:
+                kernel_power_off();
+                break;
         }
         kernel_halt();
         /*
@@ -298,6 +398,10 @@ int hibernate(void)
         if (error)
                 goto Exit;
 
+        printk("Syncing filesystems ... ");
+        sys_sync();
+        printk("done.\n");
+
         error = prepare_processes();
         if (error)
                 goto Finish;
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 350b485b3b60..3cdf95b1dc92 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -20,6 +20,7 @@
 #include <linux/resume-trace.h>
 #include <linux/freezer.h>
 #include <linux/vmstat.h>
+#include <linux/syscalls.h>
 
 #include "power.h"
 
@@ -32,39 +33,32 @@ DEFINE_MUTEX(pm_mutex);
 /* This is just an arbitrary number */
 #define FREE_PAGE_NUMBER (100)
 
-struct pm_ops *pm_ops;
+static struct platform_suspend_ops *suspend_ops;
 
 /**
- *      pm_set_ops - Set the global power method table. 
+ *      suspend_set_ops - Set the global suspend method table.
  *      @ops:   Pointer to ops structure.
  */
 
-void pm_set_ops(struct pm_ops * ops)
+void suspend_set_ops(struct platform_suspend_ops *ops)
 {
         mutex_lock(&pm_mutex);
-        pm_ops = ops;
+        suspend_ops = ops;
         mutex_unlock(&pm_mutex);
 }
 
 /**
- * pm_valid_only_mem - generic memory-only valid callback
+ * suspend_valid_only_mem - generic memory-only valid callback
  *
- * pm_ops drivers that implement mem suspend only and only need
+ * Platform drivers that implement mem suspend only and only need
  * to check for that in their .valid callback can use this instead
  * of rolling their own .valid callback.
  */
-int pm_valid_only_mem(suspend_state_t state)
+int suspend_valid_only_mem(suspend_state_t state)
 {
         return state == PM_SUSPEND_MEM;
 }
 
-
-static inline void pm_finish(suspend_state_t state)
-{
-        if (pm_ops->finish)
-                pm_ops->finish(state);
-}
-
 /**
  *      suspend_prepare - Do prep work before entering low-power state.
  *
@@ -76,7 +70,7 @@ static int suspend_prepare(void)
         int error;
         unsigned int free_pages;
 
-        if (!pm_ops || !pm_ops->enter)
+        if (!suspend_ops || !suspend_ops->enter)
                 return -EPERM;
 
         error = pm_notifier_call_chain(PM_SUSPEND_PREPARE);
@@ -128,7 +122,7 @@ void __attribute__ ((weak)) arch_suspend_enable_irqs(void)
  *
  *      This function should be called after devices have been suspended.
  */
-int suspend_enter(suspend_state_t state)
+static int suspend_enter(suspend_state_t state)
 {
         int error = 0;
 
@@ -139,7 +133,7 @@ int suspend_enter(suspend_state_t state)
                 printk(KERN_ERR "Some devices failed to power down\n");
                 goto Done;
         }
-        error = pm_ops->enter(state);
+        error = suspend_ops->enter(state);
         device_power_up();
  Done:
         arch_suspend_enable_irqs();
@@ -156,11 +150,11 @@ int suspend_devices_and_enter(suspend_state_t state)
 {
         int error;
 
-        if (!pm_ops)
+        if (!suspend_ops)
                 return -ENOSYS;
 
-        if (pm_ops->set_target) {
-                error = pm_ops->set_target(state);
+        if (suspend_ops->set_target) {
+                error = suspend_ops->set_target(state);
                 if (error)
                         return error;
         }
@@ -170,8 +164,8 @@ int suspend_devices_and_enter(suspend_state_t state)
                 printk(KERN_ERR "Some devices failed to suspend\n");
                 goto Resume_console;
         }
-        if (pm_ops->prepare) {
-                error = pm_ops->prepare(state);
+        if (suspend_ops->prepare) {
+                error = suspend_ops->prepare();
                 if (error)
                         goto Resume_devices;
         }
@@ -180,7 +174,8 @@ int suspend_devices_and_enter(suspend_state_t state)
                 suspend_enter(state);
 
         enable_nonboot_cpus();
-        pm_finish(state);
+        if (suspend_ops->finish)
+                suspend_ops->finish();
  Resume_devices:
         device_resume();
  Resume_console:
@@ -214,7 +209,7 @@ static inline int valid_state(suspend_state_t state)
         /* All states need lowlevel support and need to be valid
          * to the lowlevel implementation, no valid callback
          * implies that none are valid. */
-        if (!pm_ops || !pm_ops->valid || !pm_ops->valid(state))
+        if (!suspend_ops || !suspend_ops->valid || !suspend_ops->valid(state))
                 return 0;
         return 1;
 }
@@ -236,9 +231,14 @@ static int enter_state(suspend_state_t state)
 
         if (!valid_state(state))
                 return -ENODEV;
+
         if (!mutex_trylock(&pm_mutex))
                 return -EBUSY;
 
+        printk("Syncing filesystems ... ");
+        sys_sync();
+        printk("done.\n");
+
         pr_debug("PM: Preparing system for %s sleep\n", pm_states[state]);
         if ((error = suspend_prepare()))
                 goto Unlock;
diff --git a/kernel/power/power.h b/kernel/power/power.h
index 95fbf2dd3fe3..195dc4611764 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -11,14 +11,32 @@ struct swsusp_info {
         unsigned long           size;
 } __attribute__((aligned(PAGE_SIZE)));
 
+#ifdef CONFIG_HIBERNATION
+#ifdef CONFIG_ARCH_HIBERNATION_HEADER
+/* Maximum size of architecture specific data in a hibernation header */
+#define MAX_ARCH_HEADER_SIZE    (sizeof(struct new_utsname) + 4)
 
+extern int arch_hibernation_header_save(void *addr, unsigned int max_size);
+extern int arch_hibernation_header_restore(void *addr);
+
+static inline int init_header_complete(struct swsusp_info *info)
+{
+        return arch_hibernation_header_save(info, MAX_ARCH_HEADER_SIZE);
+}
+
+static inline char *check_image_kernel(struct swsusp_info *info)
+{
+        return arch_hibernation_header_restore(info) ?
+                        "architecture specific data" : NULL;
+}
+#endif /* CONFIG_ARCH_HIBERNATION_HEADER */
 
-#ifdef CONFIG_HIBERNATION
 /*
  * Keep some memory free so that I/O operations can succeed without paging
  * [Might this be more than 4 MB?]
  */
 #define PAGES_FOR_IO    ((4096 * 1024) >> PAGE_SHIFT)
+
 /*
  * Keep 1 MB of memory free so that device drivers can allocate some pages in
  * their .suspend() routines without breaking the suspend to disk.
@@ -165,7 +183,6 @@ extern int swsusp_swap_in_use(void);
 extern int swsusp_check(void);
 extern int swsusp_shrink_memory(void);
 extern void swsusp_free(void);
-extern int swsusp_suspend(void);
 extern int swsusp_resume(void);
 extern int swsusp_read(unsigned int *flags_p);
 extern int swsusp_write(unsigned int flags);
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 3434940a3df1..6533923e711b 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -75,21 +75,79 @@ void refrigerator(void)
         __set_current_state(save);
 }
 
-static void freeze_task(struct task_struct *p)
+static void fake_signal_wake_up(struct task_struct *p, int resume)
 {
         unsigned long flags;
 
-        if (!freezing(p)) {
+        spin_lock_irqsave(&p->sighand->siglock, flags);
+        signal_wake_up(p, resume);
+        spin_unlock_irqrestore(&p->sighand->siglock, flags);
+}
+
+static void send_fake_signal(struct task_struct *p)
+{
+        if (p->state == TASK_STOPPED)
+                force_sig_specific(SIGSTOP, p);
+        fake_signal_wake_up(p, p->state == TASK_STOPPED);
+}
+
+static int has_mm(struct task_struct *p)
+{
+        return (p->mm && !(p->flags & PF_BORROWED_MM));
+}
+
+/**
+ *      freeze_task - send a freeze request to given task
+ *      @p: task to send the request to
+ *      @with_mm_only: if set, the request will only be sent if the task has its
+ *              own mm
+ *      Return value: 0, if @with_mm_only is set and the task has no mm of its
+ *              own or the task is frozen, 1, otherwise
+ *
+ *      The freeze request is sent by seting the tasks's TIF_FREEZE flag and
+ *      either sending a fake signal to it or waking it up, depending on whether
+ *      or not it has its own mm (ie. it is a user land task).  If @with_mm_only
+ *      is set and the task has no mm of its own (ie. it is a kernel thread),
+ *      its TIF_FREEZE flag should not be set.
+ *
+ *      The task_lock() is necessary to prevent races with exit_mm() or
+ *      use_mm()/unuse_mm() from occuring.
+ */
+static int freeze_task(struct task_struct *p, int with_mm_only)
+{
+        int ret = 1;
+
+        task_lock(p);
+        if (freezing(p)) {
+                if (has_mm(p)) {
+                        if (!signal_pending(p))
+                                fake_signal_wake_up(p, 0);
+                } else {
+                        if (with_mm_only)
+                                ret = 0;
+                        else
+                                wake_up_state(p, TASK_INTERRUPTIBLE);
+                }
+        } else {
                 rmb();
-                if (!frozen(p)) {
-                        set_freeze_flag(p);
-                        if (p->state == TASK_STOPPED)
-                                force_sig_specific(SIGSTOP, p);
-                        spin_lock_irqsave(&p->sighand->siglock, flags);
-                        signal_wake_up(p, p->state == TASK_STOPPED);
-                        spin_unlock_irqrestore(&p->sighand->siglock, flags);
+                if (frozen(p)) {
+                        ret = 0;
+                } else {
+                        if (has_mm(p)) {
+                                set_freeze_flag(p);
+                                send_fake_signal(p);
+                        } else {
+                                if (with_mm_only) {
+                                        ret = 0;
+                                } else {
+                                        set_freeze_flag(p);
+                                        wake_up_state(p, TASK_INTERRUPTIBLE);
+                                }
+                        }
                 }
         }
+        task_unlock(p);
+        return ret;
 }
 
 static void cancel_freezing(struct task_struct *p)
@@ -110,6 +168,11 @@ static int try_to_freeze_tasks(int freeze_user_space)
         struct task_struct *g, *p;
         unsigned long end_time;
         unsigned int todo;
+        struct timeval start, end;
+        s64 elapsed_csecs64;
+        unsigned int elapsed_csecs;
+
+        do_gettimeofday(&start);
 
         end_time = jiffies + TIMEOUT;
         do {
@@ -119,31 +182,14 @@ static int try_to_freeze_tasks(int freeze_user_space)
                         if (frozen(p) || !freezeable(p))
                                 continue;
 
-                        if (freeze_user_space) {
-                                if (p->state == TASK_TRACED &&
-                                    frozen(p->parent)) {
-                                        cancel_freezing(p);
-                                        continue;
-                                }
-                                /*
-                                 * Kernel threads should not have TIF_FREEZE set
-                                 * at this point, so we must ensure that either
-                                 * p->mm is not NULL *and* PF_BORROWED_MM is
-                                 * unset, or TIF_FRREZE is left unset.
-                                 * The task_lock() is necessary to prevent races
-                                 * with exit_mm() or use_mm()/unuse_mm() from
-                                 * occuring.
-                                 */
-                                task_lock(p);
-                                if (!p->mm || (p->flags & PF_BORROWED_MM)) {
-                                        task_unlock(p);
-                                        continue;
-                                }
-                                freeze_task(p);
-                                task_unlock(p);
-                        } else {
-                                freeze_task(p);
+                        if (p->state == TASK_TRACED && frozen(p->parent)) {
+                                cancel_freezing(p);
+                                continue;
                         }
+
+                        if (!freeze_task(p, freeze_user_space))
+                                continue;
+
                         if (!freezer_should_skip(p))
                                 todo++;
                 } while_each_thread(g, p);
@@ -153,6 +199,11 @@ static int try_to_freeze_tasks(int freeze_user_space)
                         break;
         } while (todo);
 
+        do_gettimeofday(&end);
+        elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
+        do_div(elapsed_csecs64, NSEC_PER_SEC / 100);
+        elapsed_csecs = elapsed_csecs64;
+
         if (todo) {
                 /* This does not unfreeze processes that are already frozen
                  * (we have slightly ugly calling convention in that respect,
@@ -160,10 +211,9 @@ static int try_to_freeze_tasks(int freeze_user_space)
                  * but it cleans up leftover PF_FREEZE requests.
                  */
                 printk("\n");
-                printk(KERN_ERR "Freezing of %s timed out after %d seconds "
+                printk(KERN_ERR "Freezing of tasks failed after %d.%02d seconds "
                                 "(%d tasks refusing to freeze):\n",
-                                freeze_user_space ? "user space " : "tasks ",
-                                TIMEOUT / HZ, todo);
+                                elapsed_csecs / 100, elapsed_csecs % 100, todo);
                 show_state();
                 read_lock(&tasklist_lock);
                 do_each_thread(g, p) {
@@ -174,6 +224,9 @@ static int try_to_freeze_tasks(int freeze_user_space)
                         task_unlock(p);
                 } while_each_thread(g, p);
                 read_unlock(&tasklist_lock);
+        } else {
+                printk("(elapsed %d.%02d seconds) ", elapsed_csecs / 100,
+                        elapsed_csecs % 100);
         }
 
         return todo ? -EBUSY : 0;
@@ -186,19 +239,21 @@ int freeze_processes(void)
 {
         int error;
 
-        printk("Stopping tasks ... ");
+        printk("Freezing user space processes ... ");
         error = try_to_freeze_tasks(FREEZER_USER_SPACE);
         if (error)
-                return error;
+                goto Exit;
+        printk("done.\n");
 
-        sys_sync();
+        printk("Freezing remaining freezable tasks ... ");
         error = try_to_freeze_tasks(FREEZER_KERNEL_THREADS);
         if (error)
-                return error;
-
-        printk("done.\n");
+                goto Exit;
+        printk("done.");
+ Exit:
         BUG_ON(in_atomic());
-        return 0;
+        printk("\n");
+        return error;
 }
 
 static void thaw_tasks(int thaw_user_space)
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index a686590d88c1..ccc95ac07bed 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -1239,17 +1239,39 @@ asmlinkage int swsusp_save(void)
         return 0;
 }
 
-static void init_header(struct swsusp_info *info)
+#ifndef CONFIG_ARCH_HIBERNATION_HEADER
+static int init_header_complete(struct swsusp_info *info)
 {
-        memset(info, 0, sizeof(struct swsusp_info));
+        memcpy(&info->uts, init_utsname(), sizeof(struct new_utsname));
         info->version_code = LINUX_VERSION_CODE;
+        return 0;
+}
+
+static char *check_image_kernel(struct swsusp_info *info)
+{
+        if (info->version_code != LINUX_VERSION_CODE)
+                return "kernel version";
+        if (strcmp(info->uts.sysname,init_utsname()->sysname))
+                return "system type";
+        if (strcmp(info->uts.release,init_utsname()->release))
+                return "kernel release";
+        if (strcmp(info->uts.version,init_utsname()->version))
+                return "version";
+        if (strcmp(info->uts.machine,init_utsname()->machine))
+                return "machine";
+        return NULL;
+}
+#endif /* CONFIG_ARCH_HIBERNATION_HEADER */
+
+static int init_header(struct swsusp_info *info)
+{
+        memset(info, 0, sizeof(struct swsusp_info));
         info->num_physpages = num_physpages;
-        memcpy(&info->uts, init_utsname(), sizeof(struct new_utsname));
-        info->cpus = num_online_cpus();
         info->image_pages = nr_copy_pages;
         info->pages = nr_copy_pages + nr_meta_pages + 1;
         info->size = info->pages;
         info->size <<= PAGE_SHIFT;
+        return init_header_complete(info);
 }
 
 /**
@@ -1303,7 +1325,11 @@ int snapshot_read_next(struct snapshot_handle *handle, size_t count)
                         return -ENOMEM;
         }
         if (!handle->offset) {
-                init_header((struct swsusp_info *)buffer);
+                int error;
+
+                error = init_header((struct swsusp_info *)buffer);
+                if (error)
+                        return error;
                 handle->buffer = buffer;
                 memory_bm_position_reset(&orig_bm);
                 memory_bm_position_reset(&copy_bm);
@@ -1394,22 +1420,13 @@ duplicate_memory_bitmap(struct memory_bitmap *dst, struct memory_bitmap *src)
         }
 }
 
-static inline int check_header(struct swsusp_info *info)
+static int check_header(struct swsusp_info *info)
 {
-        char *reason = NULL;
+        char *reason;
 
-        if (info->version_code != LINUX_VERSION_CODE)
-                reason = "kernel version";
-        if (info->num_physpages != num_physpages)
+        reason = check_image_kernel(info);
+        if (!reason && info->num_physpages != num_physpages)
                 reason = "memory size";
-        if (strcmp(info->uts.sysname,init_utsname()->sysname))
-                reason = "system type";
-        if (strcmp(info->uts.release,init_utsname()->release))
-                reason = "kernel release";
-        if (strcmp(info->uts.version,init_utsname()->version))
-                reason = "version";
-        if (strcmp(info->uts.machine,init_utsname()->machine))
-                reason = "machine";
         if (reason) {
                 printk(KERN_ERR "swsusp: Resume mismatch: %s\n", reason);
                 return -EPERM;
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index 5da304c8f1f6..e1722d3155f1 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -270,39 +270,6 @@ int swsusp_shrink_memory(void)
         return 0;
 }
 
-int swsusp_suspend(void)
-{
-        int error;
-
-        if ((error = arch_prepare_suspend()))
-                return error;
-
-        local_irq_disable();
-        /* At this point, device_suspend() has been called, but *not*
-         * device_power_down(). We *must* device_power_down() now.
-         * Otherwise, drivers for some devices (e.g. interrupt controllers)
-         * become desynchronized with the actual state of the hardware
-         * at resume time, and evil weirdness ensues.
-         */
-        if ((error = device_power_down(PMSG_FREEZE))) {
-                printk(KERN_ERR "Some devices failed to power down, aborting suspend\n");
-                goto Enable_irqs;
-        }
-
-        save_processor_state();
-        if ((error = swsusp_arch_suspend()))
-                printk(KERN_ERR "Error %d suspending\n", error);
-        /* Restore control flow magically appears here */
-        restore_processor_state();
-        /* NOTE:  device_power_up() is just a resume() for devices
-         * that suspended with irqs off ... no overall powerup.
-         */
-        device_power_up();
- Enable_irqs:
-        local_irq_enable();
-        return error;
-}
-
 int swsusp_resume(void)
 {
         int error;
diff --git a/kernel/power/user.c b/kernel/power/user.c
index bd0723a7df3f..5bd321bcbb75 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -153,6 +153,10 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                 mutex_lock(&pm_mutex);
                 error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE);
                 if (!error) {
+                        printk("Syncing filesystems ... ");
+                        sys_sync();
+                        printk("done.\n");
+
                         error = freeze_processes();
                         if (error)
                                 thaw_processes();
diff --git a/kernel/printk.c b/kernel/printk.c
index 52493474f0ab..a30fe33de395 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -862,7 +862,16 @@ int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, cha
         return -1;
 }
 
-#ifndef CONFIG_DISABLE_CONSOLE_SUSPEND
+int console_suspend_enabled = 1;
+EXPORT_SYMBOL(console_suspend_enabled);
+
+static int __init console_suspend_disable(char *str)
+{
+        console_suspend_enabled = 0;
+        return 1;
+}
+__setup("no_console_suspend", console_suspend_disable);
+
 /**
  * suspend_console - suspend the console subsystem
  *
@@ -870,6 +879,8 @@ int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, cha
  */
 void suspend_console(void)
 {
+        if (!console_suspend_enabled)
+                return;
         printk("Suspending console(s)\n");
         acquire_console_sem();
         console_suspended = 1;
@@ -877,10 +888,11 @@ void suspend_console(void)
 
 void resume_console(void)
 {
+        if (!console_suspend_enabled)
+                return;
         console_suspended = 0;
         release_console_sem();
 }
-#endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */
 
 /**
  * acquire_console_sem - lock the console system for exclusive use.
diff --git a/kernel/relay.c b/kernel/relay.c
index ad855017bc59..61134eb7a0c8 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -370,7 +370,7 @@ void relay_reset(struct rchan *chan)
         if (!chan)
                 return;
 
-        if (chan->is_global && chan->buf[0]) {
+        if (chan->is_global && chan->buf[0]) {
                 __relay_reset(chan->buf[0], 0);
                 return;
         }
@@ -850,13 +850,13 @@ static int relay_file_read_avail(struct rchan_buf *buf, size_t read_pos)
                 buf->subbufs_consumed = consumed;
                 buf->bytes_consumed = 0;
         }
-        
+
         produced = (produced % n_subbufs) * subbuf_size + buf->offset;
         consumed = (consumed % n_subbufs) * subbuf_size + buf->bytes_consumed;
 
         if (consumed > produced)
                 produced += n_subbufs * subbuf_size;
-        
+
         if (consumed == produced)
                 return 0;
 
diff --git a/kernel/sched.c b/kernel/sched.c
index 92721d1534b8..12534421d7b5 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3334,6 +3334,16 @@ void account_guest_time(struct task_struct *p, cputime_t cputime)
 }
 
 /*
+ * Account scaled user cpu time to a process.
+ * @p: the process that the cpu time gets accounted to
+ * @cputime: the cpu time spent in user space since the last update
+ */
+void account_user_time_scaled(struct task_struct *p, cputime_t cputime)
+{
+        p->utimescaled = cputime_add(p->utimescaled, cputime);
+}
+
+/*
  * Account system cpu time to a process.
  * @p: the process that the cpu time gets accounted to
  * @hardirq_offset: the offset to subtract from hardirq_count()
@@ -3371,6 +3381,17 @@ void account_system_time(struct task_struct *p, int hardirq_offset,
 }
 
 /*
+ * Account scaled system cpu time to a process.
+ * @p: the process that the cpu time gets accounted to
+ * @hardirq_offset: the offset to subtract from hardirq_count()
+ * @cputime: the cpu time spent in kernel space since the last update
+ */
+void account_system_time_scaled(struct task_struct *p, cputime_t cputime)
+{
+        p->stimescaled = cputime_add(p->stimescaled, cputime);
+}
+
+/*
  * Account for involuntary wait time.
  * @p: the process from which the cpu time has been stolen
  * @steal: the cpu time spent in involuntary wait
diff --git a/kernel/signal.c b/kernel/signal.c
index 2124ffadcfde..e4f059cd9867 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -99,7 +99,6 @@ static inline int has_pending_signals(sigset_t *signal, sigset_t *blocked)
 static int recalc_sigpending_tsk(struct task_struct *t)
 {
         if (t->signal->group_stop_count > 0 ||
-            (freezing(t)) ||
             PENDING(&t->pending, &t->blocked) ||
             PENDING(&t->signal->shared_pending, &t->blocked)) {
                 set_tsk_thread_flag(t, TIF_SIGPENDING);
diff --git a/kernel/sys.c b/kernel/sys.c
index 8ae2e636eb1b..bc8879c822a5 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -105,7 +105,6 @@ EXPORT_SYMBOL(cad_pid);
  */
 
 void (*pm_power_off_prepare)(void);
-EXPORT_SYMBOL(pm_power_off_prepare);
 
 /*
  *      Notifier list for kernel code which wants to be called
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index dde3d53e8adc..067554bda8b7 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -24,7 +24,7 @@
 #include <linux/slab.h>
 #include <linux/sysctl.h>
 #include <linux/proc_fs.h>
-#include <linux/capability.h>
+#include <linux/security.h>
 #include <linux/ctype.h>
 #include <linux/utsname.h>
 #include <linux/smp_lock.h>
@@ -55,6 +55,8 @@
 #include <asm/stacktrace.h>
 #endif
 
+static int deprecated_sysctl_warning(struct __sysctl_args *args);
+
 #if defined(CONFIG_SYSCTL)
 
 /* External variables not in a header file. */
@@ -142,32 +144,29 @@ extern int max_lock_depth;
 
 #ifdef CONFIG_SYSCTL_SYSCALL
 static int parse_table(int __user *, int, void __user *, size_t __user *,
-                void __user *, size_t, ctl_table *);
+                void __user *, size_t, struct ctl_table *);
 #endif
 
 
 #ifdef CONFIG_PROC_SYSCTL
-static int proc_do_cad_pid(ctl_table *table, int write, struct file *filp,
+static int proc_do_cad_pid(struct ctl_table *table, int write, struct file *filp,
                   void __user *buffer, size_t *lenp, loff_t *ppos);
-static int proc_dointvec_taint(ctl_table *table, int write, struct file *filp,
+static int proc_dointvec_taint(struct ctl_table *table, int write, struct file *filp,
                                void __user *buffer, size_t *lenp, loff_t *ppos);
 #endif
 
-static ctl_table root_table[];
+static struct ctl_table root_table[];
 static struct ctl_table_header root_table_header =
         { root_table, LIST_HEAD_INIT(root_table_header.ctl_entry) };
 
-static ctl_table kern_table[];
-static ctl_table vm_table[];
-static ctl_table fs_table[];
-static ctl_table debug_table[];
-static ctl_table dev_table[];
-extern ctl_table random_table[];
-#ifdef CONFIG_UNIX98_PTYS
-extern ctl_table pty_table[];
-#endif
+static struct ctl_table kern_table[];
+static struct ctl_table vm_table[];
+static struct ctl_table fs_table[];
+static struct ctl_table debug_table[];
+static struct ctl_table dev_table[];
+extern struct ctl_table random_table[];
 #ifdef CONFIG_INOTIFY_USER
-extern ctl_table inotify_table[];
+extern struct ctl_table inotify_table[];
 #endif
 
 #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT
@@ -179,7 +178,7 @@ extern int lock_stat;
 
 /* The default sysctl tables: */
 
-static ctl_table root_table[] = {
+static struct ctl_table root_table[] = {
         {
                 .ctl_name       = CTL_KERN,
                 .procname       = "kernel",
@@ -232,7 +231,7 @@ static unsigned long min_wakeup_granularity_ns;			/* 0 usecs */
 static unsigned long max_wakeup_granularity_ns = 1000000000;    /* 1 second */
 #endif
 
-static ctl_table kern_table[] = {
+static struct ctl_table kern_table[] = {
 #ifdef CONFIG_SCHED_DEBUG
         {
                 .ctl_name       = CTL_UNNUMBERED,
@@ -365,7 +364,6 @@ static ctl_table kern_table[] = {
         },
 #ifdef CONFIG_PROC_SYSCTL
         {
-                .ctl_name       = KERN_TAINTED,
                 .procname       = "tainted",
                 .data           = &tainted,
                 .maxlen         = sizeof(int),
@@ -373,14 +371,15 @@ static ctl_table kern_table[] = {
                 .proc_handler   = &proc_dointvec_taint,
         },
 #endif
+#ifdef CONFIG_SECURITY_CAPABILITIES
         {
-                .ctl_name       = KERN_CAP_BSET,
                 .procname       = "cap-bound",
                 .data           = &cap_bset,
                 .maxlen         = sizeof(kernel_cap_t),
                 .mode           = 0600,
                 .proc_handler   = &proc_dointvec_bset,
         },
+#endif /* def CONFIG_SECURITY_CAPABILITIES */
 #ifdef CONFIG_BLK_DEV_INITRD
         {
                 .ctl_name       = KERN_REALROOTDEV,
@@ -514,7 +513,6 @@ static ctl_table kern_table[] = {
 #endif
 #ifdef CONFIG_PROC_SYSCTL
         {
-                .ctl_name       = KERN_CADPID,
                 .procname       = "cad_pid",
                 .data           = NULL,
                 .maxlen         = sizeof (int),
@@ -536,14 +534,6 @@ static ctl_table kern_table[] = {
                 .mode           = 0555,
                 .child          = random_table,
         },
-#ifdef CONFIG_UNIX98_PTYS
-        {
-                .ctl_name       = KERN_PTY,
-                .procname       = "pty",
-                .mode           = 0555,
-                .child          = pty_table,
-        },
-#endif
         {
                 .ctl_name       = KERN_OVERFLOWUID,
                 .procname       = "overflowuid",
@@ -650,7 +640,6 @@ static ctl_table kern_table[] = {
                 .proc_handler   = &proc_dointvec,
         },
         {
-                .ctl_name       = KERN_NMI_WATCHDOG,
                 .procname       = "nmi_watchdog",
                 .data           = &nmi_watchdog_enabled,
                 .maxlen         = sizeof (int),
@@ -706,7 +695,6 @@ static ctl_table kern_table[] = {
 #endif
 #if     defined(CONFIG_ACPI_SLEEP) && defined(CONFIG_X86)
         {
-                .ctl_name       = KERN_ACPI_VIDEO_FLAGS,
                 .procname       = "acpi_video_flags",
                 .data           = &acpi_realmode_flags,
                 .maxlen         = sizeof (unsigned long),
@@ -783,7 +771,7 @@ static ctl_table kern_table[] = {
         { .ctl_name = 0 }
 };
 
-static ctl_table vm_table[] = {
+static struct ctl_table vm_table[] = {
         {
                 .ctl_name       = VM_OVERCOMMIT_MEMORY,
                 .procname       = "overcommit_memory",
@@ -847,7 +835,6 @@ static ctl_table vm_table[] = {
                 .extra2         = &one_hundred,
         },
         {
-                .ctl_name       = VM_DIRTY_WB_CS,
                 .procname       = "dirty_writeback_centisecs",
                 .data           = &dirty_writeback_interval,
                 .maxlen         = sizeof(dirty_writeback_interval),
@@ -855,7 +842,6 @@ static ctl_table vm_table[] = {
                 .proc_handler   = &dirty_writeback_centisecs_handler,
         },
         {
-                .ctl_name       = VM_DIRTY_EXPIRE_CS,
                 .procname       = "dirty_expire_centisecs",
                 .data           = &dirty_expire_interval,
                 .maxlen         = sizeof(dirty_expire_interval),
@@ -883,7 +869,6 @@ static ctl_table vm_table[] = {
         },
 #ifdef CONFIG_HUGETLB_PAGE
          {
-                .ctl_name       = VM_HUGETLB_PAGES,
                 .procname       = "nr_hugepages",
                 .data           = &max_huge_pages,
                 .maxlen         = sizeof(unsigned long),
@@ -1093,12 +1078,12 @@ static ctl_table vm_table[] = {
 };
 
 #if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE)
-static ctl_table binfmt_misc_table[] = {
+static struct ctl_table binfmt_misc_table[] = {
         { .ctl_name = 0 }
 };
 #endif
 
-static ctl_table fs_table[] = {
+static struct ctl_table fs_table[] = {
         {
                 .ctl_name       = FS_NRINODE,
                 .procname       = "inode-nr",
@@ -1116,7 +1101,6 @@ static ctl_table fs_table[] = {
                 .proc_handler   = &proc_dointvec,
         },
         {
-                .ctl_name       = FS_NRFILE,
                 .procname       = "file-nr",
                 .data           = &files_stat,
                 .maxlen         = 3*sizeof(int),
@@ -1192,7 +1176,6 @@ static ctl_table fs_table[] = {
                 .extra2         = &two,
         },
         {
-                .ctl_name       = FS_AIO_NR,
                 .procname       = "aio-nr",
                 .data           = &aio_nr,
                 .maxlen         = sizeof(aio_nr),
@@ -1200,7 +1183,6 @@ static ctl_table fs_table[] = {
                 .proc_handler   = &proc_doulongvec_minmax,
         },
         {
-                .ctl_name       = FS_AIO_MAX_NR,
                 .procname       = "aio-max-nr",
                 .data           = &aio_max_nr,
                 .maxlen         = sizeof(aio_max_nr),
@@ -1239,7 +1221,7 @@ static ctl_table fs_table[] = {
         { .ctl_name = 0 }
 };
 
-static ctl_table debug_table[] = {
+static struct ctl_table debug_table[] = {
 #if defined(CONFIG_X86) || defined(CONFIG_PPC)
         {
                 .ctl_name       = CTL_UNNUMBERED,
@@ -1253,7 +1235,7 @@ static ctl_table debug_table[] = {
         { .ctl_name = 0 }
 };
 
-static ctl_table dev_table[] = {
+static struct ctl_table dev_table[] = {
         { .ctl_name = 0 }
 };
 
@@ -1369,10 +1351,15 @@ asmlinkage long sys_sysctl(struct __sysctl_args __user *args)
         if (copy_from_user(&tmp, args, sizeof(tmp)))
                 return -EFAULT;
 
+        error = deprecated_sysctl_warning(&tmp);
+        if (error)
+                goto out;
+
         lock_kernel();
         error = do_sysctl(tmp.name, tmp.nlen, tmp.oldval, tmp.oldlenp,
                           tmp.newval, tmp.newlen);
         unlock_kernel();
+out:
         return error;
 }
 #endif /* CONFIG_SYSCTL_SYSCALL */
@@ -1393,7 +1380,7 @@ static int test_perm(int mode, int op)
         return -EACCES;
 }
 
-int sysctl_perm(ctl_table *table, int op)
+int sysctl_perm(struct ctl_table *table, int op)
 {
         int error;
         error = security_sysctl(table, op);
@@ -1406,7 +1393,7 @@ int sysctl_perm(ctl_table *table, int op)
 static int parse_table(int __user *name, int nlen,
                        void __user *oldval, size_t __user *oldlenp,
                        void __user *newval, size_t newlen,
-                       ctl_table *table)
+                       struct ctl_table *table)
 {
         int n;
 repeat:
@@ -1437,13 +1424,12 @@ repeat:
 }
 
 /* Perform the actual read/write of a sysctl table entry. */
-int do_sysctl_strategy (ctl_table *table, 
+int do_sysctl_strategy (struct ctl_table *table,
                         int __user *name, int nlen,
                         void __user *oldval, size_t __user *oldlenp,
                         void __user *newval, size_t newlen)
 {
         int op = 0, rc;
-        size_t len;
 
         if (oldval)
                 op |= 004;
@@ -1464,25 +1450,10 @@ int do_sysctl_strategy (ctl_table *table,
         /* If there is no strategy routine, or if the strategy returns
          * zero, proceed with automatic r/w */
         if (table->data && table->maxlen) {
-                if (oldval && oldlenp) {
-                        if (get_user(len, oldlenp))
-                                return -EFAULT;
-                        if (len) {
-                                if (len > table->maxlen)
-                                        len = table->maxlen;
-                                if(copy_to_user(oldval, table->data, len))
-                                        return -EFAULT;
-                                if(put_user(len, oldlenp))
-                                        return -EFAULT;
-                        }
-                }
-                if (newval && newlen) {
-                        len = newlen;
-                        if (len > table->maxlen)
-                                len = table->maxlen;
-                        if(copy_from_user(table->data, newval, len))
-                                return -EFAULT;
-                }
+                rc = sysctl_data(table, name, nlen, oldval, oldlenp,
+                                 newval, newlen);
+                if (rc < 0)
+                        return rc;
         }
         return 0;
 }
@@ -1499,7 +1470,9 @@ static void sysctl_set_parent(struct ctl_table *parent, struct ctl_table *table)
 
 static __init int sysctl_init(void)
 {
+        int err;
         sysctl_set_parent(NULL, root_table);
+        err = sysctl_check_table(root_table);
         return 0;
 }
 
@@ -1512,7 +1485,7 @@ core_initcall(sysctl_init);
  * Register a sysctl table hierarchy. @table should be a filled in ctl_table
  * array. An entry with a ctl_name of 0 terminates the table. 
  *
- * The members of the &ctl_table structure are used as follows:
+ * The members of the &struct ctl_table structure are used as follows:
  *
  * ctl_name - This is the numeric sysctl value used by sysctl(2). The number
  *            must be unique within that level of sysctl
@@ -1573,7 +1546,7 @@ core_initcall(sysctl_init);
  * This routine returns %NULL on a failure to register, and a pointer
  * to the table header on success.
  */
-struct ctl_table_header *register_sysctl_table(ctl_table * table)
+struct ctl_table_header *register_sysctl_table(struct ctl_table * table)
 {
         struct ctl_table_header *tmp;
         tmp = kmalloc(sizeof(struct ctl_table_header), GFP_KERNEL);
@@ -1584,6 +1557,10 @@ struct ctl_table_header *register_sysctl_table(ctl_table * table)
         tmp->used = 0;
         tmp->unregistering = NULL;
         sysctl_set_parent(NULL, table);
+        if (sysctl_check_table(tmp->ctl_table)) {
+                kfree(tmp);
+                return NULL;
+        }
         spin_lock(&sysctl_lock);
         list_add_tail(&tmp->ctl_entry, &root_table_header.ctl_entry);
         spin_unlock(&sysctl_lock);
@@ -1607,7 +1584,7 @@ void unregister_sysctl_table(struct ctl_table_header * header)
 }
 
 #else /* !CONFIG_SYSCTL */
-struct ctl_table_header *register_sysctl_table(ctl_table * table)
+struct ctl_table_header *register_sysctl_table(struct ctl_table * table)
 {
         return NULL;
 }
@@ -1700,7 +1677,7 @@ static int _proc_do_string(void* data, int maxlen, int write,
  *
  * Returns 0 on success.
  */
-int proc_dostring(ctl_table *table, int write, struct file *filp,
+int proc_dostring(struct ctl_table *table, int write, struct file *filp,
                   void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         return _proc_do_string(table->data, table->maxlen, write, filp,
@@ -1727,7 +1704,7 @@ static int do_proc_dointvec_conv(int *negp, unsigned long *lvalp,
         return 0;
 }
 
-static int __do_proc_dointvec(void *tbl_data, ctl_table *table,
+static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table,
                   int write, struct file *filp, void __user *buffer,
                   size_t *lenp, loff_t *ppos,
                   int (*conv)(int *negp, unsigned long *lvalp, int *valp,
@@ -1837,7 +1814,7 @@ static int __do_proc_dointvec(void *tbl_data, ctl_table *table,
 #undef TMPBUFLEN
 }
 
-static int do_proc_dointvec(ctl_table *table, int write, struct file *filp,
+static int do_proc_dointvec(struct ctl_table *table, int write, struct file *filp,
                   void __user *buffer, size_t *lenp, loff_t *ppos,
                   int (*conv)(int *negp, unsigned long *lvalp, int *valp,
                               int write, void *data),
@@ -1861,7 +1838,7 @@ static int do_proc_dointvec(ctl_table *table, int write, struct file *filp,
  *
  * Returns 0 on success.
  */
-int proc_dointvec(ctl_table *table, int write, struct file *filp,
+int proc_dointvec(struct ctl_table *table, int write, struct file *filp,
                      void __user *buffer, size_t *lenp, loff_t *ppos)
 {
     return do_proc_dointvec(table,write,filp,buffer,lenp,ppos,
@@ -1897,11 +1874,12 @@ static int do_proc_dointvec_bset_conv(int *negp, unsigned long *lvalp,
         return 0;
 }
 
+#ifdef CONFIG_SECURITY_CAPABILITIES
 /*
  *      init may raise the set.
  */
- 
-int proc_dointvec_bset(ctl_table *table, int write, struct file *filp,
+
+int proc_dointvec_bset(struct ctl_table *table, int write, struct file *filp,
                         void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         int op;
@@ -1914,11 +1892,12 @@ int proc_dointvec_bset(ctl_table *table, int write, struct file *filp,
         return do_proc_dointvec(table,write,filp,buffer,lenp,ppos,
                                 do_proc_dointvec_bset_conv,&op);
 }
+#endif /* def CONFIG_SECURITY_CAPABILITIES */
 
 /*
  *      Taint values can only be increased
  */
-static int proc_dointvec_taint(ctl_table *table, int write, struct file *filp,
+static int proc_dointvec_taint(struct ctl_table *table, int write, struct file *filp,
                                void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         int op;
@@ -1977,7 +1956,7 @@ static int do_proc_dointvec_minmax_conv(int *negp, unsigned long *lvalp,
  *
  * Returns 0 on success.
  */
-int proc_dointvec_minmax(ctl_table *table, int write, struct file *filp,
+int proc_dointvec_minmax(struct ctl_table *table, int write, struct file *filp,
                   void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         struct do_proc_dointvec_minmax_conv_param param = {
@@ -1988,7 +1967,7 @@ int proc_dointvec_minmax(ctl_table *table, int write, struct file *filp,
                                 do_proc_dointvec_minmax_conv, &param);
 }
 
-static int __do_proc_doulongvec_minmax(void *data, ctl_table *table, int write,
+static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int write,
                                      struct file *filp,
                                      void __user *buffer,
                                      size_t *lenp, loff_t *ppos,
@@ -2093,7 +2072,7 @@ static int __do_proc_doulongvec_minmax(void *data, ctl_table *table, int write,
 #undef TMPBUFLEN
 }
 
-static int do_proc_doulongvec_minmax(ctl_table *table, int write,
+static int do_proc_doulongvec_minmax(struct ctl_table *table, int write,
                                      struct file *filp,
                                      void __user *buffer,
                                      size_t *lenp, loff_t *ppos,
@@ -2121,7 +2100,7 @@ static int do_proc_doulongvec_minmax(ctl_table *table, int write,
  *
  * Returns 0 on success.
  */
-int proc_doulongvec_minmax(ctl_table *table, int write, struct file *filp,
+int proc_doulongvec_minmax(struct ctl_table *table, int write, struct file *filp,
                            void __user *buffer, size_t *lenp, loff_t *ppos)
 {
     return do_proc_doulongvec_minmax(table, write, filp, buffer, lenp, ppos, 1l, 1l);
@@ -2145,7 +2124,7 @@ int proc_doulongvec_minmax(ctl_table *table, int write, struct file *filp,
  *
  * Returns 0 on success.
  */
-int proc_doulongvec_ms_jiffies_minmax(ctl_table *table, int write,
+int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int write,
                                       struct file *filp,
                                       void __user *buffer,
                                       size_t *lenp, loff_t *ppos)
@@ -2238,7 +2217,7 @@ static int do_proc_dointvec_ms_jiffies_conv(int *negp, unsigned long *lvalp,
  *
  * Returns 0 on success.
  */
-int proc_dointvec_jiffies(ctl_table *table, int write, struct file *filp,
+int proc_dointvec_jiffies(struct ctl_table *table, int write, struct file *filp,
                           void __user *buffer, size_t *lenp, loff_t *ppos)
 {
     return do_proc_dointvec(table,write,filp,buffer,lenp,ppos,
@@ -2261,7 +2240,7 @@ int proc_dointvec_jiffies(ctl_table *table, int write, struct file *filp,
  *
  * Returns 0 on success.
  */
-int proc_dointvec_userhz_jiffies(ctl_table *table, int write, struct file *filp,
+int proc_dointvec_userhz_jiffies(struct ctl_table *table, int write, struct file *filp,
                                  void __user *buffer, size_t *lenp, loff_t *ppos)
 {
     return do_proc_dointvec(table,write,filp,buffer,lenp,ppos,
@@ -2285,14 +2264,14 @@ int proc_dointvec_userhz_jiffies(ctl_table *table, int write, struct file *filp,
  *
  * Returns 0 on success.
  */
-int proc_dointvec_ms_jiffies(ctl_table *table, int write, struct file *filp,
+int proc_dointvec_ms_jiffies(struct ctl_table *table, int write, struct file *filp,
                              void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         return do_proc_dointvec(table, write, filp, buffer, lenp, ppos,
                                 do_proc_dointvec_ms_jiffies_conv, NULL);
 }
 
-static int proc_do_cad_pid(ctl_table *table, int write, struct file *filp,
+static int proc_do_cad_pid(struct ctl_table *table, int write, struct file *filp,
                            void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         struct pid *new_pid;
@@ -2316,55 +2295,55 @@ static int proc_do_cad_pid(ctl_table *table, int write, struct file *filp,
 
 #else /* CONFIG_PROC_FS */
 
-int proc_dostring(ctl_table *table, int write, struct file *filp,
+int proc_dostring(struct ctl_table *table, int write, struct file *filp,
                   void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         return -ENOSYS;
 }
 
-int proc_dointvec(ctl_table *table, int write, struct file *filp,
+int proc_dointvec(struct ctl_table *table, int write, struct file *filp,
                   void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         return -ENOSYS;
 }
 
-int proc_dointvec_bset(ctl_table *table, int write, struct file *filp,
+int proc_dointvec_bset(struct ctl_table *table, int write, struct file *filp,
                         void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         return -ENOSYS;
 }
 
-int proc_dointvec_minmax(ctl_table *table, int write, struct file *filp,
+int proc_dointvec_minmax(struct ctl_table *table, int write, struct file *filp,
                     void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         return -ENOSYS;
 }
 
-int proc_dointvec_jiffies(ctl_table *table, int write, struct file *filp,
+int proc_dointvec_jiffies(struct ctl_table *table, int write, struct file *filp,
                     void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         return -ENOSYS;
 }
 
-int proc_dointvec_userhz_jiffies(ctl_table *table, int write, struct file *filp,
+int proc_dointvec_userhz_jiffies(struct ctl_table *table, int write, struct file *filp,
                     void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         return -ENOSYS;
 }
 
-int proc_dointvec_ms_jiffies(ctl_table *table, int write, struct file *filp,
+int proc_dointvec_ms_jiffies(struct ctl_table *table, int write, struct file *filp,
                              void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         return -ENOSYS;
 }
 
-int proc_doulongvec_minmax(ctl_table *table, int write, struct file *filp,
+int proc_doulongvec_minmax(struct ctl_table *table, int write, struct file *filp,
                     void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         return -ENOSYS;
 }
 
-int proc_doulongvec_ms_jiffies_minmax(ctl_table *table, int write,
+int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int write,
                                       struct file *filp,
                                       void __user *buffer,
                                       size_t *lenp, loff_t *ppos)
@@ -2381,8 +2360,42 @@ int proc_doulongvec_ms_jiffies_minmax(ctl_table *table, int write,
  * General sysctl support routines 
  */
 
+/* The generic sysctl data routine (used if no strategy routine supplied) */
+int sysctl_data(struct ctl_table *table, int __user *name, int nlen,
+                void __user *oldval, size_t __user *oldlenp,
+                void __user *newval, size_t newlen)
+{
+        size_t len;
+
+        /* Get out of I don't have a variable */
+        if (!table->data || !table->maxlen)
+                return -ENOTDIR;
+
+        if (oldval && oldlenp) {
+                if (get_user(len, oldlenp))
+                        return -EFAULT;
+                if (len) {
+                        if (len > table->maxlen)
+                                len = table->maxlen;
+                        if (copy_to_user(oldval, table->data, len))
+                                return -EFAULT;
+                        if (put_user(len, oldlenp))
+                                return -EFAULT;
+                }
+        }
+
+        if (newval && newlen) {
+                if (newlen > table->maxlen)
+                        newlen = table->maxlen;
+
+                if (copy_from_user(table->data, newval, newlen))
+                        return -EFAULT;
+        }
+        return 1;
+}
+
 /* The generic string strategy routine: */
-int sysctl_string(ctl_table *table, int __user *name, int nlen,
+int sysctl_string(struct ctl_table *table, int __user *name, int nlen,
                   void __user *oldval, size_t __user *oldlenp,
                   void __user *newval, size_t newlen)
 {
@@ -2428,7 +2441,7 @@ int sysctl_string(ctl_table *table, int __user *name, int nlen,
  * are between the minimum and maximum values given in the arrays
  * table->extra1 and table->extra2, respectively.
  */
-int sysctl_intvec(ctl_table *table, int __user *name, int nlen,
+int sysctl_intvec(struct ctl_table *table, int __user *name, int nlen,
                 void __user *oldval, size_t __user *oldlenp,
                 void __user *newval, size_t newlen)
 {
@@ -2464,7 +2477,7 @@ int sysctl_intvec(ctl_table *table, int __user *name, int nlen,
 }
 
 /* Strategy function to convert jiffies to seconds */ 
-int sysctl_jiffies(ctl_table *table, int __user *name, int nlen,
+int sysctl_jiffies(struct ctl_table *table, int __user *name, int nlen,
                 void __user *oldval, size_t __user *oldlenp,
                 void __user *newval, size_t newlen)
 {
@@ -2498,7 +2511,7 @@ int sysctl_jiffies(ctl_table *table, int __user *name, int nlen,
 }
 
 /* Strategy function to convert jiffies to seconds */ 
-int sysctl_ms_jiffies(ctl_table *table, int __user *name, int nlen,
+int sysctl_ms_jiffies(struct ctl_table *table, int __user *name, int nlen,
                 void __user *oldval, size_t __user *oldlenp,
                 void __user *newval, size_t newlen)
 {
@@ -2538,59 +2551,50 @@ int sysctl_ms_jiffies(ctl_table *table, int __user *name, int nlen,
 
 asmlinkage long sys_sysctl(struct __sysctl_args __user *args)
 {
-        static int msg_count;
         struct __sysctl_args tmp;
-        int name[CTL_MAXNAME];
-        int i;
+        int error;
 
-        /* Read in the sysctl name for better debug message logging */
         if (copy_from_user(&tmp, args, sizeof(tmp)))
                 return -EFAULT;
-        if (tmp.nlen <= 0 || tmp.nlen >= CTL_MAXNAME)
-                return -ENOTDIR;
-        for (i = 0; i < tmp.nlen; i++)
-                if (get_user(name[i], tmp.name + i))
-                        return -EFAULT;
 
-        /* Ignore accesses to kernel.version */
-        if ((tmp.nlen == 2) && (name[0] == CTL_KERN) && (name[1] == KERN_VERSION))
-                goto out;
+        error = deprecated_sysctl_warning(&tmp);
 
-        if (msg_count < 5) {
-                msg_count++;
-                printk(KERN_INFO
-                        "warning: process `%s' used the removed sysctl "
-                        "system call with ", current->comm);
-                for (i = 0; i < tmp.nlen; i++)
-                        printk("%d.", name[i]);
-                printk("\n");
-        }
-out:
+        /* If no error reading the parameters then just -ENOSYS ... */
+        if (!error)
+                error = -ENOSYS;
+
+        return error;
+}
+
+int sysctl_data(struct ctl_table *table, int __user *name, int nlen,
+                  void __user *oldval, size_t __user *oldlenp,
+                  void __user *newval, size_t newlen)
+{
         return -ENOSYS;
 }
 
-int sysctl_string(ctl_table *table, int __user *name, int nlen,
+int sysctl_string(struct ctl_table *table, int __user *name, int nlen,
                   void __user *oldval, size_t __user *oldlenp,
                   void __user *newval, size_t newlen)
 {
         return -ENOSYS;
 }
 
-int sysctl_intvec(ctl_table *table, int __user *name, int nlen,
+int sysctl_intvec(struct ctl_table *table, int __user *name, int nlen,
                 void __user *oldval, size_t __user *oldlenp,
                 void __user *newval, size_t newlen)
 {
         return -ENOSYS;
 }
 
-int sysctl_jiffies(ctl_table *table, int __user *name, int nlen,
+int sysctl_jiffies(struct ctl_table *table, int __user *name, int nlen,
                 void __user *oldval, size_t __user *oldlenp,
                 void __user *newval, size_t newlen)
 {
         return -ENOSYS;
 }
 
-int sysctl_ms_jiffies(ctl_table *table, int __user *name, int nlen,
+int sysctl_ms_jiffies(struct ctl_table *table, int __user *name, int nlen,
                 void __user *oldval, size_t __user *oldlenp,
                 void __user *newval, size_t newlen)
 {
@@ -2599,6 +2603,33 @@ int sysctl_ms_jiffies(ctl_table *table, int __user *name, int nlen,
 
 #endif /* CONFIG_SYSCTL_SYSCALL */
 
+static int deprecated_sysctl_warning(struct __sysctl_args *args)
+{
+        static int msg_count;
+        int name[CTL_MAXNAME];
+        int i;
+
+        /* Read in the sysctl name for better debug message logging */
+        for (i = 0; i < args->nlen; i++)
+                if (get_user(name[i], args->name + i))
+                        return -EFAULT;
+
+        /* Ignore accesses to kernel.version */
+        if ((args->nlen == 2) && (name[0] == CTL_KERN) && (name[1] == KERN_VERSION))
+                return 0;
+
+        if (msg_count < 5) {
+                msg_count++;
+                printk(KERN_INFO
+                        "warning: process `%s' used the deprecated sysctl "
+                        "system call with ", current->comm);
+                for (i = 0; i < args->nlen; i++)
+                        printk("%d.", name[i]);
+                printk("\n");
+        }
+        return 0;
+}
+
 /*
  * No sense putting this after each symbol definition, twice,
  * exception granted :-)
@@ -2616,4 +2647,5 @@ EXPORT_SYMBOL(sysctl_intvec);
 EXPORT_SYMBOL(sysctl_jiffies);
 EXPORT_SYMBOL(sysctl_ms_jiffies);
 EXPORT_SYMBOL(sysctl_string);
+EXPORT_SYMBOL(sysctl_data);
 EXPORT_SYMBOL(unregister_sysctl_table);
diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
new file mode 100644
index 000000000000..3c9ef5a7d575
--- /dev/null
+++ b/kernel/sysctl_check.c
@@ -0,0 +1,1588 @@
+#include <linux/stat.h>
+#include <linux/sysctl.h>
+#include "../arch/s390/appldata/appldata.h"
+#include "../fs/xfs/linux-2.6/xfs_sysctl.h"
+#include <linux/sunrpc/debug.h>
+#include <linux/string.h>
+#include <net/ip_vs.h>
+
+struct trans_ctl_table {
+        int                     ctl_name;
+        const char              *procname;
+        struct trans_ctl_table  *child;
+};
+
+static struct trans_ctl_table trans_random_table[] = {
+        { RANDOM_POOLSIZE,      "poolsize" },
+        { RANDOM_ENTROPY_COUNT, "entropy_avail" },
+        { RANDOM_READ_THRESH,   "read_wakeup_threshold" },
+        { RANDOM_WRITE_THRESH,  "write_wakeup_threshold" },
+        { RANDOM_BOOT_ID,       "boot_id" },
+        { RANDOM_UUID,          "uuid" },
+        {}
+};
+
+static struct trans_ctl_table trans_pty_table[] = {
+        { PTY_MAX,              "max" },
+        { PTY_NR,               "nr" },
+        {}
+};
+
+static struct trans_ctl_table trans_kern_table[] = {
+        { KERN_OSTYPE,                  "ostype" },
+        { KERN_OSRELEASE,               "osrelease" },
+        /* KERN_OSREV not used */
+        { KERN_VERSION,                 "version" },
+        /* KERN_SECUREMASK not used */
+        /* KERN_PROF not used */
+        { KERN_NODENAME,                "hostname" },
+        { KERN_DOMAINNAME,              "domainname" },
+
+#ifdef CONFIG_SECURITY_CAPABILITIES
+        { KERN_CAP_BSET,                "cap-bound" },
+#endif /* def CONFIG_SECURITY_CAPABILITIES */
+
+        { KERN_PANIC,                   "panic" },
+        { KERN_REALROOTDEV,             "real-root-dev" },
+
+        { KERN_SPARC_REBOOT,            "reboot-cmd" },
+        { KERN_CTLALTDEL,               "ctrl-alt-del" },
+        { KERN_PRINTK,                  "printk" },
+
+        /* KERN_NAMETRANS not used */
+        /* KERN_PPC_HTABRECLAIM not used */
+        /* KERN_PPC_ZEROPAGED not used */
+        { KERN_PPC_POWERSAVE_NAP,       "powersave-nap" },
+
+        { KERN_MODPROBE,                "modprobe" },
+        { KERN_SG_BIG_BUFF,             "sg-big-buff" },
+        { KERN_ACCT,                    "acct" },
+        { KERN_PPC_L2CR,                "l2cr" },
+
+        /* KERN_RTSIGNR not used */
+        /* KERN_RTSIGMAX not used */
+
+        { KERN_SHMMAX,                  "shmmax" },
+        { KERN_MSGMAX,                  "msgmax" },
+        { KERN_MSGMNB,                  "msgmnb" },
+        /* KERN_MSGPOOL not used*/
+        { KERN_SYSRQ,                   "sysrq" },
+        { KERN_MAX_THREADS,             "threads-max" },
+        { KERN_RANDOM,                  "random",       trans_random_table },
+        { KERN_SHMALL,                  "shmall" },
+        { KERN_MSGMNI,                  "msgmni" },
+        { KERN_SEM,                     "sem" },
+        { KERN_SPARC_STOP_A,            "stop-a" },
+        { KERN_SHMMNI,                  "shmmni" },
+
+        { KERN_OVERFLOWUID,             "overflowuid" },
+        { KERN_OVERFLOWGID,             "overflowgid" },
+
+        { KERN_HOTPLUG,                 "hotplug", },
+        { KERN_IEEE_EMULATION_WARNINGS, "ieee_emulation_warnings" },
+
+        { KERN_S390_USER_DEBUG_LOGGING, "userprocess_debug" },
+        { KERN_CORE_USES_PID,           "core_uses_pid" },
+        { KERN_TAINTED,                 "tainted" },
+        { KERN_CADPID,                  "cad_pid" },
+        { KERN_PIDMAX,                  "pid_max" },
+        { KERN_CORE_PATTERN,            "core_pattern" },
+        { KERN_PANIC_ON_OOPS,           "panic_on_oops" },
+        { KERN_HPPA_PWRSW,              "soft-power" },
+        { KERN_HPPA_UNALIGNED,          "unaligned-trap" },
+
+        { KERN_PRINTK_RATELIMIT,        "printk_ratelimit" },
+        { KERN_PRINTK_RATELIMIT_BURST,  "printk_ratelimit_burst" },
+
+        { KERN_PTY,                     "pty",          trans_pty_table },
+        { KERN_NGROUPS_MAX,             "ngroups_max" },
+        { KERN_SPARC_SCONS_PWROFF,      "scons_poweroff" },
+        { KERN_HZ_TIMER,                "hz_timer" },
+        { KERN_UNKNOWN_NMI_PANIC,       "unknown_nmi_panic" },
+        { KERN_BOOTLOADER_TYPE,         "bootloader_type" },
+        { KERN_RANDOMIZE,               "randomize_va_space" },
+
+        { KERN_SPIN_RETRY,              "spin_retry" },
+        { KERN_ACPI_VIDEO_FLAGS,        "acpi_video_flags" },
+        { KERN_IA64_UNALIGNED,          "ignore-unaligned-usertrap" },
+        { KERN_COMPAT_LOG,              "compat-log" },
+        { KERN_MAX_LOCK_DEPTH,          "max_lock_depth" },
+        { KERN_NMI_WATCHDOG,            "nmi_watchdog" },
+        { KERN_PANIC_ON_NMI,            "panic_on_unrecovered_nmi" },
+        {}
+};
+
+static struct trans_ctl_table trans_vm_table[] = {
+        { VM_OVERCOMMIT_MEMORY,         "overcommit_memory" },
+        { VM_PAGE_CLUSTER,              "page-cluster" },
+        { VM_DIRTY_BACKGROUND,          "dirty_background_ratio" },
+        { VM_DIRTY_RATIO,               "dirty_ratio" },
+        { VM_DIRTY_WB_CS,               "dirty_writeback_centisecs" },
+        { VM_DIRTY_EXPIRE_CS,           "dirty_expire_centisecs" },
+        { VM_NR_PDFLUSH_THREADS,        "nr_pdflush_threads" },
+        { VM_OVERCOMMIT_RATIO,          "overcommit_ratio" },
+        /* VM_PAGEBUF unused */
+        { VM_HUGETLB_PAGES,             "nr_hugepages" },
+        { VM_SWAPPINESS,                "swappiness" },
+        { VM_LOWMEM_RESERVE_RATIO,      "lowmem_reserve_ratio" },
+        { VM_MIN_FREE_KBYTES,           "min_free_kbytes" },
+        { VM_MAX_MAP_COUNT,             "max_map_count" },
+        { VM_LAPTOP_MODE,               "laptop_mode" },
+        { VM_BLOCK_DUMP,                "block_dump" },
+        { VM_HUGETLB_GROUP,             "hugetlb_shm_group" },
+        { VM_VFS_CACHE_PRESSURE,        "vfs_cache_pressure" },
+        { VM_LEGACY_VA_LAYOUT,          "legacy_va_layout" },
+        /* VM_SWAP_TOKEN_TIMEOUT unused */
+        { VM_DROP_PAGECACHE,            "drop_caches" },
+        { VM_PERCPU_PAGELIST_FRACTION,  "percpu_pagelist_fraction" },
+        { VM_ZONE_RECLAIM_MODE,         "zone_reclaim_mode" },
+        { VM_MIN_UNMAPPED,              "min_unmapped_ratio" },
+        { VM_PANIC_ON_OOM,              "panic_on_oom" },
+        { VM_VDSO_ENABLED,              "vdso_enabled" },
+        { VM_MIN_SLAB,                  "min_slab_ratio" },
+        { VM_CMM_PAGES,                 "cmm_pages" },
+        { VM_CMM_TIMED_PAGES,           "cmm_timed_pages" },
+        { VM_CMM_TIMEOUT,               "cmm_timeout" },
+
+        {}
+};
+
+static struct trans_ctl_table trans_net_core_table[] = {
+        { NET_CORE_WMEM_MAX,            "wmem_max" },
+        { NET_CORE_RMEM_MAX,            "rmem_max" },
+        { NET_CORE_WMEM_DEFAULT,        "wmem_default" },
+        { NET_CORE_RMEM_DEFAULT,        "rmem_default" },
+        /* NET_CORE_DESTROY_DELAY unused */
+        { NET_CORE_MAX_BACKLOG,         "netdev_max_backlog" },
+        /* NET_CORE_FASTROUTE unused */
+        { NET_CORE_MSG_COST,            "message_cost" },
+        { NET_CORE_MSG_BURST,           "message_burst" },
+        { NET_CORE_OPTMEM_MAX,          "optmem_max" },
+        /* NET_CORE_HOT_LIST_LENGTH unused */
+        /* NET_CORE_DIVERT_VERSION unused */
+        /* NET_CORE_NO_CONG_THRESH unused */
+        /* NET_CORE_NO_CONG unused */
+        /* NET_CORE_LO_CONG unused */
+        /* NET_CORE_MOD_CONG unused */
+        { NET_CORE_DEV_WEIGHT,          "dev_weight" },
+        { NET_CORE_SOMAXCONN,           "somaxconn" },
+        { NET_CORE_BUDGET,              "netdev_budget" },
+        { NET_CORE_AEVENT_ETIME,        "xfrm_aevent_etime" },
+        { NET_CORE_AEVENT_RSEQTH,       "xfrm_aevent_rseqth" },
+        { NET_CORE_WARNINGS,            "warnings" },
+        {},
+};
+
+static struct trans_ctl_table trans_net_unix_table[] = {
+        /* NET_UNIX_DESTROY_DELAY unused */
+        /* NET_UNIX_DELETE_DELAY unused */
+        { NET_UNIX_MAX_DGRAM_QLEN,      "max_dgram_qlen" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_ipv4_route_table[] = {
+        { NET_IPV4_ROUTE_FLUSH,                 "flush" },
+        { NET_IPV4_ROUTE_MIN_DELAY,             "min_delay" },
+        { NET_IPV4_ROUTE_MAX_DELAY,             "max_delay" },
+        { NET_IPV4_ROUTE_GC_THRESH,             "gc_thresh" },
+        { NET_IPV4_ROUTE_MAX_SIZE,              "max_size" },
+        { NET_IPV4_ROUTE_GC_MIN_INTERVAL,       "gc_min_interval" },
+        { NET_IPV4_ROUTE_GC_TIMEOUT,            "gc_timeout" },
+        { NET_IPV4_ROUTE_GC_INTERVAL,           "gc_interval" },
+        { NET_IPV4_ROUTE_REDIRECT_LOAD,         "redirect_load" },
+        { NET_IPV4_ROUTE_REDIRECT_NUMBER,       "redirect_number" },
+        { NET_IPV4_ROUTE_REDIRECT_SILENCE,      "redirect_silence" },
+        { NET_IPV4_ROUTE_ERROR_COST,            "error_cost" },
+        { NET_IPV4_ROUTE_ERROR_BURST,           "error_burst" },
+        { NET_IPV4_ROUTE_GC_ELASTICITY,         "gc_elasticity" },
+        { NET_IPV4_ROUTE_MTU_EXPIRES,           "mtu_expires" },
+        { NET_IPV4_ROUTE_MIN_PMTU,              "min_pmtu" },
+        { NET_IPV4_ROUTE_MIN_ADVMSS,            "min_adv_mss" },
+        { NET_IPV4_ROUTE_SECRET_INTERVAL,       "secret_interval" },
+        { NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS,    "gc_min_interval_ms" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_ipv4_conf_vars_table[] = {
+        { NET_IPV4_CONF_FORWARDING,             "forwarding" },
+        { NET_IPV4_CONF_MC_FORWARDING,          "mc_forwarding" },
+
+        { NET_IPV4_CONF_PROXY_ARP,              "proxy_arp" },
+        { NET_IPV4_CONF_ACCEPT_REDIRECTS,       "accept_redirects" },
+        { NET_IPV4_CONF_SECURE_REDIRECTS,       "secure_redirects" },
+        { NET_IPV4_CONF_SEND_REDIRECTS,         "send_redirects" },
+        { NET_IPV4_CONF_SHARED_MEDIA,           "shared_media" },
+        { NET_IPV4_CONF_RP_FILTER,              "rp_filter" },
+        { NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE,    "accept_source_route" },
+        { NET_IPV4_CONF_BOOTP_RELAY,            "bootp_relay" },
+        { NET_IPV4_CONF_LOG_MARTIANS,           "log_martians" },
+        { NET_IPV4_CONF_TAG,                    "tag" },
+        { NET_IPV4_CONF_ARPFILTER,              "arp_filter" },
+        { NET_IPV4_CONF_MEDIUM_ID,              "medium_id" },
+        { NET_IPV4_CONF_NOXFRM,                 "disable_xfrm" },
+        { NET_IPV4_CONF_NOPOLICY,               "disable_policy" },
+        { NET_IPV4_CONF_FORCE_IGMP_VERSION,     "force_igmp_version" },
+
+        { NET_IPV4_CONF_ARP_ANNOUNCE,           "arp_announce" },
+        { NET_IPV4_CONF_ARP_IGNORE,             "arp_ignore" },
+        { NET_IPV4_CONF_PROMOTE_SECONDARIES,    "promote_secondaries" },
+        { NET_IPV4_CONF_ARP_ACCEPT,             "arp_accept" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_ipv4_conf_table[] = {
+        { NET_PROTO_CONF_ALL,           "all",          trans_net_ipv4_conf_vars_table },
+        { NET_PROTO_CONF_DEFAULT,       "default",      trans_net_ipv4_conf_vars_table },
+        { 0, NULL, trans_net_ipv4_conf_vars_table },
+        {}
+};
+
+
+static struct trans_ctl_table trans_net_ipv4_vs_table[] = {
+        { NET_IPV4_VS_AMEMTHRESH,       "amemthresh" },
+        { NET_IPV4_VS_DEBUG_LEVEL,      "debug_level" },
+        { NET_IPV4_VS_AMDROPRATE,       "am_droprate" },
+        { NET_IPV4_VS_DROP_ENTRY,       "drop_entry" },
+        { NET_IPV4_VS_DROP_PACKET,      "drop_packet" },
+        { NET_IPV4_VS_SECURE_TCP,       "secure_tcp" },
+        { NET_IPV4_VS_TO_ES,            "timeout_established" },
+        { NET_IPV4_VS_TO_SS,            "timeout_synsent" },
+        { NET_IPV4_VS_TO_SR,            "timeout_synrecv" },
+        { NET_IPV4_VS_TO_FW,            "timeout_finwait" },
+        { NET_IPV4_VS_TO_TW,            "timeout_timewait" },
+        { NET_IPV4_VS_TO_CL,            "timeout_close" },
+        { NET_IPV4_VS_TO_CW,            "timeout_closewait" },
+        { NET_IPV4_VS_TO_LA,            "timeout_lastack" },
+        { NET_IPV4_VS_TO_LI,            "timeout_listen" },
+        { NET_IPV4_VS_TO_SA,            "timeout_synack" },
+        { NET_IPV4_VS_TO_UDP,           "timeout_udp" },
+        { NET_IPV4_VS_TO_ICMP,          "timeout_icmp" },
+        { NET_IPV4_VS_CACHE_BYPASS,     "cache_bypass" },
+        { NET_IPV4_VS_EXPIRE_NODEST_CONN,       "expire_nodest_conn" },
+        { NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE,        "expire_quiescent_template" },
+        { NET_IPV4_VS_SYNC_THRESHOLD,           "sync_threshold" },
+        { NET_IPV4_VS_NAT_ICMP_SEND,    "nat_icmp_send" },
+        { NET_IPV4_VS_LBLC_EXPIRE,              "lblc_expiration" },
+        { NET_IPV4_VS_LBLCR_EXPIRE,             "lblcr_expiration" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_neigh_vars_table[] = {
+        { NET_NEIGH_MCAST_SOLICIT,      "mcast_solicit" },
+        { NET_NEIGH_UCAST_SOLICIT,      "ucast_solicit" },
+        { NET_NEIGH_APP_SOLICIT,        "app_solicit" },
+        { NET_NEIGH_RETRANS_TIME,       "retrans_time" },
+        { NET_NEIGH_REACHABLE_TIME,     "base_reachable_time" },
+        { NET_NEIGH_DELAY_PROBE_TIME,   "delay_first_probe_time" },
+        { NET_NEIGH_GC_STALE_TIME,      "gc_stale_time" },
+        { NET_NEIGH_UNRES_QLEN,         "unres_qlen" },
+        { NET_NEIGH_PROXY_QLEN,         "proxy_qlen" },
+        { NET_NEIGH_ANYCAST_DELAY,      "anycast_delay" },
+        { NET_NEIGH_PROXY_DELAY,        "proxy_delay" },
+        { NET_NEIGH_LOCKTIME,           "locktime" },
+        { NET_NEIGH_GC_INTERVAL,        "gc_interval" },
+        { NET_NEIGH_GC_THRESH1,         "gc_thresh1" },
+        { NET_NEIGH_GC_THRESH2,         "gc_thresh2" },
+        { NET_NEIGH_GC_THRESH3,         "gc_thresh3" },
+        { NET_NEIGH_RETRANS_TIME_MS,    "retrans_time_ms" },
+        { NET_NEIGH_REACHABLE_TIME_MS,  "base_reachable_time_ms" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_neigh_table[] = {
+        { NET_PROTO_CONF_DEFAULT, "default", trans_net_neigh_vars_table },
+        { 0, NULL, trans_net_neigh_vars_table },
+        {}
+};
+
+static struct trans_ctl_table trans_net_ipv4_netfilter_table[] = {
+        { NET_IPV4_NF_CONNTRACK_MAX,                            "ip_conntrack_max" },
+
+        { NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT,           "ip_conntrack_tcp_timeout_syn_sent" },
+        { NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV,           "ip_conntrack_tcp_timeout_syn_recv" },
+        { NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED,        "ip_conntrack_tcp_timeout_established" },
+        { NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT,           "ip_conntrack_tcp_timeout_fin_wait" },
+        { NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT,         "ip_conntrack_tcp_timeout_close_wait" },
+        { NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK,           "ip_conntrack_tcp_timeout_last_ack" },
+        { NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT,          "ip_conntrack_tcp_timeout_time_wait" },
+        { NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE,              "ip_conntrack_tcp_timeout_close" },
+
+        { NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT,                    "ip_conntrack_udp_timeout" },
+        { NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM,             "ip_conntrack_udp_timeout_stream" },
+        { NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT,                   "ip_conntrack_icmp_timeout" },
+        { NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT,                "ip_conntrack_generic_timeout" },
+
+        { NET_IPV4_NF_CONNTRACK_BUCKETS,                        "ip_conntrack_buckets" },
+        { NET_IPV4_NF_CONNTRACK_LOG_INVALID,                    "ip_conntrack_log_invalid" },
+        { NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS,        "ip_conntrack_tcp_timeout_max_retrans" },
+        { NET_IPV4_NF_CONNTRACK_TCP_LOOSE,                      "ip_conntrack_tcp_loose" },
+        { NET_IPV4_NF_CONNTRACK_TCP_BE_LIBERAL,                 "ip_conntrack_tcp_be_liberal" },
+        { NET_IPV4_NF_CONNTRACK_TCP_MAX_RETRANS,                "ip_conntrack_tcp_max_retrans" },
+
+        { NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED,            "ip_conntrack_sctp_timeout_closed" },
+        { NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT,       "ip_conntrack_sctp_timeout_cookie_wait" },
+        { NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED,     "ip_conntrack_sctp_timeout_cookie_echoed" },
+        { NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED,       "ip_conntrack_sctp_timeout_established" },
+        { NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT,     "ip_conntrack_sctp_timeout_shutdown_sent" },
+        { NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD,     "ip_conntrack_sctp_timeout_shutdown_recd" },
+        { NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT, "ip_conntrack_sctp_timeout_shutdown_ack_sent" },
+
+        { NET_IPV4_NF_CONNTRACK_COUNT,          "ip_conntrack_count" },
+        { NET_IPV4_NF_CONNTRACK_CHECKSUM,       "ip_conntrack_checksum" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_ipv4_table[] = {
+        { NET_IPV4_FORWARD,                     "ip_forward" },
+        { NET_IPV4_DYNADDR,                     "ip_dynaddr" },
+
+        { NET_IPV4_CONF,                "conf",         trans_net_ipv4_conf_table },
+        { NET_IPV4_NEIGH,               "neigh",        trans_net_neigh_table },
+        { NET_IPV4_ROUTE,               "route",        trans_net_ipv4_route_table },
+        /* NET_IPV4_FIB_HASH unused */
+        { NET_IPV4_NETFILTER,           "netfilter",    trans_net_ipv4_netfilter_table },
+        { NET_IPV4_VS,                  "vs",           trans_net_ipv4_vs_table },
+
+        { NET_IPV4_TCP_TIMESTAMPS,              "tcp_timestamps" },
+        { NET_IPV4_TCP_WINDOW_SCALING,          "tcp_window_scaling" },
+        { NET_IPV4_TCP_SACK,                    "tcp_sack" },
+        { NET_IPV4_TCP_RETRANS_COLLAPSE,        "tcp_retrans_collapse" },
+        { NET_IPV4_DEFAULT_TTL,                 "ip_default_ttl" },
+        /* NET_IPV4_AUTOCONFIG unused */
+        { NET_IPV4_NO_PMTU_DISC,                "ip_no_pmtu_disc" },
+        { NET_IPV4_TCP_SYN_RETRIES,             "tcp_syn_retries" },
+        { NET_IPV4_IPFRAG_HIGH_THRESH,          "ipfrag_high_thresh" },
+        { NET_IPV4_IPFRAG_LOW_THRESH,           "ipfrag_low_thresh" },
+        { NET_IPV4_IPFRAG_TIME,                 "ipfrag_time" },
+        /* NET_IPV4_TCP_MAX_KA_PROBES unused */
+        { NET_IPV4_TCP_KEEPALIVE_TIME,          "tcp_keepalive_time" },
+        { NET_IPV4_TCP_KEEPALIVE_PROBES,        "tcp_keepalive_probes" },
+        { NET_IPV4_TCP_RETRIES1,                "tcp_retries1" },
+        { NET_IPV4_TCP_RETRIES2,                "tcp_retries2" },
+        { NET_IPV4_TCP_FIN_TIMEOUT,             "tcp_fin_timeout" },
+        /* NET_IPV4_IP_MASQ_DEBUG unused */
+        { NET_TCP_SYNCOOKIES,                   "tcp_syncookies" },
+        { NET_TCP_STDURG,                       "tcp_stdurg" },
+        { NET_TCP_RFC1337,                      "tcp_rfc1337" },
+        /* NET_TCP_SYN_TAILDROP unused */
+        { NET_TCP_MAX_SYN_BACKLOG,              "tcp_max_syn_backlog" },
+        { NET_IPV4_LOCAL_PORT_RANGE,            "ip_local_port_range" },
+        { NET_IPV4_ICMP_ECHO_IGNORE_ALL,        "icmp_echo_ignore_all" },
+        { NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS, "icmp_echo_ignore_broadcasts" },
+        /* NET_IPV4_ICMP_SOURCEQUENCH_RATE unused */
+        /* NET_IPV4_ICMP_DESTUNREACH_RATE unused */
+        /* NET_IPV4_ICMP_TIMEEXCEED_RATE unused */
+        /* NET_IPV4_ICMP_PARAMPROB_RATE unused */
+        /* NET_IPV4_ICMP_ECHOREPLY_RATE unused */
+        { NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES,   "icmp_ignore_bogus_error_responses" },
+        { NET_IPV4_IGMP_MAX_MEMBERSHIPS,        "igmp_max_memberships" },
+        { NET_TCP_TW_RECYCLE,                   "tcp_tw_recycle" },
+        /* NET_IPV4_ALWAYS_DEFRAG unused */
+        { NET_IPV4_TCP_KEEPALIVE_INTVL,         "tcp_keepalive_intvl" },
+        { NET_IPV4_INET_PEER_THRESHOLD,         "inet_peer_threshold" },
+        { NET_IPV4_INET_PEER_MINTTL,            "inet_peer_minttl" },
+        { NET_IPV4_INET_PEER_MAXTTL,            "inet_peer_maxttl" },
+        { NET_IPV4_INET_PEER_GC_MINTIME,        "inet_peer_gc_mintime" },
+        { NET_IPV4_INET_PEER_GC_MAXTIME,        "inet_peer_gc_maxtime" },
+        { NET_TCP_ORPHAN_RETRIES,               "tcp_orphan_retries" },
+        { NET_TCP_ABORT_ON_OVERFLOW,            "tcp_abort_on_overflow" },
+        { NET_TCP_SYNACK_RETRIES,               "tcp_synack_retries" },
+        { NET_TCP_MAX_ORPHANS,                  "tcp_max_orphans" },
+        { NET_TCP_MAX_TW_BUCKETS,               "tcp_max_tw_buckets" },
+        { NET_TCP_FACK,                         "tcp_fack" },
+        { NET_TCP_REORDERING,                   "tcp_reordering" },
+        { NET_TCP_ECN,                          "tcp_ecn" },
+        { NET_TCP_DSACK,                        "tcp_dsack" },
+        { NET_TCP_MEM,                          "tcp_mem" },
+        { NET_TCP_WMEM,                         "tcp_wmem" },
+        { NET_TCP_RMEM,                         "tcp_rmem" },
+        { NET_TCP_APP_WIN,                      "tcp_app_win" },
+        { NET_TCP_ADV_WIN_SCALE,                "tcp_adv_win_scale" },
+        { NET_IPV4_NONLOCAL_BIND,               "ip_nonlocal_bind" },
+        { NET_IPV4_ICMP_RATELIMIT,              "icmp_ratelimit" },
+        { NET_IPV4_ICMP_RATEMASK,               "icmp_ratemask" },
+        { NET_TCP_TW_REUSE,                     "tcp_tw_reuse" },
+        { NET_TCP_FRTO,                         "tcp_frto" },
+        { NET_TCP_LOW_LATENCY,                  "tcp_low_latency" },
+        { NET_IPV4_IPFRAG_SECRET_INTERVAL,      "ipfrag_secret_interval" },
+        { NET_IPV4_IGMP_MAX_MSF,                "igmp_max_msf" },
+        { NET_TCP_NO_METRICS_SAVE,              "tcp_no_metrics_save" },
+        /* NET_TCP_DEFAULT_WIN_SCALE unused */
+        { NET_TCP_MODERATE_RCVBUF,              "tcp_moderate_rcvbuf" },
+        { NET_TCP_TSO_WIN_DIVISOR,              "tcp_tso_win_divisor" },
+        /* NET_TCP_BIC_BETA unused */
+        { NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR,      "icmp_errors_use_inbound_ifaddr" },
+        { NET_TCP_CONG_CONTROL,                 "tcp_congestion_control" },
+        { NET_TCP_ABC,                          "tcp_abc" },
+        { NET_IPV4_IPFRAG_MAX_DIST,             "ipfrag_max_dist" },
+        { NET_TCP_MTU_PROBING,                  "tcp_mtu_probing" },
+        { NET_TCP_BASE_MSS,                     "tcp_base_mss" },
+        { NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS,       "tcp_workaround_signed_windows" },
+        { NET_TCP_DMA_COPYBREAK,                "tcp_dma_copybreak" },
+        { NET_TCP_SLOW_START_AFTER_IDLE,        "tcp_slow_start_after_idle" },
+        { NET_CIPSOV4_CACHE_ENABLE,             "cipso_cache_enable" },
+        { NET_CIPSOV4_CACHE_BUCKET_SIZE,        "cipso_cache_bucket_size" },
+        { NET_CIPSOV4_RBM_OPTFMT,               "cipso_rbm_optfmt" },
+        { NET_CIPSOV4_RBM_STRICTVALID,          "cipso_rbm_strictvalid" },
+        { NET_TCP_AVAIL_CONG_CONTROL,           "tcp_available_congestion_control" },
+        { NET_TCP_ALLOWED_CONG_CONTROL,         "tcp_allowed_congestion_control" },
+        { NET_TCP_MAX_SSTHRESH,                 "tcp_max_ssthresh" },
+        { NET_TCP_FRTO_RESPONSE,                "tcp_frto_response" },
+        { 2088 /* NET_IPQ_QMAX */,              "ip_queue_maxlen" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_ipx_table[] = {
+        { NET_IPX_PPROP_BROADCASTING,   "ipx_pprop_broadcasting" },
+        /* NET_IPX_FORWARDING unused */
+        {}
+};
+
+static struct trans_ctl_table trans_net_atalk_table[] = {
+        { NET_ATALK_AARP_EXPIRY_TIME,           "aarp-expiry-time" },
+        { NET_ATALK_AARP_TICK_TIME,             "aarp-tick-time" },
+        { NET_ATALK_AARP_RETRANSMIT_LIMIT,      "aarp-retransmit-limit" },
+        { NET_ATALK_AARP_RESOLVE_TIME,          "aarp-resolve-time" },
+        {},
+};
+
+static struct trans_ctl_table trans_net_netrom_table[] = {
+        { NET_NETROM_DEFAULT_PATH_QUALITY,              "default_path_quality" },
+        { NET_NETROM_OBSOLESCENCE_COUNT_INITIALISER,    "obsolescence_count_initialiser" },
+        { NET_NETROM_NETWORK_TTL_INITIALISER,           "network_ttl_initialiser" },
+        { NET_NETROM_TRANSPORT_TIMEOUT,                 "transport_timeout" },
+        { NET_NETROM_TRANSPORT_MAXIMUM_TRIES,           "transport_maximum_tries" },
+        { NET_NETROM_TRANSPORT_ACKNOWLEDGE_DELAY,       "transport_acknowledge_delay" },
+        { NET_NETROM_TRANSPORT_BUSY_DELAY,              "transport_busy_delay" },
+        { NET_NETROM_TRANSPORT_REQUESTED_WINDOW_SIZE,   "transport_requested_window_size" },
+        { NET_NETROM_TRANSPORT_NO_ACTIVITY_TIMEOUT,     "transport_no_activity_timeout" },
+        { NET_NETROM_ROUTING_CONTROL,                   "routing_control" },
+        { NET_NETROM_LINK_FAILS_COUNT,                  "link_fails_count" },
+        { NET_NETROM_RESET,                             "reset" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_ax25_table[] = {
+        { NET_AX25_IP_DEFAULT_MODE,     "ip_default_mode" },
+        { NET_AX25_DEFAULT_MODE,        "ax25_default_mode" },
+        { NET_AX25_BACKOFF_TYPE,        "backoff_type" },
+        { NET_AX25_CONNECT_MODE,        "connect_mode" },
+        { NET_AX25_STANDARD_WINDOW,     "standard_window_size" },
+        { NET_AX25_EXTENDED_WINDOW,     "extended_window_size" },
+        { NET_AX25_T1_TIMEOUT,          "t1_timeout" },
+        { NET_AX25_T2_TIMEOUT,          "t2_timeout" },
+        { NET_AX25_T3_TIMEOUT,          "t3_timeout" },
+        { NET_AX25_IDLE_TIMEOUT,        "idle_timeout" },
+        { NET_AX25_N2,                  "maximum_retry_count" },
+        { NET_AX25_PACLEN,              "maximum_packet_length" },
+        { NET_AX25_PROTOCOL,            "protocol" },
+        { NET_AX25_DAMA_SLAVE_TIMEOUT,  "dama_slave_timeout" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_bridge_table[] = {
+        { NET_BRIDGE_NF_CALL_ARPTABLES,         "bridge-nf-call-arptables" },
+        { NET_BRIDGE_NF_CALL_IPTABLES,          "bridge-nf-call-iptables" },
+        { NET_BRIDGE_NF_CALL_IP6TABLES,         "bridge-nf-call-ip6tables" },
+        { NET_BRIDGE_NF_FILTER_VLAN_TAGGED,     "bridge-nf-filter-vlan-tagged" },
+        { NET_BRIDGE_NF_FILTER_PPPOE_TAGGED,    "bridge-nf-filter-pppoe-tagged" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_rose_table[] = {
+        { NET_ROSE_RESTART_REQUEST_TIMEOUT,     "restart_request_timeout" },
+        { NET_ROSE_CALL_REQUEST_TIMEOUT,        "call_request_timeout" },
+        { NET_ROSE_RESET_REQUEST_TIMEOUT,       "reset_request_timeout" },
+        { NET_ROSE_CLEAR_REQUEST_TIMEOUT,       "clear_request_timeout" },
+        { NET_ROSE_ACK_HOLD_BACK_TIMEOUT,       "acknowledge_hold_back_timeout" },
+        { NET_ROSE_ROUTING_CONTROL,             "routing_control" },
+        { NET_ROSE_LINK_FAIL_TIMEOUT,           "link_fail_timeout" },
+        { NET_ROSE_MAX_VCS,                     "maximum_virtual_circuits" },
+        { NET_ROSE_WINDOW_SIZE,                 "window_size" },
+        { NET_ROSE_NO_ACTIVITY_TIMEOUT,         "no_activity_timeout" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_ipv6_conf_var_table[] = {
+        { NET_IPV6_FORWARDING,                  "forwarding" },
+        { NET_IPV6_HOP_LIMIT,                   "hop_limit" },
+        { NET_IPV6_MTU,                         "mtu" },
+        { NET_IPV6_ACCEPT_RA,                   "accept_ra" },
+        { NET_IPV6_ACCEPT_REDIRECTS,            "accept_redirects" },
+        { NET_IPV6_AUTOCONF,                    "autoconf" },
+        { NET_IPV6_DAD_TRANSMITS,               "dad_transmits" },
+        { NET_IPV6_RTR_SOLICITS,                "router_solicitations" },
+        { NET_IPV6_RTR_SOLICIT_INTERVAL,        "router_solicitation_interval" },
+        { NET_IPV6_RTR_SOLICIT_DELAY,           "router_solicitation_delay" },
+        { NET_IPV6_USE_TEMPADDR,                "use_tempaddr" },
+        { NET_IPV6_TEMP_VALID_LFT,              "temp_valid_lft" },
+        { NET_IPV6_TEMP_PREFERED_LFT,           "temp_prefered_lft" },
+        { NET_IPV6_REGEN_MAX_RETRY,             "regen_max_retry" },
+        { NET_IPV6_MAX_DESYNC_FACTOR,           "max_desync_factor" },
+        { NET_IPV6_MAX_ADDRESSES,               "max_addresses" },
+        { NET_IPV6_FORCE_MLD_VERSION,           "force_mld_version" },
+        { NET_IPV6_ACCEPT_RA_DEFRTR,            "accept_ra_defrtr" },
+        { NET_IPV6_ACCEPT_RA_PINFO,             "accept_ra_pinfo" },
+        { NET_IPV6_ACCEPT_RA_RTR_PREF,          "accept_ra_rtr_pref" },
+        { NET_IPV6_RTR_PROBE_INTERVAL,          "router_probe_interval" },
+        { NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN,  "accept_ra_rt_info_max_plen" },
+        { NET_IPV6_PROXY_NDP,                   "proxy_ndp" },
+        { NET_IPV6_ACCEPT_SOURCE_ROUTE,         "accept_source_route" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_ipv6_conf_table[] = {
+        { NET_PROTO_CONF_ALL,           "all",  trans_net_ipv6_conf_var_table },
+        { NET_PROTO_CONF_DEFAULT,       "default", trans_net_ipv6_conf_var_table },
+        { 0, NULL, trans_net_ipv6_conf_var_table },
+        {}
+};
+
+static struct trans_ctl_table trans_net_ipv6_route_table[] = {
+        { NET_IPV6_ROUTE_FLUSH,                 "flush" },
+        { NET_IPV6_ROUTE_GC_THRESH,             "gc_thresh" },
+        { NET_IPV6_ROUTE_MAX_SIZE,              "max_size" },
+        { NET_IPV6_ROUTE_GC_MIN_INTERVAL,       "gc_min_interval" },
+        { NET_IPV6_ROUTE_GC_TIMEOUT,            "gc_timeout" },
+        { NET_IPV6_ROUTE_GC_INTERVAL,           "gc_interval" },
+        { NET_IPV6_ROUTE_GC_ELASTICITY,         "gc_elasticity" },
+        { NET_IPV6_ROUTE_MTU_EXPIRES,           "mtu_expires" },
+        { NET_IPV6_ROUTE_MIN_ADVMSS,            "min_adv_mss" },
+        { NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS,    "gc_min_interval_ms" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_ipv6_icmp_table[] = {
+        { NET_IPV6_ICMP_RATELIMIT,      "ratelimit" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_ipv6_table[] = {
+        { NET_IPV6_CONF,                "conf",         trans_net_ipv6_conf_table },
+        { NET_IPV6_NEIGH,               "neigh",        trans_net_neigh_table },
+        { NET_IPV6_ROUTE,               "route",        trans_net_ipv6_route_table },
+        { NET_IPV6_ICMP,                "icmp",         trans_net_ipv6_icmp_table },
+        { NET_IPV6_BINDV6ONLY,          "bindv6only" },
+        { NET_IPV6_IP6FRAG_HIGH_THRESH, "ip6frag_high_thresh" },
+        { NET_IPV6_IP6FRAG_LOW_THRESH,  "ip6frag_low_thresh" },
+        { NET_IPV6_IP6FRAG_TIME,        "ip6frag_time" },
+        { NET_IPV6_IP6FRAG_SECRET_INTERVAL,     "ip6frag_secret_interval" },
+        { NET_IPV6_MLD_MAX_MSF,         "mld_max_msf" },
+        { 2088 /* IPQ_QMAX */,          "ip6_queue_maxlen" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_x25_table[] = {
+        { NET_X25_RESTART_REQUEST_TIMEOUT,      "restart_request_timeout" },
+        { NET_X25_CALL_REQUEST_TIMEOUT,         "call_request_timeout" },
+        { NET_X25_RESET_REQUEST_TIMEOUT,        "reset_request_timeout" },
+        { NET_X25_CLEAR_REQUEST_TIMEOUT,        "clear_request_timeout" },
+        { NET_X25_ACK_HOLD_BACK_TIMEOUT,        "acknowledgement_hold_back_timeout" },
+        { NET_X25_FORWARD,                      "x25_forward" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_tr_table[] = {
+        { NET_TR_RIF_TIMEOUT,   "rif_timeout" },
+        {}
+};
+
+
+static struct trans_ctl_table trans_net_decnet_conf_vars[] = {
+        { NET_DECNET_CONF_DEV_FORWARDING,       "forwarding" },
+        { NET_DECNET_CONF_DEV_PRIORITY,         "priority" },
+        { NET_DECNET_CONF_DEV_T2,               "t2" },
+        { NET_DECNET_CONF_DEV_T3,               "t3" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_decnet_conf[] = {
+        { 0, NULL, trans_net_decnet_conf_vars },
+        {}
+};
+
+static struct trans_ctl_table trans_net_decnet_table[] = {
+        { NET_DECNET_CONF,              "conf", trans_net_decnet_conf },
+        { NET_DECNET_NODE_ADDRESS,      "node_address" },
+        { NET_DECNET_NODE_NAME,         "node_name" },
+        { NET_DECNET_DEFAULT_DEVICE,    "default_device" },
+        { NET_DECNET_TIME_WAIT,         "time_wait" },
+        { NET_DECNET_DN_COUNT,          "dn_count" },
+        { NET_DECNET_DI_COUNT,          "di_count" },
+        { NET_DECNET_DR_COUNT,          "dr_count" },
+        { NET_DECNET_DST_GC_INTERVAL,   "dst_gc_interval" },
+        { NET_DECNET_NO_FC_MAX_CWND,    "no_fc_max_cwnd" },
+        { NET_DECNET_MEM,               "decnet_mem" },
+        { NET_DECNET_RMEM,              "decnet_rmem" },
+        { NET_DECNET_WMEM,              "decnet_wmem" },
+        { NET_DECNET_DEBUG_LEVEL,       "debug" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_sctp_table[] = {
+        { NET_SCTP_RTO_INITIAL,         "rto_initial" },
+        { NET_SCTP_RTO_MIN,             "rto_min" },
+        { NET_SCTP_RTO_MAX,             "rto_max" },
+        { NET_SCTP_RTO_ALPHA,           "rto_alpha_exp_divisor" },
+        { NET_SCTP_RTO_BETA,            "rto_beta_exp_divisor" },
+        { NET_SCTP_VALID_COOKIE_LIFE,   "valid_cookie_life" },
+        { NET_SCTP_ASSOCIATION_MAX_RETRANS,     "association_max_retrans" },
+        { NET_SCTP_PATH_MAX_RETRANS,    "path_max_retrans" },
+        { NET_SCTP_MAX_INIT_RETRANSMITS,        "max_init_retransmits" },
+        { NET_SCTP_HB_INTERVAL,         "hb_interval" },
+        { NET_SCTP_PRESERVE_ENABLE,     "cookie_preserve_enable" },
+        { NET_SCTP_MAX_BURST,           "max_burst" },
+        { NET_SCTP_ADDIP_ENABLE,        "addip_enable" },
+        { NET_SCTP_PRSCTP_ENABLE,       "prsctp_enable" },
+        { NET_SCTP_SNDBUF_POLICY,       "sndbuf_policy" },
+        { NET_SCTP_SACK_TIMEOUT,        "sack_timeout" },
+        { NET_SCTP_RCVBUF_POLICY,       "rcvbuf_policy" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_llc_llc2_timeout_table[] = {
+        { NET_LLC2_ACK_TIMEOUT,         "ack" },
+        { NET_LLC2_P_TIMEOUT,           "p" },
+        { NET_LLC2_REJ_TIMEOUT,         "rej" },
+        { NET_LLC2_BUSY_TIMEOUT,        "busy" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_llc_station_table[] = {
+        { NET_LLC_STATION_ACK_TIMEOUT,  "ack_timeout" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_llc_llc2_table[] = {
+        { NET_LLC2,             "timeout",      trans_net_llc_llc2_timeout_table },
+        {}
+};
+
+static struct trans_ctl_table trans_net_llc_table[] = {
+        { NET_LLC2,             "llc2",         trans_net_llc_llc2_table },
+        { NET_LLC_STATION,      "station",      trans_net_llc_station_table },
+        {}
+};
+
+static struct trans_ctl_table trans_net_netfilter_table[] = {
+        { NET_NF_CONNTRACK_MAX,                         "nf_conntrack_max" },
+        { NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT,        "nf_conntrack_tcp_timeout_syn_sent" },
+        { NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV,        "nf_conntrack_tcp_timeout_syn_recv" },
+        { NET_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED,     "nf_conntrack_tcp_timeout_established" },
+        { NET_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT,        "nf_conntrack_tcp_timeout_fin_wait" },
+        { NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT,      "nf_conntrack_tcp_timeout_close_wait" },
+        { NET_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK,        "nf_conntrack_tcp_timeout_last_ack" },
+        { NET_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT,       "nf_conntrack_tcp_timeout_time_wait" },
+        { NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE,           "nf_conntrack_tcp_timeout_close" },
+        { NET_NF_CONNTRACK_UDP_TIMEOUT,                 "nf_conntrack_udp_timeout" },
+        { NET_NF_CONNTRACK_UDP_TIMEOUT_STREAM,          "nf_conntrack_udp_timeout_stream" },
+        { NET_NF_CONNTRACK_ICMP_TIMEOUT,        "nf_conntrack_icmp_timeout" },
+        { NET_NF_CONNTRACK_GENERIC_TIMEOUT,             "nf_conntrack_generic_timeout" },
+        { NET_NF_CONNTRACK_BUCKETS,                     "nf_conntrack_buckets" },
+        { NET_NF_CONNTRACK_LOG_INVALID,                 "nf_conntrack_log_invalid" },
+        { NET_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS,     "nf_conntrack_tcp_timeout_max_retrans" },
+        { NET_NF_CONNTRACK_TCP_LOOSE,                   "nf_conntrack_tcp_loose" },
+        { NET_NF_CONNTRACK_TCP_BE_LIBERAL,              "nf_conntrack_tcp_be_liberal" },
+        { NET_NF_CONNTRACK_TCP_MAX_RETRANS,             "nf_conntrack_tcp_max_retrans" },
+        { NET_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED,         "nf_conntrack_sctp_timeout_closed" },
+        { NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT,    "nf_conntrack_sctp_timeout_cookie_wait" },
+        { NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED,  "nf_conntrack_sctp_timeout_cookie_echoed" },
+        { NET_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED,    "nf_conntrack_sctp_timeout_established" },
+        { NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT,  "nf_conntrack_sctp_timeout_shutdown_sent" },
+        { NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD,  "nf_conntrack_sctp_timeout_shutdown_recd" },
+        { NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT,      "nf_conntrack_sctp_timeout_shutdown_ack_sent" },
+        { NET_NF_CONNTRACK_COUNT,                       "nf_conntrack_count" },
+        { NET_NF_CONNTRACK_ICMPV6_TIMEOUT,      "nf_conntrack_icmpv6_timeout" },
+        { NET_NF_CONNTRACK_FRAG6_TIMEOUT,               "nf_conntrack_frag6_timeout" },
+        { NET_NF_CONNTRACK_FRAG6_LOW_THRESH,            "nf_conntrack_frag6_low_thresh" },
+        { NET_NF_CONNTRACK_FRAG6_HIGH_THRESH,           "nf_conntrack_frag6_high_thresh" },
+        { NET_NF_CONNTRACK_CHECKSUM,                    "nf_conntrack_checksum" },
+
+        {}
+};
+
+static struct trans_ctl_table trans_net_dccp_table[] = {
+        { NET_DCCP_DEFAULT,     "default" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_irda_table[] = {
+        { NET_IRDA_DISCOVERY,           "discovery" },
+        { NET_IRDA_DEVNAME,             "devname" },
+        { NET_IRDA_DEBUG,               "debug" },
+        { NET_IRDA_FAST_POLL,           "fast_poll_increase" },
+        { NET_IRDA_DISCOVERY_SLOTS,     "discovery_slots" },
+        { NET_IRDA_DISCOVERY_TIMEOUT,   "discovery_timeout" },
+        { NET_IRDA_SLOT_TIMEOUT,        "slot_timeout" },
+        { NET_IRDA_MAX_BAUD_RATE,       "max_baud_rate" },
+        { NET_IRDA_MIN_TX_TURN_TIME,    "min_tx_turn_time" },
+        { NET_IRDA_MAX_TX_DATA_SIZE,    "max_tx_data_size" },
+        { NET_IRDA_MAX_TX_WINDOW,       "max_tx_window" },
+        { NET_IRDA_MAX_NOREPLY_TIME,    "max_noreply_time" },
+        { NET_IRDA_WARN_NOREPLY_TIME,   "warn_noreply_time" },
+        { NET_IRDA_LAP_KEEPALIVE_TIME,  "lap_keepalive_time" },
+        {}
+};
+
+static struct trans_ctl_table trans_net_table[] = {
+        { NET_CORE,             "core",         trans_net_core_table },
+        /* NET_ETHER not used */
+        /* NET_802 not used */
+        { NET_UNIX,             "unix",         trans_net_unix_table },
+        { NET_IPV4,             "ipv4",         trans_net_ipv4_table },
+        { NET_IPX,              "ipx",          trans_net_ipx_table },
+        { NET_ATALK,            "atalk",        trans_net_atalk_table },
+        { NET_NETROM,           "netrom",       trans_net_netrom_table },
+        { NET_AX25,             "ax25",         trans_net_ax25_table },
+        { NET_BRIDGE,           "bridge",       trans_net_bridge_table },
+        { NET_ROSE,             "rose",         trans_net_rose_table },
+        { NET_IPV6,             "ipv6",         trans_net_ipv6_table },
+        { NET_X25,              "x25",          trans_net_x25_table },
+        { NET_TR,               "tr",           trans_net_tr_table },
+        { NET_DECNET,           "decnet",       trans_net_decnet_table },
+        /*  NET_ECONET not used */
+        { NET_SCTP,             "sctp",         trans_net_sctp_table },
+        { NET_LLC,              "llc",          trans_net_llc_table },
+        { NET_NETFILTER,        "netfilter",    trans_net_netfilter_table },
+        { NET_DCCP,             "dccp",         trans_net_dccp_table },
+        { NET_IRDA,             "irda",         trans_net_irda_table },
+        { 2089,                 "nf_conntrack_max" },
+        {}
+};
+
+static struct trans_ctl_table trans_fs_quota_table[] = {
+        { FS_DQ_LOOKUPS,        "lookups" },
+        { FS_DQ_DROPS,          "drops" },
+        { FS_DQ_READS,          "reads" },
+        { FS_DQ_WRITES,         "writes" },
+        { FS_DQ_CACHE_HITS,     "cache_hits" },
+        { FS_DQ_ALLOCATED,      "allocated_dquots" },
+        { FS_DQ_FREE,           "free_dquots" },
+        { FS_DQ_SYNCS,          "syncs" },
+        { FS_DQ_WARNINGS,       "warnings" },
+        {}
+};
+
+static struct trans_ctl_table trans_fs_xfs_table[] = {
+        { XFS_RESTRICT_CHOWN,   "restrict_chown" },
+        { XFS_SGID_INHERIT,     "irix_sgid_inherit" },
+        { XFS_SYMLINK_MODE,     "irix_symlink_mode" },
+        { XFS_PANIC_MASK,       "panic_mask" },
+
+        { XFS_ERRLEVEL,         "error_level" },
+        { XFS_SYNCD_TIMER,      "xfssyncd_centisecs" },
+        { XFS_INHERIT_SYNC,     "inherit_sync" },
+        { XFS_INHERIT_NODUMP,   "inherit_nodump" },
+        { XFS_INHERIT_NOATIME,  "inherit_noatime" },
+        { XFS_BUF_TIMER,        "xfsbufd_centisecs" },
+        { XFS_BUF_AGE,          "age_buffer_centisecs" },
+        { XFS_INHERIT_NOSYM,    "inherit_nosymlinks" },
+        { XFS_ROTORSTEP,        "rotorstep" },
+        { XFS_INHERIT_NODFRG,   "inherit_nodefrag" },
+        { XFS_FILESTREAM_TIMER, "filestream_centisecs" },
+        { XFS_STATS_CLEAR,      "stats_clear" },
+        {}
+};
+
+static struct trans_ctl_table trans_fs_ocfs2_nm_table[] = {
+        { 1, "hb_ctl_path" },
+        {}
+};
+
+static struct trans_ctl_table trans_fs_ocfs2_table[] = {
+        { 1,    "nm",   trans_fs_ocfs2_nm_table },
+        {}
+};
+
+static struct trans_ctl_table trans_inotify_table[] = {
+        { INOTIFY_MAX_USER_INSTANCES,   "max_user_instances" },
+        { INOTIFY_MAX_USER_WATCHES,     "max_user_watches" },
+        { INOTIFY_MAX_QUEUED_EVENTS,    "max_queued_events" },
+        {}
+};
+
+static struct trans_ctl_table trans_fs_table[] = {
+        { FS_NRINODE,           "inode-nr" },
+        { FS_STATINODE,         "inode-state" },
+        /* FS_MAXINODE unused */
+        /* FS_NRDQUOT unused */
+        /* FS_MAXDQUOT unused */
+        { FS_NRFILE,            "file-nr" },
+        { FS_MAXFILE,           "file-max" },
+        { FS_DENTRY,            "dentry-state" },
+        /* FS_NRSUPER unused */
+        /* FS_MAXUPSER unused */
+        { FS_OVERFLOWUID,       "overflowuid" },
+        { FS_OVERFLOWGID,       "overflowgid" },
+        { FS_LEASES,            "leases-enable" },
+        { FS_DIR_NOTIFY,        "dir-notify-enable" },
+        { FS_LEASE_TIME,        "lease-break-time" },
+        { FS_DQSTATS,           "quota",                trans_fs_quota_table },
+        { FS_XFS,               "xfs",                  trans_fs_xfs_table },
+        { FS_AIO_NR,            "aio-nr" },
+        { FS_AIO_MAX_NR,        "aio-max-nr" },
+        { FS_INOTIFY,           "inotify",              trans_inotify_table },
+        { FS_OCFS2,             "ocfs2",                trans_fs_ocfs2_table },
+        { KERN_SETUID_DUMPABLE, "suid_dumpable" },
+        {}
+};
+
+static struct trans_ctl_table trans_debug_table[] = {
+        {}
+};
+
+static struct trans_ctl_table trans_cdrom_table[] = {
+        { DEV_CDROM_INFO,               "info" },
+        { DEV_CDROM_AUTOCLOSE,          "autoclose" },
+        { DEV_CDROM_AUTOEJECT,          "autoeject" },
+        { DEV_CDROM_DEBUG,              "debug" },
+        { DEV_CDROM_LOCK,               "lock" },
+        { DEV_CDROM_CHECK_MEDIA,        "check_media" },
+        {}
+};
+
+static struct trans_ctl_table trans_ipmi_table[] = {
+        { DEV_IPMI_POWEROFF_POWERCYCLE, "poweroff_powercycle" },
+        {}
+};
+
+static struct trans_ctl_table trans_mac_hid_files[] = {
+        /* DEV_MAC_HID_KEYBOARD_SENDS_LINUX_KEYCODES unused */
+        /* DEV_MAC_HID_KEYBOARD_LOCK_KEYCODES unused */
+        { DEV_MAC_HID_MOUSE_BUTTON_EMULATION,   "mouse_button_emulation" },
+        { DEV_MAC_HID_MOUSE_BUTTON2_KEYCODE,    "mouse_button2_keycode" },
+        { DEV_MAC_HID_MOUSE_BUTTON3_KEYCODE,    "mouse_button3_keycode" },
+        /* DEV_MAC_HID_ADB_MOUSE_SENDS_KEYCODES unused */
+        {}
+};
+
+static struct trans_ctl_table trans_raid_table[] = {
+        { DEV_RAID_SPEED_LIMIT_MIN,     "speed_limit_min" },
+        { DEV_RAID_SPEED_LIMIT_MAX,     "speed_limit_max" },
+        {}
+};
+
+static struct trans_ctl_table trans_scsi_table[] = {
+        { DEV_SCSI_LOGGING_LEVEL, "logging_level" },
+        {}
+};
+
+static struct trans_ctl_table trans_parport_default_table[] = {
+        { DEV_PARPORT_DEFAULT_TIMESLICE,        "timeslice" },
+        { DEV_PARPORT_DEFAULT_SPINTIME,         "spintime" },
+        {}
+};
+
+static struct trans_ctl_table trans_parport_device_table[] = {
+        { DEV_PARPORT_DEVICE_TIMESLICE,         "timeslice" },
+        {}
+};
+
+static struct trans_ctl_table trans_parport_devices_table[] = {
+        { DEV_PARPORT_DEVICES_ACTIVE,           "active" },
+        { 0, NULL, trans_parport_device_table },
+        {}
+};
+
+static struct trans_ctl_table trans_parport_parport_table[] = {
+        { DEV_PARPORT_SPINTIME,         "spintime" },
+        { DEV_PARPORT_BASE_ADDR,        "base-addr" },
+        { DEV_PARPORT_IRQ,              "irq" },
+        { DEV_PARPORT_DMA,              "dma" },
+        { DEV_PARPORT_MODES,            "modes" },
+        { DEV_PARPORT_DEVICES,          "devices",      trans_parport_devices_table },
+        { DEV_PARPORT_AUTOPROBE,        "autoprobe" },
+        { DEV_PARPORT_AUTOPROBE + 1,    "autoprobe0" },
+        { DEV_PARPORT_AUTOPROBE + 2,    "autoprobe1" },
+        { DEV_PARPORT_AUTOPROBE + 3,    "autoprobe2" },
+        { DEV_PARPORT_AUTOPROBE + 4,    "autoprobe3" },
+        {}
+};
+static struct trans_ctl_table trans_parport_table[] = {
+        { DEV_PARPORT_DEFAULT,  "default",      trans_parport_default_table },
+        { 0, NULL, trans_parport_parport_table },
+        {}
+};
+
+static struct trans_ctl_table trans_dev_table[] = {
+        { DEV_CDROM,    "cdrom",        trans_cdrom_table },
+        /* DEV_HWMON unused */
+        { DEV_PARPORT,  "parport",      trans_parport_table },
+        { DEV_RAID,     "raid",         trans_raid_table },
+        { DEV_MAC_HID,  "mac_hid",      trans_mac_hid_files },
+        { DEV_SCSI,     "scsi",         trans_scsi_table },
+        { DEV_IPMI,     "ipmi",         trans_ipmi_table },
+        {}
+};
+
+static struct trans_ctl_table trans_bus_isa_table[] = {
+        { BUS_ISA_MEM_BASE,     "membase" },
+        { BUS_ISA_PORT_BASE,    "portbase" },
+        { BUS_ISA_PORT_SHIFT,   "portshift" },
+        {}
+};
+
+static struct trans_ctl_table trans_bus_table[] = {
+        { CTL_BUS_ISA,  "isa",  trans_bus_isa_table },
+        {}
+};
+
+static struct trans_ctl_table trans_arlan_conf_table0[] = {
+        { 1,    "spreadingCode" },
+        { 2,    "channelNumber" },
+        { 3,    "scramblingDisable" },
+        { 4,    "txAttenuation" },
+        { 5,    "systemId" },
+        { 6,    "maxDatagramSize" },
+        { 7,    "maxFrameSize" },
+        { 8,    "maxRetries" },
+        { 9,    "receiveMode" },
+        { 10,   "priority" },
+        { 11,   "rootOrRepeater" },
+        { 12,   "SID" },
+        { 13,   "registrationMode" },
+        { 14,   "registrationFill" },
+        { 15,   "localTalkAddress" },
+        { 16,   "codeFormat" },
+        { 17,   "numChannels" },
+        { 18,   "channel1" },
+        { 19,   "channel2" },
+        { 20,   "channel3" },
+        { 21,   "channel4" },
+        { 22,   "txClear" },
+        { 23,   "txRetries" },
+        { 24,   "txRouting" },
+        { 25,   "txScrambled" },
+        { 26,   "rxParameter" },
+        { 27,   "txTimeoutMs" },
+        { 28,   "waitCardTimeout" },
+        { 29,   "channelSet" },
+        { 30,   "name" },
+        { 31,   "waitTime" },
+        { 32,   "lParameter" },
+        { 33,   "_15" },
+        { 34,   "headerSize" },
+        { 36,   "tx_delay_ms" },
+        { 37,   "retries" },
+        { 38,   "ReTransmitPacketMaxSize" },
+        { 39,   "waitReTransmitPacketMaxSize" },
+        { 40,   "fastReTransCount" },
+        { 41,   "driverRetransmissions" },
+        { 42,   "txAckTimeoutMs" },
+        { 43,   "registrationInterrupts" },
+        { 44,   "hardwareType" },
+        { 45,   "radioType" },
+        { 46,   "writeEEPROM" },
+        { 47,   "writeRadioType" },
+        { 48,   "entry_exit_debug" },
+        { 49,   "debug" },
+        { 50,   "in_speed" },
+        { 51,   "out_speed" },
+        { 52,   "in_speed10" },
+        { 53,   "out_speed10" },
+        { 54,   "in_speed_max" },
+        { 55,   "out_speed_max" },
+        { 56,   "measure_rate" },
+        { 57,   "pre_Command_Wait" },
+        { 58,   "rx_tweak1" },
+        { 59,   "rx_tweak2" },
+        { 60,   "tx_queue_len" },
+
+        { 150,  "arlan0-txRing" },
+        { 151,  "arlan0-rxRing" },
+        { 152,  "arlan0-18" },
+        { 153,  "arlan0-ring" },
+        { 154,  "arlan0-shm-cpy" },
+        { 155,  "config0" },
+        { 156,  "reset0" },
+        {}
+};
+
+static struct trans_ctl_table trans_arlan_conf_table1[] = {
+        { 1,    "spreadingCode" },
+        { 2,    "channelNumber" },
+        { 3,    "scramblingDisable" },
+        { 4,    "txAttenuation" },
+        { 5,    "systemId" },
+        { 6,    "maxDatagramSize" },
+        { 7,    "maxFrameSize" },
+        { 8,    "maxRetries" },
+        { 9,    "receiveMode" },
+        { 10,   "priority" },
+        { 11,   "rootOrRepeater" },
+        { 12,   "SID" },
+        { 13,   "registrationMode" },
+        { 14,   "registrationFill" },
+        { 15,   "localTalkAddress" },
+        { 16,   "codeFormat" },
+        { 17,   "numChannels" },
+        { 18,   "channel1" },
+        { 19,   "channel2" },
+        { 20,   "channel3" },
+        { 21,   "channel4" },
+        { 22,   "txClear" },
+        { 23,   "txRetries" },
+        { 24,   "txRouting" },
+        { 25,   "txScrambled" },
+        { 26,   "rxParameter" },
+        { 27,   "txTimeoutMs" },
+        { 28,   "waitCardTimeout" },
+        { 29,   "channelSet" },
+        { 30,   "name" },
+        { 31,   "waitTime" },
+        { 32,   "lParameter" },
+        { 33,   "_15" },
+        { 34,   "headerSize" },
+        { 36,   "tx_delay_ms" },
+        { 37,   "retries" },
+        { 38,   "ReTransmitPacketMaxSize" },
+        { 39,   "waitReTransmitPacketMaxSize" },
+        { 40,   "fastReTransCount" },
+        { 41,   "driverRetransmissions" },
+        { 42,   "txAckTimeoutMs" },
+        { 43,   "registrationInterrupts" },
+        { 44,   "hardwareType" },
+        { 45,   "radioType" },
+        { 46,   "writeEEPROM" },
+        { 47,   "writeRadioType" },
+        { 48,   "entry_exit_debug" },
+        { 49,   "debug" },
+        { 50,   "in_speed" },
+        { 51,   "out_speed" },
+        { 52,   "in_speed10" },
+        { 53,   "out_speed10" },
+        { 54,   "in_speed_max" },
+        { 55,   "out_speed_max" },
+        { 56,   "measure_rate" },
+        { 57,   "pre_Command_Wait" },
+        { 58,   "rx_tweak1" },
+        { 59,   "rx_tweak2" },
+        { 60,   "tx_queue_len" },
+
+        { 150,  "arlan1-txRing" },
+        { 151,  "arlan1-rxRing" },
+        { 152,  "arlan1-18" },
+        { 153,  "arlan1-ring" },
+        { 154,  "arlan1-shm-cpy" },
+        { 155,  "config1" },
+        { 156,  "reset1" },
+        {}
+};
+
+static struct trans_ctl_table trans_arlan_conf_table2[] = {
+        { 1,    "spreadingCode" },
+        { 2,    "channelNumber" },
+        { 3,    "scramblingDisable" },
+        { 4,    "txAttenuation" },
+        { 5,    "systemId" },
+        { 6,    "maxDatagramSize" },
+        { 7,    "maxFrameSize" },
+        { 8,    "maxRetries" },
+        { 9,    "receiveMode" },
+        { 10,   "priority" },
+        { 11,   "rootOrRepeater" },
+        { 12,   "SID" },
+        { 13,   "registrationMode" },
+        { 14,   "registrationFill" },
+        { 15,   "localTalkAddress" },
+        { 16,   "codeFormat" },
+        { 17,   "numChannels" },
+        { 18,   "channel1" },
+        { 19,   "channel2" },
+        { 20,   "channel3" },
+        { 21,   "channel4" },
+        { 22,   "txClear" },
+        { 23,   "txRetries" },
+        { 24,   "txRouting" },
+        { 25,   "txScrambled" },
+        { 26,   "rxParameter" },
+        { 27,   "txTimeoutMs" },
+        { 28,   "waitCardTimeout" },
+        { 29,   "channelSet" },
+        { 30,   "name" },
+        { 31,   "waitTime" },
+        { 32,   "lParameter" },
+        { 33,   "_15" },
+        { 34,   "headerSize" },
+        { 36,   "tx_delay_ms" },
+        { 37,   "retries" },
+        { 38,   "ReTransmitPacketMaxSize" },
+        { 39,   "waitReTransmitPacketMaxSize" },
+        { 40,   "fastReTransCount" },
+        { 41,   "driverRetransmissions" },
+        { 42,   "txAckTimeoutMs" },
+        { 43,   "registrationInterrupts" },
+        { 44,   "hardwareType" },
+        { 45,   "radioType" },
+        { 46,   "writeEEPROM" },
+        { 47,   "writeRadioType" },
+        { 48,   "entry_exit_debug" },
+        { 49,   "debug" },
+        { 50,   "in_speed" },
+        { 51,   "out_speed" },
+        { 52,   "in_speed10" },
+        { 53,   "out_speed10" },
+        { 54,   "in_speed_max" },
+        { 55,   "out_speed_max" },
+        { 56,   "measure_rate" },
+        { 57,   "pre_Command_Wait" },
+        { 58,   "rx_tweak1" },
+        { 59,   "rx_tweak2" },
+        { 60,   "tx_queue_len" },
+
+        { 150,  "arlan2-txRing" },
+        { 151,  "arlan2-rxRing" },
+        { 152,  "arlan2-18" },
+        { 153,  "arlan2-ring" },
+        { 154,  "arlan2-shm-cpy" },
+        { 155,  "config2" },
+        { 156,  "reset2" },
+        {}
+};
+
+static struct trans_ctl_table trans_arlan_conf_table3[] = {
+        { 1,    "spreadingCode" },
+        { 2,    "channelNumber" },
+        { 3,    "scramblingDisable" },
+        { 4,    "txAttenuation" },
+        { 5,    "systemId" },
+        { 6,    "maxDatagramSize" },
+        { 7,    "maxFrameSize" },
+        { 8,    "maxRetries" },
+        { 9,    "receiveMode" },
+        { 10,   "priority" },
+        { 11,   "rootOrRepeater" },
+        { 12,   "SID" },
+        { 13,   "registrationMode" },
+        { 14,   "registrationFill" },
+        { 15,   "localTalkAddress" },
+        { 16,   "codeFormat" },
+        { 17,   "numChannels" },
+        { 18,   "channel1" },
+        { 19,   "channel2" },
+        { 20,   "channel3" },
+        { 21,   "channel4" },
+        { 22,   "txClear" },
+        { 23,   "txRetries" },
+        { 24,   "txRouting" },
+        { 25,   "txScrambled" },
+        { 26,   "rxParameter" },
+        { 27,   "txTimeoutMs" },
+        { 28,   "waitCardTimeout" },
+        { 29,   "channelSet" },
+        { 30,   "name" },
+        { 31,   "waitTime" },
+        { 32,   "lParameter" },
+        { 33,   "_15" },
+        { 34,   "headerSize" },
+        { 36,   "tx_delay_ms" },
+        { 37,   "retries" },
+        { 38,   "ReTransmitPacketMaxSize" },
+        { 39,   "waitReTransmitPacketMaxSize" },
+        { 40,   "fastReTransCount" },
+        { 41,   "driverRetransmissions" },
+        { 42,   "txAckTimeoutMs" },
+        { 43,   "registrationInterrupts" },
+        { 44,   "hardwareType" },
+        { 45,   "radioType" },
+        { 46,   "writeEEPROM" },
+        { 47,   "writeRadioType" },
+        { 48,   "entry_exit_debug" },
+        { 49,   "debug" },
+        { 50,   "in_speed" },
+        { 51,   "out_speed" },
+        { 52,   "in_speed10" },
+        { 53,   "out_speed10" },
+        { 54,   "in_speed_max" },
+        { 55,   "out_speed_max" },
+        { 56,   "measure_rate" },
+        { 57,   "pre_Command_Wait" },
+        { 58,   "rx_tweak1" },
+        { 59,   "rx_tweak2" },
+        { 60,   "tx_queue_len" },
+
+        { 150,  "arlan3-txRing" },
+        { 151,  "arlan3-rxRing" },
+        { 152,  "arlan3-18" },
+        { 153,  "arlan3-ring" },
+        { 154,  "arlan3-shm-cpy" },
+        { 155,  "config3" },
+        { 156,  "reset3" },
+        {}
+};
+
+static struct trans_ctl_table trans_arlan_table[] = {
+        { 1,            "arlan0",       trans_arlan_conf_table0 },
+        { 2,            "arlan1",       trans_arlan_conf_table1 },
+        { 3,            "arlan2",       trans_arlan_conf_table2 },
+        { 4,            "arlan3",       trans_arlan_conf_table3 },
+        {}
+};
+
+static struct trans_ctl_table trans_appldata_table[] = {
+        { CTL_APPLDATA_TIMER,           "timer" },
+        { CTL_APPLDATA_INTERVAL,        "interval" },
+        { CTL_APPLDATA_OS,              "os" },
+        { CTL_APPLDATA_NET_SUM,         "net_sum" },
+        { CTL_APPLDATA_MEM,             "mem" },
+        {}
+
+};
+
+static struct trans_ctl_table trans_s390dbf_table[] = {
+        { 5678 /* CTL_S390DBF_STOPPABLE */,     "debug_stoppable" },
+        { 5679 /* CTL_S390DBF_ACTIVE */,        "debug_active" },
+        {}
+};
+
+static struct trans_ctl_table trans_sunrpc_table[] = {
+        { CTL_RPCDEBUG,         "rpc_debug" },
+        { CTL_NFSDEBUG,         "nfs_debug" },
+        { CTL_NFSDDEBUG,        "nfsd_debug" },
+        { CTL_NLMDEBUG,         "nlm_debug" },
+        { CTL_SLOTTABLE_UDP,    "udp_slot_table_entries" },
+        { CTL_SLOTTABLE_TCP,    "tcp_slot_table_entries" },
+        { CTL_MIN_RESVPORT,     "min_resvport" },
+        { CTL_MAX_RESVPORT,     "max_resvport" },
+        {}
+};
+
+static struct trans_ctl_table trans_pm_table[] = {
+        { 1 /* CTL_PM_SUSPEND */,       "suspend" },
+        { 2 /* CTL_PM_CMODE */,         "cmode" },
+        { 3 /* CTL_PM_P0 */,            "p0" },
+        { 4 /* CTL_PM_CM */,            "cm" },
+        {}
+};
+
+static struct trans_ctl_table trans_frv_table[] = {
+        { 1,    "cache-mode" },
+        { 2,    "pin-cxnr" },
+        {}
+};
+
+static struct trans_ctl_table trans_root_table[] = {
+        { CTL_KERN,     "kernel",       trans_kern_table },
+        { CTL_VM,       "vm",           trans_vm_table },
+        { CTL_NET,      "net",          trans_net_table },
+        /* CTL_PROC not used */
+        { CTL_FS,       "fs",           trans_fs_table },
+        { CTL_DEBUG,    "debug",        trans_debug_table },
+        { CTL_DEV,      "dev",          trans_dev_table },
+        { CTL_BUS,      "bus",          trans_bus_table },
+        { CTL_ABI,      "abi" },
+        /* CTL_CPU not used */
+        { CTL_ARLAN,    "arlan",        trans_arlan_table },
+        { CTL_APPLDATA, "appldata",     trans_appldata_table },
+        { CTL_S390DBF,  "s390dbf",      trans_s390dbf_table },
+        { CTL_SUNRPC,   "sunrpc",       trans_sunrpc_table },
+        { CTL_PM,       "pm",           trans_pm_table },
+        { CTL_FRV,      "frv",          trans_frv_table },
+        {}
+};
+
+
+
+
+static int sysctl_depth(struct ctl_table *table)
+{
+        struct ctl_table *tmp;
+        int depth;
+
+        depth = 0;
+        for (tmp = table; tmp->parent; tmp = tmp->parent)
+                depth++;
+
+        return depth;
+}
+
+static struct ctl_table *sysctl_parent(struct ctl_table *table, int n)
+{
+        int i;
+
+        for (i = 0; table && i < n; i++)
+                table = table->parent;
+
+        return table;
+}
+
+static struct trans_ctl_table *sysctl_binary_lookup(struct ctl_table *table)
+{
+        struct ctl_table *test;
+        struct trans_ctl_table *ref;
+        int depth, cur_depth;
+
+        depth = sysctl_depth(table);
+
+        cur_depth = depth;
+        ref = trans_root_table;
+repeat:
+        test = sysctl_parent(table, cur_depth);
+        for (; ref->ctl_name || ref->procname || ref->child; ref++) {
+                int match = 0;
+
+                if (cur_depth && !ref->child)
+                        continue;
+
+                if (test->procname && ref->procname &&
+                        (strcmp(test->procname, ref->procname) == 0))
+                        match++;
+
+                if (test->ctl_name && ref->ctl_name &&
+                        (test->ctl_name == ref->ctl_name))
+                        match++;
+
+                if (!ref->ctl_name && !ref->procname)
+                        match++;
+
+                if (match) {
+                        if (cur_depth != 0) {
+                                cur_depth--;
+                                ref = ref->child;
+                                goto repeat;
+                        }
+                        goto out;
+                }
+        }
+        ref = NULL;
+out:
+        return ref;
+}
+
+static void sysctl_print_path(struct ctl_table *table)
+{
+        struct ctl_table *tmp;
+        int depth, i;
+        depth = sysctl_depth(table);
+        if (table->procname) {
+                for (i = depth; i >= 0; i--) {
+                        tmp = sysctl_parent(table, i);
+                        printk("/%s", tmp->procname?tmp->procname:"");
+                }
+        }
+        printk(" ");
+        if (table->ctl_name) {
+                for (i = depth; i >= 0; i--) {
+                        tmp = sysctl_parent(table, i);
+                        printk(".%d", tmp->ctl_name);
+                }
+        }
+}
+
+static void sysctl_repair_table(struct ctl_table *table)
+{
+        /* Don't complain about the classic default
+         * sysctl strategy routine.  Maybe later we
+         * can get the tables fixed and complain about
+         * this.
+         */
+        if (table->ctl_name && table->procname &&
+                (table->proc_handler == proc_dointvec) &&
+                (!table->strategy)) {
+                table->strategy = sysctl_data;
+        }
+}
+
+static struct ctl_table *sysctl_check_lookup(struct ctl_table *table)
+{
+        struct ctl_table_header *head;
+        struct ctl_table *ref, *test;
+        int depth, cur_depth;
+
+        depth = sysctl_depth(table);
+
+        for (head = sysctl_head_next(NULL); head;
+             head = sysctl_head_next(head)) {
+                cur_depth = depth;
+                ref = head->ctl_table;
+repeat:
+                test = sysctl_parent(table, cur_depth);
+                for (; ref->ctl_name || ref->procname; ref++) {
+                        int match = 0;
+                        if (cur_depth && !ref->child)
+                                continue;
+
+                        if (test->procname && ref->procname &&
+                            (strcmp(test->procname, ref->procname) == 0))
+                                        match++;
+
+                        if (test->ctl_name && ref->ctl_name &&
+                            (test->ctl_name == ref->ctl_name))
+                                match++;
+
+                        if (match) {
+                                if (cur_depth != 0) {
+                                        cur_depth--;
+                                        ref = ref->child;
+                                        goto repeat;
+                                }
+                                goto out;
+                        }
+                }
+        }
+        ref = NULL;
+out:
+        sysctl_head_finish(head);
+        return ref;
+}
+
+static void set_fail(const char **fail, struct ctl_table *table, const char *str)
+{
+        if (*fail) {
+                printk(KERN_ERR "sysctl table check failed: ");
+                sysctl_print_path(table);
+                printk(" %s\n", *fail);
+        }
+        *fail = str;
+}
+
+static int sysctl_check_dir(struct ctl_table *table)
+{
+        struct ctl_table *ref;
+        int error;
+
+        error = 0;
+        ref = sysctl_check_lookup(table);
+        if (ref) {
+                int match = 0;
+                if ((!table->procname && !ref->procname) ||
+                    (table->procname && ref->procname &&
+                     (strcmp(table->procname, ref->procname) == 0)))
+                        match++;
+
+                if ((!table->ctl_name && !ref->ctl_name) ||
+                    (table->ctl_name && ref->ctl_name &&
+                     (table->ctl_name == ref->ctl_name)))
+                        match++;
+
+                if (match != 2) {
+                        printk(KERN_ERR "%s: failed: ", __func__);
+                        sysctl_print_path(table);
+                        printk(" ref: ");
+                        sysctl_print_path(ref);
+                        printk("\n");
+                        error = -EINVAL;
+                }
+        }
+        return error;
+}
+
+static void sysctl_check_leaf(struct ctl_table *table, const char **fail)
+{
+        struct ctl_table *ref;
+
+        ref = sysctl_check_lookup(table);
+        if (ref && (ref != table))
+                set_fail(fail, table, "Sysctl already exists");
+}
+
+static void sysctl_check_bin_path(struct ctl_table *table, const char **fail)
+{
+        struct trans_ctl_table *ref;
+
+        ref = sysctl_binary_lookup(table);
+        if (table->ctl_name && !ref)
+                set_fail(fail, table, "Unknown sysctl binary path");
+        if (ref) {
+                if (ref->procname &&
+                    (!table->procname ||
+                     (strcmp(table->procname, ref->procname) != 0)))
+                        set_fail(fail, table, "procname does not match binary path procname");
+
+                if (ref->ctl_name && table->ctl_name &&
+                    (table->ctl_name != ref->ctl_name))
+                        set_fail(fail, table, "ctl_name does not match binary path ctl_name");
+        }
+}
+
+int sysctl_check_table(struct ctl_table *table)
+{
+        int error = 0;
+        for (; table->ctl_name || table->procname; table++) {
+                const char *fail = NULL;
+
+                sysctl_repair_table(table);
+                if (table->parent) {
+                        if (table->procname && !table->parent->procname)
+                                set_fail(&fail, table, "Parent without procname");
+                        if (table->ctl_name && !table->parent->ctl_name)
+                                set_fail(&fail, table, "Parent without ctl_name");
+                }
+                if (!table->procname)
+                        set_fail(&fail, table, "No procname");
+                if (table->child) {
+                        if (table->data)
+                                set_fail(&fail, table, "Directory with data?");
+                        if (table->maxlen)
+                                set_fail(&fail, table, "Directory with maxlen?");
+                        if ((table->mode & (S_IRUGO|S_IXUGO)) != table->mode)
+                                set_fail(&fail, table, "Writable sysctl directory");
+                        if (table->proc_handler)
+                                set_fail(&fail, table, "Directory with proc_handler");
+                        if (table->strategy)
+                                set_fail(&fail, table, "Directory with strategy");
+                        if (table->extra1)
+                                set_fail(&fail, table, "Directory with extra1");
+                        if (table->extra2)
+                                set_fail(&fail, table, "Directory with extra2");
+                        if (sysctl_check_dir(table))
+                                set_fail(&fail, table, "Inconsistent directory names");
+                } else {
+                        if ((table->strategy == sysctl_data) ||
+                            (table->strategy == sysctl_string) ||
+                            (table->strategy == sysctl_intvec) ||
+                            (table->strategy == sysctl_jiffies) ||
+                            (table->strategy == sysctl_ms_jiffies) ||
+                            (table->proc_handler == proc_dostring) ||
+                            (table->proc_handler == proc_dointvec) ||
+#ifdef CONFIG_SECURITY_CAPABILITIES
+                            (table->proc_handler == proc_dointvec_bset) ||
+#endif /* def CONFIG_SECURITY_CAPABILITIES */
+                            (table->proc_handler == proc_dointvec_minmax) ||
+                            (table->proc_handler == proc_dointvec_jiffies) ||
+                            (table->proc_handler == proc_dointvec_userhz_jiffies) ||
+                            (table->proc_handler == proc_dointvec_ms_jiffies) ||
+                            (table->proc_handler == proc_doulongvec_minmax) ||
+                            (table->proc_handler == proc_doulongvec_ms_jiffies_minmax)) {
+                                if (!table->data)
+                                        set_fail(&fail, table, "No data");
+                                if (!table->maxlen)
+                                        set_fail(&fail, table, "No maxlen");
+                        }
+                        if ((table->proc_handler == proc_doulongvec_minmax) ||
+                            (table->proc_handler == proc_doulongvec_ms_jiffies_minmax)) {
+                                if (table->maxlen > sizeof (unsigned long)) {
+                                        if (!table->extra1)
+                                                set_fail(&fail, table, "No min");
+                                        if (!table->extra2)
+                                                set_fail(&fail, table, "No max");
+                                }
+                        }
+#ifdef CONFIG_SYSCTL_SYSCALL
+                        if (table->ctl_name && !table->strategy)
+                                set_fail(&fail, table, "Missing strategy");
+#endif
+#if 0
+                        if (!table->ctl_name && table->strategy)
+                                set_fail(&fail, table, "Strategy without ctl_name");
+#endif
+#ifdef CONFIG_PROC_FS
+                        if (table->procname && !table->proc_handler)
+                                set_fail(&fail, table, "No proc_handler");
+#endif
+#if 0
+                        if (!table->procname && table->proc_handler)
+                                set_fail(&fail, table, "proc_handler without procname");
+#endif
+                        sysctl_check_leaf(table, &fail);
+                }
+                sysctl_check_bin_path(table, &fail);
+                if (fail) {
+                        set_fail(&fail, table, NULL);
+                        error = -EINVAL;
+                }
+                if (table->child)
+                        error |= sysctl_check_table(table->child);
+        }
+        return error;
+}
diff --git a/kernel/time.c b/kernel/time.c
index 2d5b6a682138..09d3c45c4da7 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -9,9 +9,9 @@
  */
 /*
  * Modification history kernel/time.c
- * 
+ *
  * 1993-09-02    Philip Gladstone
- *      Created file with time related functions from sched.c and adjtimex() 
+ *      Created file with time related functions from sched.c and adjtimex()
  * 1993-10-08    Torsten Duwe
  *      adjtime interface update and CMOS clock write code
  * 1995-08-13    Torsten Duwe
@@ -30,6 +30,7 @@
 #include <linux/module.h>
 #include <linux/timex.h>
 #include <linux/capability.h>
+#include <linux/clocksource.h>
 #include <linux/errno.h>
 #include <linux/syscalls.h>
 #include <linux/security.h>
@@ -38,7 +39,7 @@
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 
-/* 
+/*
  * The timezone where the local system is located.  Used as a default by some
  * programs who obtain this value by using gettimeofday.
  */
@@ -71,7 +72,7 @@ asmlinkage long sys_time(time_t __user * tloc)
  * why not move it into the appropriate arch directory (for those
  * architectures that need it).
  */
- 
+
 asmlinkage long sys_stime(time_t __user *tptr)
 {
         struct timespec tv;
@@ -110,10 +111,10 @@ asmlinkage long sys_gettimeofday(struct timeval __user *tv, struct timezone __us
 /*
  * Adjust the time obtained from the CMOS to be UTC time instead of
  * local time.
- * 
+ *
  * This is ugly, but preferable to the alternatives.  Otherwise we
  * would either need to write a program to do it in /etc/rc (and risk
- * confusion if the program gets run more than once; it would also be 
+ * confusion if the program gets run more than once; it would also be
  * hard to make the program warp the clock precisely n hours)  or
  * compile in the timezone information into the kernel.  Bad, bad....
  *
@@ -158,6 +159,7 @@ int do_sys_settimeofday(struct timespec *tv, struct timezone *tz)
         if (tz) {
                 /* SMP safe, global irq locking makes it work. */
                 sys_tz = *tz;
+                update_vsyscall_tz();
                 if (firsttime) {
                         firsttime = 0;
                         if (!tv)
diff --git a/kernel/timer.c b/kernel/timer.c
index 6ce1952eea7d..8521d10fbb27 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -817,7 +817,7 @@ unsigned long next_timer_interrupt(void)
 #endif
 
 /*
- * Called from the timer interrupt handler to charge one tick to the current 
+ * Called from the timer interrupt handler to charge one tick to the current
  * process.  user_tick is 1 if the tick is user time, 0 for system.
  */
 void update_process_times(int user_tick)
@@ -826,10 +826,13 @@ void update_process_times(int user_tick)
         int cpu = smp_processor_id();
 
         /* Note: this timer irq context must be accounted for as well. */
-        if (user_tick)
+        if (user_tick) {
                 account_user_time(p, jiffies_to_cputime(1));
-        else
+                account_user_time_scaled(p, jiffies_to_cputime(1));
+        } else {
                 account_system_time(p, HARDIRQ_OFFSET, jiffies_to_cputime(1));
+                account_system_time_scaled(p, jiffies_to_cputime(1));
+        }
         run_local_timers();
         if (rcu_pending(cpu))
                 rcu_check_callbacks(cpu, user_tick);
diff --git a/kernel/tsacct.c b/kernel/tsacct.c
index c122131a122f..4ab1b584961b 100644
--- a/kernel/tsacct.c
+++ b/kernel/tsacct.c
@@ -62,6 +62,10 @@ void bacct_add_tsk(struct taskstats *stats, struct task_struct *tsk)
         rcu_read_unlock();
         stats->ac_utime  = cputime_to_msecs(tsk->utime) * USEC_PER_MSEC;
         stats->ac_stime  = cputime_to_msecs(tsk->stime) * USEC_PER_MSEC;
+        stats->ac_utimescaled =
+                cputime_to_msecs(tsk->utimescaled) * USEC_PER_MSEC;
+        stats->ac_stimescaled =
+                cputime_to_msecs(tsk->stimescaled) * USEC_PER_MSEC;
         stats->ac_minflt = tsk->min_flt;
         stats->ac_majflt = tsk->maj_flt;
 
diff --git a/lib/crc32.c b/lib/crc32.c
index bfc33314c720..d2c2f257bedd 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -49,7 +49,7 @@ MODULE_LICENSE("GPL");
  * @p: pointer to buffer over which CRC is run
  * @len: length of buffer @p
  */
-u32 __attribute_pure__ crc32_le(u32 crc, unsigned char const *p, size_t len);
+u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len);
 
 #if CRC_LE_BITS == 1
 /*
@@ -57,7 +57,7 @@ u32 __attribute_pure__ crc32_le(u32 crc, unsigned char const *p, size_t len);
  * simplified by inlining the table in ?: form.
  */
 
-u32 __attribute_pure__ crc32_le(u32 crc, unsigned char const *p, size_t len)
+u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)
 {
         int i;
         while (len--) {
@@ -69,7 +69,7 @@ u32 __attribute_pure__ crc32_le(u32 crc, unsigned char const *p, size_t len)
 }
 #else                           /* Table-based approach */
 
-u32 __attribute_pure__ crc32_le(u32 crc, unsigned char const *p, size_t len)
+u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)
 {
 # if CRC_LE_BITS == 8
         const u32      *b =(u32 *)p;
@@ -145,7 +145,7 @@ u32 __attribute_pure__ crc32_le(u32 crc, unsigned char const *p, size_t len)
  * @p: pointer to buffer over which CRC is run
  * @len: length of buffer @p
  */
-u32 __attribute_pure__ crc32_be(u32 crc, unsigned char const *p, size_t len);
+u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len);
 
 #if CRC_BE_BITS == 1
 /*
@@ -153,7 +153,7 @@ u32 __attribute_pure__ crc32_be(u32 crc, unsigned char const *p, size_t len);
  * simplified by inlining the table in ?: form.
  */
 
-u32 __attribute_pure__ crc32_be(u32 crc, unsigned char const *p, size_t len)
+u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
 {
         int i;
         while (len--) {
@@ -167,7 +167,7 @@ u32 __attribute_pure__ crc32_be(u32 crc, unsigned char const *p, size_t len)
 }
 
 #else                           /* Table-based approach */
-u32 __attribute_pure__ crc32_be(u32 crc, unsigned char const *p, size_t len)
+u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
 {
 # if CRC_BE_BITS == 8
         const u32      *b =(u32 *)p;
diff --git a/lib/libcrc32c.c b/lib/libcrc32c.c
index 60f46803af3f..802f11f0bf5b 100644
--- a/lib/libcrc32c.c
+++ b/lib/libcrc32c.c
@@ -66,7 +66,7 @@ EXPORT_SYMBOL(crc32c_le);
  * loop below with crc32 and vary the POLY if we don't find value in terms
  * of space and maintainability in keeping the two modules separate.
  */
-u32 __attribute_pure__
+u32 __pure
 crc32c_le(u32 crc, unsigned char const *p, size_t len)
 {
         int i;
@@ -160,7 +160,7 @@ static const u32 crc32c_table[256] = {
  * crc using table.
  */
 
-u32 __attribute_pure__
+u32 __pure
 crc32c_le(u32 seed, unsigned char const *data, size_t length)
 {
         u32 crc = __cpu_to_le32(seed);
@@ -177,7 +177,7 @@ crc32c_le(u32 seed, unsigned char const *data, size_t length)
 EXPORT_SYMBOL(crc32c_be);
 
 #if CRC_BE_BITS == 1
-u32 __attribute_pure__
+u32 __pure
 crc32c_be(u32 crc, unsigned char const *p, size_t len)
 {
         int i;
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index ae2959bb59cb..034617f8cdb2 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1020,7 +1020,7 @@ static long region_chg(struct list_head *head, long f, long t)
          * size such that we can guarentee to record the reservation. */
         if (&rg->link == head || t < rg->from) {
                 nrg = kmalloc(sizeof(*nrg), GFP_KERNEL);
-                if (nrg == 0)
+                if (!nrg)
                         return -ENOMEM;
                 nrg->from = f;
                 nrg->to   = f;
diff --git a/mm/mremap.c b/mm/mremap.c
index 8ea5c2412c6e..08e3c7f2bd15 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -291,7 +291,7 @@ unsigned long do_mremap(unsigned long addr,
                 if ((addr <= new_addr) && (addr+old_len) > new_addr)
                         goto out;
 
-                ret = security_file_mmap(0, 0, 0, 0, new_addr, 1);
+                ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
                 if (ret)
                         goto out;
 
@@ -399,7 +399,7 @@ unsigned long do_mremap(unsigned long addr,
                                 goto out;
                         }
 
-                        ret = security_file_mmap(0, 0, 0, 0, new_addr, 1);
+                        ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
                         if (ret)
                                 goto out;
                 }
diff --git a/mm/slab.c b/mm/slab.c
index 3ce9bc024d67..54eb555c4ef8 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1156,105 +1156,187 @@ static inline int cache_free_alien(struct kmem_cache *cachep, void *objp)
 }
 #endif
 
-static int __cpuinit cpuup_callback(struct notifier_block *nfb,
-                                    unsigned long action, void *hcpu)
+static void __cpuinit cpuup_canceled(long cpu)
+{
+        struct kmem_cache *cachep;
+        struct kmem_list3 *l3 = NULL;
+        int node = cpu_to_node(cpu);
+
+        list_for_each_entry(cachep, &cache_chain, next) {
+                struct array_cache *nc;
+                struct array_cache *shared;
+                struct array_cache **alien;
+                cpumask_t mask;
+
+                mask = node_to_cpumask(node);
+                /* cpu is dead; no one can alloc from it. */
+                nc = cachep->array[cpu];
+                cachep->array[cpu] = NULL;
+                l3 = cachep->nodelists[node];
+
+                if (!l3)
+                        goto free_array_cache;
+
+                spin_lock_irq(&l3->list_lock);
+
+                /* Free limit for this kmem_list3 */
+                l3->free_limit -= cachep->batchcount;
+                if (nc)
+                        free_block(cachep, nc->entry, nc->avail, node);
+
+                if (!cpus_empty(mask)) {
+                        spin_unlock_irq(&l3->list_lock);
+                        goto free_array_cache;
+                }
+
+                shared = l3->shared;
+                if (shared) {
+                        free_block(cachep, shared->entry,
+                                   shared->avail, node);
+                        l3->shared = NULL;
+                }
+
+                alien = l3->alien;
+                l3->alien = NULL;
+
+                spin_unlock_irq(&l3->list_lock);
+
+                kfree(shared);
+                if (alien) {
+                        drain_alien_cache(cachep, alien);
+                        free_alien_cache(alien);
+                }
+free_array_cache:
+                kfree(nc);
+        }
+        /*
+         * In the previous loop, all the objects were freed to
+         * the respective cache's slabs,  now we can go ahead and
+         * shrink each nodelist to its limit.
+         */
+        list_for_each_entry(cachep, &cache_chain, next) {
+                l3 = cachep->nodelists[node];
+                if (!l3)
+                        continue;
+                drain_freelist(cachep, l3, l3->free_objects);
+        }
+}
+
+static int __cpuinit cpuup_prepare(long cpu)
 {
-        long cpu = (long)hcpu;
         struct kmem_cache *cachep;
         struct kmem_list3 *l3 = NULL;
         int node = cpu_to_node(cpu);
         const int memsize = sizeof(struct kmem_list3);
 
-        switch (action) {
-        case CPU_LOCK_ACQUIRE:
-                mutex_lock(&cache_chain_mutex);
-                break;
-        case CPU_UP_PREPARE:
-        case CPU_UP_PREPARE_FROZEN:
+        /*
+         * We need to do this right in the beginning since
+         * alloc_arraycache's are going to use this list.
+         * kmalloc_node allows us to add the slab to the right
+         * kmem_list3 and not this cpu's kmem_list3
+         */
+
+        list_for_each_entry(cachep, &cache_chain, next) {
                 /*
-                 * We need to do this right in the beginning since
-                 * alloc_arraycache's are going to use this list.
-                 * kmalloc_node allows us to add the slab to the right
-                 * kmem_list3 and not this cpu's kmem_list3
+                 * Set up the size64 kmemlist for cpu before we can
+                 * begin anything. Make sure some other cpu on this
+                 * node has not already allocated this
                  */
+                if (!cachep->nodelists[node]) {
+                        l3 = kmalloc_node(memsize, GFP_KERNEL, node);
+                        if (!l3)
+                                goto bad;
+                        kmem_list3_init(l3);
+                        l3->next_reap = jiffies + REAPTIMEOUT_LIST3 +
+                            ((unsigned long)cachep) % REAPTIMEOUT_LIST3;
 
-                list_for_each_entry(cachep, &cache_chain, next) {
                         /*
-                         * Set up the size64 kmemlist for cpu before we can
-                         * begin anything. Make sure some other cpu on this
-                         * node has not already allocated this
+                         * The l3s don't come and go as CPUs come and
+                         * go.  cache_chain_mutex is sufficient
+                         * protection here.
                          */
-                        if (!cachep->nodelists[node]) {
-                                l3 = kmalloc_node(memsize, GFP_KERNEL, node);
-                                if (!l3)
-                                        goto bad;
-                                kmem_list3_init(l3);
-                                l3->next_reap = jiffies + REAPTIMEOUT_LIST3 +
-                                    ((unsigned long)cachep) % REAPTIMEOUT_LIST3;
-
-                                /*
-                                 * The l3s don't come and go as CPUs come and
-                                 * go.  cache_chain_mutex is sufficient
-                                 * protection here.
-                                 */
-                                cachep->nodelists[node] = l3;
-                        }
-
-                        spin_lock_irq(&cachep->nodelists[node]->list_lock);
-                        cachep->nodelists[node]->free_limit =
-                                (1 + nr_cpus_node(node)) *
-                                cachep->batchcount + cachep->num;
-                        spin_unlock_irq(&cachep->nodelists[node]->list_lock);
+                        cachep->nodelists[node] = l3;
                 }
 
-                /*
-                 * Now we can go ahead with allocating the shared arrays and
-                 * array caches
-                 */
-                list_for_each_entry(cachep, &cache_chain, next) {
-                        struct array_cache *nc;
-                        struct array_cache *shared = NULL;
-                        struct array_cache **alien = NULL;
-
-                        nc = alloc_arraycache(node, cachep->limit,
-                                                cachep->batchcount);
-                        if (!nc)
+                spin_lock_irq(&cachep->nodelists[node]->list_lock);
+                cachep->nodelists[node]->free_limit =
+                        (1 + nr_cpus_node(node)) *
+                        cachep->batchcount + cachep->num;
+                spin_unlock_irq(&cachep->nodelists[node]->list_lock);
+        }
+
+        /*
+         * Now we can go ahead with allocating the shared arrays and
+         * array caches
+         */
+        list_for_each_entry(cachep, &cache_chain, next) {
+                struct array_cache *nc;
+                struct array_cache *shared = NULL;
+                struct array_cache **alien = NULL;
+
+                nc = alloc_arraycache(node, cachep->limit,
+                                        cachep->batchcount);
+                if (!nc)
+                        goto bad;
+                if (cachep->shared) {
+                        shared = alloc_arraycache(node,
+                                cachep->shared * cachep->batchcount,
+                                0xbaadf00d);
+                        if (!shared) {
+                                kfree(nc);
                                 goto bad;
-                        if (cachep->shared) {
-                                shared = alloc_arraycache(node,
-                                        cachep->shared * cachep->batchcount,
-                                        0xbaadf00d);
-                                if (!shared)
-                                        goto bad;
                         }
-                        if (use_alien_caches) {
-                                alien = alloc_alien_cache(node, cachep->limit);
-                                if (!alien)
-                                        goto bad;
-                        }
-                        cachep->array[cpu] = nc;
-                        l3 = cachep->nodelists[node];
-                        BUG_ON(!l3);
-
-                        spin_lock_irq(&l3->list_lock);
-                        if (!l3->shared) {
-                                /*
-                                 * We are serialised from CPU_DEAD or
-                                 * CPU_UP_CANCELLED by the cpucontrol lock
-                                 */
-                                l3->shared = shared;
-                                shared = NULL;
+                }
+                if (use_alien_caches) {
+                        alien = alloc_alien_cache(node, cachep->limit);
+                        if (!alien) {
+                                kfree(shared);
+                                kfree(nc);
+                                goto bad;
                         }
+                }
+                cachep->array[cpu] = nc;
+                l3 = cachep->nodelists[node];
+                BUG_ON(!l3);
+
+                spin_lock_irq(&l3->list_lock);
+                if (!l3->shared) {
+                        /*
+                         * We are serialised from CPU_DEAD or
+                         * CPU_UP_CANCELLED by the cpucontrol lock
+                         */
+                        l3->shared = shared;
+                        shared = NULL;
+                }
 #ifdef CONFIG_NUMA
-                        if (!l3->alien) {
-                                l3->alien = alien;
-                                alien = NULL;
-                        }
-#endif
-                        spin_unlock_irq(&l3->list_lock);
-                        kfree(shared);
-                        free_alien_cache(alien);
+                if (!l3->alien) {
+                        l3->alien = alien;
+                        alien = NULL;
                 }
+#endif
+                spin_unlock_irq(&l3->list_lock);
+                kfree(shared);
+                free_alien_cache(alien);
+        }
+        return 0;
+bad:
+        cpuup_canceled(cpu);
+        return -ENOMEM;
+}
+
+static int __cpuinit cpuup_callback(struct notifier_block *nfb,
+                                    unsigned long action, void *hcpu)
+{
+        long cpu = (long)hcpu;
+        int err = 0;
+
+        switch (action) {
+        case CPU_LOCK_ACQUIRE:
+                mutex_lock(&cache_chain_mutex);
+                break;
+        case CPU_UP_PREPARE:
+        case CPU_UP_PREPARE_FROZEN:
+                err = cpuup_prepare(cpu);
                 break;
         case CPU_ONLINE:
         case CPU_ONLINE_FROZEN:
@@ -1291,72 +1373,13 @@ static int __cpuinit cpuup_callback(struct notifier_block *nfb,
 #endif
         case CPU_UP_CANCELED:
         case CPU_UP_CANCELED_FROZEN:
-                list_for_each_entry(cachep, &cache_chain, next) {
-                        struct array_cache *nc;
-                        struct array_cache *shared;
-                        struct array_cache **alien;
-                        cpumask_t mask;
-
-                        mask = node_to_cpumask(node);
-                        /* cpu is dead; no one can alloc from it. */
-                        nc = cachep->array[cpu];
-                        cachep->array[cpu] = NULL;
-                        l3 = cachep->nodelists[node];
-
-                        if (!l3)
-                                goto free_array_cache;
-
-                        spin_lock_irq(&l3->list_lock);
-
-                        /* Free limit for this kmem_list3 */
-                        l3->free_limit -= cachep->batchcount;
-                        if (nc)
-                                free_block(cachep, nc->entry, nc->avail, node);
-
-                        if (!cpus_empty(mask)) {
-                                spin_unlock_irq(&l3->list_lock);
-                                goto free_array_cache;
-                        }
-
-                        shared = l3->shared;
-                        if (shared) {
-                                free_block(cachep, shared->entry,
-                                           shared->avail, node);
-                                l3->shared = NULL;
-                        }
-
-                        alien = l3->alien;
-                        l3->alien = NULL;
-
-                        spin_unlock_irq(&l3->list_lock);
-
-                        kfree(shared);
-                        if (alien) {
-                                drain_alien_cache(cachep, alien);
-                                free_alien_cache(alien);
-                        }
-free_array_cache:
-                        kfree(nc);
-                }
-                /*
-                 * In the previous loop, all the objects were freed to
-                 * the respective cache's slabs,  now we can go ahead and
-                 * shrink each nodelist to its limit.
-                 */
-                list_for_each_entry(cachep, &cache_chain, next) {
-                        l3 = cachep->nodelists[node];
-                        if (!l3)
-                                continue;
-                        drain_freelist(cachep, l3, l3->free_objects);
-                }
+                cpuup_canceled(cpu);
                 break;
         case CPU_LOCK_RELEASE:
                 mutex_unlock(&cache_chain_mutex);
                 break;
         }
-        return NOTIFY_OK;
-bad:
-        return NOTIFY_BAD;
+        return err ? NOTIFY_BAD : NOTIFY_OK;
 }
 
 static struct notifier_block __cpuinitdata cpucache_notifier = {
diff --git a/mm/vmscan.c b/mm/vmscan.c
index e1471385d001..cb474cc99645 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1282,7 +1282,7 @@ out:
          */
         if (priority < 0)
                 priority = 0;
-        for (i = 0; zones[i] != 0; i++) {
+        for (i = 0; zones[i] != NULL; i++) {
                 struct zone *zone = zones[i];
 
                 if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index cd3af59b38a1..67ba9914e52e 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2496,7 +2496,6 @@ static struct neigh_sysctl_table {
                         .proc_handler   = &proc_dointvec,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_RETRANS_TIME,
                         .procname       = "retrans_time",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
@@ -2541,27 +2540,40 @@ static struct neigh_sysctl_table {
                         .proc_handler   = &proc_dointvec,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_ANYCAST_DELAY,
                         .procname       = "anycast_delay",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
                         .proc_handler   = &proc_dointvec_userhz_jiffies,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_PROXY_DELAY,
                         .procname       = "proxy_delay",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
                         .proc_handler   = &proc_dointvec_userhz_jiffies,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_LOCKTIME,
                         .procname       = "locktime",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
                         .proc_handler   = &proc_dointvec_userhz_jiffies,
                 },
                 {
+                        .ctl_name       = NET_NEIGH_RETRANS_TIME_MS,
+                        .procname       = "retrans_time_ms",
+                        .maxlen         = sizeof(int),
+                        .mode           = 0644,
+                        .proc_handler   = &proc_dointvec_ms_jiffies,
+                        .strategy       = &sysctl_ms_jiffies,
+                },
+                {
+                        .ctl_name       = NET_NEIGH_REACHABLE_TIME_MS,
+                        .procname       = "base_reachable_time_ms",
+                        .maxlen         = sizeof(int),
+                        .mode           = 0644,
+                        .proc_handler   = &proc_dointvec_ms_jiffies,
+                        .strategy       = &sysctl_ms_jiffies,
+                },
+                {
                         .ctl_name       = NET_NEIGH_GC_INTERVAL,
                         .procname       = "gc_interval",
                         .maxlen         = sizeof(int),
@@ -2590,22 +2602,7 @@ static struct neigh_sysctl_table {
                         .mode           = 0644,
                         .proc_handler   = &proc_dointvec,
                 },
-                {
-                        .ctl_name       = NET_NEIGH_RETRANS_TIME_MS,
-                        .procname       = "retrans_time_ms",
-                        .maxlen         = sizeof(int),
-                        .mode           = 0644,
-                        .proc_handler   = &proc_dointvec_ms_jiffies,
-                        .strategy       = &sysctl_ms_jiffies,
-                },
-                {
-                        .ctl_name       = NET_NEIGH_REACHABLE_TIME_MS,
-                        .procname       = "base_reachable_time_ms",
-                        .maxlen         = sizeof(int),
-                        .mode           = 0644,
-                        .proc_handler   = &proc_dointvec_ms_jiffies,
-                        .strategy       = &sysctl_ms_jiffies,
-                },
+                {}
         },
         .neigh_dev = {
                 {
@@ -2658,42 +2655,48 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
         t->neigh_vars[9].data  = &p->anycast_delay;
         t->neigh_vars[10].data = &p->proxy_delay;
         t->neigh_vars[11].data = &p->locktime;
+        t->neigh_vars[12].data  = &p->retrans_time;
+        t->neigh_vars[13].data  = &p->base_reachable_time;
 
         if (dev) {
                 dev_name_source = dev->name;
                 t->neigh_dev[0].ctl_name = dev->ifindex;
-                t->neigh_vars[12].procname = NULL;
-                t->neigh_vars[13].procname = NULL;
-                t->neigh_vars[14].procname = NULL;
-                t->neigh_vars[15].procname = NULL;
+                /* Terminate the table early */
+                memset(&t->neigh_vars[14], 0, sizeof(t->neigh_vars[14]));
         } else {
                 dev_name_source = t->neigh_dev[0].procname;
-                t->neigh_vars[12].data = (int *)(p + 1);
-                t->neigh_vars[13].data = (int *)(p + 1) + 1;
-                t->neigh_vars[14].data = (int *)(p + 1) + 2;
-                t->neigh_vars[15].data = (int *)(p + 1) + 3;
+                t->neigh_vars[14].data = (int *)(p + 1);
+                t->neigh_vars[15].data = (int *)(p + 1) + 1;
+                t->neigh_vars[16].data = (int *)(p + 1) + 2;
+                t->neigh_vars[17].data = (int *)(p + 1) + 3;
         }
 
-        t->neigh_vars[16].data  = &p->retrans_time;
-        t->neigh_vars[17].data  = &p->base_reachable_time;
 
         if (handler || strategy) {
                 /* RetransTime */
                 t->neigh_vars[3].proc_handler = handler;
                 t->neigh_vars[3].strategy = strategy;
                 t->neigh_vars[3].extra1 = dev;
+                if (!strategy)
+                        t->neigh_vars[3].ctl_name = CTL_UNNUMBERED;
                 /* ReachableTime */
                 t->neigh_vars[4].proc_handler = handler;
                 t->neigh_vars[4].strategy = strategy;
                 t->neigh_vars[4].extra1 = dev;
+                if (!strategy)
+                        t->neigh_vars[4].ctl_name = CTL_UNNUMBERED;
                 /* RetransTime (in milliseconds)*/
-                t->neigh_vars[16].proc_handler = handler;
-                t->neigh_vars[16].strategy = strategy;
-                t->neigh_vars[16].extra1 = dev;
+                t->neigh_vars[12].proc_handler = handler;
+                t->neigh_vars[12].strategy = strategy;
+                t->neigh_vars[12].extra1 = dev;
+                if (!strategy)
+                        t->neigh_vars[12].ctl_name = CTL_UNNUMBERED;
                 /* ReachableTime (in milliseconds) */
-                t->neigh_vars[17].proc_handler = handler;
-                t->neigh_vars[17].strategy = strategy;
-                t->neigh_vars[17].extra1 = dev;
+                t->neigh_vars[13].proc_handler = handler;
+                t->neigh_vars[13].strategy = strategy;
+                t->neigh_vars[13].extra1 = dev;
+                if (!strategy)
+                        t->neigh_vars[13].ctl_name = CTL_UNNUMBERED;
         }
 
         dev_name = kstrdup(dev_name_source, GFP_KERNEL);
diff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
index 11fedc73049c..adcbaf6d4299 100644
--- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
+++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
@@ -281,7 +281,6 @@ static int icmp_nlattr_to_tuple(struct nlattr *tb[],
 static struct ctl_table_header *icmp_sysctl_header;
 static struct ctl_table icmp_sysctl_table[] = {
         {
-                .ctl_name       = NET_NF_CONNTRACK_ICMP_TIMEOUT,
                 .procname       = "nf_conntrack_icmp_timeout",
                 .data           = &nf_ct_icmp_timeout,
                 .maxlen         = sizeof(unsigned int),
@@ -295,7 +294,6 @@ static struct ctl_table icmp_sysctl_table[] = {
 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
 static struct ctl_table icmp_compat_sysctl_table[] = {
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT,
                 .procname       = "ip_conntrack_icmp_timeout",
                 .data           = &nf_ct_icmp_timeout,
                 .maxlen         = sizeof(unsigned int),
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index c98ef16effd2..c78acc1a7f11 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -740,7 +740,6 @@ ctl_table ipv4_table[] = {
                 .strategy       = &sysctl_jiffies
         },
         {
-                .ctl_name       = NET_IPV4_IPFRAG_MAX_DIST,
                 .procname       = "ipfrag_max_dist",
                 .data           = &sysctl_ipfrag_max_dist,
                 .maxlen         = sizeof(int),
@@ -865,7 +864,6 @@ ctl_table ipv4_table[] = {
         },
 #endif /* CONFIG_NETLABEL */
         {
-                .ctl_name       = NET_TCP_AVAIL_CONG_CONTROL,
                 .procname       = "tcp_available_congestion_control",
                 .maxlen         = TCP_CA_BUF_MAX,
                 .mode           = 0444,
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 6cc33dc83d1c..20cfc90d5597 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1658,30 +1658,26 @@ int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, struct file * f
         struct inet6_dev *idev;
         int ret;
 
-        if (ctl->ctl_name == NET_NEIGH_RETRANS_TIME ||
-            ctl->ctl_name == NET_NEIGH_REACHABLE_TIME)
+        if ((strcmp(ctl->procname, "retrans_time") == 0) ||
+            (strcmp(ctl->procname, "base_reachable_time") == 0))
                 ndisc_warn_deprecated_sysctl(ctl, "syscall", dev ? dev->name : "default");
 
-        switch (ctl->ctl_name) {
-        case NET_NEIGH_RETRANS_TIME:
+        if (strcmp(ctl->procname, "retrans_time") == 0)
                 ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
-                break;
-        case NET_NEIGH_REACHABLE_TIME:
+
+        else if (strcmp(ctl->procname, "base_reachable_time") == 0)
                 ret = proc_dointvec_jiffies(ctl, write,
                                             filp, buffer, lenp, ppos);
-                break;
-        case NET_NEIGH_RETRANS_TIME_MS:
-        case NET_NEIGH_REACHABLE_TIME_MS:
+
+        else if ((strcmp(ctl->procname, "retrans_time_ms") == 0) ||
+                 (strcmp(ctl->procname, "base_reacable_time_ms") == 0))
                 ret = proc_dointvec_ms_jiffies(ctl, write,
                                                filp, buffer, lenp, ppos);
-                break;
-        default:
+        else
                 ret = -1;
-        }
 
         if (write && ret == 0 && dev && (idev = in6_dev_get(dev)) != NULL) {
-                if (ctl->ctl_name == NET_NEIGH_REACHABLE_TIME ||
-                    ctl->ctl_name == NET_NEIGH_REACHABLE_TIME_MS)
+                if (ctl->data == &idev->nd_parms->base_reachable_time)
                         idev->nd_parms->reachable_time = neigh_rand_reach_time(idev->nd_parms->base_reachable_time);
                 idev->tstamp = jiffies;
                 inet6_ifinfo_notify(RTM_NEWLINK, idev);
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index 0e40948f4fc6..ad74bab05047 100644
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -306,7 +306,6 @@ static struct nf_hook_ops ipv6_conntrack_ops[] = {
 #ifdef CONFIG_SYSCTL
 static ctl_table nf_ct_ipv6_sysctl_table[] = {
         {
-                .ctl_name       = NET_NF_CONNTRACK_FRAG6_TIMEOUT,
                 .procname       = "nf_conntrack_frag6_timeout",
                 .data           = &nf_frags_ctl.timeout,
                 .maxlen         = sizeof(unsigned int),
diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
index fbdc66920de4..fd9123f3dc04 100644
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
@@ -260,7 +260,6 @@ static int icmpv6_nlattr_to_tuple(struct nlattr *tb[],
 static struct ctl_table_header *icmpv6_sysctl_header;
 static struct ctl_table icmpv6_sysctl_table[] = {
         {
-                .ctl_name       = NET_NF_CONNTRACK_ICMPV6_TIMEOUT,
                 .procname       = "nf_conntrack_icmpv6_timeout",
                 .data           = &nf_ct_icmpv6_timeout,
                 .maxlen         = sizeof(unsigned int),
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index cce9941c11c6..95f8e4a62f68 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2397,7 +2397,6 @@ int ipv6_sysctl_rtcache_flush(ctl_table *ctl, int write, struct file * filp,
 
 ctl_table ipv6_route_table[] = {
         {
-                .ctl_name       =       NET_IPV6_ROUTE_FLUSH,
                 .procname       =       "flush",
                 .data           =       &flush_delay,
                 .maxlen         =       sizeof(int),
diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c
index 957e04feb0f7..525343a1c521 100644
--- a/net/irda/irsysctl.c
+++ b/net/irda/irsysctl.c
@@ -31,12 +31,6 @@
 #include <net/irda/irda.h>              /* irda_debug */
 #include <net/irda/irias_object.h>
 
-#define NET_IRDA 412 /* Random number */
-enum { DISCOVERY=1, DEVNAME, DEBUG, FAST_POLL, DISCOVERY_SLOTS,
-       DISCOVERY_TIMEOUT, SLOT_TIMEOUT, MAX_BAUD_RATE, MIN_TX_TURN_TIME,
-       MAX_TX_DATA_SIZE, MAX_TX_WINDOW, MAX_NOREPLY_TIME, WARN_NOREPLY_TIME,
-       LAP_KEEPALIVE_TIME };
-
 extern int  sysctl_discovery;
 extern int  sysctl_discovery_slots;
 extern int  sysctl_discovery_timeout;
@@ -94,7 +88,7 @@ static int do_devname(ctl_table *table, int write, struct file *filp,
 /* One file */
 static ctl_table irda_table[] = {
         {
-                .ctl_name       = DISCOVERY,
+                .ctl_name       = NET_IRDA_DISCOVERY,
                 .procname       = "discovery",
                 .data           = &sysctl_discovery,
                 .maxlen         = sizeof(int),
@@ -102,7 +96,7 @@ static ctl_table irda_table[] = {
                 .proc_handler   = &proc_dointvec
         },
         {
-                .ctl_name       = DEVNAME,
+                .ctl_name       = NET_IRDA_DEVNAME,
                 .procname       = "devname",
                 .data           = sysctl_devname,
                 .maxlen         = 65,
@@ -112,7 +106,7 @@ static ctl_table irda_table[] = {
         },
 #ifdef CONFIG_IRDA_DEBUG
         {
-                .ctl_name       = DEBUG,
+                .ctl_name       = NET_IRDA_DEBUG,
                 .procname       = "debug",
                 .data           = &irda_debug,
                 .maxlen         = sizeof(int),
@@ -122,7 +116,7 @@ static ctl_table irda_table[] = {
 #endif
 #ifdef CONFIG_IRDA_FAST_RR
         {
-                .ctl_name       = FAST_POLL,
+                .ctl_name       = NET_IRDA_FAST_POLL,
                 .procname       = "fast_poll_increase",
                 .data           = &sysctl_fast_poll_increase,
                 .maxlen         = sizeof(int),
@@ -131,7 +125,7 @@ static ctl_table irda_table[] = {
         },
 #endif
         {
-                .ctl_name       = DISCOVERY_SLOTS,
+                .ctl_name       = NET_IRDA_DISCOVERY_SLOTS,
                 .procname       = "discovery_slots",
                 .data           = &sysctl_discovery_slots,
                 .maxlen         = sizeof(int),
@@ -142,7 +136,7 @@ static ctl_table irda_table[] = {
                 .extra2         = &max_discovery_slots
         },
         {
-                .ctl_name       = DISCOVERY_TIMEOUT,
+                .ctl_name       = NET_IRDA_DISCOVERY_TIMEOUT,
                 .procname       = "discovery_timeout",
                 .data           = &sysctl_discovery_timeout,
                 .maxlen         = sizeof(int),
@@ -150,7 +144,7 @@ static ctl_table irda_table[] = {
                 .proc_handler   = &proc_dointvec
         },
         {
-                .ctl_name       = SLOT_TIMEOUT,
+                .ctl_name       = NET_IRDA_SLOT_TIMEOUT,
                 .procname       = "slot_timeout",
                 .data           = &sysctl_slot_timeout,
                 .maxlen         = sizeof(int),
@@ -161,7 +155,7 @@ static ctl_table irda_table[] = {
                 .extra2         = &max_slot_timeout
         },
         {
-                .ctl_name       = MAX_BAUD_RATE,
+                .ctl_name       = NET_IRDA_MAX_BAUD_RATE,
                 .procname       = "max_baud_rate",
                 .data           = &sysctl_max_baud_rate,
                 .maxlen         = sizeof(int),
@@ -172,7 +166,7 @@ static ctl_table irda_table[] = {
                 .extra2         = &max_max_baud_rate
         },
         {
-                .ctl_name       = MIN_TX_TURN_TIME,
+                .ctl_name       = NET_IRDA_MIN_TX_TURN_TIME,
                 .procname       = "min_tx_turn_time",
                 .data           = &sysctl_min_tx_turn_time,
                 .maxlen         = sizeof(int),
@@ -183,7 +177,7 @@ static ctl_table irda_table[] = {
                 .extra2         = &max_min_tx_turn_time
         },
         {
-                .ctl_name       = MAX_TX_DATA_SIZE,
+                .ctl_name       = NET_IRDA_MAX_TX_DATA_SIZE,
                 .procname       = "max_tx_data_size",
                 .data           = &sysctl_max_tx_data_size,
                 .maxlen         = sizeof(int),
@@ -194,7 +188,7 @@ static ctl_table irda_table[] = {
                 .extra2         = &max_max_tx_data_size
         },
         {
-                .ctl_name       = MAX_TX_WINDOW,
+                .ctl_name       = NET_IRDA_MAX_TX_WINDOW,
                 .procname       = "max_tx_window",
                 .data           = &sysctl_max_tx_window,
                 .maxlen         = sizeof(int),
@@ -205,7 +199,7 @@ static ctl_table irda_table[] = {
                 .extra2         = &max_max_tx_window
         },
         {
-                .ctl_name       = MAX_NOREPLY_TIME,
+                .ctl_name       = NET_IRDA_MAX_NOREPLY_TIME,
                 .procname       = "max_noreply_time",
                 .data           = &sysctl_max_noreply_time,
                 .maxlen         = sizeof(int),
@@ -216,7 +210,7 @@ static ctl_table irda_table[] = {
                 .extra2         = &max_max_noreply_time
         },
         {
-                .ctl_name       = WARN_NOREPLY_TIME,
+                .ctl_name       = NET_IRDA_WARN_NOREPLY_TIME,
                 .procname       = "warn_noreply_time",
                 .data           = &sysctl_warn_noreply_time,
                 .maxlen         = sizeof(int),
@@ -227,7 +221,7 @@ static ctl_table irda_table[] = {
                 .extra2         = &max_warn_noreply_time
         },
         {
-                .ctl_name       = LAP_KEEPALIVE_TIME,
+                .ctl_name       = NET_IRDA_LAP_KEEPALIVE_TIME,
                 .procname       = "lap_keepalive_time",
                 .data           = &sysctl_lap_keepalive_time,
                 .maxlen         = sizeof(int),
diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c
index d8b501878d9f..13f819179642 100644
--- a/net/netfilter/nf_conntrack_proto_generic.c
+++ b/net/netfilter/nf_conntrack_proto_generic.c
@@ -70,7 +70,6 @@ static int new(struct nf_conn *conntrack, const struct sk_buff *skb,
 static struct ctl_table_header *generic_sysctl_header;
 static struct ctl_table generic_sysctl_table[] = {
         {
-                .ctl_name       = NET_NF_CONNTRACK_GENERIC_TIMEOUT,
                 .procname       = "nf_conntrack_generic_timeout",
                 .data           = &nf_ct_generic_timeout,
                 .maxlen         = sizeof(unsigned int),
@@ -84,7 +83,6 @@ static struct ctl_table generic_sysctl_table[] = {
 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
 static struct ctl_table generic_compat_sysctl_table[] = {
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT,
                 .procname       = "ip_conntrack_generic_timeout",
                 .data           = &nf_ct_generic_timeout,
                 .maxlen         = sizeof(unsigned int),
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
index 04192acc7c40..cb0467510592 100644
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -476,7 +476,6 @@ static unsigned int sctp_sysctl_table_users;
 static struct ctl_table_header *sctp_sysctl_header;
 static struct ctl_table sctp_sysctl_table[] = {
         {
-                .ctl_name       = NET_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED,
                 .procname       = "nf_conntrack_sctp_timeout_closed",
                 .data           = &nf_ct_sctp_timeout_closed,
                 .maxlen         = sizeof(unsigned int),
@@ -484,7 +483,6 @@ static struct ctl_table sctp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT,
                 .procname       = "nf_conntrack_sctp_timeout_cookie_wait",
                 .data           = &nf_ct_sctp_timeout_cookie_wait,
                 .maxlen         = sizeof(unsigned int),
@@ -492,7 +490,6 @@ static struct ctl_table sctp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED,
                 .procname       = "nf_conntrack_sctp_timeout_cookie_echoed",
                 .data           = &nf_ct_sctp_timeout_cookie_echoed,
                 .maxlen         = sizeof(unsigned int),
@@ -500,7 +497,6 @@ static struct ctl_table sctp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED,
                 .procname       = "nf_conntrack_sctp_timeout_established",
                 .data           = &nf_ct_sctp_timeout_established,
                 .maxlen         = sizeof(unsigned int),
@@ -508,7 +504,6 @@ static struct ctl_table sctp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT,
                 .procname       = "nf_conntrack_sctp_timeout_shutdown_sent",
                 .data           = &nf_ct_sctp_timeout_shutdown_sent,
                 .maxlen         = sizeof(unsigned int),
@@ -516,7 +511,6 @@ static struct ctl_table sctp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD,
                 .procname       = "nf_conntrack_sctp_timeout_shutdown_recd",
                 .data           = &nf_ct_sctp_timeout_shutdown_recd,
                 .maxlen         = sizeof(unsigned int),
@@ -524,7 +518,6 @@ static struct ctl_table sctp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT,
                 .procname       = "nf_conntrack_sctp_timeout_shutdown_ack_sent",
                 .data           = &nf_ct_sctp_timeout_shutdown_ack_sent,
                 .maxlen         = sizeof(unsigned int),
@@ -539,7 +532,6 @@ static struct ctl_table sctp_sysctl_table[] = {
 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
 static struct ctl_table sctp_compat_sysctl_table[] = {
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED,
                 .procname       = "ip_conntrack_sctp_timeout_closed",
                 .data           = &nf_ct_sctp_timeout_closed,
                 .maxlen         = sizeof(unsigned int),
@@ -547,7 +539,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT,
                 .procname       = "ip_conntrack_sctp_timeout_cookie_wait",
                 .data           = &nf_ct_sctp_timeout_cookie_wait,
                 .maxlen         = sizeof(unsigned int),
@@ -555,7 +546,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED,
                 .procname       = "ip_conntrack_sctp_timeout_cookie_echoed",
                 .data           = &nf_ct_sctp_timeout_cookie_echoed,
                 .maxlen         = sizeof(unsigned int),
@@ -563,7 +553,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED,
                 .procname       = "ip_conntrack_sctp_timeout_established",
                 .data           = &nf_ct_sctp_timeout_established,
                 .maxlen         = sizeof(unsigned int),
@@ -571,7 +560,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT,
                 .procname       = "ip_conntrack_sctp_timeout_shutdown_sent",
                 .data           = &nf_ct_sctp_timeout_shutdown_sent,
                 .maxlen         = sizeof(unsigned int),
@@ -579,7 +567,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD,
                 .procname       = "ip_conntrack_sctp_timeout_shutdown_recd",
                 .data           = &nf_ct_sctp_timeout_shutdown_recd,
                 .maxlen         = sizeof(unsigned int),
@@ -587,7 +574,6 @@ static struct ctl_table sctp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT,
                 .procname       = "ip_conntrack_sctp_timeout_shutdown_ack_sent",
                 .data           = &nf_ct_sctp_timeout_shutdown_ack_sent,
                 .maxlen         = sizeof(unsigned int),
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index 4dc23ab3a39f..7a3f64c1aca6 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -1165,7 +1165,6 @@ static unsigned int tcp_sysctl_table_users;
 static struct ctl_table_header *tcp_sysctl_header;
 static struct ctl_table tcp_sysctl_table[] = {
         {
-                .ctl_name       = NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT,
                 .procname       = "nf_conntrack_tcp_timeout_syn_sent",
                 .data           = &nf_ct_tcp_timeout_syn_sent,
                 .maxlen         = sizeof(unsigned int),
@@ -1173,7 +1172,6 @@ static struct ctl_table tcp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV,
                 .procname       = "nf_conntrack_tcp_timeout_syn_recv",
                 .data           = &nf_ct_tcp_timeout_syn_recv,
                 .maxlen         = sizeof(unsigned int),
@@ -1181,7 +1179,6 @@ static struct ctl_table tcp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED,
                 .procname       = "nf_conntrack_tcp_timeout_established",
                 .data           = &nf_ct_tcp_timeout_established,
                 .maxlen         = sizeof(unsigned int),
@@ -1189,7 +1186,6 @@ static struct ctl_table tcp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT,
                 .procname       = "nf_conntrack_tcp_timeout_fin_wait",
                 .data           = &nf_ct_tcp_timeout_fin_wait,
                 .maxlen         = sizeof(unsigned int),
@@ -1197,7 +1193,6 @@ static struct ctl_table tcp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT,
                 .procname       = "nf_conntrack_tcp_timeout_close_wait",
                 .data           = &nf_ct_tcp_timeout_close_wait,
                 .maxlen         = sizeof(unsigned int),
@@ -1205,7 +1200,6 @@ static struct ctl_table tcp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK,
                 .procname       = "nf_conntrack_tcp_timeout_last_ack",
                 .data           = &nf_ct_tcp_timeout_last_ack,
                 .maxlen         = sizeof(unsigned int),
@@ -1213,7 +1207,6 @@ static struct ctl_table tcp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT,
                 .procname       = "nf_conntrack_tcp_timeout_time_wait",
                 .data           = &nf_ct_tcp_timeout_time_wait,
                 .maxlen         = sizeof(unsigned int),
@@ -1221,7 +1214,6 @@ static struct ctl_table tcp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE,
                 .procname       = "nf_conntrack_tcp_timeout_close",
                 .data           = &nf_ct_tcp_timeout_close,
                 .maxlen         = sizeof(unsigned int),
@@ -1229,7 +1221,6 @@ static struct ctl_table tcp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS,
                 .procname       = "nf_conntrack_tcp_timeout_max_retrans",
                 .data           = &nf_ct_tcp_timeout_max_retrans,
                 .maxlen         = sizeof(unsigned int),
@@ -1268,7 +1259,6 @@ static struct ctl_table tcp_sysctl_table[] = {
 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
 static struct ctl_table tcp_compat_sysctl_table[] = {
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT,
                 .procname       = "ip_conntrack_tcp_timeout_syn_sent",
                 .data           = &nf_ct_tcp_timeout_syn_sent,
                 .maxlen         = sizeof(unsigned int),
@@ -1276,7 +1266,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV,
                 .procname       = "ip_conntrack_tcp_timeout_syn_recv",
                 .data           = &nf_ct_tcp_timeout_syn_recv,
                 .maxlen         = sizeof(unsigned int),
@@ -1284,7 +1273,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED,
                 .procname       = "ip_conntrack_tcp_timeout_established",
                 .data           = &nf_ct_tcp_timeout_established,
                 .maxlen         = sizeof(unsigned int),
@@ -1292,7 +1280,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT,
                 .procname       = "ip_conntrack_tcp_timeout_fin_wait",
                 .data           = &nf_ct_tcp_timeout_fin_wait,
                 .maxlen         = sizeof(unsigned int),
@@ -1300,7 +1287,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT,
                 .procname       = "ip_conntrack_tcp_timeout_close_wait",
                 .data           = &nf_ct_tcp_timeout_close_wait,
                 .maxlen         = sizeof(unsigned int),
@@ -1308,7 +1294,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK,
                 .procname       = "ip_conntrack_tcp_timeout_last_ack",
                 .data           = &nf_ct_tcp_timeout_last_ack,
                 .maxlen         = sizeof(unsigned int),
@@ -1316,7 +1301,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT,
                 .procname       = "ip_conntrack_tcp_timeout_time_wait",
                 .data           = &nf_ct_tcp_timeout_time_wait,
                 .maxlen         = sizeof(unsigned int),
@@ -1324,7 +1308,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE,
                 .procname       = "ip_conntrack_tcp_timeout_close",
                 .data           = &nf_ct_tcp_timeout_close,
                 .maxlen         = sizeof(unsigned int),
@@ -1332,7 +1315,6 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS,
                 .procname       = "ip_conntrack_tcp_timeout_max_retrans",
                 .data           = &nf_ct_tcp_timeout_max_retrans,
                 .maxlen         = sizeof(unsigned int),
diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c
index ba80e1a1ea17..b3e7ecb080e6 100644
--- a/net/netfilter/nf_conntrack_proto_udp.c
+++ b/net/netfilter/nf_conntrack_proto_udp.c
@@ -146,7 +146,6 @@ static unsigned int udp_sysctl_table_users;
 static struct ctl_table_header *udp_sysctl_header;
 static struct ctl_table udp_sysctl_table[] = {
         {
-                .ctl_name       = NET_NF_CONNTRACK_UDP_TIMEOUT,
                 .procname       = "nf_conntrack_udp_timeout",
                 .data           = &nf_ct_udp_timeout,
                 .maxlen         = sizeof(unsigned int),
@@ -154,7 +153,6 @@ static struct ctl_table udp_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_NF_CONNTRACK_UDP_TIMEOUT_STREAM,
                 .procname       = "nf_conntrack_udp_timeout_stream",
                 .data           = &nf_ct_udp_timeout_stream,
                 .maxlen         = sizeof(unsigned int),
@@ -168,7 +166,6 @@ static struct ctl_table udp_sysctl_table[] = {
 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
 static struct ctl_table udp_compat_sysctl_table[] = {
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT,
                 .procname       = "ip_conntrack_udp_timeout",
                 .data           = &nf_ct_udp_timeout,
                 .maxlen         = sizeof(unsigned int),
@@ -176,7 +173,6 @@ static struct ctl_table udp_compat_sysctl_table[] = {
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         {
-                .ctl_name       = NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM,
                 .procname       = "ip_conntrack_udp_timeout_stream",
                 .data           = &nf_ct_udp_timeout_stream,
                 .maxlen         = sizeof(unsigned int),
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
index 738db32a287d..864b541bbf51 100644
--- a/net/sunrpc/sysctl.c
+++ b/net/sunrpc/sysctl.c
@@ -114,7 +114,6 @@ done:
 
 static ctl_table debug_table[] = {
         {
-                .ctl_name       = CTL_RPCDEBUG,
                 .procname       = "rpc_debug",
                 .data           = &rpc_debug,
                 .maxlen         = sizeof(int),
@@ -122,7 +121,6 @@ static ctl_table debug_table[] = {
                 .proc_handler   = &proc_dodebug
         },
         {
-                .ctl_name       = CTL_NFSDEBUG,
                 .procname       = "nfs_debug",
                 .data           = &nfs_debug,
                 .maxlen         = sizeof(int),
@@ -130,7 +128,6 @@ static ctl_table debug_table[] = {
                 .proc_handler   = &proc_dodebug
         },
         {
-                .ctl_name       = CTL_NFSDDEBUG,
                 .procname       = "nfsd_debug",
                 .data           = &nfsd_debug,
                 .maxlen         = sizeof(int),
@@ -138,7 +135,6 @@ static ctl_table debug_table[] = {
                 .proc_handler   = &proc_dodebug
         },
         {
-                .ctl_name       = CTL_NLMDEBUG,
                 .procname       = "nlm_debug",
                 .data           = &nlm_debug,
                 .maxlen         = sizeof(int),
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 59ad83caa210..cbb42580a81d 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -9,7 +9,7 @@ use strict;
 my $P = $0;
 $P =~ s@.*/@@g;
 
-my $V = '0.10';
+my $V = '0.11';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -18,12 +18,21 @@ my $tree = 1;
 my $chk_signoff = 1;
 my $chk_patch = 1;
 my $tst_type = 0;
+my $emacs = 0;
+my $file = 0;
+my $check = 0;
+my $root;
 GetOptions(
-        'q|quiet'       => \$quiet,
+        'q|quiet+'      => \$quiet,
         'tree!'         => \$tree,
         'signoff!'      => \$chk_signoff,
         'patch!'        => \$chk_patch,
         'test-type!'    => \$tst_type,
+        'emacs!'        => \$emacs,
+        'file!'         => \$file,
+        'subjective!'   => \$check,
+        'strict!'       => \$check,
+        'root=s'        => \$root,
 ) or exit;
 
 my $exit = 0;
@@ -33,19 +42,110 @@ if ($#ARGV < 0) {
         print "version: $V\n";
         print "options: -q           => quiet\n";
         print "         --no-tree    => run without a kernel tree\n";
+        print "         --emacs      => emacs compile window format\n";
+        print "         --file       => check a source file\n";
+        print "         --strict     => enable more subjective tests\n";
+        print "         --root       => path to the kernel tree root\n";
         exit(1);
 }
 
-if ($tree && !top_of_kernel_tree()) {
-        print "Must be run from the top-level dir. of a kernel tree\n";
-        exit(2);
+if ($tree) {
+        if (defined $root) {
+                if (!top_of_kernel_tree($root)) {
+                        die "$P: $root: --root does not point at a valid tree\n";
+                }
+        } else {
+                if (top_of_kernel_tree('.')) {
+                        $root = '.';
+                } elsif ($0 =~ m@(.*)/scripts/[^/]*$@ &&
+                                                top_of_kernel_tree($1)) {
+                        $root = $1;
+                }
+        }
+
+        if (!defined $root) {
+                print "Must be run from the top-level dir. of a kernel tree\n";
+                exit(2);
+        }
 }
 
+my $emitted_corrupt = 0;
+
+our $Ident       = qr{[A-Za-z_][A-Za-z\d_]*};
+our $Storage    = qr{extern|static|asmlinkage};
+our $Sparse     = qr{
+                        __user|
+                        __kernel|
+                        __force|
+                        __iomem|
+                        __must_check|
+                        __init_refok|
+                        __kprobes|
+                        fastcall
+                }x;
+our $Attribute  = qr{
+                        const|
+                        __read_mostly|
+                        __kprobes|
+                        __(?:mem|cpu|dev|)(?:initdata|init)
+                  }x;
+our $Inline     = qr{inline|__always_inline|noinline};
+our $NonptrType = qr{
+                        \b
+                        (?:const\s+)?
+                        (?:unsigned\s+)?
+                        (?:
+                                void|
+                                char|
+                                short|
+                                int|
+                                long|
+                                unsigned|
+                                float|
+                                double|
+                                bool|
+                                long\s+int|
+                                long\s+long|
+                                long\s+long\s+int|
+                                (?:__)?(?:u|s|be|le)(?:8|16|32|64)|
+                                struct\s+$Ident|
+                                union\s+$Ident|
+                                enum\s+$Ident|
+                                ${Ident}_t|
+                                ${Ident}_handler|
+                                ${Ident}_handler_fn
+                        )
+                        (?:\s+$Sparse)*
+                        \b
+                  }x;
+
+our $Type       = qr{
+                        \b$NonptrType\b
+                        (?:\s*\*+\s*const|\s*\*+|(?:\s*\[\s*\])+)?
+                        (?:\s+$Sparse|\s+$Attribute)*
+                  }x;
+our $Declare    = qr{(?:$Storage\s+)?$Type};
+our $Member     = qr{->$Ident|\.$Ident|\[[^]]*\]};
+our $Lval       = qr{$Ident(?:$Member)*};
+
+our $Constant   = qr{(?:[0-9]+|0x[0-9a-fA-F]+)[UL]*};
+our $Assignment = qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)};
+our $Operators  = qr{
+                        <=|>=|==|!=|
+                        =>|->|<<|>>|<|>|!|~|
+                        &&|\|\||,|\^|\+\+|--|&|\||\+|-|\*|\/
+                  }x;
+
+our $Bare = '';
+
+$chk_signoff = 0 if ($file);
+
 my @dep_includes = ();
 my @dep_functions = ();
-my $removal = 'Documentation/feature-removal-schedule.txt';
-if ($tree && -f $removal) {
-        open(REMOVE, "<$removal") || die "$P: $removal: open failed - $!\n";
+my $removal = "Documentation/feature-removal-schedule.txt";
+if ($tree && -f "$root/$removal") {
+        open(REMOVE, "<$root/$removal") ||
+                                die "$P: $removal: open failed - $!\n";
         while (<REMOVE>) {
                 if (/^Check:\s+(.*\S)/) {
                         for my $entry (split(/[, ]+/, $1)) {
@@ -61,28 +161,42 @@ if ($tree && -f $removal) {
 }
 
 my @rawlines = ();
-while (<>) {
-        chomp;
-        push(@rawlines, $_);
-        if (eof(ARGV)) {
-                if (!process($ARGV, @rawlines)) {
-                        $exit = 1;
-                }
-                @rawlines = ();
+for my $filename (@ARGV) {
+        if ($file) {
+                open(FILE, "diff -u /dev/null $filename|") ||
+                        die "$P: $filename: diff failed - $!\n";
+        } else {
+                open(FILE, "<$filename") ||
+                        die "$P: $filename: open failed - $!\n";
         }
+        while (<FILE>) {
+                chomp;
+                push(@rawlines, $_);
+        }
+        close(FILE);
+        if (!process($filename, @rawlines)) {
+                $exit = 1;
+        }
+        @rawlines = ();
 }
 
 exit($exit);
 
 sub top_of_kernel_tree {
-        if ((-f "COPYING") && (-f "CREDITS") && (-f "Kbuild") &&
-            (-f "MAINTAINERS") && (-f "Makefile") && (-f "README") &&
-            (-d "Documentation") && (-d "arch") && (-d "include") &&
-            (-d "drivers") && (-d "fs") && (-d "init") && (-d "ipc") &&
-            (-d "kernel") && (-d "lib") && (-d "scripts")) {
-                return 1;
+        my ($root) = @_;
+
+        my @tree_check = (
+                "COPYING", "CREDITS", "Kbuild", "MAINTAINERS", "Makefile",
+                "README", "Documentation", "arch", "include", "drivers",
+                "fs", "init", "ipc", "kernel", "lib", "scripts",
+        );
+
+        foreach my $check (@tree_check) {
+                if (! -e $root . '/' . $check) {
+                        return 0;
+                }
         }
-        return 0;
+        return 1;
 }
 
 sub expand_tabs {
@@ -105,6 +219,20 @@ sub expand_tabs {
 
         return $res;
 }
+sub copy_spacing {
+        my ($str) = @_;
+
+        my $res = '';
+        for my $c (split(//, $str)) {
+                if ($c eq "\t") {
+                        $res .= $c;
+                } else {
+                        $res .= ' ';
+                }
+        }
+
+        return $res;
+}
 
 sub line_stats {
         my ($line) = @_;
@@ -260,47 +388,138 @@ sub ctx_has_comment {
         return ($cmt ne '');
 }
 
-sub ctx_expr_before {
-        my ($line) = @_;
-
-        ##print "CHECK<$line>\n";
-
-        my $pos = length($line) - 1;
-        my $count = 0;
-        my $c;
+sub cat_vet {
+        my ($vet) = @_;
+        my ($res, $coded);
 
-        for (; $pos >= 0; $pos--) {
-                $c = substr($line, $pos, 1);
-                ##print "CHECK: c<$c> count<$count>\n";
-                if ($c eq ')') {
-                        $count++;
-                } elsif ($c eq '(') {
-                        last if (--$count == 0);
+        $res = '';
+        while ($vet =~ /([^[:cntrl:]]*)([[:cntrl:]]|$)/g) {
+                $res .= $1;
+                if ($2 ne '') {
+                        $coded = sprintf("^%c", unpack('C', $2) + 64);
+                        $res .= $coded;
                 }
         }
+        $res =~ s/$/\$/;
 
-        ##print "CHECK: result<" . substr($line, 0, $pos) . ">\n";
-
-        return substr($line, 0, $pos);
+        return $res;
 }
 
-sub cat_vet {
-        my ($vet) = @_;
-        my ($res, $coded);
+sub annotate_values {
+        my ($stream, $type) = @_;
 
-        $res = '';
-        while ($vet =~ /([^[:cntrl:]]*)([[:cntrl:]])/g) {
-                $coded = sprintf("^%c", unpack('C', $2) + 64);
-                $res .= $1 . $coded;
+        my $res;
+        my $cur = $stream;
+
+        my $debug = 0;
+
+        print "$stream\n" if ($debug);
+
+        ##my $type = 'N';
+        my $pos = 0;
+        my $preprocessor = 0;
+        my $paren = 0;
+        my @paren_type;
+
+        # Include any user defined types we may have found as we went.
+        my $type_match = "(?:$Type$Bare)";
+
+        while (length($cur)) {
+                print " <$type> " if ($debug);
+                if ($cur =~ /^(\s+)/o) {
+                        print "WS($1)\n" if ($debug);
+                        if ($1 =~ /\n/ && $preprocessor) {
+                                $preprocessor = 0;
+                                $type = 'N';
+                        }
+
+                } elsif ($cur =~ /^($type_match)/) {
+                        print "DECLARE($1)\n" if ($debug);
+                        $type = 'T';
+
+                } elsif ($cur =~ /^(#\s*define\s*$Ident)(\(?)/o) {
+                        print "DEFINE($1)\n" if ($debug);
+                        $preprocessor = 1;
+                        $paren_type[$paren] = 'N';
+
+                } elsif ($cur =~ /^(#\s*(?:ifdef|ifndef|if|else|endif))/o) {
+                        print "PRE($1)\n" if ($debug);
+                        $preprocessor = 1;
+                        $type = 'N';
+
+                } elsif ($cur =~ /^(\\\n)/o) {
+                        print "PRECONT($1)\n" if ($debug);
+
+                } elsif ($cur =~ /^(sizeof)\s*(\()?/o) {
+                        print "SIZEOF($1)\n" if ($debug);
+                        if (defined $2) {
+                                $paren_type[$paren] = 'V';
+                        }
+                        $type = 'N';
+
+                } elsif ($cur =~ /^(if|while|typeof)\b/o) {
+                        print "COND($1)\n" if ($debug);
+                        $paren_type[$paren] = 'N';
+                        $type = 'N';
+
+                } elsif ($cur =~/^(return|case|else)/o) {
+                        print "KEYWORD($1)\n" if ($debug);
+                        $type = 'N';
+
+                } elsif ($cur =~ /^(\()/o) {
+                        print "PAREN('$1')\n" if ($debug);
+                        $paren++;
+                        $type = 'N';
+
+                } elsif ($cur =~ /^(\))/o) {
+                        $paren-- if ($paren > 0);
+                        if (defined $paren_type[$paren]) {
+                                $type = $paren_type[$paren];
+                                undef $paren_type[$paren];
+                                print "PAREN('$1') -> $type\n" if ($debug);
+                        } else {
+                                print "PAREN('$1')\n" if ($debug);
+                        }
+
+                } elsif ($cur =~ /^($Ident)\(/o) {
+                        print "FUNC($1)\n" if ($debug);
+                        $paren_type[$paren] = 'V';
+
+                } elsif ($cur =~ /^($Ident|$Constant)/o) {
+                        print "IDENT($1)\n" if ($debug);
+                        $type = 'V';
+
+                } elsif ($cur =~ /^($Assignment)/o) {
+                        print "ASSIGN($1)\n" if ($debug);
+                        $type = 'N';
+
+                } elsif ($cur =~ /^(;|{|}|\?|:|\[)/o) {
+                        print "END($1)\n" if ($debug);
+                        $type = 'N';
+
+                } elsif ($cur =~ /^($Operators)/o) {
+                        print "OP($1)\n" if ($debug);
+                        if ($1 ne '++' && $1 ne '--') {
+                                $type = 'N';
+                        }
+
+                } elsif ($cur =~ /(^.)/o) {
+                        print "C($1)\n" if ($debug);
+                }
+                if (defined $1) {
+                        $cur = substr($cur, length($1));
+                        $res .= $type x length($1);
+                }
         }
-        $res =~ s/$/\$/;
 
         return $res;
 }
 
+my $prefix = '';
+
 my @report = ();
 sub report {
-        push(@report, $_[0]);
+        push(@report, $prefix . $_[0]);
 }
 sub report_dump {
         @report;
@@ -308,14 +527,19 @@ sub report_dump {
 sub ERROR {
         report("ERROR: $_[0]\n");
         our $clean = 0;
+        our $cnt_error++;
 }
 sub WARN {
         report("WARNING: $_[0]\n");
         our $clean = 0;
+        our $cnt_warn++;
 }
 sub CHK {
-        report("CHECK: $_[0]\n");
-        our $clean = 0;
+        if ($check) {
+                report("CHECK: $_[0]\n");
+                our $clean = 0;
+                our $cnt_chk++;
+        }
 }
 
 sub process {
@@ -335,6 +559,11 @@ sub process {
         my $signoff = 0;
         my $is_patch = 0;
 
+        our $cnt_lines = 0;
+        our $cnt_error = 0;
+        our $cnt_warn = 0;
+        our $cnt_chk = 0;
+
         # Trace the real file/line as we go.
         my $realfile = '';
         my $realline = 0;
@@ -343,62 +572,10 @@ sub process {
         my $in_comment = 0;
         my $first_line = 0;
 
-        my $Ident       = qr{[A-Za-z\d_]+};
-        my $Storage     = qr{extern|static|asmlinkage};
-        my $Sparse      = qr{
-                                __user|
-                                __kernel|
-                                __force|
-                                __iomem|
-                                __must_check|
-                                __init_refok|
-                                fastcall
-                        }x;
-        my $Inline      = qr{inline|__always_inline|noinline};
-        my $NonptrType  = qr{
-                                \b
-                                (?:const\s+)?
-                                (?:unsigned\s+)?
-                                (?:
-                                        void|
-                                        char|
-                                        short|
-                                        int|
-                                        long|
-                                        unsigned|
-                                        float|
-                                        double|
-                                        bool|
-                                        long\s+int|
-                                        long\s+long|
-                                        long\s+long\s+int|
-                                        u8|u16|u32|u64|
-                                        s8|s16|s32|s64|
-                                        struct\s+$Ident|
-                                        union\s+$Ident|
-                                        enum\s+$Ident|
-                                        ${Ident}_t
-                                )
-                                (?:\s+$Sparse)*
-                                \b
-                          }x;
-        my $Type        = qr{
-                                \b$NonptrType\b
-                                (?:\s*\*+\s*const|\s*\*+|(?:\s*\[\s*\])+)?
-                                (?:\s+$Sparse)*
-                          }x;
-        my $Declare     = qr{(?:$Storage\s+)?$Type};
-        my $Attribute   = qr{
-                                const|
-                                __read_mostly|
-                                __(?:mem|cpu|dev|)(?:initdata|init)
-                          }x;
-        my $Member      = qr{->$Ident|\.$Ident|\[[^]]*\]};
-        my $Lval        = qr{$Ident(?:$Member)*};
+        my $prev_values = 'N';
 
         # Possible bare types.
         my @bare = ();
-        my $Bare = $NonptrType;
 
         # Pre-scan the patch looking for any __setup documentation.
         my @setup_docs = ();
@@ -417,11 +594,14 @@ sub process {
                 }
         }
 
+        $prefix = '';
+
         foreach my $line (@lines) {
                 $linenr++;
 
                 my $rawline = $line;
 
+
 #extract the filename as it passes
                 if ($line=~/^\+\+\+\s+(\S+)/) {
                         $realfile=$1;
@@ -430,7 +610,7 @@ sub process {
                         next;
                 }
 #extract the line range in the file after the patch is applied
-                if ($line=~/^\@\@ -\d+,\d+ \+(\d+)(,(\d+))? \@\@/) {
+                if ($line=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
                         $is_patch = 1;
                         $first_line = $linenr + 1;
                         $in_comment = 0;
@@ -440,6 +620,7 @@ sub process {
                         } else {
                                 $realcnt=1+1;
                         }
+                        $prev_values = 'N';
                         next;
                 }
 
@@ -473,18 +654,24 @@ sub process {
                         # Track the previous line.
                         ($prevline, $stashline) = ($stashline, $line);
                         ($previndent, $stashindent) = ($stashindent, $indent);
+
                 } elsif ($realcnt == 1) {
                         $realcnt--;
                 }
 
 #make up the handle for any error we report on this line
-                $here = "#$linenr: ";
+                $here = "#$linenr: " if (!$file);
+                $here = "#$realline: " if ($file);
                 $here .= "FILE: $realfile:$realline:" if ($realcnt != 0);
 
                 my $hereline = "$here\n$line\n";
                 my $herecurr = "$here\n$line\n";
                 my $hereprev = "$here\n$prevline\n$line\n";
 
+                $prefix = "$filename:$realline: " if ($emacs && $file);
+                $prefix = "$filename:$linenr: " if ($emacs && !$file);
+                $cnt_lines++ if ($realcnt != 0);
+
 #check the patch for a signoff:
                 if ($line =~ /^\s*signed-off-by:/i) {
                         # This is a signoff, if ugly, so do not double report.
@@ -502,7 +689,7 @@ sub process {
 # Check for wrappage within a valid hunk of the file
                 if ($realcnt != 0 && $line !~ m{^(?:\+|-| |$)}) {
                         ERROR("patch seems to be corrupt (line wrapped?)\n" .
-                                $herecurr);
+                                $herecurr) if (!$emitted_corrupt++);
                 }
 
 # UTF-8 regex found at http://www.w3.org/International/questions/qa-forms-utf-8.en.php
@@ -568,8 +755,12 @@ sub process {
                     $line !~ /^.\s*(?:$Storage\s+)?(?:$Inline\s+)?$Type\b/ &&
                     $line !~ /$Ident:\s*$/ &&
                     $line !~ /^.\s*$Ident\s*\(/ &&
+                     # definitions in global scope can only start with types
                     ($line =~ /^.(?:$Storage\s+)?(?:$Inline\s+)?($Ident)\b/ ||
-                     $line =~ /^.\s*(?:$Storage\s+)?($Ident)\b\s*\**\s*$Ident\s*(?:;|=)/)) {
+                     # declarations always start with types
+                     $line =~ /^.\s*(?:$Storage\s+)?($Ident)\b\s*\**\s*$Ident\s*(?:;|=)/) ||
+                     # any (foo ... *) is a pointer cast, and foo is a type
+                     $line =~ /\(($Ident)(?:\s+$Sparse)*\s*\*+\s*\)/) {
                         my $possible = $1;
                         if ($possible !~ /^(?:$Storage|$Type|DEFINE_\S+)$/ &&
                             $possible ne 'goto' && $possible ne 'return' &&
@@ -579,7 +770,7 @@ sub process {
                                 #print "POSSIBLE<$possible>\n";
                                 push(@bare, $possible);
                                 my $bare = join("|", @bare);
-                                $Bare   = qr{
+                                $Bare   = '|' . qr{
                                                 \b(?:$bare)\b
                                                 (?:\s*\*+\s*const|\s*\*+|(?:\s*\[\s*\])+)?
                                                 (?:\s+$Sparse)*
@@ -641,6 +832,14 @@ sub process {
                         }
                 }
 
+                # Track the 'values' across context and added lines.
+                my $opline = $line; $opline =~ s/^./ /;
+                my $curr_values = annotate_values($opline . "\n", $prev_values);
+                $curr_values = $prev_values . $curr_values;
+                #warn "--> $opline\n";
+                #warn "--> $curr_values ($prev_values)\n";
+                $prev_values = substr($curr_values, -1);
+
 #ignore lines not being added
                 if ($line=~/^[^\+]/) {next;}
 
@@ -678,6 +877,7 @@ sub process {
                 }
                 # Remove C99 comments.
                 $line =~ s@//.*@@;
+                $opline =~ s@//.*@@;
 
 #EXPORT_SYMBOL should immediately follow its function closing }.
                 if (($line =~ /EXPORT_SYMBOL.*\((.*)\)/) ||
@@ -766,18 +966,13 @@ sub process {
                 }
 
 # check for spaces between functions and their parentheses.
-                if ($line =~ /($Ident)\s+\(/ &&
-                    $1 !~ /^(?:if|for|while|switch|return|volatile|__volatile__|__attribute__|format|__extension__|Copyright)$/ &&
-                    $line !~ /$Type\s+\(/ && $line !~ /^.\#\s*define\b/) {
-                        WARN("no space between function name and open parenthesis '('\n" . $herecurr);
+                while ($line =~ /($Ident)\s+\(/g) {
+                        if ($1 !~ /^(?:if|for|while|switch|return|volatile|__volatile__|__attribute__|format|__extension__|Copyright|case)$/ &&
+                            $line !~ /$Type\s+\(/ && $line !~ /^.\#\s*define\b/) {
+                                WARN("no space between function name and open parenthesis '('\n" . $herecurr);
+                        }
                 }
 # Check operator spacing.
-                # Note we expand the line with the leading + as the real
-                # line will be displayed with the leading + and the tabs
-                # will therefore also expand that way.
-                my $opline = $line;
-                $opline = expand_tabs($opline);
-                $opline =~ s/^./ /;
                 if (!($line=~/\#\s*include/)) {
                         my $ops = qr{
                                 <<=|>>=|<=|>=|==|!=|
@@ -787,6 +982,9 @@ sub process {
                         }x;
                         my @elements = split(/($ops|;)/, $opline);
                         my $off = 0;
+
+                        my $blank = copy_spacing($opline);
+
                         for (my $n = 0; $n < $#elements; $n += 2) {
                                 $off += length($elements[$n]);
 
@@ -822,62 +1020,24 @@ sub process {
 
                                 my $at = "(ctx:$ctx)";
 
-                                my $ptr = (" " x $off) . "^";
+                                my $ptr = substr($blank, 0, $off) . "^";
                                 my $hereptr = "$hereline$ptr\n";
 
                                 # Classify operators into binary, unary, or
                                 # definitions (* only) where they have more
                                 # than one mode.
-                                my $unary_ctx = $prevline . $ca;
-                                $unary_ctx =~ s/^./ /;
-                                my $is_unary = 0;
-                                my $Unary = qr{
-                                        (?:
-                                                ^|;|,|$ops|\(|\?|:|
-                                                \(\s*$Type\s*\)|
-                                                $Type|
-                                                return|case|else|
-                                                \{|\}|
-                                                \[|
-                                                ^.\#\s*define\s+$Ident\s*(?:\([^\)]*\))?|
-                                                ^.\#\s*else|
-                                                ^.\#\s*endif|
-                                                ^.\#\s*(?:if|ifndef|ifdef)\b.*
-                                        )\s*(?:|\\)\s*$
-                                }x;
-                                my $UnaryFalse = qr{
-                                        sizeof\s*\(\s*$Type\s*\)\s*$
-                                }x;
-                                my $UnaryDefine = qr{
-                                         (?:$Type|$Bare)\s*|
-                                         (?:$Type|$Bare).*,\s*\**
-                                }x;
-                                if ($op eq '-' || $op eq '&' || $op eq '*') {
-                                        # An operator is binary if the left hand
-                                        # side is a value.  Pick out the known
-                                        # non-values.
-                                        if ($unary_ctx =~ /$Unary$/s &&
-                                            $unary_ctx !~ /$UnaryFalse$/s) {
-                                                $is_unary = 1;
-
-                                        # Special handling for ')' check if this
-                                        # brace represents a conditional, if so
-                                        # we are unary.
-                                        } elsif ($unary_ctx =~ /\)\s*$/) {
-                                                my $before = ctx_expr_before($unary_ctx);
-                                                if ($before =~ /(?:for|if|while)\s*$/) {
-                                                        $is_unary = 1;
-                                                }
-                                        }
-
-                                        # Check for type definition for of '*'.
-                                        if ($op eq '*' && $unary_ctx =~ /$UnaryDefine$/) {
-                                                $is_unary = 2;
-                                        }
+                                my $op_type = substr($curr_values, $off + 1, 1);
+                                my $op_left = substr($curr_values, $off, 1);
+                                my $is_unary;
+                                if ($op_type eq 'T') {
+                                        $is_unary = 2;
+                                } elsif ($op_left eq 'V') {
+                                        $is_unary = 0;
+                                } else {
+                                        $is_unary = 1;
                                 }
-
                                 #if ($op eq '-' || $op eq '&' || $op eq '*') {
-                                #       print "UNARY: <$is_unary $a:$op:$c> <$ca:$op:$cc> <$unary_ctx>\n";
+                                #       print "UNARY: <$op_left$op_type $is_unary $a:$op:$c> <$ca:$op:$cc> <$unary_ctx>\n";
                                 #}
 
                                 # ; should have either the end of line or a space or \ after it
@@ -952,7 +1112,7 @@ sub process {
 
 # check for multiple assignments
                 if ($line =~ /^.\s*$Lval\s*=\s*$Lval\s*=(?!=)/) {
-                        WARN("multiple assignments should be avoided\n" . $herecurr);
+                        CHK("multiple assignments should be avoided\n" . $herecurr);
                 }
 
 ## # check for multiple declarations, allowing for a function declaration
@@ -1012,7 +1172,7 @@ sub process {
                 }
 
 # Check for illegal assignment in if conditional.
-                if ($line=~/\bif\s*\(.*[^<>!=]=[^=].*\)/) {
+                if ($line=~/\bif\s*\(.*[^<>!=]=[^=]/) {
                         #next if ($line=~/\".*\Q$op\E.*\"/ or $line=~/\'\Q$op\E\'/);
                         ERROR("do not use assignment in if condition\n" . $herecurr);
                 }
@@ -1038,8 +1198,8 @@ sub process {
 
 #warn if <asm/foo.h> is #included and <linux/foo.h> is available (uses RAW line)
                 if ($tree && $rawline =~ m{^.\#\s*include\s*\<asm\/(.*)\.h\>}) {
-                        my $checkfile = "include/linux/$1.h";
-                        if (-f $checkfile) {
+                        my $checkfile = "$root/include/linux/$1.h";
+                        if (-f $checkfile && $1 ne 'irq.h') {
                                 CHK("Use #include <linux/$1.h> instead of <asm/$1.h>\n" .
                                         $herecurr);
                         }
@@ -1151,7 +1311,8 @@ sub process {
                 }
 
 # no volatiles please
-                if ($line =~ /\bvolatile\b/ && $line !~ /\basm\s+volatile\b/) {
+                my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b};
+                if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) {
                         WARN("Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr);
                 }
 
@@ -1240,6 +1401,11 @@ sub process {
 
         if ($clean == 0 && ($chk_patch || $is_patch)) {
                 print report_dump();
+                if ($quiet < 2) {
+                        print "total: $cnt_error errors, $cnt_warn warnings, " .
+                                (($check)? "$cnt_chk checks, " : "") .
+                                "$cnt_lines lines checked\n";
+                }
         }
         if ($clean == 1 && $quiet == 0) {
                 print "Your patch has no obvious style problems and is ready for submission.\n"
diff --git a/security/commoncap.c b/security/commoncap.c
index 778cb0cfc5d8..48ca5b092768 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -24,6 +24,25 @@
 #include <linux/hugetlb.h>
 #include <linux/mount.h>
 
+#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
+/*
+ * Because of the reduced scope of CAP_SETPCAP when filesystem
+ * capabilities are in effect, it is safe to allow this capability to
+ * be available in the default configuration.
+ */
+# define CAP_INIT_BSET  CAP_FULL_SET
+#else /* ie. ndef CONFIG_SECURITY_FILE_CAPABILITIES */
+# define CAP_INIT_BSET  CAP_INIT_EFF_SET
+#endif /* def CONFIG_SECURITY_FILE_CAPABILITIES */
+
+kernel_cap_t cap_bset = CAP_INIT_BSET;    /* systemwide capability bound */
+EXPORT_SYMBOL(cap_bset);
+
+/* Global security state */
+
+unsigned securebits = SECUREBITS_DEFAULT; /* systemwide security settings */
+EXPORT_SYMBOL(securebits);
+
 int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
 {
         NETLINK_CB(skb).eff_cap = current->cap_effective;
@@ -73,14 +92,44 @@ int cap_capget (struct task_struct *target, kernel_cap_t *effective,
         return 0;
 }
 
+#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
+
+static inline int cap_block_setpcap(struct task_struct *target)
+{
+        /*
+         * No support for remote process capability manipulation with
+         * filesystem capability support.
+         */
+        return (target != current);
+}
+
+static inline int cap_inh_is_capped(void)
+{
+        /*
+         * return 1 if changes to the inheritable set are limited
+         * to the old permitted set.
+         */
+        return !cap_capable(current, CAP_SETPCAP);
+}
+
+#else /* ie., ndef CONFIG_SECURITY_FILE_CAPABILITIES */
+
+static inline int cap_block_setpcap(struct task_struct *t) { return 0; }
+static inline int cap_inh_is_capped(void) { return 1; }
+
+#endif /* def CONFIG_SECURITY_FILE_CAPABILITIES */
+
 int cap_capset_check (struct task_struct *target, kernel_cap_t *effective,
                       kernel_cap_t *inheritable, kernel_cap_t *permitted)
 {
-        /* Derived from kernel/capability.c:sys_capset. */
-        /* verify restrictions on target's new Inheritable set */
-        if (!cap_issubset (*inheritable,
-                           cap_combine (target->cap_inheritable,
-                                        current->cap_permitted))) {
+        if (cap_block_setpcap(target)) {
+                return -EPERM;
+        }
+        if (cap_inh_is_capped()
+            && !cap_issubset(*inheritable,
+                             cap_combine(target->cap_inheritable,
+                                         current->cap_permitted))) {
+                /* incapable of using this inheritable set */
                 return -EPERM;
         }
 
diff --git a/security/dummy.c b/security/dummy.c
index bc43d4c7383e..6d895ade73de 100644
--- a/security/dummy.c
+++ b/security/dummy.c
@@ -37,15 +37,13 @@ static int dummy_capget (struct task_struct *target, kernel_cap_t * effective,
                          kernel_cap_t * inheritable, kernel_cap_t * permitted)
 {
         *effective = *inheritable = *permitted = 0;
-        if (!issecure(SECURE_NOROOT)) {
-                if (target->euid == 0) {
-                        *permitted |= (~0 & ~CAP_FS_MASK);
-                        *effective |= (~0 & ~CAP_TO_MASK(CAP_SETPCAP) & ~CAP_FS_MASK);
-                }
-                if (target->fsuid == 0) {
-                        *permitted |= CAP_FS_MASK;
-                        *effective |= CAP_FS_MASK;
-                }
+        if (target->euid == 0) {
+                *permitted |= (~0 & ~CAP_FS_MASK);
+                *effective |= (~0 & ~CAP_TO_MASK(CAP_SETPCAP) & ~CAP_FS_MASK);
+        }
+        if (target->fsuid == 0) {
+                *permitted |= CAP_FS_MASK;
+                *effective |= CAP_FS_MASK;
         }
         return 0;
 }
diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c
index cb008d9f0a82..36a191e7004e 100644
--- a/security/selinux/xfrm.c
+++ b/security/selinux/xfrm.c
@@ -448,7 +448,7 @@ int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb,
         if (dst) {
                 struct dst_entry *dst_test;
 
-                for (dst_test = dst; dst_test != 0;
+                for (dst_test = dst; dst_test != NULL;
                      dst_test = dst_test->child) {
                         struct xfrm_state *x = dst_test->xfrm;
 
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index b9eca9f3dd25..3b73ba7d03e8 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -209,7 +209,7 @@ static void aaci_fifo_irq(struct aaci *aaci, int channel, u32 mask)
                 void *ptr;
 
                 if (!aacirun->substream || !aacirun->start) {
-                        dev_warn(&aaci->dev->dev, "RX interrupt???");
+                        dev_warn(&aaci->dev->dev, "RX interrupt???\n");
                         writel(0, aacirun->base + AACI_IE);
                         return;
                 }
@@ -263,7 +263,7 @@ static void aaci_fifo_irq(struct aaci *aaci, int channel, u32 mask)
                 void *ptr;
 
                 if (!aacirun->substream || !aacirun->start) {
-                        dev_warn(&aaci->dev->dev, "TX interrupt???");
+                        dev_warn(&aaci->dev->dev, "TX interrupt???\n");
                         writel(0, aacirun->base + AACI_IE);
                         return;
                 }
diff --git a/sound/oss/Makefile b/sound/oss/Makefile
index 1200670017bd..f883c4b676ab 100644
--- a/sound/oss/Makefile
+++ b/sound/oss/Makefile
@@ -36,7 +36,6 @@ obj-$(CONFIG_SOUND_MSNDCLAS)	+= msnd.o msnd_classic.o
 obj-$(CONFIG_SOUND_MSNDPIN)     += msnd.o msnd_pinnacle.o
 obj-$(CONFIG_SOUND_VWSND)       += vwsnd.o
 obj-$(CONFIG_SOUND_ICH)         += i810_audio.o ac97_codec.o
-obj-$(CONFIG_SOUND_ES1371)      += es1371.o ac97_codec.o
 obj-$(CONFIG_SOUND_AU1550_AC97) += au1550_ac97.o ac97_codec.o
 obj-$(CONFIG_SOUND_TRIDENT)     += trident.o ac97_codec.o
 obj-$(CONFIG_SOUND_BCM_CS4297A) += swarm_cs4297a.o
diff --git a/sound/oss/dmasound/Makefile b/sound/oss/dmasound/Makefile
index 4611636b1a81..3c1531652d11 100644
--- a/sound/oss/dmasound/Makefile
+++ b/sound/oss/dmasound/Makefile
@@ -2,12 +2,6 @@
 # Makefile for the DMA sound driver
 #
 
-dmasound_pmac-y                 += dmasound_awacs.o \
-                                   trans_16.o dac3550a.o tas_common.o \
-                                   tas3001c.o tas3001c_tables.o \
-                                   tas3004.o tas3004_tables.o
-
 obj-$(CONFIG_DMASOUND_ATARI)    += dmasound_core.o dmasound_atari.o
-obj-$(CONFIG_DMASOUND_PMAC)     += dmasound_core.o dmasound_pmac.o
 obj-$(CONFIG_DMASOUND_PAULA)    += dmasound_core.o dmasound_paula.o
 obj-$(CONFIG_DMASOUND_Q40)      += dmasound_core.o dmasound_q40.o
diff --git a/sound/oss/dmasound/awacs_defs.h b/sound/oss/dmasound/awacs_defs.h
deleted file mode 100644
index 2194f46b046c..000000000000
--- a/sound/oss/dmasound/awacs_defs.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*********************************************************/
-/* This file was written by someone, somewhere, sometime */
-/* And is released into the Public Domain                */
-/*********************************************************/
-
-#ifndef _AWACS_DEFS_H_
-#define _AWACS_DEFS_H_
-
-/*******************************/
-/* AWACs Audio Register Layout */
-/*******************************/
-
-struct awacs_regs {
-    unsigned    control;        /* Audio control register */
-    unsigned    pad0[3];
-    unsigned    codec_ctrl;     /* Codec control register */
-    unsigned    pad1[3];
-    unsigned    codec_stat;     /* Codec status register */
-    unsigned    pad2[3];
-    unsigned    clip_count;     /* Clipping count register */
-    unsigned    pad3[3];
-    unsigned    byteswap;       /* Data is little-endian if 1 */
-};
-
-/*******************/
-/* Audio Bit Masks */
-/*******************/
-
-/* Audio Control Reg Bit Masks */
-/* ----- ------- --- --- ----- */
-#define MASK_ISFSEL     (0xf)           /* Input SubFrame Select */
-#define MASK_OSFSEL     (0xf << 4)      /* Output SubFrame Select */
-#define MASK_RATE       (0x7 << 8)      /* Sound Rate */
-#define MASK_CNTLERR    (0x1 << 11)     /* Error */
-#define MASK_PORTCHG    (0x1 << 12)     /* Port Change */
-#define MASK_IEE        (0x1 << 13)     /* Enable Interrupt on Error */
-#define MASK_IEPC       (0x1 << 14)     /* Enable Interrupt on Port Change */
-#define MASK_SSFSEL     (0x3 << 15)     /* Status SubFrame Select */
-
-/* Audio Codec Control Reg Bit Masks */
-/* ----- ----- ------- --- --- ----- */
-#define MASK_NEWECMD    (0x1 << 24)     /* Lock: don't write to reg when 1 */
-#define MASK_EMODESEL   (0x3 << 22)     /* Send info out on which frame? */
-#define MASK_EXMODEADDR (0x3ff << 12)   /* Extended Mode Address -- 10 bits */
-#define MASK_EXMODEDATA (0xfff)         /* Extended Mode Data -- 12 bits */
-
-/* Audio Codec Control Address Values / Masks */
-/* ----- ----- ------- ------- ------ - ----- */
-#define MASK_ADDR0      (0x0 << 12)     /* Expanded Data Mode Address 0 */
-#define MASK_ADDR_MUX   MASK_ADDR0      /* Mux Control */
-#define MASK_ADDR_GAIN  MASK_ADDR0
-
-#define MASK_ADDR1      (0x1 << 12)     /* Expanded Data Mode Address 1 */
-#define MASK_ADDR_MUTE  MASK_ADDR1
-#define MASK_ADDR_RATE  MASK_ADDR1
-
-#define MASK_ADDR2      (0x2 << 12)     /* Expanded Data Mode Address 2 */
-#define MASK_ADDR_VOLA  MASK_ADDR2      /* Volume Control A -- Headphones */
-#define MASK_ADDR_VOLHD MASK_ADDR2
-
-#define MASK_ADDR4      (0x4 << 12)     /* Expanded Data Mode Address 4 */
-#define MASK_ADDR_VOLC  MASK_ADDR4      /* Volume Control C -- Speaker */
-#define MASK_ADDR_VOLSPK MASK_ADDR4
-
-/* additional registers of screamer */
-#define MASK_ADDR5      (0x5 << 12)     /* Expanded Data Mode Address 5 */
-#define MASK_ADDR6      (0x6 << 12)     /* Expanded Data Mode Address 6 */
-#define MASK_ADDR7      (0x7 << 12)     /* Expanded Data Mode Address 7 */
-
-/* Address 0 Bit Masks & Macros */
-/* ------- - --- ----- - ------ */
-#define MASK_GAINRIGHT  (0xf)           /* Gain Right Mask */
-#define MASK_GAINLEFT   (0xf << 4)      /* Gain Left Mask */
-#define MASK_GAINLINE   (0x1 << 8)      /* Disable Mic preamp */
-#define MASK_GAINMIC    (0x0 << 8)      /* Enable Mic preamp */
-
-#define MASK_MUX_CD     (0x1 << 9)      /* Select CD in MUX */
-#define MASK_MUX_MIC    (0x1 << 10)     /* Select Mic in MUX */
-#define MASK_MUX_AUDIN  (0x1 << 11)     /* Select Audio In in MUX */
-#define MASK_MUX_LINE   MASK_MUX_AUDIN
-
-#define GAINRIGHT(x)    ((x) & MASK_GAINRIGHT)
-#define GAINLEFT(x)     (((x) << 4) & MASK_GAINLEFT)
-
-#define DEF_CD_GAIN 0x00bb
-#define DEF_MIC_GAIN 0x00cc
-
-/* Address 1 Bit Masks */
-/* ------- - --- ----- */
-#define MASK_ADDR1RES1  (0x3)           /* Reserved */
-#define MASK_RECALIBRATE (0x1 << 2)     /* Recalibrate */
-#define MASK_SAMPLERATE (0x7 << 3)      /* Sample Rate: */
-#define MASK_LOOPTHRU   (0x1 << 6)      /* Loopthrough Enable */
-#define MASK_CMUTE      (0x1 << 7)      /* Output C (Speaker) Mute when 1 */
-#define MASK_SPKMUTE    MASK_CMUTE
-#define MASK_ADDR1RES2  (0x1 << 8)      /* Reserved */
-#define MASK_AMUTE      (0x1 << 9)      /* Output A (Headphone) Mute when 1 */
-#define MASK_HDMUTE     MASK_AMUTE
-#define MASK_PAROUT0    (0x1 << 10)     /* Parallel Output 0 */
-#define MASK_PAROUT1    (0x2 << 10)     /* Parallel Output 1 */
-
-#define MASK_MIC_BOOST  (0x4)           /* screamer mic boost */
-
-#define SAMPLERATE_48000        (0x0 << 3)      /* 48 or 44.1 kHz */
-#define SAMPLERATE_32000        (0x1 << 3)      /* 32 or 29.4 kHz */
-#define SAMPLERATE_24000        (0x2 << 3)      /* 24 or 22.05 kHz */
-#define SAMPLERATE_19200        (0x3 << 3)      /* 19.2 or 17.64 kHz */
-#define SAMPLERATE_16000        (0x4 << 3)      /* 16 or 14.7 kHz */
-#define SAMPLERATE_12000        (0x5 << 3)      /* 12 or 11.025 kHz */
-#define SAMPLERATE_9600         (0x6 << 3)      /* 9.6 or 8.82 kHz */
-#define SAMPLERATE_8000         (0x7 << 3)      /* 8 or 7.35 kHz */
-
-/* Address 2 & 4 Bit Masks & Macros */
-/* ------- - - - --- ----- - ------ */
-#define MASK_OUTVOLRIGHT (0xf)          /* Output Right Volume */
-#define MASK_ADDR2RES1  (0x2 << 4)      /* Reserved */
-#define MASK_ADDR4RES1  MASK_ADDR2RES1
-#define MASK_OUTVOLLEFT (0xf << 6)      /* Output Left Volume */
-#define MASK_ADDR2RES2  (0x2 << 10)     /* Reserved */
-#define MASK_ADDR4RES2  MASK_ADDR2RES2
-
-#define VOLRIGHT(x)     (((~(x)) & MASK_OUTVOLRIGHT))
-#define VOLLEFT(x)      (((~(x)) << 6) & MASK_OUTVOLLEFT)
-
-/* Audio Codec Status Reg Bit Masks */
-/* ----- ----- ------ --- --- ----- */
-#define MASK_EXTEND     (0x1 << 23)     /* Extend */
-#define MASK_VALID      (0x1 << 22)     /* Valid Data? */
-#define MASK_OFLEFT     (0x1 << 21)     /* Overflow Left */
-#define MASK_OFRIGHT    (0x1 << 20)     /* Overflow Right */
-#define MASK_ERRCODE    (0xf << 16)     /* Error Code */
-#define MASK_REVISION   (0xf << 12)     /* Revision Number */
-#define MASK_MFGID      (0xf << 8)      /* Mfg. ID */
-#define MASK_CODSTATRES (0xf << 4)      /* bits 4 - 7 reserved */
-#define MASK_INPPORT    (0xf)           /* Input Port */
-#define MASK_HDPCONN    8               /* headphone plugged in */
-
-/* Clipping Count Reg Bit Masks */
-/* -------- ----- --- --- ----- */
-#define MASK_CLIPLEFT   (0xff << 7)     /* Clipping Count, Left Channel */
-#define MASK_CLIPRIGHT  (0xff)          /* Clipping Count, Right Channel */
-
-/* DBDMA ChannelStatus Bit Masks */
-/* ----- ------------- --- ----- */
-#define MASK_CSERR      (0x1 << 7)      /* Error */
-#define MASK_EOI        (0x1 << 6)      /* End of Input -- only for Input Channel */
-#define MASK_CSUNUSED   (0x1f << 1)     /* bits 1-5 not used */
-#define MASK_WAIT       (0x1)           /* Wait */
-
-/* Various Rates */
-/* ------- ----- */
-#define RATE_48000      (0x0 << 8)      /* 48 kHz */
-#define RATE_44100      (0x0 << 8)      /* 44.1 kHz */
-#define RATE_32000      (0x1 << 8)      /* 32 kHz */
-#define RATE_29400      (0x1 << 8)      /* 29.4 kHz */
-#define RATE_24000      (0x2 << 8)      /* 24 kHz */
-#define RATE_22050      (0x2 << 8)      /* 22.05 kHz */
-#define RATE_19200      (0x3 << 8)      /* 19.2 kHz */
-#define RATE_17640      (0x3 << 8)      /* 17.64 kHz */
-#define RATE_16000      (0x4 << 8)      /* 16 kHz */
-#define RATE_14700      (0x4 << 8)      /* 14.7 kHz */
-#define RATE_12000      (0x5 << 8)      /* 12 kHz */
-#define RATE_11025      (0x5 << 8)      /* 11.025 kHz */
-#define RATE_9600       (0x6 << 8)      /* 9.6 kHz */
-#define RATE_8820       (0x6 << 8)      /* 8.82 kHz */
-#define RATE_8000       (0x7 << 8)      /* 8 kHz */
-#define RATE_7350       (0x7 << 8)      /* 7.35 kHz */
-
-#define RATE_LOW        1       /* HIGH = 48kHz, etc;  LOW = 44.1kHz, etc. */
-
-/*******************/
-/* Burgundy values */
-/*******************/
-
-#define MASK_ADDR_BURGUNDY_INPSEL21 (0x11 << 12)
-#define MASK_ADDR_BURGUNDY_INPSEL3 (0x12 << 12)
-
-#define MASK_ADDR_BURGUNDY_GAINCH1 (0x13 << 12)
-#define MASK_ADDR_BURGUNDY_GAINCH2 (0x14 << 12)
-#define MASK_ADDR_BURGUNDY_GAINCH3 (0x15 << 12)
-#define MASK_ADDR_BURGUNDY_GAINCH4 (0x16 << 12)
-
-#define MASK_ADDR_BURGUNDY_VOLCH1 (0x20 << 12)
-#define MASK_ADDR_BURGUNDY_VOLCH2 (0x21 << 12)
-#define MASK_ADDR_BURGUNDY_VOLCH3 (0x22 << 12)
-#define MASK_ADDR_BURGUNDY_VOLCH4 (0x23 << 12)
-
-#define MASK_ADDR_BURGUNDY_OUTPUTSELECTS (0x2B << 12)
-#define MASK_ADDR_BURGUNDY_OUTPUTENABLES (0x2F << 12)
-
-#define MASK_ADDR_BURGUNDY_MASTER_VOLUME (0x30 << 12)
-
-#define MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES (0x60 << 12)
-
-#define MASK_ADDR_BURGUNDY_ATTENSPEAKER (0x62 << 12)
-#define MASK_ADDR_BURGUNDY_ATTENLINEOUT (0x63 << 12)
-#define MASK_ADDR_BURGUNDY_ATTENHP (0x64 << 12)
-
-#define MASK_ADDR_BURGUNDY_VOLCD (MASK_ADDR_BURGUNDY_VOLCH1)
-#define MASK_ADDR_BURGUNDY_VOLLINE (MASK_ADDR_BURGUNDY_VOLCH2)
-#define MASK_ADDR_BURGUNDY_VOLMIC (MASK_ADDR_BURGUNDY_VOLCH3)
-#define MASK_ADDR_BURGUNDY_VOLMODEM (MASK_ADDR_BURGUNDY_VOLCH4)
-
-#define MASK_ADDR_BURGUNDY_GAINCD (MASK_ADDR_BURGUNDY_GAINCH1)
-#define MASK_ADDR_BURGUNDY_GAINLINE (MASK_ADDR_BURGUNDY_GAINCH2)
-#define MASK_ADDR_BURGUNDY_GAINMIC (MASK_ADDR_BURGUNDY_GAINCH3)
-#define MASK_ADDR_BURGUNDY_GAINMODEM (MASK_ADDR_BURGUNDY_VOLCH4)
-
-
-/* These are all default values for the burgundy */
-#define DEF_BURGUNDY_INPSEL21 (0xAA)
-#define DEF_BURGUNDY_INPSEL3 (0x0A)
-
-#define DEF_BURGUNDY_GAINCD (0x33)
-#define DEF_BURGUNDY_GAINLINE (0x44)
-#define DEF_BURGUNDY_GAINMIC (0x44)
-#define DEF_BURGUNDY_GAINMODEM (0x06)
-
-/* Remember: lowest volume here is 0x9b */
-#define DEF_BURGUNDY_VOLCD (0xCCCCCCCC)
-#define DEF_BURGUNDY_VOLLINE (0x00000000)
-#define DEF_BURGUNDY_VOLMIC (0x00000000)
-#define DEF_BURGUNDY_VOLMODEM (0xCCCCCCCC)
-
-#define DEF_BURGUNDY_OUTPUTSELECTS (0x010f010f)
-#define DEF_BURGUNDY_OUTPUTENABLES (0x0A)
-
-#define DEF_BURGUNDY_MASTER_VOLUME (0xFFFFFFFF)
-
-#define DEF_BURGUNDY_MORE_OUTPUTENABLES (0x7E)
-
-#define DEF_BURGUNDY_ATTENSPEAKER (0x44)
-#define DEF_BURGUNDY_ATTENLINEOUT (0xCC)
-#define DEF_BURGUNDY_ATTENHP (0xCC)
-
-/*********************/
-/* i2s layout values */
-/*********************/
-
-#define I2S_REG_INT_CTL                 0x00
-#define I2S_REG_SERIAL_FORMAT           0x10
-#define I2S_REG_CODEC_MSG_OUT           0x20
-#define I2S_REG_CODEC_MSG_IN            0x30
-#define I2S_REG_FRAME_COUNT             0x40
-#define I2S_REG_FRAME_MATCH             0x50
-#define I2S_REG_DATAWORD_SIZES          0x60
-#define I2S_REG_PEAKLEVEL_SEL           0x70
-#define I2S_REG_PEAKLEVEL_IN0           0x80
-#define I2S_REG_PEAKLEVEL_IN1           0x90
-
-#endif /* _AWACS_DEFS_H_ */
diff --git a/sound/oss/dmasound/dac3550a.c b/sound/oss/dmasound/dac3550a.c
deleted file mode 100644
index 0f0d03a55dab..000000000000
--- a/sound/oss/dmasound/dac3550a.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Driver for the i2c/i2s based DAC3550a sound chip used
- * on some Apple iBooks. Also known as "DACA".
- *
- *  This file is subject to the terms and conditions of the GNU General Public
- *  License.  See the file COPYING in the main directory of this archive
- *  for more details.
- */
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/proc_fs.h>
-#include <linux/ioport.h>
-#include <linux/sysctl.h>
-#include <linux/types.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <asm/uaccess.h>
-#include <asm/errno.h>
-#include <asm/io.h>
-
-#include "dmasound.h"
-
-/* FYI: This code was derived from the tas3001c.c Texas/Tumbler mixer
- * control code, as well as info derived from the AppleDACAAudio driver
- * from Darwin CVS (main thing I derived being register numbers and 
- * values, as well as when to make the calls). */
-
-#define I2C_DRIVERID_DACA (0xFDCB)
-
-#define DACA_VERSION    "0.1"
-#define DACA_DATE "20010930"
-
-static int cur_left_vol;
-static int cur_right_vol;
-static struct i2c_client *daca_client;
-
-static int daca_attach_adapter(struct i2c_adapter *adapter);
-static int daca_detect_client(struct i2c_adapter *adapter, int address);
-static int daca_detach_client(struct i2c_client *client);
-
-struct i2c_driver daca_driver = {  
-        .driver = {
-                .name           = "DAC3550A driver  V " DACA_VERSION,
-        },
-        .id                     = I2C_DRIVERID_DACA,
-        .attach_adapter         = daca_attach_adapter,
-        .detach_client          = daca_detach_client,
-};
-
-#define VOL_MAX ((1<<20) - 1)
-
-void daca_get_volume(uint * left_vol, uint  *right_vol)
-{
-        *left_vol = cur_left_vol >> 5;
-        *right_vol = cur_right_vol >> 5;
-}
-
-int daca_set_volume(uint left_vol, uint right_vol)
-{
-        unsigned short voldata;
-  
-        if (!daca_client)
-                return -1;
-
-        /* Derived from experience, not from any specific values */
-        left_vol <<= 5;
-        right_vol <<= 5;
-
-        if (left_vol > VOL_MAX)
-                left_vol = VOL_MAX;
-        if (right_vol > VOL_MAX)
-                right_vol = VOL_MAX;
-
-        voldata = ((left_vol >> 14)  & 0x3f) << 8;
-        voldata |= (right_vol >> 14)  & 0x3f;
-  
-        if (i2c_smbus_write_word_data(daca_client, 2, voldata) < 0) {
-                printk("daca: failed to set volume \n");
-                return -1; 
-        }
-
-        cur_left_vol = left_vol;
-        cur_right_vol = right_vol;
-  
-        return 0;
-}
-
-int daca_leave_sleep(void)
-{
-        if (!daca_client)
-                return -1;
-  
-        /* Do a short sleep, just to make sure I2C bus is awake and paying
-         * attention to us
-         */
-        msleep(20);
-        /* Write the sample rate reg the value it needs */
-        i2c_smbus_write_byte_data(daca_client, 1, 8);
-        daca_set_volume(cur_left_vol >> 5, cur_right_vol >> 5);
-        /* Another short delay, just to make sure the other I2C bus writes
-         * have taken...
-         */
-        msleep(20);
-        /* Write the global config reg - invert right power amp,
-         * DAC on, use 5-volt mode */
-        i2c_smbus_write_byte_data(daca_client, 3, 0x45);
-
-        return 0;
-}
-
-int daca_enter_sleep(void)
-{
-        if (!daca_client)
-                return -1;
-
-        i2c_smbus_write_byte_data(daca_client, 1, 8);
-        daca_set_volume(cur_left_vol >> 5, cur_right_vol >> 5);
-
-        /* Write the global config reg - invert right power amp,
-         * DAC on, enter low-power mode, use 5-volt mode
-         */
-        i2c_smbus_write_byte_data(daca_client, 3, 0x65);
-
-        return 0;
-}
-
-static int daca_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!strncmp(adapter->name, "mac-io", 6))
-                daca_detect_client(adapter, 0x4d);
-        return 0;
-}
-
-static int daca_init_client(struct i2c_client * new_client)
-{
-        /* 
-         * Probe is not working with the current i2c-keywest
-         * driver. We try to use addr 0x4d on each adapters
-         * instead, by setting the format register.
-         * 
-         * FIXME: I'm sure that can be obtained from the
-         * device-tree. --BenH.
-         */
-  
-        /* Write the global config reg - invert right power amp,
-         * DAC on, use 5-volt mode
-         */
-        if (i2c_smbus_write_byte_data(new_client, 3, 0x45))
-                return -1;
-
-        i2c_smbus_write_byte_data(new_client, 1, 8);
-        daca_client = new_client;
-        daca_set_volume(15000, 15000);
-
-        return 0;
-}
-
-static int daca_detect_client(struct i2c_adapter *adapter, int address)
-{
-        const char *client_name = "DAC 3550A Digital Equalizer";
-        struct i2c_client *new_client;
-        int rc = -ENODEV;
-
-        new_client = kzalloc(sizeof(*new_client), GFP_KERNEL);
-        if (!new_client)
-                return -ENOMEM;
-
-        new_client->addr = address;
-        new_client->adapter = adapter;
-        new_client->driver = &daca_driver;
-        new_client->flags = 0;
-        strcpy(new_client->name, client_name);
-
-        if (daca_init_client(new_client))
-                goto bail;
-
-        /* Tell the i2c layer a new client has arrived */
-        if (i2c_attach_client(new_client))
-                goto bail;
-
-        return 0;
- bail:
-        kfree(new_client);
-        return rc;
-}
-
-
-static int daca_detach_client(struct i2c_client *client)
-{
-        if (client == daca_client)
-                daca_client = NULL;
-
-        i2c_detach_client(client);
-        kfree(client);
-        return 0;
-}
-
-void daca_cleanup(void)
-{
-        i2c_del_driver(&daca_driver);
-}
-
-int daca_init(void)
-{
-        printk("dac3550a driver version %s (%s)\n",DACA_VERSION,DACA_DATE);
-        return i2c_add_driver(&daca_driver);
-}
diff --git a/sound/oss/dmasound/dmasound.h b/sound/oss/dmasound/dmasound.h
index 25dd5a318eb4..d978b0096564 100644
--- a/sound/oss/dmasound/dmasound.h
+++ b/sound/oss/dmasound/dmasound.h
@@ -59,7 +59,6 @@ static inline int ioctl_return(int __user *addr, int value)
      */
 
 #undef HAS_8BIT_TABLES
-#undef HAS_RECORD
 
 #if defined(CONFIG_DMASOUND_ATARI) || defined(CONFIG_DMASOUND_ATARI_MODULE) ||\
     defined(CONFIG_DMASOUND_PAULA) || defined(CONFIG_DMASOUND_PAULA_MODULE) ||\
@@ -83,10 +82,6 @@ static inline int ioctl_return(int __user *addr, int value)
 #define DEFAULT_N_BUFFERS 4
 #define DEFAULT_BUFF_SIZE (1<<15)
 
-#if defined(CONFIG_DMASOUND_PMAC) || defined(CONFIG_DMASOUND_PMAC_MODULE)
-#define HAS_RECORD
-#endif
-
     /*
      *  Initialization
      */
@@ -168,9 +163,6 @@ struct sound_settings {
     SETTINGS soft;      /* software settings */
     SETTINGS dsp;       /* /dev/dsp default settings */
     TRANS *trans_write; /* supported translations */
-#ifdef HAS_RECORD
-    TRANS *trans_read;  /* supported translations */
-#endif
     int volume_left;    /* volume (range is machine dependent) */
     int volume_right;
     int bass;           /* tone (range is machine dependent) */
@@ -253,11 +245,6 @@ struct sound_queue {
 extern struct sound_queue dmasound_write_sq;
 #define write_sq        dmasound_write_sq
 
-#ifdef HAS_RECORD
-extern struct sound_queue dmasound_read_sq;
-#define read_sq         dmasound_read_sq
-#endif
-
 extern int dmasound_catchRadius;
 #define catchRadius     dmasound_catchRadius
 
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
deleted file mode 100644
index 8f6388004f44..000000000000
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ /dev/null
@@ -1,3215 +0,0 @@
-/*
- *  linux/sound/oss/dmasound/dmasound_awacs.c
- *
- *  PowerMac `AWACS' and `Burgundy' DMA Sound Driver
- *  with some limited support for DACA & Tumbler
- *
- *  See linux/sound/oss/dmasound/dmasound_core.c for copyright and
- *  history prior to 2001/01/26.
- *
- *      26/01/2001 ed 0.1 Iain Sandoe
- *              - added version info.
- *              - moved dbdma command buffer allocation to PMacXXXSqSetup()
- *              - fixed up beep dbdma cmd buffers
- *
- *      08/02/2001 [0.2]
- *              - make SNDCTL_DSP_GETFMTS return the correct info for the h/w
- *              - move soft format translations to a separate file
- *              - [0.3] make SNDCTL_DSP_GETCAPS return correct info.
- *              - [0.4] more informative machine name strings.
- *              - [0.5]
- *              - record changes.
- *              - made the default_hard/soft entries.
- *      04/04/2001 [0.6]
- *              - minor correction to bit assignments in awacs_defs.h
- *              - incorporate mixer changes from 2.2.x back-port.
- *              - take out passthru as a rec input (it isn't).
- *              - make Input Gain slider work the 'right way up'.
- *              - try to make the mixer sliders more logical - so now the
- *                input selectors are just two-state (>50% == ON) and the
- *                Input Gain slider handles the rest of the gain issues.
- *              - try to pick slider representations that most closely match
- *                the actual use - e.g. IGain for input gain... 
- *              - first stab at over/under-run detection.
- *              - minor cosmetic changes to IRQ identification.
- *              - fix bug where rates > max would be reported as supported.
- *              - first stab at over/under-run detection.
- *              - make use of i2c for mixer settings conditional on perch
- *                rather than cuda (some machines without perch have cuda).
- *              - fix bug where TX stops when dbdma status comes up "DEAD"
- *                so far only reported on PowerComputing clones ... but.
- *              - put in AWACS/Screamer register write timeouts.
- *              - part way to partitioning the init() stuff
- *              - first pass at 'tumbler' stuff (not support - just an attempt
- *                to allow the driver to load on new G4s).
- *      01/02/2002 [0.7] - BenH
- *              - all sort of minor bits went in since the latest update, I
- *                bumped the version number for that reason
- *
- *      07/26/2002 [0.8] - BenH
- *              - More minor bits since last changelog (I should be more careful
- *                with those)
- *              - Support for snapper & better tumbler integration by Toby Sargeant
- *              - Headphone detect for scremer by Julien Blache
- *              - More tumbler fixed by Andreas Schwab
- *      11/29/2003 [0.8.1] - Renzo Davoli (King Enzo)
- *              - Support for Snapper line in
- *              - snapper input resampling (for rates < 44100)
- *              - software line gain control
- */
-
-/* GENERAL FIXME/TODO: check that the assumptions about what is written to
-   mac-io is valid for DACA & Tumbler.
-
-   This driver is in bad need of a rewrite. The dbdma code has to be split,
-   some proper device-tree parsing code has to be written, etc...
-*/
-
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/soundcard.h>
-#include <linux/adb.h>
-#include <linux/nvram.h>
-#include <linux/tty.h>
-#include <linux/vt_kern.h>
-#include <linux/spinlock.h>
-#include <linux/kmod.h>
-#include <linux/interrupt.h>
-#include <linux/input.h>
-#include <linux/mutex.h>
-#ifdef CONFIG_ADB_CUDA
-#include <linux/cuda.h>
-#endif
-#ifdef CONFIG_ADB_PMU
-#include <linux/pmu.h>
-#endif
-
-#include <asm/uaccess.h>
-#include <asm/prom.h>
-#include <asm/machdep.h>
-#include <asm/io.h>
-#include <asm/dbdma.h>
-#include <asm/pmac_feature.h>
-#include <asm/irq.h>
-#include <asm/nvram.h>
-
-#include "awacs_defs.h"
-#include "dmasound.h"
-#include "tas3001c.h"
-#include "tas3004.h"
-#include "tas_common.h"
-
-#define DMASOUND_AWACS_REVISION 0
-#define DMASOUND_AWACS_EDITION  7
-
-#define AWACS_SNAPPER   110     /* fake revision # for snapper */
-#define AWACS_BURGUNDY  100     /* fake revision # for burgundy */
-#define AWACS_TUMBLER    90     /* fake revision # for tumbler */
-#define AWACS_DACA       80     /* fake revision # for daca (ibook) */
-#define AWACS_AWACS       2     /* holding revision for AWACS */
-#define AWACS_SCREAMER    3     /* holding revision for Screamer */
-/*
- * Interrupt numbers and addresses, & info obtained from the device tree.
- */
-static int awacs_irq, awacs_tx_irq, awacs_rx_irq;
-static volatile struct awacs_regs __iomem *awacs;
-static volatile u32 __iomem *i2s;
-static volatile struct dbdma_regs __iomem *awacs_txdma, *awacs_rxdma;
-static int awacs_rate_index;
-static int awacs_subframe;
-static struct device_node* awacs_node;
-static struct device_node* i2s_node;
-static struct resource awacs_rsrc[3];
-
-static char awacs_name[64];
-static int awacs_revision;
-static int awacs_sleeping;
-static DEFINE_MUTEX(dmasound_mutex);
-
-static int sound_device_id;             /* exists after iMac revA */
-static int hw_can_byteswap = 1 ;        /* most pmac sound h/w can */
-
-/* model info */
-/* To be replaced with better interaction with pmac_feature.c */
-static int is_pbook_3X00;
-static int is_pbook_g3;
-
-/* expansion info */
-static int has_perch;
-static int has_ziva;
-
-/* for earlier powerbooks which need fiddling with mac-io to enable
- * cd etc.
-*/
-static unsigned char __iomem *latch_base;
-static unsigned char __iomem *macio_base;
-
-/*
- * Space for the DBDMA command blocks.
- */
-static void *awacs_tx_cmd_space;
-static volatile struct dbdma_cmd *awacs_tx_cmds;
-static int number_of_tx_cmd_buffers;
-
-static void *awacs_rx_cmd_space;
-static volatile struct dbdma_cmd *awacs_rx_cmds;
-static int number_of_rx_cmd_buffers;
-
-/*
- * Cached values of AWACS registers (we can't read them).
- * Except on the burgundy (and screamer). XXX
- */
-
-int awacs_reg[8];
-int awacs_reg1_save;
-
-/* tracking values for the mixer contents
-*/
-
-static int spk_vol;
-static int line_vol;
-static int passthru_vol;
-
-static int ip_gain;           /* mic preamp settings */
-static int rec_lev = 0x4545 ; /* default CD gain 69 % */
-static int mic_lev;
-static int cd_lev = 0x6363 ; /* 99 % */
-static int line_lev;
-
-static int hdp_connected;
-
-/*
- * Stuff for outputting a beep.  The values range from -327 to +327
- * so we can multiply by an amplitude in the range 0..100 to get a
- * signed short value to put in the output buffer.
- */
-static short beep_wform[256] = {
-        0,      40,     79,     117,    153,    187,    218,    245,
-        269,    288,    304,    316,    323,    327,    327,    324,
-        318,    310,    299,    288,    275,    262,    249,    236,
-        224,    213,    204,    196,    190,    186,    183,    182,
-        182,    183,    186,    189,    192,    196,    200,    203,
-        206,    208,    209,    209,    209,    207,    204,    201,
-        197,    193,    188,    183,    179,    174,    170,    166,
-        163,    161,    160,    159,    159,    160,    161,    162,
-        164,    166,    168,    169,    171,    171,    171,    170,
-        169,    167,    163,    159,    155,    150,    144,    139,
-        133,    128,    122,    117,    113,    110,    107,    105,
-        103,    103,    103,    103,    104,    104,    105,    105,
-        105,    103,    101,    97,     92,     86,     78,     68,
-        58,     45,     32,     18,     3,      -11,    -26,    -41,
-        -55,    -68,    -79,    -88,    -95,    -100,   -102,   -102,
-        -99,    -93,    -85,    -75,    -62,    -48,    -33,    -16,
-        0,      16,     33,     48,     62,     75,     85,     93,
-        99,     102,    102,    100,    95,     88,     79,     68,
-        55,     41,     26,     11,     -3,     -18,    -32,    -45,
-        -58,    -68,    -78,    -86,    -92,    -97,    -101,   -103,
-        -105,   -105,   -105,   -104,   -104,   -103,   -103,   -103,
-        -103,   -105,   -107,   -110,   -113,   -117,   -122,   -128,
-        -133,   -139,   -144,   -150,   -155,   -159,   -163,   -167,
-        -169,   -170,   -171,   -171,   -171,   -169,   -168,   -166,
-        -164,   -162,   -161,   -160,   -159,   -159,   -160,   -161,
-        -163,   -166,   -170,   -174,   -179,   -183,   -188,   -193,
-        -197,   -201,   -204,   -207,   -209,   -209,   -209,   -208,
-        -206,   -203,   -200,   -196,   -192,   -189,   -186,   -183,
-        -182,   -182,   -183,   -186,   -190,   -196,   -204,   -213,
-        -224,   -236,   -249,   -262,   -275,   -288,   -299,   -310,
-        -318,   -324,   -327,   -327,   -323,   -316,   -304,   -288,
-        -269,   -245,   -218,   -187,   -153,   -117,   -79,    -40,
-};
-
-/* beep support */
-#define BEEP_SRATE      22050   /* 22050 Hz sample rate */
-#define BEEP_BUFLEN     512
-#define BEEP_VOLUME     15      /* 0 - 100 */
-
-static int beep_vol = BEEP_VOLUME;
-static int beep_playing;
-static int awacs_beep_state;
-static short *beep_buf;
-static void *beep_dbdma_cmd_space;
-static volatile struct dbdma_cmd *beep_dbdma_cmd;
-
-/* Burgundy functions */
-static void awacs_burgundy_wcw(unsigned addr,unsigned newval);
-static unsigned awacs_burgundy_rcw(unsigned addr);
-static void awacs_burgundy_write_volume(unsigned address, int volume);
-static int awacs_burgundy_read_volume(unsigned address);
-static void awacs_burgundy_write_mvolume(unsigned address, int volume);
-static int awacs_burgundy_read_mvolume(unsigned address);
-
-/* we will allocate a single 'emergency' dbdma cmd block to use if the
-   tx status comes up "DEAD".  This happens on some PowerComputing Pmac
-   clones, either owing to a bug in dbdma or some interaction between
-   IDE and sound.  However, this measure would deal with DEAD status if
-   if appeared elsewhere.
-
-   for the sake of memory efficiency we'll allocate this cmd as part of
-   the beep cmd stuff.
-*/
-
-static volatile struct dbdma_cmd *emergency_dbdma_cmd;
-
-#ifdef CONFIG_PM
-/*
- * Stuff for restoring after a sleep.
- */
-static void awacs_sleep_notify(struct pmu_sleep_notifier *self, int when);
-struct pmu_sleep_notifier awacs_sleep_notifier = {
-        awacs_sleep_notify, SLEEP_LEVEL_SOUND,
-};
-#endif /* CONFIG_PM */
-
-/* for (soft) sample rate translations */
-int expand_bal;         /* Balance factor for expanding (not volume!) */
-int expand_read_bal;    /* Balance factor for expanding reads (not volume!) */
-
-/*** Low level stuff *********************************************************/
-
-static void *PMacAlloc(unsigned int size, gfp_t flags);
-static void PMacFree(void *ptr, unsigned int size);
-static int PMacIrqInit(void);
-#ifdef MODULE
-static void PMacIrqCleanup(void);
-#endif
-static void PMacSilence(void);
-static void PMacInit(void);
-static int PMacSetFormat(int format);
-static int PMacSetVolume(int volume);
-static void PMacPlay(void);
-static void PMacRecord(void);
-static irqreturn_t pmac_awacs_tx_intr(int irq, void *devid);
-static irqreturn_t pmac_awacs_rx_intr(int irq, void *devid);
-static irqreturn_t pmac_awacs_intr(int irq, void *devid);
-static void awacs_write(int val);
-static int awacs_get_volume(int reg, int lshift);
-static int awacs_volume_setter(int volume, int n, int mute, int lshift);
-
-
-/*** Mid level stuff **********************************************************/
-
-static int PMacMixerIoctl(u_int cmd, u_long arg);
-static int PMacWriteSqSetup(void);
-static int PMacReadSqSetup(void);
-static void PMacAbortRead(void);
-
-extern TRANS transAwacsNormal ;
-extern TRANS transAwacsExpand ;
-extern TRANS transAwacsNormalRead ;
-extern TRANS transAwacsExpandRead ;
-
-extern int daca_init(void);
-extern void daca_cleanup(void);
-extern int daca_set_volume(uint left_vol, uint right_vol);
-extern void daca_get_volume(uint * left_vol, uint  *right_vol);
-extern int daca_enter_sleep(void);
-extern int daca_leave_sleep(void);
-
-#define TRY_LOCK()      \
-        if ((rc = mutex_lock_interruptible(&dmasound_mutex)) != 0)      \
-                return rc;
-#define LOCK()          mutex_lock(&dmasound_mutex);
-
-#define UNLOCK()        mutex_unlock(&dmasound_mutex);
-
-/* We use different versions that the ones provided in dmasound.h
- * 
- * FIXME: Use different names ;)
- */
-#undef IOCTL_IN
-#undef IOCTL_OUT
-
-#define IOCTL_IN(arg, ret)      \
-        rc = get_user(ret, (int __user *)(arg)); \
-        if (rc) break;
-#define IOCTL_OUT(arg, ret)     \
-        ioctl_return2((int __user *)(arg), ret)
-
-static inline int ioctl_return2(int __user *addr, int value)
-{
-        return value < 0 ? value : put_user(value, addr);
-}
-
-
-/*** AE - TUMBLER / SNAPPER START ************************************************/
-
-
-int gpio_audio_reset, gpio_audio_reset_pol;
-int gpio_amp_mute, gpio_amp_mute_pol;
-int gpio_headphone_mute, gpio_headphone_mute_pol;
-int gpio_headphone_detect, gpio_headphone_detect_pol;
-int gpio_headphone_irq;
-
-int
-setup_audio_gpio(const char *name, const char* compatible, int *gpio_addr, int* gpio_pol)
-{
-        struct device_node *gpiop;
-        struct device_node *np;
-        const u32* pp;
-        int ret = -ENODEV;
-
-        gpiop = of_find_node_by_name(NULL, "gpio");
-        if (!gpiop)
-                goto done;
-
-        np = of_get_next_child(gpiop, NULL);
-        while(np != 0) {
-                if (name) {
-                        const char *property =
-                                of_get_property(np,"audio-gpio",NULL);
-                        if (property != 0 && strcmp(property,name) == 0)
-                                break;
-                } else if (compatible && of_device_is_compatible(np, compatible))
-                        break;
-                np = of_get_next_child(gpiop, np);
-        }
-        if (!np)
-                goto done;
-        pp = of_get_property(np, "AAPL,address", NULL);
-        if (!pp)
-                goto done;
-        *gpio_addr = (*pp) & 0x0000ffff;
-        pp = of_get_property(np, "audio-gpio-active-state", NULL);
-        if (pp)
-                *gpio_pol = *pp;
-        else
-                *gpio_pol = 1;
-        ret = irq_of_parse_and_map(np, 0);
-done:
-        of_node_put(np);
-        of_node_put(gpiop);
-        return ret;
-}
-
-static inline void
-write_audio_gpio(int gpio_addr, int data)
-{
-        if (!gpio_addr)
-                return;
-        pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, gpio_addr, data ? 0x05 : 0x04);
-}
-
-static inline int
-read_audio_gpio(int gpio_addr)
-{
-        if (!gpio_addr)
-                return 0;
-        return ((pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, gpio_addr, 0) & 0x02) !=0);
-}
-
-/*
- * Headphone interrupt via GPIO (Tumbler, Snapper, DACA)
- */
-static irqreturn_t
-headphone_intr(int irq, void *devid)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&dmasound.lock, flags);
-        if (read_audio_gpio(gpio_headphone_detect) == gpio_headphone_detect_pol) {
-                printk(KERN_INFO "Audio jack plugged, muting speakers.\n");
-                write_audio_gpio(gpio_headphone_mute, !gpio_headphone_mute_pol);
-                write_audio_gpio(gpio_amp_mute, gpio_amp_mute_pol);
-                tas_output_device_change(sound_device_id,TAS_OUTPUT_HEADPHONES,0);
-        } else {
-                printk(KERN_INFO "Audio jack unplugged, enabling speakers.\n");
-                write_audio_gpio(gpio_amp_mute, !gpio_amp_mute_pol);
-                write_audio_gpio(gpio_headphone_mute, gpio_headphone_mute_pol);
-                tas_output_device_change(sound_device_id,TAS_OUTPUT_INTERNAL_SPKR,0);
-        }
-        spin_unlock_irqrestore(&dmasound.lock, flags);
-        return IRQ_HANDLED;
-}
-
-
-/* Initialize tumbler */
-
-static int
-tas_dmasound_init(void)
-{
-        setup_audio_gpio(
-                "audio-hw-reset",
-                NULL,
-                &gpio_audio_reset,
-                &gpio_audio_reset_pol);
-        setup_audio_gpio(
-                "amp-mute",
-                NULL,
-                &gpio_amp_mute,
-                &gpio_amp_mute_pol);
-        setup_audio_gpio("headphone-mute",
-                NULL,
-                &gpio_headphone_mute,
-                &gpio_headphone_mute_pol);
-        gpio_headphone_irq = setup_audio_gpio(
-                "headphone-detect",
-                NULL,
-                &gpio_headphone_detect,
-                &gpio_headphone_detect_pol);
-        /* Fix some broken OF entries in desktop machines */
-        if (!gpio_headphone_irq)
-                gpio_headphone_irq = setup_audio_gpio(
-                        NULL,
-                        "keywest-gpio15",
-                        &gpio_headphone_detect,
-                        &gpio_headphone_detect_pol);
-
-        write_audio_gpio(gpio_audio_reset, gpio_audio_reset_pol);
-        msleep(100);
-        write_audio_gpio(gpio_audio_reset, !gpio_audio_reset_pol);
-        msleep(100);
-        if (gpio_headphone_irq) {
-                if (request_irq(gpio_headphone_irq,headphone_intr,0,"Headphone detect",NULL) < 0) {
-                        printk(KERN_ERR "tumbler: Can't request headphone interrupt\n");
-                        gpio_headphone_irq = 0;
-                } else {
-                        u8 val;
-                        /* Activate headphone status interrupts */
-                        val = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, gpio_headphone_detect, 0);
-                        pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, gpio_headphone_detect, val | 0x80);
-                        /* Trigger it */
-                        headphone_intr(0, NULL);
-                }
-        }
-        if (!gpio_headphone_irq) {
-                /* Some machine enter this case ? */
-                printk(KERN_WARNING "tumbler: Headphone detect IRQ not found, enabling all outputs !\n");
-                write_audio_gpio(gpio_amp_mute, !gpio_amp_mute_pol);
-                write_audio_gpio(gpio_headphone_mute, !gpio_headphone_mute_pol);
-        }
-        return 0;
-}
-
-
-static int
-tas_dmasound_cleanup(void)
-{
-        if (gpio_headphone_irq)
-                free_irq(gpio_headphone_irq, NULL);
-        return 0;
-}
-
-/* We don't support 48k yet */
-static int tas_freqs[1] = { 44100 } ;
-static int tas_freqs_ok[1] = { 1 } ;
-
-/* don't know what to do really - just have to leave it where
- * OF left things
-*/
-
-static int
-tas_set_frame_rate(void)
-{
-        if (i2s) {
-                out_le32(i2s + (I2S_REG_SERIAL_FORMAT >> 2), 0x41190000);
-                out_le32(i2s + (I2S_REG_DATAWORD_SIZES >> 2), 0x02000200);
-        }
-        dmasound.hard.speed = 44100 ;
-        awacs_rate_index = 0 ;
-        return 44100 ;
-}
-
-static int
-tas_mixer_ioctl(u_int cmd, u_long arg)
-{
-        int __user *argp = (int __user *)arg;
-        int data;
-        int rc;
-
-        rc=tas_device_ioctl(cmd, arg);
-        if (rc != -EINVAL) {
-                return rc;
-        }
-
-        if ((cmd & ~0xff) == MIXER_WRITE(0) &&
-            tas_supported_mixers() & (1<<(cmd & 0xff))) {
-                rc = get_user(data, argp);
-                if (rc<0) return rc;
-                tas_set_mixer_level(cmd & 0xff, data);
-                tas_get_mixer_level(cmd & 0xff, &data);
-                return ioctl_return2(argp, data);
-        }
-        if ((cmd & ~0xff) == MIXER_READ(0) &&
-            tas_supported_mixers() & (1<<(cmd & 0xff))) {
-                tas_get_mixer_level(cmd & 0xff, &data);
-                return ioctl_return2(argp, data);
-        }
-
-        switch(cmd) {
-        case SOUND_MIXER_READ_DEVMASK:
-                data = tas_supported_mixers() | SOUND_MASK_SPEAKER;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_STEREODEVS:
-                data = tas_stereo_mixers();
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_CAPS:
-                rc = IOCTL_OUT(arg, 0);
-                break;
-        case SOUND_MIXER_READ_RECMASK:
-                // XXX FIXME: find a way to check what is really available */
-                data = SOUND_MASK_LINE | SOUND_MASK_MIC;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_RECSRC:
-                if (awacs_reg[0] & MASK_MUX_AUDIN)
-                        data |= SOUND_MASK_LINE;
-                if (awacs_reg[0] & MASK_MUX_MIC)
-                        data |= SOUND_MASK_MIC;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_WRITE_RECSRC:
-                IOCTL_IN(arg, data);
-                data =0;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_WRITE_SPEAKER: /* really bell volume */
-                IOCTL_IN(arg, data);
-                beep_vol = data & 0xff;
-                /* fall through */
-        case SOUND_MIXER_READ_SPEAKER:
-                rc = IOCTL_OUT(arg, (beep_vol<<8) | beep_vol);
-                break;
-        case SOUND_MIXER_OUTMASK:
-        case SOUND_MIXER_OUTSRC:
-        default:
-                rc = -EINVAL;
-        }
-
-        return rc;
-}
-
-static void __init
-tas_init_frame_rates(const unsigned int *prop, unsigned int l)
-{
-        int i ;
-        if (prop) {
-                for (i=0; i<1; i++)
-                        tas_freqs_ok[i] = 0;
-                for (l /= sizeof(int); l > 0; --l) {
-                        unsigned int r = *prop++;
-                        /* Apple 'Fixed' format */
-                        if (r >= 0x10000)
-                                r >>= 16;
-                        for (i = 0; i < 1; ++i) {
-                                if (r == tas_freqs[i]) {
-                                        tas_freqs_ok[i] = 1;
-                                        break;
-                                }
-                        }
-                }
-        }
-        /* else we assume that all the rates are available */
-}
-
-
-/*** AE - TUMBLER / SNAPPER END ************************************************/
-
-
-
-/*** Low level stuff *********************************************************/
-
-/*
- * PCI PowerMac, with AWACS, Screamer, Burgundy, DACA or Tumbler and DBDMA.
- */
-static void *PMacAlloc(unsigned int size, gfp_t flags)
-{
-        return kmalloc(size, flags);
-}
-
-static void PMacFree(void *ptr, unsigned int size)
-{
-        kfree(ptr);
-}
-
-static int __init PMacIrqInit(void)
-{
-        if (awacs)
-                if (request_irq(awacs_irq, pmac_awacs_intr, 0, "Built-in Sound misc", NULL))
-                        return 0;
-        if (request_irq(awacs_tx_irq, pmac_awacs_tx_intr, 0, "Built-in Sound out", NULL)
-            || request_irq(awacs_rx_irq, pmac_awacs_rx_intr, 0, "Built-in Sound in", NULL))
-                return 0;
-        return 1;
-}
-
-#ifdef MODULE
-static void PMacIrqCleanup(void)
-{
-        /* turn off input & output dma */
-        DBDMA_DO_STOP(awacs_txdma);
-        DBDMA_DO_STOP(awacs_rxdma);
-
-        if (awacs)
-                /* disable interrupts from awacs interface */
-                out_le32(&awacs->control, in_le32(&awacs->control) & 0xfff);
-        
-        /* Switch off the sound clock */
-        pmac_call_feature(PMAC_FTR_SOUND_CHIP_ENABLE, awacs_node, 0, 0);
-        /* Make sure proper bits are set on pismo & tipb */
-        if ((machine_is_compatible("PowerBook3,1") ||
-            machine_is_compatible("PowerBook3,2")) && awacs) {
-                awacs_reg[1] |= MASK_PAROUT0 | MASK_PAROUT1;
-                awacs_write(MASK_ADDR1 | awacs_reg[1]);
-                msleep(200);
-        }
-        if (awacs)
-                free_irq(awacs_irq, NULL);
-        free_irq(awacs_tx_irq, NULL);
-        free_irq(awacs_rx_irq, NULL);
-        
-        if (awacs)
-                iounmap(awacs);
-        if (i2s)
-                iounmap(i2s);
-        iounmap(awacs_txdma);
-        iounmap(awacs_rxdma);
-
-        release_mem_region(awacs_rsrc[0].start,
-                           awacs_rsrc[0].end - awacs_rsrc[0].start + 1);
-        release_mem_region(awacs_rsrc[1].start,
-                           awacs_rsrc[1].end - awacs_rsrc[1].start + 1);
-        release_mem_region(awacs_rsrc[2].start,
-                           awacs_rsrc[2].end - awacs_rsrc[2].start + 1);
-
-        kfree(awacs_tx_cmd_space);
-        kfree(awacs_rx_cmd_space);
-        kfree(beep_dbdma_cmd_space);
-        kfree(beep_buf);
-#ifdef CONFIG_PM
-        pmu_unregister_sleep_notifier(&awacs_sleep_notifier);
-#endif
-}
-#endif /* MODULE */
-
-static void PMacSilence(void)
-{
-        /* turn off output dma */
-        DBDMA_DO_STOP(awacs_txdma);
-}
-
-/* don't know what to do really - just have to leave it where
- * OF left things
-*/
-
-static int daca_set_frame_rate(void)
-{
-        if (i2s) {
-                out_le32(i2s + (I2S_REG_SERIAL_FORMAT >> 2), 0x41190000);
-                out_le32(i2s + (I2S_REG_DATAWORD_SIZES >> 2), 0x02000200);
-        }
-        dmasound.hard.speed = 44100 ;
-        awacs_rate_index = 0 ;
-        return 44100 ;
-}
-
-static int awacs_freqs[8] = {
-        44100, 29400, 22050, 17640, 14700, 11025, 8820, 7350
-};
-static int awacs_freqs_ok[8] = { 1, 1, 1, 1, 1, 1, 1, 1 };
-
-static int
-awacs_set_frame_rate(int desired, int catch_r)
-{
-        int tolerance, i = 8 ;
-        /*
-         * If we have a sample rate which is within catchRadius percent
-         * of the requested value, we don't have to expand the samples.
-         * Otherwise choose the next higher rate.
-         * N.B.: burgundy awacs only works at 44100 Hz.
-         */
-        do {
-                tolerance = catch_r * awacs_freqs[--i] / 100;
-                if (awacs_freqs_ok[i]
-                    && dmasound.soft.speed <= awacs_freqs[i] + tolerance)
-                        break;
-        } while (i > 0);
-        dmasound.hard.speed = awacs_freqs[i];
-        awacs_rate_index = i;
-
-        out_le32(&awacs->control, MASK_IEPC | (i << 8) | 0x11 );
-        awacs_reg[1] = (awacs_reg[1] & ~MASK_SAMPLERATE) | (i << 3);
-        awacs_write(awacs_reg[1] | MASK_ADDR1);
-        return dmasound.hard.speed;
-}
-
-static int
-burgundy_set_frame_rate(void)
-{
-        awacs_rate_index = 0 ;
-        awacs_reg[1] = (awacs_reg[1] & ~MASK_SAMPLERATE) ;
-        /* XXX disable error interrupt on burgundy for now */
-        out_le32(&awacs->control, MASK_IEPC | 0 | 0x11 | MASK_IEE);
-        return 44100 ;
-}
-
-static int
-set_frame_rate(int desired, int catch_r)
-{
-        switch (awacs_revision) {
-                case AWACS_BURGUNDY:
-                        dmasound.hard.speed = burgundy_set_frame_rate();
-                        break ;
-                case AWACS_TUMBLER:
-                case AWACS_SNAPPER:
-                        dmasound.hard.speed = tas_set_frame_rate();
-                        break ;
-                case AWACS_DACA:
-                        dmasound.hard.speed =
-                          daca_set_frame_rate();
-                        break ;
-                default:
-                        dmasound.hard.speed = awacs_set_frame_rate(desired,
-                                                catch_r);
-                        break ;
-        }
-        return dmasound.hard.speed ;
-}
-
-static void
-awacs_recalibrate(void)
-{
-        /* Sorry for the horrible delays... I hope to get that improved
-         * by making the whole PM process asynchronous in a future version
-         */
-        msleep(750);
-        awacs_reg[1] |= MASK_CMUTE | MASK_AMUTE;
-        awacs_write(awacs_reg[1] | MASK_RECALIBRATE | MASK_ADDR1);
-        msleep(1000);
-        awacs_write(awacs_reg[1] | MASK_ADDR1);
-}
-
-static void PMacInit(void)
-{
-        int tolerance;
-
-        switch (dmasound.soft.format) {
-            case AFMT_S16_LE:
-            case AFMT_U16_LE:
-                if (hw_can_byteswap)
-                        dmasound.hard.format = AFMT_S16_LE;
-                else
-                        dmasound.hard.format = AFMT_S16_BE;
-                break;
-        default:
-                dmasound.hard.format = AFMT_S16_BE;
-                break;
-        }
-        dmasound.hard.stereo = 1;
-        dmasound.hard.size = 16;
-
-        /* set dmasound.hard.speed - on the basis of what we want (soft)
-         * and the tolerance we'll allow.
-        */
-        set_frame_rate(dmasound.soft.speed, catchRadius) ;
-
-        tolerance = (catchRadius * dmasound.hard.speed) / 100;
-        if (dmasound.soft.speed >= dmasound.hard.speed - tolerance) {
-                dmasound.trans_write = &transAwacsNormal;
-                dmasound.trans_read = &transAwacsNormalRead;
-        } else {
-                dmasound.trans_write = &transAwacsExpand;
-                dmasound.trans_read = &transAwacsExpandRead;
-        }
-
-        if (awacs) {
-                if (hw_can_byteswap && (dmasound.hard.format == AFMT_S16_LE))
-                        out_le32(&awacs->byteswap, BS_VAL);
-                else
-                        out_le32(&awacs->byteswap, 0);
-        }
-        
-        expand_bal = -dmasound.soft.speed;
-        expand_read_bal = -dmasound.soft.speed;
-}
-
-static int PMacSetFormat(int format)
-{
-        int size;
-        int req_format = format;
-                
-        switch (format) {
-        case AFMT_QUERY:
-                return dmasound.soft.format;
-        case AFMT_MU_LAW:
-        case AFMT_A_LAW:
-        case AFMT_U8:
-        case AFMT_S8:
-                size = 8;
-                break;
-        case AFMT_S16_LE:
-                if(!hw_can_byteswap)
-                        format = AFMT_S16_BE;
-        case AFMT_S16_BE:
-                size = 16;
-                break;
-        case AFMT_U16_LE:
-                if(!hw_can_byteswap)
-                        format = AFMT_U16_BE;
-        case AFMT_U16_BE:
-                size = 16;
-                break;
-        default: /* :-) */
-                printk(KERN_ERR "dmasound: unknown format 0x%x, using AFMT_U8\n",
-                       format);
-                size = 8;
-                format = AFMT_U8;
-        }
-        
-        if (req_format == format) {
-                dmasound.soft.format = format;
-                dmasound.soft.size = size;
-                if (dmasound.minDev == SND_DEV_DSP) {
-                        dmasound.dsp.format = format;
-                        dmasound.dsp.size = size;
-                }
-        }
-
-        return format;
-}
-
-#define AWACS_VOLUME_TO_MASK(x) (15 - ((((x) - 1) * 15) / 99))
-#define AWACS_MASK_TO_VOLUME(y) (100 - ((y) * 99 / 15))
-
-static int awacs_get_volume(int reg, int lshift)
-{
-        int volume;
-
-        volume = AWACS_MASK_TO_VOLUME((reg >> lshift) & 0xf);
-        volume |= AWACS_MASK_TO_VOLUME(reg & 0xf) << 8;
-        return volume;
-}
-
-static int awacs_volume_setter(int volume, int n, int mute, int lshift)
-{
-        int r1, rn;
-
-        if (mute && volume == 0) {
-                r1 = awacs_reg[1] | mute;
-        } else {
-                r1 = awacs_reg[1] & ~mute;
-                rn = awacs_reg[n] & ~(0xf | (0xf << lshift));
-                rn |= ((AWACS_VOLUME_TO_MASK(volume & 0xff) & 0xf) << lshift);
-                rn |= AWACS_VOLUME_TO_MASK((volume >> 8) & 0xff) & 0xf;
-                awacs_reg[n] = rn;
-                awacs_write((n << 12) | rn);
-                volume = awacs_get_volume(rn, lshift);
-        }
-        if (r1 != awacs_reg[1]) {
-                awacs_reg[1] = r1;
-                awacs_write(r1 | MASK_ADDR1);
-        }
-        return volume;
-}
-
-static int PMacSetVolume(int volume)
-{
-        printk(KERN_WARNING "Bogus call to PMacSetVolume !\n");
-        return 0;
-}
-
-static void awacs_setup_for_beep(int speed)
-{
-        out_le32(&awacs->control,
-                 (in_le32(&awacs->control) & ~0x1f00)
-                 | ((speed > 0 ? speed : awacs_rate_index) << 8));
-
-        if (hw_can_byteswap && (dmasound.hard.format == AFMT_S16_LE) && speed == -1)
-                out_le32(&awacs->byteswap, BS_VAL);
-        else
-                out_le32(&awacs->byteswap, 0);
-}
-
-/* CHECK: how much of this *really* needs IRQs masked? */
-static void __PMacPlay(void)
-{
-        volatile struct dbdma_cmd *cp;
-        int next_frg, count;
-
-        count = 300 ; /* > two cycles at the lowest sample rate */
-
-        /* what we want to send next */
-        next_frg = (write_sq.front + write_sq.active) % write_sq.max_count;
-
-        if (awacs_beep_state) {
-                /* sound takes precedence over beeps */
-                /* stop the dma channel */
-                out_le32(&awacs_txdma->control, (RUN|PAUSE|FLUSH|WAKE) << 16);
-                while ( (in_le32(&awacs_txdma->status) & RUN) && count--)
-                        udelay(1);
-                if (awacs)
-                        awacs_setup_for_beep(-1);
-                out_le32(&awacs_txdma->cmdptr,
-                         virt_to_bus(&(awacs_tx_cmds[next_frg])));
-
-                beep_playing = 0;
-                awacs_beep_state = 0;
-        }
-        /* this won't allow more than two frags to be in the output queue at
-           once. (or one, if the max frags is 2 - because count can't exceed
-           2 in that case)
-        */
-        while (write_sq.active < 2 && write_sq.active < write_sq.count) {
-                count = (write_sq.count == write_sq.active + 1) ?
-                                write_sq.rear_size:write_sq.block_size ;
-                if (count < write_sq.block_size) {
-                        if (!write_sq.syncing) /* last block not yet filled,*/
-                                break;  /* and we're not syncing or POST-ed */
-                        else {
-                                /* pretend the block is full to force a new
-                                   block to be started on the next write */
-                                write_sq.rear_size = write_sq.block_size ;
-                                write_sq.syncing &= ~2 ; /* clear POST */
-                        }
-                }
-                cp = &awacs_tx_cmds[next_frg];
-                st_le16(&cp->req_count, count);
-                st_le16(&cp->xfer_status, 0);
-                st_le16(&cp->command, OUTPUT_MORE + INTR_ALWAYS);
-                /* put a STOP at the end of the queue - but only if we have
-                   space for it.  This means that, if we under-run and we only
-                   have two fragments, we might re-play sound from an existing
-                   queued frag.  I guess the solution to that is not to set two
-                   frags if you are likely to under-run...
-                */
-                if (write_sq.count < write_sq.max_count) {
-                        if (++next_frg >= write_sq.max_count)
-                                next_frg = 0 ; /* wrap */
-                        /* if we get here then we've underrun so we will stop*/
-                        st_le16(&awacs_tx_cmds[next_frg].command, DBDMA_STOP);
-                }
-                /* set the dbdma controller going, if it is not already */
-                if (write_sq.active == 0)
-                        out_le32(&awacs_txdma->cmdptr, virt_to_bus(cp));
-                (void)in_le32(&awacs_txdma->status);
-                out_le32(&awacs_txdma->control, ((RUN|WAKE) << 16) + (RUN|WAKE));
-                ++write_sq.active;
-        }
-}
-
-static void PMacPlay(void)
-{
-        LOCK();
-        if (!awacs_sleeping) {
-                unsigned long flags;
-
-                spin_lock_irqsave(&dmasound.lock, flags);
-                __PMacPlay();
-                spin_unlock_irqrestore(&dmasound.lock, flags);
-        }
-        UNLOCK();
-}
-
-static void PMacRecord(void)
-{
-        unsigned long flags;
-
-        if (read_sq.active)
-                return;
-
-        spin_lock_irqsave(&dmasound.lock, flags);
-
-        /* This is all we have to do......Just start it up.
-        */
-        out_le32(&awacs_rxdma->control, ((RUN|WAKE) << 16) + (RUN|WAKE));
-        read_sq.active = 1;
-
-        spin_unlock_irqrestore(&dmasound.lock, flags);
-}
-
-/* if the TX status comes up "DEAD" - reported on some Power Computing machines
-   we need to re-start the dbdma - but from a different physical start address
-   and with a different transfer length.  It would get very messy to do this
-   with the normal dbdma_cmd blocks - we would have to re-write the buffer start
-   addresses each time.  So, we will keep a single dbdma_cmd block which can be
-   fiddled with.
-   When DEAD status is first reported the content of the faulted dbdma block is
-   copied into the emergency buffer and we note that the buffer is in use.
-   we then bump the start physical address by the amount that was successfully
-   output before it died.
-   On any subsequent DEAD result we just do the bump-ups (we know that we are
-   already using the emergency dbdma_cmd).
-   CHECK: this just tries to "do it".  It is possible that we should abandon
-   xfers when the number of residual bytes gets below a certain value - I can
-   see that this might cause a loop-forever if too small a transfer causes
-   DEAD status.  However this is a TODO for now - we'll see what gets reported.
-   When we get a successful transfer result with the emergency buffer we just
-   pretend that it completed using the original dmdma_cmd and carry on.  The
-   'next_cmd' field will already point back to the original loop of blocks.
-*/
-
-static irqreturn_t
-pmac_awacs_tx_intr(int irq, void *devid)
-{
-        int i = write_sq.front;
-        int stat;
-        int i_nowrap = write_sq.front;
-        volatile struct dbdma_cmd *cp;
-        /* != 0 when we are dealing with a DEAD xfer */
-        static int emergency_in_use;
-
-        spin_lock(&dmasound.lock);
-        while (write_sq.active > 0) { /* we expect to have done something*/
-                if (emergency_in_use) /* we are dealing with DEAD xfer */
-                        cp = emergency_dbdma_cmd ;
-                else
-                        cp = &awacs_tx_cmds[i];
-                stat = ld_le16(&cp->xfer_status);
-                if (stat & DEAD) {
-                        unsigned short req, res ;
-                        unsigned int phy ;
-#ifdef DEBUG_DMASOUND
-printk("dmasound_pmac: tx-irq: xfer died - patching it up...\n") ;
-#endif
-                        /* to clear DEAD status we must first clear RUN
-                           set it to quiescent to be on the safe side */
-                        (void)in_le32(&awacs_txdma->status);
-                        out_le32(&awacs_txdma->control,
-                                (RUN|PAUSE|FLUSH|WAKE) << 16);
-                        write_sq.died++ ;
-                        if (!emergency_in_use) { /* new problem */
-                                memcpy((void *)emergency_dbdma_cmd, (void *)cp,
-                                        sizeof(struct dbdma_cmd));
-                                emergency_in_use = 1;
-                                cp = emergency_dbdma_cmd;
-                        }
-                        /* now bump the values to reflect the amount
-                           we haven't yet shifted */
-                        req = ld_le16(&cp->req_count);
-                        res = ld_le16(&cp->res_count);
-                        phy = ld_le32(&cp->phy_addr);
-                        phy += (req - res);
-                        st_le16(&cp->req_count, res);
-                        st_le16(&cp->res_count, 0);
-                        st_le16(&cp->xfer_status, 0);
-                        st_le32(&cp->phy_addr, phy);
-                        st_le32(&cp->cmd_dep, virt_to_bus(&awacs_tx_cmds[(i+1)%write_sq.max_count]));
-                        st_le16(&cp->command, OUTPUT_MORE | BR_ALWAYS | INTR_ALWAYS);
-                        
-                        /* point at our patched up command block */
-                        out_le32(&awacs_txdma->cmdptr, virt_to_bus(cp));
-                        /* we must re-start the controller */
-                        (void)in_le32(&awacs_txdma->status);
-                        /* should complete clearing the DEAD status */
-                        out_le32(&awacs_txdma->control,
-                                ((RUN|WAKE) << 16) + (RUN|WAKE));
-                        break; /* this block is still going */
-                }
-                if ((stat & ACTIVE) == 0)
-                        break;  /* this frame is still going */
-                if (emergency_in_use)
-                        emergency_in_use = 0 ; /* done that */
-                --write_sq.count;
-                --write_sq.active;
-                i_nowrap++;
-                if (++i >= write_sq.max_count)
-                        i = 0;
-        }
-
-        /* if we stopped and we were not sync-ing - then we under-ran */
-        if( write_sq.syncing == 0 ){
-                stat = in_le32(&awacs_txdma->status) ;
-                /* we hit the dbdma_stop */
-                if( (stat & ACTIVE) == 0 ) write_sq.xruns++ ;
-        }
-
-        /* if we used some data up then wake the writer to supply some more*/
-        if (i_nowrap != write_sq.front)
-                WAKE_UP(write_sq.action_queue);
-        write_sq.front = i;
-
-        /* but make sure we funnel what we've already got */\
-         if (!awacs_sleeping)
-                __PMacPlay();
-
-        /* make the wake-on-empty conditional on syncing */
-        if (!write_sq.active && (write_sq.syncing & 1))
-                WAKE_UP(write_sq.sync_queue); /* any time we're empty */
-        spin_unlock(&dmasound.lock);
-        return IRQ_HANDLED;
-}
-
-
-static irqreturn_t
-pmac_awacs_rx_intr(int irq, void *devid)
-{
-        int stat ;
-        /* For some reason on my PowerBook G3, I get one interrupt
-         * when the interrupt vector is installed (like something is
-         * pending).  This happens before the dbdma is initialized by
-         * us, so I just check the command pointer and if it is zero,
-         * just blow it off.
-         */
-        if (in_le32(&awacs_rxdma->cmdptr) == 0)
-                return IRQ_HANDLED;
-
-        /* We also want to blow 'em off when shutting down.
-        */
-        if (read_sq.active == 0)
-                return IRQ_HANDLED;
-
-        spin_lock(&dmasound.lock);
-        /* Check multiple buffers in case we were held off from
-         * interrupt processing for a long time.  Geeze, I really hope
-         * this doesn't happen.
-         */
-        while ((stat=awacs_rx_cmds[read_sq.rear].xfer_status)) {
-
-                /* if we got a "DEAD" status then just log it for now.
-                   and try to restart dma.
-                   TODO: figure out how best to fix it up
-                */
-                if (stat & DEAD){
-#ifdef DEBUG_DMASOUND
-printk("dmasound_pmac: rx-irq: DIED - attempting resurection\n");
-#endif
-                        /* to clear DEAD status we must first clear RUN
-                           set it to quiescent to be on the safe side */
-                        (void)in_le32(&awacs_txdma->status);
-                        out_le32(&awacs_txdma->control,
-                                (RUN|PAUSE|FLUSH|WAKE) << 16);
-                        awacs_rx_cmds[read_sq.rear].xfer_status = 0;
-                        awacs_rx_cmds[read_sq.rear].res_count = 0;
-                        read_sq.died++ ;
-                        (void)in_le32(&awacs_txdma->status);
-                        /* re-start the same block */
-                        out_le32(&awacs_rxdma->cmdptr,
-                                virt_to_bus(&awacs_rx_cmds[read_sq.rear]));
-                        /* we must re-start the controller */
-                        (void)in_le32(&awacs_rxdma->status);
-                        /* should complete clearing the DEAD status */
-                        out_le32(&awacs_rxdma->control,
-                                ((RUN|WAKE) << 16) + (RUN|WAKE));
-                        spin_unlock(&dmasound.lock);
-                        return IRQ_HANDLED; /* try this block again */
-                }
-                /* Clear status and move on to next buffer.
-                */
-                awacs_rx_cmds[read_sq.rear].xfer_status = 0;
-                read_sq.rear++;
-
-                /* Wrap the buffer ring.
-                */
-                if (read_sq.rear >= read_sq.max_active)
-                        read_sq.rear = 0;
-
-                /* If we have caught up to the front buffer, bump it.
-                 * This will cause weird (but not fatal) results if the
-                 * read loop is currently using this buffer.  The user is
-                 * behind in this case anyway, so weird things are going
-                 * to happen.
-                 */
-                if (read_sq.rear == read_sq.front) {
-                        read_sq.front++;
-                        read_sq.xruns++ ; /* we overan */
-                        if (read_sq.front >= read_sq.max_active)
-                                read_sq.front = 0;
-                }
-        }
-
-        WAKE_UP(read_sq.action_queue);
-        spin_unlock(&dmasound.lock);
-        return IRQ_HANDLED;
-}
-
-
-static irqreturn_t
-pmac_awacs_intr(int irq, void *devid)
-{
-        int ctrl;
-        int status;
-        int r1;
-
-        spin_lock(&dmasound.lock);
-        ctrl = in_le32(&awacs->control);
-        status = in_le32(&awacs->codec_stat);
-
-        if (ctrl & MASK_PORTCHG) {
-                /* tested on Screamer, should work on others too */
-                if (awacs_revision == AWACS_SCREAMER) {
-                        if (((status & MASK_HDPCONN) >> 3) && (hdp_connected == 0)) {
-                                hdp_connected = 1;
-                                
-                                r1 = awacs_reg[1] | MASK_SPKMUTE;
-                                awacs_reg[1] = r1;
-                                awacs_write(r1 | MASK_ADDR_MUTE);
-                        } else if (((status & MASK_HDPCONN) >> 3 == 0) && (hdp_connected == 1)) {
-                                hdp_connected = 0;
-                                
-                                r1 = awacs_reg[1] & ~MASK_SPKMUTE;
-                                awacs_reg[1] = r1;
-                                awacs_write(r1 | MASK_ADDR_MUTE);
-                        }
-                }
-        }
-        if (ctrl & MASK_CNTLERR) {
-                int err = (in_le32(&awacs->codec_stat) & MASK_ERRCODE) >> 16;
-                /* CHECK: we just swallow burgundy errors at the moment..*/
-                if (err != 0 && awacs_revision != AWACS_BURGUNDY)
-                        printk(KERN_ERR "dmasound_pmac: error %x\n", err);
-        }
-        /* Writing 1s to the CNTLERR and PORTCHG bits clears them... */
-        out_le32(&awacs->control, ctrl);
-        spin_unlock(&dmasound.lock);
-        return IRQ_HANDLED;
-}
-
-static void
-awacs_write(int val)
-{
-        int count = 300 ;
-        if (awacs_revision >= AWACS_DACA || !awacs)
-                return ;
-
-        while ((in_le32(&awacs->codec_ctrl) & MASK_NEWECMD) && count--)
-                udelay(1) ;     /* timeout is > 2 samples at lowest rate */
-        out_le32(&awacs->codec_ctrl, val | (awacs_subframe << 22));
-        (void)in_le32(&awacs->byteswap);
-}
-
-/* this is called when the beep timer expires... it will be called even
-   if the beep has been overidden by other sound output.
-*/
-static void awacs_nosound(unsigned long xx)
-{
-        unsigned long flags;
-        int count = 600 ; /* > four samples at lowest rate */
-
-        spin_lock_irqsave(&dmasound.lock, flags);
-        if (beep_playing) {
-                st_le16(&beep_dbdma_cmd->command, DBDMA_STOP);
-                out_le32(&awacs_txdma->control, (RUN|PAUSE|FLUSH|WAKE) << 16);
-                while ((in_le32(&awacs_txdma->status) & RUN) && count--)
-                        udelay(1);
-                if (awacs)
-                        awacs_setup_for_beep(-1);
-                beep_playing = 0;
-        }
-        spin_unlock_irqrestore(&dmasound.lock, flags);
-}
-
-/*
- * We generate the beep with a single dbdma command that loops a buffer
- * forever - without generating interrupts.
- *
- * So, to stop it you have to stop dma output as per awacs_nosound.
- */
-static int awacs_beep_event(struct input_dev *dev, unsigned int type,
-                unsigned int code, int hz)
-{
-        unsigned long flags;
-        int beep_speed = 0;
-        int srate;
-        int period, ncycles, nsamples;
-        int i, j, f;
-        short *p;
-        static int beep_hz_cache;
-        static int beep_nsamples_cache;
-        static int beep_volume_cache;
-
-        if (type != EV_SND)
-                return -1;
-        switch (code) {
-        case SND_BELL:
-                if (hz)
-                        hz = 1000;
-                break;
-        case SND_TONE:
-                break;
-        default:
-                return -1;
-        }
-
-        if (beep_buf == NULL)
-                return -1;
-
-        /* quick-hack fix for DACA, Burgundy & Tumbler */
-
-        if (awacs_revision >= AWACS_DACA){
-                srate = 44100 ;
-        } else {
-                for (i = 0; i < 8 && awacs_freqs[i] >= BEEP_SRATE; ++i)
-                        if (awacs_freqs_ok[i])
-                                beep_speed = i;
-                srate = awacs_freqs[beep_speed];
-        }
-
-        if (hz <= srate / BEEP_BUFLEN || hz > srate / 2) {
-                /* cancel beep currently playing */
-                awacs_nosound(0);
-                return 0;
-        }
-
-        spin_lock_irqsave(&dmasound.lock, flags);
-        if (beep_playing || write_sq.active || beep_buf == NULL) {
-                spin_unlock_irqrestore(&dmasound.lock, flags);
-                return -1;              /* too hard, sorry :-( */
-        }
-        beep_playing = 1;
-        st_le16(&beep_dbdma_cmd->command, OUTPUT_MORE + BR_ALWAYS);
-        spin_unlock_irqrestore(&dmasound.lock, flags);
-
-        if (hz == beep_hz_cache && beep_vol == beep_volume_cache) {
-                nsamples = beep_nsamples_cache;
-        } else {
-                period = srate * 256 / hz;      /* fixed point */
-                ncycles = BEEP_BUFLEN * 256 / period;
-                nsamples = (period * ncycles) >> 8;
-                f = ncycles * 65536 / nsamples;
-                j = 0;
-                p = beep_buf;
-                for (i = 0; i < nsamples; ++i, p += 2) {
-                        p[0] = p[1] = beep_wform[j >> 8] * beep_vol;
-                        j = (j + f) & 0xffff;
-                }
-                beep_hz_cache = hz;
-                beep_volume_cache = beep_vol;
-                beep_nsamples_cache = nsamples;
-        }
-
-        st_le16(&beep_dbdma_cmd->req_count, nsamples*4);
-        st_le16(&beep_dbdma_cmd->xfer_status, 0);
-        st_le32(&beep_dbdma_cmd->cmd_dep, virt_to_bus(beep_dbdma_cmd));
-        st_le32(&beep_dbdma_cmd->phy_addr, virt_to_bus(beep_buf));
-        awacs_beep_state = 1;
-
-        spin_lock_irqsave(&dmasound.lock, flags);
-        if (beep_playing) {     /* i.e. haven't been terminated already */
-                int count = 300 ;
-                out_le32(&awacs_txdma->control, (RUN|WAKE|FLUSH|PAUSE) << 16);
-                while ((in_le32(&awacs_txdma->status) & RUN) && count--)
-                        udelay(1); /* timeout > 2 samples at lowest rate*/
-                if (awacs)
-                        awacs_setup_for_beep(beep_speed);
-                out_le32(&awacs_txdma->cmdptr, virt_to_bus(beep_dbdma_cmd));
-                (void)in_le32(&awacs_txdma->status);
-                out_le32(&awacs_txdma->control, RUN | (RUN << 16));
-        }
-        spin_unlock_irqrestore(&dmasound.lock, flags);
-
-        return 0;
-}
-
-/* used in init and for wake-up */
-
-static void
-load_awacs(void)
-{
-        awacs_write(awacs_reg[0] + MASK_ADDR0);
-        awacs_write(awacs_reg[1] + MASK_ADDR1);
-        awacs_write(awacs_reg[2] + MASK_ADDR2);
-        awacs_write(awacs_reg[4] + MASK_ADDR4);
-
-        if (awacs_revision == AWACS_SCREAMER) {
-                awacs_write(awacs_reg[5] + MASK_ADDR5);
-                msleep(100);
-                awacs_write(awacs_reg[6] + MASK_ADDR6);
-                msleep(2);
-                awacs_write(awacs_reg[1] + MASK_ADDR1);
-                awacs_write(awacs_reg[7] + MASK_ADDR7);
-        }
-        if (awacs) {
-                if (hw_can_byteswap && (dmasound.hard.format == AFMT_S16_LE))
-                        out_le32(&awacs->byteswap, BS_VAL);
-                else
-                        out_le32(&awacs->byteswap, 0);
-        }
-}
-
-#ifdef CONFIG_PM
-/*
- * Save state when going to sleep, restore it afterwards.
- */
-/* FIXME: sort out disabling/re-enabling of read stuff as well */
-static void awacs_sleep_notify(struct pmu_sleep_notifier *self, int when)
-{
-        unsigned long flags;
-
-        switch (when) {
-        case PBOOK_SLEEP_NOW:           
-                LOCK();
-                awacs_sleeping = 1;
-                /* Tell the rest of the driver we are now going to sleep */
-                mb();
-                if (awacs_revision == AWACS_SCREAMER ||
-                    awacs_revision == AWACS_AWACS) {
-                        awacs_reg1_save = awacs_reg[1];
-                        awacs_reg[1] |= MASK_AMUTE | MASK_CMUTE;
-                        awacs_write(MASK_ADDR1 | awacs_reg[1]);
-                }
-
-                PMacSilence();
-                /* stop rx - if going - a bit of a daft user... but */
-                out_le32(&awacs_rxdma->control, (RUN|WAKE|FLUSH << 16));
-                /* deny interrupts */
-                if (awacs)
-                        disable_irq(awacs_irq);
-                disable_irq(awacs_tx_irq);
-                disable_irq(awacs_rx_irq);
-                /* Chip specific sleep code */
-                switch (awacs_revision) {
-                        case AWACS_TUMBLER:
-                        case AWACS_SNAPPER:
-                                write_audio_gpio(gpio_headphone_mute, gpio_headphone_mute_pol);
-                                write_audio_gpio(gpio_amp_mute, gpio_amp_mute_pol);
-                                tas_enter_sleep();
-                                write_audio_gpio(gpio_audio_reset, gpio_audio_reset_pol);
-                                break ;
-                        case AWACS_DACA:
-                                daca_enter_sleep();
-                                break ;
-                        case AWACS_BURGUNDY:
-                                break ;
-                        case AWACS_SCREAMER:
-                        case AWACS_AWACS:
-                        default:
-                                out_le32(&awacs->control, 0x11) ;
-                                break ;
-                }
-                /* Disable sound clock */
-                pmac_call_feature(PMAC_FTR_SOUND_CHIP_ENABLE, awacs_node, 0, 0);
-                /* According to Darwin, we do that after turning off the sound
-                 * chip clock. All this will have to be cleaned up once we properly
-                 * parse the OF sound-objects
-                 */
-                if ((machine_is_compatible("PowerBook3,1") ||
-                    machine_is_compatible("PowerBook3,2")) && awacs) {
-                        awacs_reg[1] |= MASK_PAROUT0 | MASK_PAROUT1;
-                        awacs_write(MASK_ADDR1 | awacs_reg[1]);
-                        msleep(200);
-                }
-                break;
-        case PBOOK_WAKE:
-                /* Enable sound clock */
-                pmac_call_feature(PMAC_FTR_SOUND_CHIP_ENABLE, awacs_node, 0, 1);
-                if ((machine_is_compatible("PowerBook3,1") ||
-                    machine_is_compatible("PowerBook3,2")) && awacs) {
-                        msleep(100);
-                        awacs_reg[1] &= ~(MASK_PAROUT0 | MASK_PAROUT1);
-                        awacs_write(MASK_ADDR1 | awacs_reg[1]);
-                        msleep(300);
-                } else
-                        msleep(1000);
-                /* restore settings */
-                switch (awacs_revision) {
-                        case AWACS_TUMBLER:
-                        case AWACS_SNAPPER:
-                                write_audio_gpio(gpio_headphone_mute, gpio_headphone_mute_pol);
-                                write_audio_gpio(gpio_amp_mute, gpio_amp_mute_pol);
-                                write_audio_gpio(gpio_audio_reset, gpio_audio_reset_pol);
-                                msleep(100);
-                                write_audio_gpio(gpio_audio_reset, !gpio_audio_reset_pol);
-                                msleep(150);
-                                tas_leave_sleep(); /* Stub for now */
-                                headphone_intr(0, NULL);
-                                break;
-                        case AWACS_DACA:
-                                msleep(10); /* Check this !!! */
-                                daca_leave_sleep();
-                                break ;         /* dont know how yet */
-                        case AWACS_BURGUNDY:
-                                break ;
-                        case AWACS_SCREAMER:
-                        case AWACS_AWACS:
-                        default:
-                                load_awacs() ;
-                                break ;
-                }
-                /* Recalibrate chip */
-                if (awacs_revision == AWACS_SCREAMER && awacs)
-                        awacs_recalibrate();
-                /* Make sure dma is stopped */
-                PMacSilence();
-                if (awacs)
-                        enable_irq(awacs_irq);
-                enable_irq(awacs_tx_irq);
-                enable_irq(awacs_rx_irq);
-                if (awacs) {
-                        /* OK, allow ints back again */
-                        out_le32(&awacs->control, MASK_IEPC
-                                | (awacs_rate_index << 8) | 0x11
-                                 | (awacs_revision < AWACS_DACA ? MASK_IEE: 0));
-                }
-                if (macio_base && is_pbook_g3) {
-                        /* FIXME: should restore the setup we had...*/
-                        out_8(macio_base + 0x37, 3);
-                } else if (is_pbook_3X00) {
-                        in_8(latch_base + 0x190);
-                }
-                /* Remove mute */
-                if (awacs_revision == AWACS_SCREAMER ||
-                    awacs_revision == AWACS_AWACS) {
-                        awacs_reg[1] = awacs_reg1_save;
-                        awacs_write(MASK_ADDR1 | awacs_reg[1]);
-                }
-                awacs_sleeping = 0;
-                /* Resume pending sounds. */
-                /* we don't try to restart input... */
-                spin_lock_irqsave(&dmasound.lock, flags);
-                __PMacPlay();
-                spin_unlock_irqrestore(&dmasound.lock, flags);
-                UNLOCK();
-        }
-}
-#endif /* CONFIG_PM */
-
-
-/* All the burgundy functions: */
-
-/* Waits for busy flag to clear */
-static inline void
-awacs_burgundy_busy_wait(void)
-{
-        int count = 50; /* > 2 samples at 44k1 */
-        while ((in_le32(&awacs->codec_ctrl) & MASK_NEWECMD) && count--)
-                udelay(1) ;
-}
-
-static inline void
-awacs_burgundy_extend_wait(void)
-{
-        int count = 50 ; /* > 2 samples at 44k1 */
-        while ((!(in_le32(&awacs->codec_stat) & MASK_EXTEND)) && count--)
-                udelay(1) ;
-        count = 50;
-        while ((in_le32(&awacs->codec_stat) & MASK_EXTEND) && count--)
-                udelay(1);
-}
-
-static void
-awacs_burgundy_wcw(unsigned addr, unsigned val)
-{
-        out_le32(&awacs->codec_ctrl, addr + 0x200c00 + (val & 0xff));
-        awacs_burgundy_busy_wait();
-        out_le32(&awacs->codec_ctrl, addr + 0x200d00 +((val>>8) & 0xff));
-        awacs_burgundy_busy_wait();
-        out_le32(&awacs->codec_ctrl, addr + 0x200e00 +((val>>16) & 0xff));
-        awacs_burgundy_busy_wait();
-        out_le32(&awacs->codec_ctrl, addr + 0x200f00 +((val>>24) & 0xff));
-        awacs_burgundy_busy_wait();
-}
-
-static unsigned
-awacs_burgundy_rcw(unsigned addr)
-{
-        unsigned val = 0;
-        unsigned long flags;
-
-        /* should have timeouts here */
-        spin_lock_irqsave(&dmasound.lock, flags);
-
-        out_le32(&awacs->codec_ctrl, addr + 0x100000);
-        awacs_burgundy_busy_wait();
-        awacs_burgundy_extend_wait();
-        val += (in_le32(&awacs->codec_stat) >> 4) & 0xff;
-
-        out_le32(&awacs->codec_ctrl, addr + 0x100100);
-        awacs_burgundy_busy_wait();
-        awacs_burgundy_extend_wait();
-        val += ((in_le32(&awacs->codec_stat)>>4) & 0xff) <<8;
-
-        out_le32(&awacs->codec_ctrl, addr + 0x100200);
-        awacs_burgundy_busy_wait();
-        awacs_burgundy_extend_wait();
-        val += ((in_le32(&awacs->codec_stat)>>4) & 0xff) <<16;
-
-        out_le32(&awacs->codec_ctrl, addr + 0x100300);
-        awacs_burgundy_busy_wait();
-        awacs_burgundy_extend_wait();
-        val += ((in_le32(&awacs->codec_stat)>>4) & 0xff) <<24;
-
-        spin_unlock_irqrestore(&dmasound.lock, flags);
-
-        return val;
-}
-
-
-static void
-awacs_burgundy_wcb(unsigned addr, unsigned val)
-{
-        out_le32(&awacs->codec_ctrl, addr + 0x300000 + (val & 0xff));
-        awacs_burgundy_busy_wait();
-}
-
-static unsigned
-awacs_burgundy_rcb(unsigned addr)
-{
-        unsigned val = 0;
-        unsigned long flags;
-
-        /* should have timeouts here */
-        spin_lock_irqsave(&dmasound.lock, flags);
-
-        out_le32(&awacs->codec_ctrl, addr + 0x100000);
-        awacs_burgundy_busy_wait();
-        awacs_burgundy_extend_wait();
-        val += (in_le32(&awacs->codec_stat) >> 4) & 0xff;
-
-        spin_unlock_irqrestore(&dmasound.lock, flags);
-
-        return val;
-}
-
-static int
-awacs_burgundy_check(void)
-{
-        /* Checks to see the chip is alive and kicking */
-        int error = in_le32(&awacs->codec_ctrl) & MASK_ERRCODE;
-
-        return error == 0xf0000;
-}
-
-static int
-awacs_burgundy_init(void)
-{
-        if (awacs_burgundy_check()) {
-                printk(KERN_WARNING "dmasound_pmac: burgundy not working :-(\n");
-                return 1;
-        }
-
-        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_OUTPUTENABLES,
-                           DEF_BURGUNDY_OUTPUTENABLES);
-        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
-                           DEF_BURGUNDY_MORE_OUTPUTENABLES);
-        awacs_burgundy_wcw(MASK_ADDR_BURGUNDY_OUTPUTSELECTS,
-                           DEF_BURGUNDY_OUTPUTSELECTS);
-
-        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_INPSEL21,
-                           DEF_BURGUNDY_INPSEL21);
-        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_INPSEL3,
-                           DEF_BURGUNDY_INPSEL3);
-        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_GAINCD,
-                           DEF_BURGUNDY_GAINCD);
-        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_GAINLINE,
-                           DEF_BURGUNDY_GAINLINE);
-        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_GAINMIC,
-                           DEF_BURGUNDY_GAINMIC);
-        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_GAINMODEM,
-                           DEF_BURGUNDY_GAINMODEM);
-
-        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_ATTENSPEAKER,
-                           DEF_BURGUNDY_ATTENSPEAKER);
-        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_ATTENLINEOUT,
-                           DEF_BURGUNDY_ATTENLINEOUT);
-        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_ATTENHP,
-                           DEF_BURGUNDY_ATTENHP);
-
-        awacs_burgundy_wcw(MASK_ADDR_BURGUNDY_MASTER_VOLUME,
-                           DEF_BURGUNDY_MASTER_VOLUME);
-        awacs_burgundy_wcw(MASK_ADDR_BURGUNDY_VOLCD,
-                           DEF_BURGUNDY_VOLCD);
-        awacs_burgundy_wcw(MASK_ADDR_BURGUNDY_VOLLINE,
-                           DEF_BURGUNDY_VOLLINE);
-        awacs_burgundy_wcw(MASK_ADDR_BURGUNDY_VOLMIC,
-                           DEF_BURGUNDY_VOLMIC);
-        return 0;
-}
-
-static void
-awacs_burgundy_write_volume(unsigned address, int volume)
-{
-        int hardvolume,lvolume,rvolume;
-
-        lvolume = (volume & 0xff) ? (volume & 0xff) + 155 : 0;
-        rvolume = ((volume >>8)&0xff) ? ((volume >> 8)&0xff ) + 155 : 0;
-
-        hardvolume = lvolume + (rvolume << 16);
-
-        awacs_burgundy_wcw(address, hardvolume);
-}
-
-static int
-awacs_burgundy_read_volume(unsigned address)
-{
-        int softvolume,wvolume;
-
-        wvolume = awacs_burgundy_rcw(address);
-
-        softvolume = (wvolume & 0xff) - 155;
-        softvolume += (((wvolume >> 16) & 0xff) - 155)<<8;
-
-        return softvolume > 0 ? softvolume : 0;
-}
-
-static int
-awacs_burgundy_read_mvolume(unsigned address)
-{
-        int lvolume,rvolume,wvolume;
-
-        wvolume = awacs_burgundy_rcw(address);
-
-        wvolume &= 0xffff;
-
-        rvolume = (wvolume & 0xff) - 155;
-        lvolume = ((wvolume & 0xff00)>>8) - 155;
-
-        return lvolume + (rvolume << 8);
-}
-
-static void
-awacs_burgundy_write_mvolume(unsigned address, int volume)
-{
-        int lvolume,rvolume,hardvolume;
-
-        lvolume = (volume &0xff) ? (volume & 0xff) + 155 :0;
-        rvolume = ((volume >>8) & 0xff) ? (volume >> 8) + 155 :0;
-
-        hardvolume = lvolume + (rvolume << 8);
-        hardvolume += (hardvolume << 16);
-
-        awacs_burgundy_wcw(address, hardvolume);
-}
-
-/* End burgundy functions */
-
-/* Set up output volumes on machines with the 'perch/whisper' extension card.
- * this has an SGS i2c chip (7433) which is accessed using the cuda.
- *
- * TODO: split this out and make use of the other parts of the SGS chip to
- * do Bass, Treble etc.
- */
-
-static void
-awacs_enable_amp(int spkr_vol)
-{
-#ifdef CONFIG_ADB_CUDA
-        struct adb_request req;
-
-        if (sys_ctrler != SYS_CTRLER_CUDA)
-                return;
-
-        /* turn on headphones */
-        cuda_request(&req, NULL, 5, CUDA_PACKET, CUDA_GET_SET_IIC,
-                     0x8a, 4, 0);
-        while (!req.complete) cuda_poll();
-        cuda_request(&req, NULL, 5, CUDA_PACKET, CUDA_GET_SET_IIC,
-                     0x8a, 6, 0);
-        while (!req.complete) cuda_poll();
-
-        /* turn on speaker */
-        cuda_request(&req, NULL, 5, CUDA_PACKET, CUDA_GET_SET_IIC,
-                     0x8a, 3, (100 - (spkr_vol & 0xff)) * 32 / 100);
-        while (!req.complete) cuda_poll();
-        cuda_request(&req, NULL, 5, CUDA_PACKET, CUDA_GET_SET_IIC,
-                     0x8a, 5, (100 - ((spkr_vol >> 8) & 0xff)) * 32 / 100);
-        while (!req.complete) cuda_poll();
-
-        cuda_request(&req, NULL, 5, CUDA_PACKET,
-                     CUDA_GET_SET_IIC, 0x8a, 1, 0x29);
-        while (!req.complete) cuda_poll();
-#endif /* CONFIG_ADB_CUDA */
-}
-
-
-/*** Mid level stuff *********************************************************/
-
-
-/*
- * /dev/mixer abstraction
- */
-
-static void do_line_lev(int data)
-{
-                line_lev = data ;
-                awacs_reg[0] &= ~MASK_MUX_AUDIN;
-                if ((data & 0xff) >= 50)
-                        awacs_reg[0] |= MASK_MUX_AUDIN;
-                awacs_write(MASK_ADDR0 | awacs_reg[0]);
-}
-
-static void do_ip_gain(int data)
-{
-        ip_gain = data ;
-        data &= 0xff;
-        awacs_reg[0] &= ~MASK_GAINLINE;
-        if (awacs_revision == AWACS_SCREAMER) {
-                awacs_reg[6] &= ~MASK_MIC_BOOST ;
-                if (data >= 33) {
-                        awacs_reg[0] |= MASK_GAINLINE;
-                        if( data >= 66)
-                                awacs_reg[6] |= MASK_MIC_BOOST ;
-                }
-                awacs_write(MASK_ADDR6 | awacs_reg[6]) ;
-        } else {
-                if (data >= 50)
-                        awacs_reg[0] |= MASK_GAINLINE;
-        }
-        awacs_write(MASK_ADDR0 | awacs_reg[0]);
-}
-
-static void do_mic_lev(int data)
-{
-        mic_lev = data ;
-        data &= 0xff;
-        awacs_reg[0] &= ~MASK_MUX_MIC;
-        if (data >= 50)
-                awacs_reg[0] |= MASK_MUX_MIC;
-        awacs_write(MASK_ADDR0 | awacs_reg[0]);
-}
-
-static void do_cd_lev(int data)
-{
-        cd_lev = data ;
-        awacs_reg[0] &= ~MASK_MUX_CD;
-        if ((data & 0xff) >= 50)
-                awacs_reg[0] |= MASK_MUX_CD;
-        awacs_write(MASK_ADDR0 | awacs_reg[0]);
-}
-
-static void do_rec_lev(int data)
-{
-        int left, right ;
-        rec_lev = data ;
-        /* need to fudge this to use the volume setter routine */
-        left = 100 - (data & 0xff) ; if( left < 0 ) left = 0 ;
-        right = 100 - ((data >> 8) & 0xff) ; if( right < 0 ) right = 0 ;
-        left |= (right << 8 );
-        left = awacs_volume_setter(left, 0, 0, 4);
-}
-
-static void do_passthru_vol(int data)
-{
-        passthru_vol = data ;
-        awacs_reg[1] &= ~MASK_LOOPTHRU;
-        if (awacs_revision == AWACS_SCREAMER) {
-                if( data ) { /* switch it on for non-zero */
-                        awacs_reg[1] |= MASK_LOOPTHRU;
-                        awacs_write(MASK_ADDR1 | awacs_reg[1]);
-                }
-                data = awacs_volume_setter(data, 5, 0, 6) ;
-        } else {
-                if ((data & 0xff) >= 50)
-                        awacs_reg[1] |= MASK_LOOPTHRU;
-                awacs_write(MASK_ADDR1 | awacs_reg[1]);
-                data = (awacs_reg[1] & MASK_LOOPTHRU)? 100: 0;
-        }
-}
-
-static int awacs_mixer_ioctl(u_int cmd, u_long arg)
-{
-        int data;
-        int rc;
-
-        switch (cmd) {
-        case SOUND_MIXER_READ_CAPS:
-                /* say we will allow multiple inputs?  prob. wrong
-                        so I'm switching it to single */
-                return IOCTL_OUT(arg, 1);
-        case SOUND_MIXER_READ_DEVMASK:
-                data  = SOUND_MASK_VOLUME | SOUND_MASK_SPEAKER
-                        | SOUND_MASK_LINE | SOUND_MASK_MIC | SOUND_MASK_CD
-                        | SOUND_MASK_IGAIN | SOUND_MASK_RECLEV
-                        | SOUND_MASK_ALTPCM
-                        | SOUND_MASK_MONITOR;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_RECMASK:
-                data = SOUND_MASK_LINE | SOUND_MASK_MIC | SOUND_MASK_CD;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_RECSRC:
-                data = 0;
-                if (awacs_reg[0] & MASK_MUX_AUDIN)
-                        data |= SOUND_MASK_LINE;
-                if (awacs_reg[0] & MASK_MUX_MIC)
-                        data |= SOUND_MASK_MIC;
-                if (awacs_reg[0] & MASK_MUX_CD)
-                        data |= SOUND_MASK_CD;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_WRITE_RECSRC:
-                IOCTL_IN(arg, data);
-                data &= (SOUND_MASK_LINE | SOUND_MASK_MIC | SOUND_MASK_CD);
-                awacs_reg[0] &= ~(MASK_MUX_CD | MASK_MUX_MIC
-                                  | MASK_MUX_AUDIN);
-                if (data & SOUND_MASK_LINE)
-                        awacs_reg[0] |= MASK_MUX_AUDIN;
-                if (data & SOUND_MASK_MIC)
-                        awacs_reg[0] |= MASK_MUX_MIC;
-                if (data & SOUND_MASK_CD)
-                        awacs_reg[0] |= MASK_MUX_CD;
-                awacs_write(awacs_reg[0] | MASK_ADDR0);
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_STEREODEVS:
-                data = SOUND_MASK_VOLUME | SOUND_MASK_SPEAKER| SOUND_MASK_RECLEV  ;
-                if (awacs_revision == AWACS_SCREAMER)
-                        data |= SOUND_MASK_MONITOR ;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_WRITE_VOLUME:
-                IOCTL_IN(arg, data);
-                line_vol = data ;
-                awacs_volume_setter(data, 2, 0, 6);
-                /* fall through */
-        case SOUND_MIXER_READ_VOLUME:
-                rc = IOCTL_OUT(arg, line_vol);
-                break;
-        case SOUND_MIXER_WRITE_SPEAKER:
-                IOCTL_IN(arg, data);
-                spk_vol = data ;
-                if (has_perch)
-                        awacs_enable_amp(data);
-                else
-                        (void)awacs_volume_setter(data, 4, MASK_CMUTE, 6);
-                /* fall though */
-        case SOUND_MIXER_READ_SPEAKER:
-                rc = IOCTL_OUT(arg, spk_vol);
-                break;
-        case SOUND_MIXER_WRITE_ALTPCM:  /* really bell volume */
-                IOCTL_IN(arg, data);
-                beep_vol = data & 0xff;
-                /* fall through */
-        case SOUND_MIXER_READ_ALTPCM:
-                rc = IOCTL_OUT(arg, beep_vol);
-                break;
-        case SOUND_MIXER_WRITE_LINE:
-                IOCTL_IN(arg, data);
-                do_line_lev(data) ;
-                /* fall through */
-        case SOUND_MIXER_READ_LINE:
-                rc = IOCTL_OUT(arg, line_lev);
-                break;
-        case SOUND_MIXER_WRITE_IGAIN:
-                IOCTL_IN(arg, data);
-                do_ip_gain(data) ;
-                /* fall through */
-        case SOUND_MIXER_READ_IGAIN:
-                rc = IOCTL_OUT(arg, ip_gain);
-                break;
-        case SOUND_MIXER_WRITE_MIC:
-                IOCTL_IN(arg, data);
-                do_mic_lev(data);
-                /* fall through */
-        case SOUND_MIXER_READ_MIC:
-                rc = IOCTL_OUT(arg, mic_lev);
-                break;
-        case SOUND_MIXER_WRITE_CD:
-                IOCTL_IN(arg, data);
-                do_cd_lev(data);
-                /* fall through */
-        case SOUND_MIXER_READ_CD:
-                rc = IOCTL_OUT(arg, cd_lev);
-                break;
-        case SOUND_MIXER_WRITE_RECLEV:
-                IOCTL_IN(arg, data);
-                do_rec_lev(data) ;
-                /* fall through */
-        case SOUND_MIXER_READ_RECLEV:
-                rc = IOCTL_OUT(arg, rec_lev);
-                break;
-        case MIXER_WRITE(SOUND_MIXER_MONITOR):
-                IOCTL_IN(arg, data);
-                do_passthru_vol(data) ;
-                /* fall through */
-        case MIXER_READ(SOUND_MIXER_MONITOR):
-                rc = IOCTL_OUT(arg, passthru_vol);
-                break;
-        default:
-                rc = -EINVAL;
-        }
-        
-        return rc;
-}
-
-static void awacs_mixer_init(void)
-{
-        awacs_volume_setter(line_vol, 2, 0, 6);
-        if (has_perch)
-                awacs_enable_amp(spk_vol);
-        else
-                (void)awacs_volume_setter(spk_vol, 4, MASK_CMUTE, 6);
-        do_line_lev(line_lev) ;
-        do_ip_gain(ip_gain) ;
-        do_mic_lev(mic_lev) ;
-        do_cd_lev(cd_lev) ;
-        do_rec_lev(rec_lev) ;
-        do_passthru_vol(passthru_vol) ;
-}
-
-static int burgundy_mixer_ioctl(u_int cmd, u_long arg)
-{
-        int data;
-        int rc;
-
-        /* We are, we are, we are... Burgundy or better */
-        switch(cmd) {
-        case SOUND_MIXER_READ_DEVMASK:
-                data = SOUND_MASK_VOLUME | SOUND_MASK_CD |
-                        SOUND_MASK_LINE | SOUND_MASK_MIC |
-                        SOUND_MASK_SPEAKER | SOUND_MASK_ALTPCM;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_RECMASK:
-                data = SOUND_MASK_LINE | SOUND_MASK_MIC
-                        | SOUND_MASK_CD;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_RECSRC:
-                data = 0;
-                if (awacs_reg[0] & MASK_MUX_AUDIN)
-                        data |= SOUND_MASK_LINE;
-                if (awacs_reg[0] & MASK_MUX_MIC)
-                        data |= SOUND_MASK_MIC;
-                if (awacs_reg[0] & MASK_MUX_CD)
-                        data |= SOUND_MASK_CD;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_WRITE_RECSRC:
-                IOCTL_IN(arg, data);
-                data &= (SOUND_MASK_LINE
-                         | SOUND_MASK_MIC | SOUND_MASK_CD);
-                awacs_reg[0] &= ~(MASK_MUX_CD | MASK_MUX_MIC
-                                  | MASK_MUX_AUDIN);
-                if (data & SOUND_MASK_LINE)
-                        awacs_reg[0] |= MASK_MUX_AUDIN;
-                if (data & SOUND_MASK_MIC)
-                        awacs_reg[0] |= MASK_MUX_MIC;
-                if (data & SOUND_MASK_CD)
-                        awacs_reg[0] |= MASK_MUX_CD;
-                awacs_write(awacs_reg[0] | MASK_ADDR0);
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_STEREODEVS:
-                data = SOUND_MASK_VOLUME | SOUND_MASK_SPEAKER
-                        | SOUND_MASK_RECLEV | SOUND_MASK_CD
-                        | SOUND_MASK_LINE;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_CAPS:
-                rc = IOCTL_OUT(arg, 0);
-                break;
-        case SOUND_MIXER_WRITE_VOLUME:
-                IOCTL_IN(arg, data);
-                awacs_burgundy_write_mvolume(MASK_ADDR_BURGUNDY_MASTER_VOLUME, data);
-                                /* Fall through */
-        case SOUND_MIXER_READ_VOLUME:
-                rc = IOCTL_OUT(arg, awacs_burgundy_read_mvolume(MASK_ADDR_BURGUNDY_MASTER_VOLUME));
-                break;
-        case SOUND_MIXER_WRITE_SPEAKER:
-                IOCTL_IN(arg, data);
-                if (!(data & 0xff)) {
-                        /* Mute the left speaker */
-                        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
-                                           awacs_burgundy_rcb(MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES) & ~0x2);
-                } else {
-                        /* Unmute the left speaker */
-                        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
-                                           awacs_burgundy_rcb(MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES) | 0x2);
-                }
-                if (!(data & 0xff00)) {
-                        /* Mute the right speaker */
-                        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
-                                           awacs_burgundy_rcb(MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES) & ~0x4);
-                } else {
-                        /* Unmute the right speaker */
-                        awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
-                                           awacs_burgundy_rcb(MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES) | 0x4);
-                }
-
-                data = (((data&0xff)*16)/100 > 0xf ? 0xf :
-                        (((data&0xff)*16)/100)) +
-                        ((((data>>8)*16)/100 > 0xf ? 0xf :
-                          ((((data>>8)*16)/100)))<<4);
-
-                awacs_burgundy_wcb(MASK_ADDR_BURGUNDY_ATTENSPEAKER, ~data);
-                                /* Fall through */
-        case SOUND_MIXER_READ_SPEAKER:
-                data = awacs_burgundy_rcb(MASK_ADDR_BURGUNDY_ATTENSPEAKER);
-                data = (((data & 0xf)*100)/16) + ((((data>>4)*100)/16)<<8);
-                rc = IOCTL_OUT(arg, (~data) & 0x0000ffff);
-                break;
-        case SOUND_MIXER_WRITE_ALTPCM:  /* really bell volume */
-                IOCTL_IN(arg, data);
-                beep_vol = data & 0xff;
-                                /* fall through */
-        case SOUND_MIXER_READ_ALTPCM:
-                rc = IOCTL_OUT(arg, beep_vol);
-                break;
-        case SOUND_MIXER_WRITE_LINE:
-                IOCTL_IN(arg, data);
-                awacs_burgundy_write_volume(MASK_ADDR_BURGUNDY_VOLLINE, data);
-
-                                /* fall through */
-        case SOUND_MIXER_READ_LINE:
-                data = awacs_burgundy_read_volume(MASK_ADDR_BURGUNDY_VOLLINE);
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_WRITE_MIC:
-                IOCTL_IN(arg, data);
-                                /* Mic is mono device */
-                data = (data << 8) + (data << 24);
-                awacs_burgundy_write_volume(MASK_ADDR_BURGUNDY_VOLMIC, data);
-                                /* fall through */
-        case SOUND_MIXER_READ_MIC:
-                data = awacs_burgundy_read_volume(MASK_ADDR_BURGUNDY_VOLMIC);
-                data <<= 24;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_WRITE_CD:
-                IOCTL_IN(arg, data);
-                awacs_burgundy_write_volume(MASK_ADDR_BURGUNDY_VOLCD, data);
-                                /* fall through */
-        case SOUND_MIXER_READ_CD:
-                data = awacs_burgundy_read_volume(MASK_ADDR_BURGUNDY_VOLCD);
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_WRITE_RECLEV:
-                IOCTL_IN(arg, data);
-                data = awacs_volume_setter(data, 0, 0, 4);
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_RECLEV:
-                data = awacs_get_volume(awacs_reg[0], 4);
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_OUTMASK:
-        case SOUND_MIXER_OUTSRC:
-        default:
-                rc = -EINVAL;
-        }
-        
-        return rc;
-}
-
-static int daca_mixer_ioctl(u_int cmd, u_long arg)
-{
-        int data;
-        int rc;
-
-        /* And the DACA's no genius either! */
-
-        switch(cmd) {
-        case SOUND_MIXER_READ_DEVMASK:
-                data = SOUND_MASK_VOLUME;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_RECMASK:
-                data = 0;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_RECSRC:
-                data = 0;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_WRITE_RECSRC:
-                IOCTL_IN(arg, data);
-                data =0;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_STEREODEVS:
-                data = SOUND_MASK_VOLUME;
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_READ_CAPS:
-                rc = IOCTL_OUT(arg, 0);
-                break;
-        case SOUND_MIXER_WRITE_VOLUME:
-                IOCTL_IN(arg, data);
-                daca_set_volume(data, data);
-                /* Fall through */
-        case SOUND_MIXER_READ_VOLUME:
-                daca_get_volume(& data, &data);
-                rc = IOCTL_OUT(arg, data);
-                break;
-        case SOUND_MIXER_OUTMASK:
-        case SOUND_MIXER_OUTSRC:
-        default:
-                rc = -EINVAL;
-        }
-        return rc;
-}
-
-static int PMacMixerIoctl(u_int cmd, u_long arg)
-{
-        int rc;
-        
-        /* Different IOCTLS for burgundy and, eventually, DACA & Tumbler */
-
-        TRY_LOCK();
-        
-        switch (awacs_revision){
-                case AWACS_BURGUNDY:
-                        rc = burgundy_mixer_ioctl(cmd, arg);
-                        break ;
-                case AWACS_DACA:
-                        rc = daca_mixer_ioctl(cmd, arg);
-                        break;
-                case AWACS_TUMBLER:
-                case AWACS_SNAPPER:
-                        rc = tas_mixer_ioctl(cmd, arg);
-                        break ;
-                default: /* ;-)) */
-                        rc = awacs_mixer_ioctl(cmd, arg);
-        }
-
-        UNLOCK();
-        
-        return rc;
-}
-
-static void PMacMixerInit(void)
-{
-        switch (awacs_revision) {
-                case AWACS_TUMBLER:
-                  printk("AE-Init tumbler mixer\n");
-                  break ;
-                case AWACS_SNAPPER:
-                  printk("AE-Init snapper mixer\n");
-                  break ;
-                case AWACS_DACA:
-                case AWACS_BURGUNDY:
-                        break ; /* don't know yet */
-                case AWACS_AWACS:
-                case AWACS_SCREAMER:
-                default:
-                        awacs_mixer_init() ;
-                        break ;
-        }
-}
-
-/* Write/Read sq setup functions:
-   Check to see if we have enough (or any) dbdma cmd buffers for the
-   user's fragment settings.  If not, allocate some. If this fails we will
-   point at the beep buffer - as an emergency provision - to stop dma tromping
-   on some random bit of memory (if someone lets it go anyway).
-   The command buffers are then set up to point to the fragment buffers
-   (allocated elsewhere).  We need n+1 commands the last of which holds
-   a NOP + loop to start.
-*/
-
-static int PMacWriteSqSetup(void)
-{
-        int i, count = 600 ;
-        volatile struct dbdma_cmd *cp;
-
-        LOCK();
-        
-        /* stop the controller from doing any output - if it isn't already.
-           it _should_ be before this is called anyway */
-
-        out_le32(&awacs_txdma->control, (RUN|PAUSE|FLUSH|WAKE) << 16);
-        while ((in_le32(&awacs_txdma->status) & RUN) && count--)
-                udelay(1);
-#ifdef DEBUG_DMASOUND
-if (count <= 0)
-        printk("dmasound_pmac: write sq setup: timeout waiting for dma to stop\n");
-#endif
-
-        if ((write_sq.max_count + 1) > number_of_tx_cmd_buffers) {
-                kfree(awacs_tx_cmd_space);
-                number_of_tx_cmd_buffers = 0;
-
-                /* we need nbufs + 1 (for the loop) and we should request + 1
-                   again because the DBDMA_ALIGN might pull the start up by up
-                   to sizeof(struct dbdma_cmd) - 4.
-                */
-
-                awacs_tx_cmd_space = kmalloc
-                        ((write_sq.max_count + 1 + 1) * sizeof(struct dbdma_cmd),
-                         GFP_KERNEL);
-                if (awacs_tx_cmd_space == NULL) {
-                        /* don't leave it dangling - nasty but better than a
-                           random address */
-                        out_le32(&awacs_txdma->cmdptr, virt_to_bus(beep_dbdma_cmd));
-                        printk(KERN_ERR
-                           "dmasound_pmac: can't allocate dbdma cmd buffers"
-                           ", driver disabled\n");
-                        UNLOCK();
-                        return -ENOMEM;
-                }
-                awacs_tx_cmds = (volatile struct dbdma_cmd *)
-                        DBDMA_ALIGN(awacs_tx_cmd_space);
-                number_of_tx_cmd_buffers = write_sq.max_count + 1;
-        }
-
-        cp = awacs_tx_cmds;
-        memset((void *)cp, 0, (write_sq.max_count+1) * sizeof(struct dbdma_cmd));
-        for (i = 0; i < write_sq.max_count; ++i, ++cp) {
-                st_le32(&cp->phy_addr, virt_to_bus(write_sq.buffers[i]));
-        }
-        st_le16(&cp->command, DBDMA_NOP + BR_ALWAYS);
-        st_le32(&cp->cmd_dep, virt_to_bus(awacs_tx_cmds));
-        /* point the controller at the command stack - ready to go */
-        out_le32(&awacs_txdma->cmdptr, virt_to_bus(awacs_tx_cmds));
-        UNLOCK();
-        return 0;
-}
-
-static int PMacReadSqSetup(void)
-{
-        int i, count = 600;
-        volatile struct dbdma_cmd *cp;
-
-        LOCK();
-        
-        /* stop the controller from doing any input - if it isn't already.
-           it _should_ be before this is called anyway */
-        
-        out_le32(&awacs_rxdma->control, (RUN|PAUSE|FLUSH|WAKE) << 16);
-        while ((in_le32(&awacs_rxdma->status) & RUN) && count--)
-                udelay(1);
-#ifdef DEBUG_DMASOUND
-if (count <= 0)
-        printk("dmasound_pmac: read sq setup: timeout waiting for dma to stop\n");
-#endif
-
-        if ((read_sq.max_count+1) > number_of_rx_cmd_buffers ) {
-                kfree(awacs_rx_cmd_space);
-                number_of_rx_cmd_buffers = 0;
-
-                /* we need nbufs + 1 (for the loop) and we should request + 1 again
-                   because the DBDMA_ALIGN might pull the start up by up to
-                   sizeof(struct dbdma_cmd) - 4 (assuming kmalloc aligns 32 bits).
-                */
-
-                awacs_rx_cmd_space = kmalloc
-                        ((read_sq.max_count + 1 + 1) * sizeof(struct dbdma_cmd),
-                         GFP_KERNEL);
-                if (awacs_rx_cmd_space == NULL) {
-                        /* don't leave it dangling - nasty but better than a
-                           random address */
-                        out_le32(&awacs_rxdma->cmdptr, virt_to_bus(beep_dbdma_cmd));
-                        printk(KERN_ERR
-                           "dmasound_pmac: can't allocate dbdma cmd buffers"
-                           ", driver disabled\n");
-                        UNLOCK();
-                        return -ENOMEM;
-                }
-                awacs_rx_cmds = (volatile struct dbdma_cmd *)
-                        DBDMA_ALIGN(awacs_rx_cmd_space);
-                number_of_rx_cmd_buffers = read_sq.max_count + 1 ;
-        }
-        cp = awacs_rx_cmds;
-        memset((void *)cp, 0, (read_sq.max_count+1) * sizeof(struct dbdma_cmd));
-
-        /* Set dma buffers up in a loop */
-        for (i = 0; i < read_sq.max_count; i++,cp++) {
-                st_le32(&cp->phy_addr, virt_to_bus(read_sq.buffers[i]));
-                st_le16(&cp->command, INPUT_MORE + INTR_ALWAYS);
-                st_le16(&cp->req_count, read_sq.block_size);
-                st_le16(&cp->xfer_status, 0);
-        }
-
-        /* The next two lines make the thing loop around.
-        */
-        st_le16(&cp->command, DBDMA_NOP + BR_ALWAYS);
-        st_le32(&cp->cmd_dep, virt_to_bus(awacs_rx_cmds));
-        /* point the controller at the command stack - ready to go */
-        out_le32(&awacs_rxdma->cmdptr, virt_to_bus(awacs_rx_cmds));
-
-        UNLOCK();
-        return 0;
-}
-
-/* TODO: this needs work to guarantee that when it returns DMA has stopped
-   but in a more elegant way than is done here....
-*/
-
-static void PMacAbortRead(void)
-{
-        int i;
-        volatile struct dbdma_cmd *cp;
-
-        LOCK();
-        /* give it a chance to update the output and provide the IRQ
-           that is expected.
-        */
-
-        out_le32(&awacs_rxdma->control, ((FLUSH) << 16) + FLUSH );
-
-        cp = awacs_rx_cmds;
-        for (i = 0; i < read_sq.max_count; i++,cp++)
-                st_le16(&cp->command, DBDMA_STOP);
-        /*
-         * We should probably wait for the thing to stop before we
-         * release the memory.
-         */
-
-        msleep(100) ; /* give it a (small) chance to act */
-
-        /* apply the sledgehammer approach - just stop it now */
-
-        out_le32(&awacs_rxdma->control, (RUN|PAUSE|FLUSH|WAKE) << 16);
-        UNLOCK();
-}
-
-extern char *get_afmt_string(int);
-static int PMacStateInfo(char *b, size_t sp)
-{
-        int i, len = 0;
-        len = sprintf(b,"HW rates: ");
-        switch (awacs_revision){
-                case AWACS_DACA:
-                case AWACS_BURGUNDY:
-                        len += sprintf(b,"44100 ") ;
-                        break ;
-                case AWACS_TUMBLER:
-                case AWACS_SNAPPER:
-                        for (i=0; i<1; i++){
-                                if (tas_freqs_ok[i])
-                                        len += sprintf(b+len,"%d ", tas_freqs[i]) ;
-                        }
-                        break ;
-                case AWACS_AWACS:
-                case AWACS_SCREAMER:
-                default:
-                        for (i=0; i<8; i++){
-                                if (awacs_freqs_ok[i])
-                                        len += sprintf(b+len,"%d ", awacs_freqs[i]) ;
-                        }
-                        break ;
-        }
-        len += sprintf(b+len,"s/sec\n") ;
-        if (len < sp) {
-                len += sprintf(b+len,"HW AFMTS: ");
-                i = AFMT_U16_BE ;
-                while (i) {
-                        if (i & dmasound.mach.hardware_afmts)
-                                len += sprintf(b+len,"%s ",
-                                        get_afmt_string(i & dmasound.mach.hardware_afmts));
-                        i >>= 1 ;
-                }
-                len += sprintf(b+len,"\n") ;
-        }
-        return len ;
-}
-
-/*** Machine definitions *****************************************************/
-
-static SETTINGS def_hard = {
-        .format = AFMT_S16_BE,
-        .stereo = 1,
-        .size   = 16,
-        .speed  = 44100
-} ;
-
-static SETTINGS def_soft = {
-        .format = AFMT_S16_BE,
-        .stereo = 1,
-        .size   = 16,
-        .speed  = 44100
-} ;
-
-static MACHINE machPMac = {
-        .name           = awacs_name,
-        .name2          = "PowerMac Built-in Sound",
-        .owner          = THIS_MODULE,
-        .dma_alloc      = PMacAlloc,
-        .dma_free       = PMacFree,
-        .irqinit        = PMacIrqInit,
-#ifdef MODULE
-        .irqcleanup     = PMacIrqCleanup,
-#endif /* MODULE */
-        .init           = PMacInit,
-        .silence        = PMacSilence,
-        .setFormat      = PMacSetFormat,
-        .setVolume      = PMacSetVolume,
-        .play           = PMacPlay,
-        .record         = NULL,         /* default to no record */
-        .mixer_init     = PMacMixerInit,
-        .mixer_ioctl    = PMacMixerIoctl,
-        .write_sq_setup = PMacWriteSqSetup,
-        .read_sq_setup  = PMacReadSqSetup,
-        .state_info     = PMacStateInfo,
-        .abort_read     = PMacAbortRead,
-        .min_dsp_speed  = 7350,
-        .max_dsp_speed  = 44100,
-        .version        = ((DMASOUND_AWACS_REVISION<<8) + DMASOUND_AWACS_EDITION)
-};
-
-
-/*** Config & Setup **********************************************************/
-
-/* Check for pmac models that we care about in terms of special actions.
-*/
-
-void __init
-set_model(void)
-{
-        /* portables/lap-tops */
-
-        if (machine_is_compatible("AAPL,3400/2400") ||
-            machine_is_compatible("AAPL,3500")) {
-                is_pbook_3X00 = 1 ;
-        }
-        if (machine_is_compatible("PowerBook1,1")  || /* lombard */
-            machine_is_compatible("AAPL,PowerBook1998")){ /* wallstreet */
-                is_pbook_g3 = 1 ;
-                return ;
-        }
-}
-
-/* Get the OF node that tells us about the registers, interrupts etc. to use
-   for sound IO.
-
-   On most machines the sound IO OF node is the 'davbus' node.  On newer pmacs
-   with DACA (& Tumbler) the node to use is i2s-a.  On much older machines i.e.
-   before 9500 there is no davbus node and we have to use the 'awacs' property.
-
-  In the latter case we signal this by setting the codec value - so that the
-  code that looks for chip properties knows how to go about it.
-*/
-
-static struct device_node* __init
-get_snd_io_node(void)
-{
-        struct device_node *np;
-
-        /* set up awacs_node for early OF which doesn't have a full set of
-         * properties on davbus
-         */
-        awacs_node = of_find_node_by_name(NULL, "awacs");
-        if (awacs_node)
-                awacs_revision = AWACS_AWACS;
-
-        /* powermac models after 9500 (other than those which use DACA or
-         * Tumbler) have a node called "davbus".
-         */
-        np = of_find_node_by_name(NULL, "davbus");
-        /*
-         * if we didn't find a davbus device, try 'i2s-a' since
-         * this seems to be what iBooks (& Tumbler) have.
-         */
-        if (np == NULL) {
-                i2s_node = of_find_node_by_name(NULL, "i2s-a");
-                np = of_node_get(i2s_node);
-        }
-
-        /* if we didn't find this - perhaps we are on an early model
-         * which _only_ has an 'awacs' node
-        */
-        if (np == NULL && awacs_node)
-                np = of_node_get(awacs_node);
-
-        /* if we failed all these return null - this will cause the
-         * driver to give up...
-        */
-        return np ;
-}
-
-/* Get the OF node that contains the info about the sound chip, inputs s-rates
-   etc.
-   This node does not exist (or contains much reduced info) on earlier machines
-   we have to deduce the info other ways for these.
-*/
-
-static struct device_node* __init
-get_snd_info_node(struct device_node *io)
-{
-        struct device_node *info;
-
-        for_each_node_by_name(info, "sound")
-                if (info->parent == io)
-                        break;
-        return info;
-}
-
-/* Find out what type of codec we have.
-*/
-
-static int __init
-get_codec_type(struct device_node *info)
-{
-        /* already set if pre-davbus model and info will be NULL */
-        int codec = awacs_revision ;
-
-        if (info) {
-                /* must do awacs first to allow screamer to overide it */
-                if (of_device_is_compatible(info, "awacs"))
-                        codec = AWACS_AWACS ;
-                if (of_device_is_compatible(info, "screamer"))
-                        codec = AWACS_SCREAMER;
-                if (of_device_is_compatible(info, "burgundy"))
-                        codec = AWACS_BURGUNDY ;
-                if (of_device_is_compatible(info, "daca"))
-                        codec = AWACS_DACA;
-                if (of_device_is_compatible(info, "tumbler"))
-                        codec = AWACS_TUMBLER;
-                if (of_device_is_compatible(info, "snapper"))
-                        codec = AWACS_SNAPPER;
-        }
-        return codec ;
-}
-
-/* find out what type, if any, of expansion card we have
-*/
-static void __init
-get_expansion_type(void)
-{
-        struct device_node *dn;
-
-        dn = of_find_node_by_name(NULL, "perch");
-        if (dn != NULL)
-                has_perch = 1;
-        of_node_put(dn);
-
-        dn = of_find_node_by_name(NULL, "pb-ziva-pc");
-        if (dn != NULL)
-                has_ziva = 1;
-        of_node_put(dn);
-        /* need to work out how we deal with iMac SRS module */
-}
-
-/* set up frame rates.
- * I suspect that these routines don't quite go about it the right way:
- * - where there is more than one rate - I think that the first property
- * value is the number of rates.
- * TODO: check some more device trees and modify accordingly
- *       Set dmasound.mach.max_dsp_rate on the basis of these routines.
-*/
-
-static void __init
-awacs_init_frame_rates(const unsigned int *prop, unsigned int l)
-{
-        int i ;
-        if (prop) {
-                for (i=0; i<8; i++)
-                        awacs_freqs_ok[i] = 0 ;
-                for (l /= sizeof(int); l > 0; --l) {
-                        unsigned int r = *prop++;
-                        /* Apple 'Fixed' format */
-                        if (r >= 0x10000)
-                                r >>= 16;
-                        for (i = 0; i < 8; ++i) {
-                                if (r == awacs_freqs[i]) {
-                                        awacs_freqs_ok[i] = 1;
-                                        break;
-                                }
-                        }
-                }
-        }
-        /* else we assume that all the rates are available */
-}
-
-static void __init
-burgundy_init_frame_rates(const unsigned int *prop, unsigned int l)
-{
-        int temp[9] ;
-        int i = 0 ;
-        if (prop) {
-                for (l /= sizeof(int); l > 0; --l) {
-                        unsigned int r = *prop++;
-                        /* Apple 'Fixed' format */
-                        if (r >= 0x10000)
-                                r >>= 16;
-                        temp[i] = r ;
-                        i++ ; if(i>=9) i=8;
-                }
-        }
-#ifdef DEBUG_DMASOUND
-if (i > 1){
-        int j;
-        printk("dmasound_pmac: burgundy with multiple frame rates\n");
-        for(j=0; j<i; j++)
-                printk("%d ", temp[j]) ;
-        printk("\n") ;
-}
-#endif
-}
-
-static void __init
-daca_init_frame_rates(const unsigned int *prop, unsigned int l)
-{
-        int temp[9] ;
-        int i = 0 ;
-        if (prop) {
-                for (l /= sizeof(int); l > 0; --l) {
-                        unsigned int r = *prop++;
-                        /* Apple 'Fixed' format */
-                        if (r >= 0x10000)
-                                r >>= 16;
-                        temp[i] = r ;
-                        i++ ; if(i>=9) i=8;
-
-                }
-        }
-#ifdef DEBUG_DMASOUND
-if (i > 1){
-        int j;
-        printk("dmasound_pmac: DACA with multiple frame rates\n");
-        for(j=0; j<i; j++)
-                printk("%d ", temp[j]) ;
-        printk("\n") ;
-}
-#endif
-}
-
-static void __init
-init_frame_rates(const unsigned int *prop, unsigned int l)
-{
-        switch (awacs_revision) {
-                case AWACS_TUMBLER:
-                case AWACS_SNAPPER:
-                        tas_init_frame_rates(prop, l);
-                        break ;
-                case AWACS_DACA:
-                        daca_init_frame_rates(prop, l);
-                        break ;
-                case AWACS_BURGUNDY:
-                        burgundy_init_frame_rates(prop, l);
-                        break ;
-                default:
-                        awacs_init_frame_rates(prop, l);
-                        break ;
-        }
-}
-
-/* find things/machines that can't do mac-io byteswap
-*/
-
-static void __init
-set_hw_byteswap(struct device_node *io)
-{
-        struct device_node *mio ;
-        unsigned int kl = 0 ;
-
-        /* if seems that Keylargo can't byte-swap  */
-
-        for (mio = io->parent; mio ; mio = mio->parent) {
-                if (strcmp(mio->name, "mac-io") == 0) {
-                        if (of_device_is_compatible(mio, "Keylargo"))
-                                kl = 1;
-                        break;
-                }
-        }
-        hw_can_byteswap = !kl;
-}
-
-/* Allocate the resources necessary for beep generation.  This cannot be (quite)
-   done statically (yet) because we cannot do virt_to_bus() on static vars when
-   the code is loaded as a module.
-
-   for the sake of saving the possibility that two allocations will incur the
-   overhead of two pull-ups in DBDMA_ALIGN() we allocate the 'emergency' dmdma
-   command here as well... even tho' it is not part of the beep process.
-*/
-
-int32_t
-__init setup_beep(void)
-{
-        /* Initialize beep stuff */
-        /* want one cmd buffer for beeps, and a second one for emergencies
-           - i.e. dbdma error conditions.
-           ask for three to allow for pull up in DBDMA_ALIGN().
-        */
-        beep_dbdma_cmd_space =
-                kmalloc((2 + 1) * sizeof(struct dbdma_cmd), GFP_KERNEL);
-        if(beep_dbdma_cmd_space == NULL) {
-                printk(KERN_ERR "dmasound_pmac: no beep dbdma cmd space\n") ;
-                return -ENOMEM ;
-        }
-        beep_dbdma_cmd = (volatile struct dbdma_cmd *)
-                        DBDMA_ALIGN(beep_dbdma_cmd_space);
-        /* set up emergency dbdma cmd */
-        emergency_dbdma_cmd = beep_dbdma_cmd+1 ;
-        beep_buf = kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL);
-        if (beep_buf == NULL) {
-                printk(KERN_ERR "dmasound_pmac: no memory for beep buffer\n");
-                kfree(beep_dbdma_cmd_space) ;
-                return -ENOMEM ;
-        }
-        return 0 ;
-}
-
-static struct input_dev *awacs_beep_dev;
-
-int __init dmasound_awacs_init(void)
-{
-        struct device_node *io = NULL, *info = NULL;
-        int vol, res;
-
-        if (!machine_is(powermac))
-                return -ENODEV;
-
-        awacs_subframe = 0;
-        awacs_revision = 0;
-        hw_can_byteswap = 1 ; /* most can */
-
-        /* look for models we need to handle specially */
-        set_model() ;
-
-        /* find the OF node that tells us about the dbdma stuff
-        */
-        io = get_snd_io_node();
-        if (io == NULL) {
-#ifdef DEBUG_DMASOUND
-printk("dmasound_pmac: couldn't find sound io OF node\n");
-#endif
-                goto no_device;
-        }
-
-        /* find the OF node that tells us about the sound sub-system
-         * this doesn't exist on pre-davbus machines (earlier than 9500)
-        */
-        if (awacs_revision != AWACS_AWACS) { /* set for pre-davbus */
-                info = get_snd_info_node(io) ;
-                if (info == NULL){
-#ifdef DEBUG_DMASOUND
-printk("dmasound_pmac: couldn't find 'sound' OF node\n");
-#endif
-                        goto no_device;
-                }
-        }
-
-        awacs_revision = get_codec_type(info) ;
-        if (awacs_revision == 0) {
-#ifdef DEBUG_DMASOUND
-printk("dmasound_pmac: couldn't find a Codec we can handle\n");
-#endif
-                goto no_device; /* we don't know this type of h/w */
-        }
-
-        /* set up perch, ziva, SRS or whatever else we have as sound
-         *  expansion.
-        */
-        get_expansion_type();
-
-        /* we've now got enough information to make up the audio topology.
-         * we will map the sound part of mac-io now so that we can probe for
-         * other info if necessary (early AWACS we want to read chip ids)
-         */
-
-        if (of_get_address(io, 2, NULL, NULL) == NULL) {
-                /* OK - maybe we need to use the 'awacs' node (on earlier
-                 * machines).
-                 */
-                if (awacs_node) {
-                        of_node_put(io);
-                        io = of_node_get(awacs_node);
-                        if (of_get_address(io, 2, NULL, NULL) == NULL) {
-                                printk("dmasound_pmac: can't use %s\n",
-                                       io->full_name);
-                                goto no_device;
-                        }
-                } else
-                        printk("dmasound_pmac: can't use %s\n", io->full_name);
-        }
-
-        if (of_address_to_resource(io, 0, &awacs_rsrc[0]) ||
-            request_mem_region(awacs_rsrc[0].start,
-                               awacs_rsrc[0].end - awacs_rsrc[0].start + 1,
-                               " (IO)") == NULL) {
-                printk(KERN_ERR "dmasound: can't request IO resource !\n");
-                goto no_device;
-        }
-        if (of_address_to_resource(io, 1, &awacs_rsrc[1]) ||
-            request_mem_region(awacs_rsrc[1].start,
-                               awacs_rsrc[1].end - awacs_rsrc[1].start + 1,
-                               " (tx dma)") == NULL) {
-                release_mem_region(awacs_rsrc[0].start,
-                                   awacs_rsrc[0].end - awacs_rsrc[0].start + 1);
-                printk(KERN_ERR "dmasound: can't request Tx DMA resource !\n");
-                goto no_device;
-        }
-        if (of_address_to_resource(io, 2, &awacs_rsrc[2]) ||
-            request_mem_region(awacs_rsrc[2].start,
-                               awacs_rsrc[2].end - awacs_rsrc[2].start + 1,
-                               " (rx dma)") == NULL) {
-                release_mem_region(awacs_rsrc[0].start,
-                                   awacs_rsrc[0].end - awacs_rsrc[0].start + 1);
-                release_mem_region(awacs_rsrc[1].start,
-                                   awacs_rsrc[1].end - awacs_rsrc[1].start + 1);
-                printk(KERN_ERR "dmasound: can't request Rx DMA resource !\n");
-                goto no_device;
-        }
-
-        awacs_beep_dev = input_allocate_device();
-        if (!awacs_beep_dev) {
-                release_mem_region(awacs_rsrc[0].start,
-                                   awacs_rsrc[0].end - awacs_rsrc[0].start + 1);
-                release_mem_region(awacs_rsrc[1].start,
-                                   awacs_rsrc[1].end - awacs_rsrc[1].start + 1);
-                release_mem_region(awacs_rsrc[2].start,
-                                   awacs_rsrc[2].end - awacs_rsrc[2].start + 1);
-                printk(KERN_ERR "dmasound: can't allocate input device !\n");
-                goto no_device;
-        }
-
-        awacs_beep_dev->name = "dmasound beeper";
-        awacs_beep_dev->phys = "macio/input0";
-        awacs_beep_dev->id.bustype = BUS_HOST;
-        awacs_beep_dev->event = awacs_beep_event;
-        awacs_beep_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
-        awacs_beep_dev->evbit[0] = BIT(EV_SND);
-
-        /* all OF versions I've seen use this value */
-        if (i2s_node)
-                i2s = ioremap(awacs_rsrc[0].start, 0x1000);
-        else
-                awacs = ioremap(awacs_rsrc[0].start, 0x1000);
-        awacs_txdma = ioremap(awacs_rsrc[1].start, 0x100);
-        awacs_rxdma = ioremap(awacs_rsrc[2].start, 0x100);
-
-        /* first of all make sure that the chip is powered up....*/
-        pmac_call_feature(PMAC_FTR_SOUND_CHIP_ENABLE, io, 0, 1);
-        if (awacs_revision == AWACS_SCREAMER && awacs)
-                awacs_recalibrate();
-
-        awacs_irq = irq_of_parse_and_map(io, 0);
-        awacs_tx_irq = irq_of_parse_and_map(io, 1);
-        awacs_rx_irq = irq_of_parse_and_map(io, 2);
-
-        /* Hack for legacy crap that will be killed someday */
-        of_node_put(awacs_node);
-        awacs_node = of_node_get(io);
-
-        /* if we have an awacs or screamer - probe the chip to make
-         * sure we have the right revision.
-        */
-
-        if (awacs_revision <= AWACS_SCREAMER){
-                uint32_t temp, rev, mfg ;
-                /* find out the awacs revision from the chip */
-                temp = in_le32(&awacs->codec_stat);
-                rev = (temp >> 12) & 0xf;
-                mfg = (temp >>  8) & 0xf;
-#ifdef DEBUG_DMASOUND
-printk("dmasound_pmac: Awacs/Screamer Codec Mfct: %d Rev %d\n", mfg, rev);
-#endif
-                if (rev >= AWACS_SCREAMER)
-                        awacs_revision = AWACS_SCREAMER ;
-                else
-                        awacs_revision = rev ;
-        }
-
-        dmasound.mach = machPMac;
-
-        /* find out other bits & pieces from OF, these may be present
-           only on some models ... so be careful.
-        */
-
-        /* in the absence of a frame rates property we will use the defaults
-        */
-
-        if (info) {
-                const unsigned int *prop;
-                unsigned int l;
-
-                sound_device_id = 0;
-                /* device ID appears post g3 b&w */
-                prop = of_get_property(info, "device-id", NULL);
-                if (prop != 0)
-                        sound_device_id = *prop;
-
-                /* look for a property saying what sample rates
-                   are available */
-
-                prop = of_get_property(info, "sample-rates", &l);
-                if (prop == 0)
-                        prop = of_get_property(info, "output-frame-rates", &l);
-
-                /* if it's there use it to set up frame rates */
-                init_frame_rates(prop, l) ;
-                of_node_put(info);
-                info = NULL;
-        }
-
-        if (awacs)
-                out_le32(&awacs->control, 0x11); /* set everything quiesent */
-
-        set_hw_byteswap(io) ; /* figure out if the h/w can do it */
-
-#ifdef CONFIG_NVRAM
-        /* get default volume from nvram */
-        vol = ((pmac_xpram_read( 8 ) & 7 ) << 1 );
-#else
-        vol = 0;
-#endif
-
-        /* set up tracking values */
-        spk_vol = vol * 100 ;
-        spk_vol /= 7 ; /* get set value to a percentage */
-        spk_vol |= (spk_vol << 8) ; /* equal left & right */
-        line_vol = passthru_vol = spk_vol ;
-
-        /* fill regs that are shared between AWACS & Burgundy */
-
-        awacs_reg[2] = vol + (vol << 6);
-        awacs_reg[4] = vol + (vol << 6);
-        awacs_reg[5] = vol + (vol << 6); /* screamer has loopthru vol control */
-        awacs_reg[6] = 0; /* maybe should be vol << 3 for PCMCIA speaker */
-        awacs_reg[7] = 0;
-
-        awacs_reg[0] = MASK_MUX_CD;
-        awacs_reg[1] = MASK_LOOPTHRU;
-
-        /* FIXME: Only machines with external SRS module need MASK_PAROUT */
-        if (has_perch || sound_device_id == 0x5
-            || /*sound_device_id == 0x8 ||*/ sound_device_id == 0xb)
-                awacs_reg[1] |= MASK_PAROUT0 | MASK_PAROUT1;
-
-        switch (awacs_revision) {
-                case AWACS_TUMBLER:
-                        tas_register_driver(&tas3001c_hooks);
-                        tas_init(I2C_DRIVERID_TAS3001C, I2C_DRIVERNAME_TAS3001C);
-                        tas_dmasound_init();
-                        tas_post_init();
-                        break ;
-                case AWACS_SNAPPER:
-                        tas_register_driver(&tas3004_hooks);
-                        tas_init(I2C_DRIVERID_TAS3004,I2C_DRIVERNAME_TAS3004);
-                        tas_dmasound_init();
-                        tas_post_init();
-                        break;
-                case AWACS_DACA:
-                        daca_init();
-                        break;  
-                case AWACS_BURGUNDY:
-                        awacs_burgundy_init();
-                        break ;
-                case AWACS_SCREAMER:
-                case AWACS_AWACS:
-                default:
-                        load_awacs();
-                        break ;
-        }
-
-        /* enable/set-up external modules - when we know how */
-
-        if (has_perch)
-                awacs_enable_amp(100 * 0x101);
-
-        /* Reset dbdma channels */
-        out_le32(&awacs_txdma->control, (RUN|PAUSE|FLUSH|WAKE|DEAD) << 16);
-        while (in_le32(&awacs_txdma->status) & RUN)
-                udelay(1);
-        out_le32(&awacs_rxdma->control, (RUN|PAUSE|FLUSH|WAKE|DEAD) << 16);
-        while (in_le32(&awacs_rxdma->status) & RUN)
-                udelay(1);
-
-        /* Initialize beep stuff */
-        if ((res=setup_beep()))
-                return res ;
-
-#ifdef CONFIG_PM
-        pmu_register_sleep_notifier(&awacs_sleep_notifier);
-#endif /* CONFIG_PM */
-
-        /* Powerbooks have odd ways of enabling inputs such as
-           an expansion-bay CD or sound from an internal modem
-           or a PC-card modem. */
-        if (is_pbook_3X00) {
-                /*
-                 * Enable CD and PC-card sound inputs.
-                 * This is done by reading from address
-                 * f301a000, + 0x10 to enable the expansion-bay
-                 * CD sound input, + 0x80 to enable the PC-card
-                 * sound input.  The 0x100 enables the SCSI bus
-                 * terminator power.
-                 */
-                latch_base = ioremap (0xf301a000, 0x1000);
-                in_8(latch_base + 0x190);
-
-        } else if (is_pbook_g3) {
-                struct device_node* mio;
-                macio_base = NULL;
-                for (mio = io->parent; mio; mio = mio->parent) {
-                        if (strcmp(mio->name, "mac-io") == 0) {
-                                struct resource r;
-                                if (of_address_to_resource(mio, 0, &r) == 0)
-                                        macio_base = ioremap(r.start, 0x40);
-                                break;
-                        }
-                }
-                /*
-                 * Enable CD sound input.
-                 * The relevant bits for writing to this byte are 0x8f.
-                 * I haven't found out what the 0x80 bit does.
-                 * For the 0xf bits, writing 3 or 7 enables the CD
-                 * input, any other value disables it.  Values
-                 * 1, 3, 5, 7 enable the microphone.  Values 0, 2,
-                 * 4, 6, 8 - f enable the input from the modem.
-                 *  -- paulus.
-                 */
-                if (macio_base)
-                        out_8(macio_base + 0x37, 3);
-        }
-
-        if (hw_can_byteswap)
-                dmasound.mach.hardware_afmts = (AFMT_S16_BE | AFMT_S16_LE) ;
-        else
-                dmasound.mach.hardware_afmts = AFMT_S16_BE ;
-
-        /* shut out chips that do output only.
-         * may need to extend this to machines which have no inputs - even tho'
-         * they use screamer - IIRC one of the powerbooks is like this.
-         */
-
-        if (awacs_revision != AWACS_DACA) {
-                dmasound.mach.capabilities = DSP_CAP_DUPLEX ;
-                dmasound.mach.record = PMacRecord ;
-        }
-
-        dmasound.mach.default_hard = def_hard ;
-        dmasound.mach.default_soft = def_soft ;
-
-        switch (awacs_revision) {
-                case AWACS_BURGUNDY:
-                        sprintf(awacs_name, "PowerMac Burgundy ") ;
-                        break ;
-                case AWACS_DACA:
-                        sprintf(awacs_name, "PowerMac DACA ") ;
-                        break ;
-                case AWACS_TUMBLER:
-                        sprintf(awacs_name, "PowerMac Tumbler ") ;
-                        break ;
-                case AWACS_SNAPPER:
-                        sprintf(awacs_name, "PowerMac Snapper ") ;
-                        break ;
-                case AWACS_SCREAMER:
-                        sprintf(awacs_name, "PowerMac Screamer ") ;
-                        break ;
-                case AWACS_AWACS:
-                default:
-                        sprintf(awacs_name, "PowerMac AWACS rev %d ", awacs_revision) ;
-                        break ;
-        }
-
-        /*
-         * XXX: we should handle errors here, but that would mean
-         * rewriting the whole init code.  later..
-         */
-        input_register_device(awacs_beep_dev);
-
-        of_node_put(io);
-
-        return dmasound_init();
-
-no_device:
-        of_node_put(info);
-        of_node_put(awacs_node);
-        of_node_put(i2s_node);
-        of_node_put(io);
-        return -ENODEV ;
-}
-
-static void __exit dmasound_awacs_cleanup(void)
-{
-        input_unregister_device(awacs_beep_dev);
-
-        switch (awacs_revision) {
-                case AWACS_TUMBLER:
-                case AWACS_SNAPPER:
-                        tas_dmasound_cleanup();
-                        tas_cleanup();
-                        break ;
-                case AWACS_DACA:
-                        daca_cleanup();
-                        break;
-        }
-        dmasound_deinit();
-
-        of_node_put(awacs_node);
-        of_node_put(i2s_node);
-}
-
-MODULE_DESCRIPTION("PowerMac built-in audio driver.");
-MODULE_LICENSE("GPL");
-
-module_init(dmasound_awacs_init);
-module_exit(dmasound_awacs_cleanup);
diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c
index f4056a9c371b..a003c0ea9303 100644
--- a/sound/oss/dmasound/dmasound_core.c
+++ b/sound/oss/dmasound/dmasound_core.c
@@ -202,13 +202,6 @@ module_param(numWriteBufs, int, 0);
 static unsigned int writeBufSize = DEFAULT_BUFF_SIZE ;  /* in bytes */
 module_param(writeBufSize, int, 0);
 
-#ifdef HAS_RECORD
-static unsigned int numReadBufs = DEFAULT_N_BUFFERS;
-module_param(numReadBufs, int, 0);
-static unsigned int readBufSize = DEFAULT_BUFF_SIZE;    /* in bytes */
-module_param(readBufSize, int, 0);
-#endif
-
 MODULE_LICENSE("GPL");
 
 #ifdef MODULE
@@ -403,10 +396,6 @@ static void mixer_init(void)
 
 struct sound_queue dmasound_write_sq;
 static void sq_reset_output(void) ;
-#ifdef HAS_RECORD
-struct sound_queue dmasound_read_sq;
-static void sq_reset_input(void) ;
-#endif
 
 static int sq_allocate_buffers(struct sound_queue *sq, int num, int size)
 {
@@ -530,12 +519,6 @@ printk("dmasound_core: invalid frag count (user set %d)\n", sq->user_frags) ;
             sq->rear = -1;
             setup_func = dmasound.mach.write_sq_setup;
         }
-#ifdef HAS_RECORD
-        else {
-            sq->rear = 0;
-            setup_func = dmasound.mach.read_sq_setup;
-        }
-#endif
         if (setup_func)
             return setup_func();
         return 0 ;
@@ -672,13 +655,6 @@ static unsigned int sq_poll(struct file *file, struct poll_table_struct *wait)
         }
         if (file->f_mode & FMODE_WRITE )
                 poll_wait(file, &write_sq.action_queue, wait);
-#ifdef HAS_RECORD
-        if (file->f_mode & FMODE_READ)
-                poll_wait(file, &read_sq.action_queue, wait);
-        if (file->f_mode & FMODE_READ)
-                if (read_sq.block_size - read_sq.rear_size > 0)
-                        mask |= POLLIN | POLLRDNORM;
-#endif
         if (file->f_mode & FMODE_WRITE)
                 if (write_sq.count < write_sq.max_active || write_sq.block_size - write_sq.rear_size > 0)
                         mask |= POLLOUT | POLLWRNORM;
@@ -686,101 +662,6 @@ static unsigned int sq_poll(struct file *file, struct poll_table_struct *wait)
 
 }
 
-#ifdef HAS_RECORD
-    /*
-     *  Here is how the values are used for reading.
-     *  The value 'active' simply indicates the DMA is running.  This is done
-     *  so the driver semantics are DMA starts when the first read is posted.
-     *  The value 'front' indicates the buffer we should next send to the user.
-     *  The value 'rear' indicates the buffer the DMA is currently filling.
-     *  When 'front' == 'rear' the buffer "ring" is empty (we always have an
-     *  empty available).  The 'rear_size' is used to track partial offsets
-     *  into the buffer we are currently returning to the user.
-
-     *  This level (> [1.5]) doesn't care what strategy the LL driver uses with
-     *  DMA on over-run.  It can leave it running (and keep active == 1) or it
-     *  can kill it and set active == 0 in which case this routine will spot
-     *  it and restart the DMA.
-     */
-
-static ssize_t sq_read(struct file *file, char __user *dst, size_t uLeft,
-                       loff_t *ppos)
-{
-
-        ssize_t uRead, bLeft, bUsed, uUsed;
-
-        if (uLeft == 0)
-                return 0;
-
-        /* cater for the compatibility mode - record compiled in but no LL */
-        if (dmasound.mach.record == NULL)
-                return -EINVAL ;
-
-        /* see comment in sq_write()
-        */
-
-        if( shared_resources_initialised == 0) {
-                dmasound.mach.init() ;
-                shared_resources_initialised = 1 ;
-        }
-
-        /* set up the sq if it is not already done. see comments in sq_write().
-        */
-
-        if (read_sq.locked == 0) {
-                if ((uRead = sq_setup(&read_sq)) < 0)
-                        return uRead ;
-        }
-
-        uRead = 0;
-
-        /* Move what the user requests, depending upon other options.
-        */
-        while (uLeft > 0) {
-
-                /* we happened to get behind and the LL driver killed DMA
-                   then we should set it going again.  This also sets it
-                   going the first time through.
-                */
-                if ( !read_sq.active )
-                        dmasound.mach.record();
-
-                /* When front == rear, the DMA is not done yet.
-                */
-                while (read_sq.front == read_sq.rear) {
-                        if (read_sq.open_mode & O_NONBLOCK) {
-                               return uRead > 0 ? uRead : -EAGAIN;
-                        }
-                        SLEEP(read_sq.action_queue);
-                        if (signal_pending(current))
-                                return uRead > 0 ? uRead : -EINTR;
-                }
-
-                /* The amount we move is either what is left in the
-                 * current buffer or what the user wants.
-                 */
-                bLeft = read_sq.block_size - read_sq.rear_size;
-                bUsed = read_sq.rear_size;
-                uUsed = sound_copy_translate(dmasound.trans_read, dst, uLeft,
-                                             read_sq.buffers[read_sq.front],
-                                             &bUsed, bLeft);
-                if (uUsed <= 0)
-                        return uUsed;
-                dst += uUsed;
-                uRead += uUsed;
-                uLeft -= uUsed;
-                read_sq.rear_size += bUsed;
-                if (read_sq.rear_size >= read_sq.block_size) {
-                        read_sq.rear_size = 0;
-                        read_sq.front++;
-                        if (read_sq.front >= read_sq.max_active)
-                                read_sq.front = 0;
-                }
-        }
-        return uRead;
-}
-#endif /* HAS_RECORD */
-
 static inline void sq_init_waitqueue(struct sound_queue *sq)
 {
         init_waitqueue_head(&sq->action_queue);
@@ -854,23 +735,6 @@ static int sq_open2(struct sound_queue *sq, struct file *file, mode_t mode,
 #define write_sq_open(file)     \
         sq_open2(&write_sq, file, FMODE_WRITE, numWriteBufs, writeBufSize )
 
-#ifdef HAS_RECORD
-#define read_sq_init_waitqueue()        sq_init_waitqueue(&read_sq)
-#if 0 /* blocking open() */
-#define read_sq_wake_up(file)           sq_wake_up(&read_sq, file, FMODE_READ)
-#endif
-#define read_sq_release_buffers()       sq_release_buffers(&read_sq)
-#define read_sq_open(file)      \
-        sq_open2(&read_sq, file, FMODE_READ, numReadBufs, readBufSize )
-#else
-#define read_sq_init_waitqueue()        do {} while (0)
-#if 0 /* blocking open() */
-#define read_sq_wake_up(file)           do {} while (0)
-#endif
-#define read_sq_release_buffers()       do {} while (0)
-#define sq_reset_input()                do {} while (0)
-#endif
-
 static int sq_open(struct inode *inode, struct file *file)
 {
         int rc;
@@ -881,25 +745,11 @@ static int sq_open(struct inode *inode, struct file *file)
         rc = write_sq_open(file); /* checks the f_mode */
         if (rc)
                 goto out;
-#ifdef HAS_RECORD
-        if (dmasound.mach.record) {
-                rc = read_sq_open(file); /* checks the f_mode */
-                if (rc)
-                        goto out;
-        } else { /* no record function installed; in compat mode */
-                if (file->f_mode & FMODE_READ) {
-                        /* TODO: if O_RDWR, release any resources grabbed by write part */
-                        rc = -ENXIO;
-                        goto out;
-                }
-        }
-#else /* !HAS_RECORD */
         if (file->f_mode & FMODE_READ) {
                 /* TODO: if O_RDWR, release any resources grabbed by write part */
                 rc = -ENXIO ; /* I think this is what is required by open(2) */
                 goto out;
         }
-#endif /* HAS_RECORD */
 
         if (dmasound.mach.sq_open)
             dmasound.mach.sq_open(file->f_mode);
@@ -956,43 +806,9 @@ static void sq_reset_output(void)
         write_sq.user_frag_size = 0 ;
 }
 
-#ifdef HAS_RECORD
-
-static void sq_reset_input(void)
-{
-        if (dmasound.mach.record && read_sq.active) {
-                if (dmasound.mach.abort_read) { /* this routine must really be present */
-                        read_sq.syncing = 1 ;
-                        /* this can use the read_sq.sync_queue to sleep if
-                           necessary - it should not return until DMA
-                           is really stopped - because we might deallocate
-                           the buffers as the next action...
-                        */
-                        dmasound.mach.abort_read() ;
-                } else {
-                        printk(KERN_ERR
-                        "dmasound_core: %s has no abort_read()!! all bets are off\n",
-                                dmasound.mach.name) ;
-                }
-        }
-        read_sq.syncing =
-        read_sq.active =
-        read_sq.front =
-        read_sq.count =
-        read_sq.rear = 0 ;
-
-        /* OK - we can unlock the parameters and fragment settings */
-        read_sq.locked = 0 ;
-        read_sq.user_frags = 0 ;
-        read_sq.user_frag_size = 0 ;
-}
-
-#endif
-
 static void sq_reset(void)
 {
         sq_reset_output() ;
-        sq_reset_input() ;
         /* we could consider resetting the shared_resources_owner here... but I
            think it is probably still rather non-obvious to application writer
         */
@@ -1038,17 +854,6 @@ static int sq_release(struct inode *inode, struct file *file)
 
         lock_kernel();
 
-#ifdef HAS_RECORD
-        /* probably best to do the read side first - so that time taken to do it
-           overlaps with playing any remaining output samples.
-        */
-        if (file->f_mode & FMODE_READ) {
-                sq_reset_input() ; /* make sure dma is stopped and all is quiet */
-                read_sq_release_buffers();
-                read_sq.busy = 0;
-        }
-#endif
-
         if (file->f_mode & FMODE_WRITE) {
                 if (write_sq.busy)
                         rc = sq_fsync(file, file->f_path.dentry);
@@ -1105,11 +910,6 @@ static int shared_resources_are_mine(mode_t md)
 
 static int queues_are_quiescent(void)
 {
-#ifdef HAS_RECORD
-        if (dmasound.mach.record)
-                if (read_sq.locked)
-                        return 0 ;
-#endif
         if (write_sq.locked)
                 return 0 ;
         return 1 ;
@@ -1185,13 +985,6 @@ static int sq_ioctl(struct inode *inode, struct file *file, u_int cmd,
                    the read_sq ones.
                 */
                 size = 0 ;
-#ifdef HAS_RECORD
-                if (dmasound.mach.record && (file->f_mode & FMODE_READ)) {
-                        if ( !read_sq.locked )
-                                sq_setup(&read_sq) ; /* set params */
-                        size = read_sq.user_frag_size ;
-                }
-#endif
                 if (file->f_mode & FMODE_WRITE) {
                         if ( !write_sq.locked )
                                 sq_setup(&write_sq) ;
@@ -1214,8 +1007,6 @@ static int sq_ioctl(struct inode *inode, struct file *file, u_int cmd,
                    everything - read, however, is killed imediately.
                 */
                 result = 0 ;
-                if ((file->f_mode & FMODE_READ) && dmasound.mach.record)
-                        sq_reset_input() ;
                 if (file->f_mode & FMODE_WRITE) {
                         result = sq_fsync(file, file->f_path.dentry);
                         sq_reset_output() ;
@@ -1294,13 +1085,6 @@ static int sq_ioctl(struct inode *inode, struct file *file, u_int cmd,
                 result = 0 ;
                 nbufs = (data >> 16) & 0x7fff ; /* 0x7fff is 'use maximum' */
                 size = data & 0xffff;
-#ifdef HAS_RECORD
-                if ((file->f_mode & FMODE_READ) && dmasound.mach.record) {
-                        result = set_queue_frags(&read_sq, nbufs, size) ;
-                        if (result)
-                                return result ;
-                }
-#endif
                 if (file->f_mode & FMODE_WRITE) {
                         result = set_queue_frags(&write_sq, nbufs, size) ;
                         if (result)
@@ -1348,20 +1132,6 @@ static const struct file_operations sq_fops =
         .release        = sq_release,
 };
 
-#ifdef HAS_RECORD
-static const struct file_operations sq_fops_record =
-{
-        .owner          = THIS_MODULE,
-        .llseek         = no_llseek,
-        .write          = sq_write,
-        .poll           = sq_poll,
-        .ioctl          = sq_ioctl,
-        .open           = sq_open,
-        .release        = sq_release,
-        .read           = sq_read,
-};
-#endif
-
 static int sq_init(void)
 {
         const struct file_operations *fops = &sq_fops;
@@ -1369,10 +1139,6 @@ static int sq_init(void)
         int sq_unit;
 #endif
 
-#ifdef HAS_RECORD
-        if (dmasound.mach.record)
-                fops = &sq_fops_record;
-#endif
         sq_unit = register_sound_dsp(fops, -1);
         if (sq_unit < 0) {
                 printk(KERN_ERR "dmasound_core: couldn't register fops\n") ;
@@ -1380,7 +1146,6 @@ static int sq_init(void)
         }
 
         write_sq_init_waitqueue();
-        read_sq_init_waitqueue();
 
         /* These parameters will be restored for every clean open()
          * in the case of multiple open()s (e.g. dsp0 & dsp1) they
@@ -1406,11 +1171,7 @@ static int sq_init(void)
    driver.
 */
 
-#ifdef HAS_RECORD
-#define STAT_BUFF_LEN 1024
-#else
 #define STAT_BUFF_LEN 768
-#endif
 
 /* this is how much space we will allow the low-level driver to use
    in the stat buffer.  Currently, 2 * (80 character line + <NL>).
@@ -1518,11 +1279,6 @@ static int state_open(struct inode *inode, struct file *file)
         len += sprintf(buffer+len,"Allocated:%8s%6s\n","Buffers","Size") ;
         len += sprintf(buffer+len,"%9s:%8d%6d\n",
                 "write", write_sq.numBufs, write_sq.bufSize) ;
-#ifdef HAS_RECORD
-        if (dmasound.mach.record)
-                len += sprintf(buffer+len,"%9s:%8d%6d\n",
-                        "read", read_sq.numBufs, read_sq.bufSize) ;
-#endif
         len += sprintf(buffer+len,
                 "Current  : MaxFrg FragSiz MaxAct Frnt Rear "
                 "Cnt RrSize A B S L  xruns\n") ;
@@ -1531,14 +1287,6 @@ static int state_open(struct inode *inode, struct file *file)
                 write_sq.max_active, write_sq.front, write_sq.rear,
                 write_sq.count, write_sq.rear_size, write_sq.active,
                 write_sq.busy, write_sq.syncing, write_sq.locked, write_sq.xruns) ;
-#ifdef HAS_RECORD
-        if (dmasound.mach.record)
-                len += sprintf(buffer+len,"%9s:%7d%8d%7d%5d%5d%4d%7d%2d%2d%2d%2d%7d\n",
-                        "read", read_sq.max_count, read_sq.block_size,
-                        read_sq.max_active, read_sq.front, read_sq.rear,
-                        read_sq.count, read_sq.rear_size, read_sq.active,
-                        read_sq.busy, read_sq.syncing, read_sq.locked, read_sq.xruns) ;
-#endif
 #ifdef DEBUG_DMASOUND
 printk("dmasound: stat buffer used %d bytes\n", len) ;
 #endif
@@ -1638,13 +1386,6 @@ int dmasound_init(void)
                 (dmasound.mach.version >> 8), (dmasound.mach.version & 0xff)) ;
         printk(KERN_INFO "Write will use %4d fragments of %7d bytes as default\n",
                 numWriteBufs, writeBufSize) ;
-#ifdef HAS_RECORD
-        if (dmasound.mach.record)
-                printk(KERN_INFO
-                        "Read  will use %4d fragments of %7d bytes as default\n",
-                        numReadBufs, readBufSize) ;
-#endif
-
         return 0;
 }
 
@@ -1659,7 +1400,6 @@ void dmasound_deinit(void)
         }
 
         write_sq_release_buffers();
-        read_sq_release_buffers();
 
         if (mixer_unit >= 0)
                 unregister_sound_mixer(mixer_unit);
@@ -1684,36 +1424,12 @@ static int dmasound_setup(char *str)
          */
 
         switch (ints[0]) {
-#ifdef HAS_RECORD
-        case 5:
-                if ((ints[5] < 0) || (ints[5] > MAX_CATCH_RADIUS))
-                        printk("dmasound_setup: invalid catch radius, using default = %d\n", catchRadius);
-                else
-                        catchRadius = ints[5];
-                /* fall through */
-        case 4:
-                if (ints[4] < MIN_BUFFERS)
-                        printk("dmasound_setup: invalid number of read buffers, using default = %d\n",
-                                 numReadBufs);
-                else
-                        numReadBufs = ints[4];
-                /* fall through */
-        case 3:
-                if ((size = ints[3]) < 256)  /* check for small buffer specs */
-                        size <<= 10 ;
-                if (size < MIN_BUFSIZE || size > MAX_BUFSIZE)
-                        printk("dmasound_setup: invalid read buffer size, using default = %d\n", readBufSize);
-                else
-                        readBufSize = size;
-                /* fall through */
-#else
         case 3:
                 if ((ints[3] < 0) || (ints[3] > MAX_CATCH_RADIUS))
                         printk("dmasound_setup: invalid catch radius, using default = %d\n", catchRadius);
                 else
                         catchRadius = ints[3];
                 /* fall through */
-#endif
         case 2:
                 if (ints[1] < MIN_BUFFERS)
                         printk("dmasound_setup: invalid number of buffers, using default = %d\n", numWriteBufs);
@@ -1830,9 +1546,6 @@ EXPORT_SYMBOL(dmasound_init);
 EXPORT_SYMBOL(dmasound_deinit);
 #endif
 EXPORT_SYMBOL(dmasound_write_sq);
-#ifdef HAS_RECORD
-EXPORT_SYMBOL(dmasound_read_sq);
-#endif
 EXPORT_SYMBOL(dmasound_catchRadius);
 #ifdef HAS_8BIT_TABLES
 EXPORT_SYMBOL(dmasound_ulaw2dma8);
diff --git a/sound/oss/dmasound/tas3001c.c b/sound/oss/dmasound/tas3001c.c
deleted file mode 100644
index 4b7dbdd2a438..000000000000
--- a/sound/oss/dmasound/tas3001c.c
+++ /dev/null
@@ -1,849 +0,0 @@
-/*
- * Driver for the i2c/i2s based TA3004 sound chip used
- * on some Apple hardware. Also known as "snapper".
- *
- * Tobias Sargeant <tobias.sargeant@bigpond.com>
- * Based upon, tas3001c.c by Christopher C. Chimelis <chris@debian.org>:
- *
- *   TODO:
- *   -----
- *   * Enable control over input line 2 (is this connected?)
- *   * Implement sleep support (at least mute everything and
- *   * set gains to minimum during sleep)
- *   * Look into some of Darwin's tweaks regarding the mute
- *   * lines (delays & different behaviour on some HW)
- *
- */
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/proc_fs.h>
-#include <linux/ioport.h>
-#include <linux/sysctl.h>
-#include <linux/types.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/soundcard.h>
-#include <linux/workqueue.h>
-#include <asm/uaccess.h>
-#include <asm/errno.h>
-#include <asm/io.h>
-#include <asm/prom.h>
-
-#include "dmasound.h"
-#include "tas_common.h"
-#include "tas3001c.h"
-
-#include "tas_ioctl.h"
-
-#define TAS3001C_BIQUAD_FILTER_COUNT  6
-#define TAS3001C_BIQUAD_CHANNEL_COUNT 2
-
-#define VOL_DEFAULT     (100 * 4 / 5)
-#define INPUT_DEFAULT   (100 * 4 / 5)
-#define BASS_DEFAULT    (100 / 2)
-#define TREBLE_DEFAULT  (100 / 2)
-
-struct tas3001c_data_t {
-        struct tas_data_t super;
-        int device_id;
-        int output_id;
-        int speaker_id;
-        struct tas_drce_t drce_state;
-        struct work_struct change;
-};
-
-
-static const union tas_biquad_t
-tas3001c_eq_unity={
-        .buf = { 0x100000, 0x000000, 0x000000, 0x000000, 0x000000 }
-};
-
-
-static inline unsigned char db_to_regval(short db) {
-        int r=0;
-
-        r=(db+0x59a0) / 0x60;
-
-        if (r < 0x91) return 0x91;
-        if (r > 0xef) return 0xef;
-        return r;
-}
-
-static inline short quantize_db(short db) {
-        return db_to_regval(db) * 0x60 - 0x59a0;
-}
-
-
-static inline int
-register_width(enum tas3001c_reg_t r)
-{
-        switch(r) {
-        case TAS3001C_REG_MCR:
-        case TAS3001C_REG_TREBLE:
-        case TAS3001C_REG_BASS:
-                return 1;
-
-        case TAS3001C_REG_DRC:
-                return 2;
-
-        case TAS3001C_REG_MIXER1:
-        case TAS3001C_REG_MIXER2:
-                return 3;
-
-        case TAS3001C_REG_VOLUME:
-                return 6;
-
-        case TAS3001C_REG_LEFT_BIQUAD0:
-        case TAS3001C_REG_LEFT_BIQUAD1:
-        case TAS3001C_REG_LEFT_BIQUAD2:
-        case TAS3001C_REG_LEFT_BIQUAD3:
-        case TAS3001C_REG_LEFT_BIQUAD4:
-        case TAS3001C_REG_LEFT_BIQUAD5:
-        case TAS3001C_REG_LEFT_BIQUAD6:
-
-        case TAS3001C_REG_RIGHT_BIQUAD0:
-        case TAS3001C_REG_RIGHT_BIQUAD1:
-        case TAS3001C_REG_RIGHT_BIQUAD2:
-        case TAS3001C_REG_RIGHT_BIQUAD3:
-        case TAS3001C_REG_RIGHT_BIQUAD4:
-        case TAS3001C_REG_RIGHT_BIQUAD5:
-        case TAS3001C_REG_RIGHT_BIQUAD6:
-                return 15;
-
-        default:
-                return 0;
-        }
-}
-
-static int
-tas3001c_write_register(        struct tas3001c_data_t *self,
-                                enum tas3001c_reg_t reg_num,
-                                char *data,
-                                uint write_mode)
-{
-        if (reg_num==TAS3001C_REG_MCR ||
-            reg_num==TAS3001C_REG_BASS ||
-            reg_num==TAS3001C_REG_TREBLE) {
-                return tas_write_byte_register(&self->super,
-                                               (uint)reg_num,
-                                               *data,
-                                               write_mode);
-        } else {
-                return tas_write_register(&self->super,
-                                          (uint)reg_num,
-                                          register_width(reg_num),
-                                          data,
-                                          write_mode);
-        }
-}
-
-static int
-tas3001c_sync_register( struct tas3001c_data_t *self,
-                        enum tas3001c_reg_t reg_num)
-{
-        if (reg_num==TAS3001C_REG_MCR ||
-            reg_num==TAS3001C_REG_BASS ||
-            reg_num==TAS3001C_REG_TREBLE) {
-                return tas_sync_byte_register(&self->super,
-                                              (uint)reg_num,
-                                              register_width(reg_num));
-        } else {
-                return tas_sync_register(&self->super,
-                                         (uint)reg_num,
-                                         register_width(reg_num));
-        }
-}
-
-static int
-tas3001c_read_register( struct tas3001c_data_t *self,
-                        enum tas3001c_reg_t reg_num,
-                        char *data,
-                        uint write_mode)
-{
-        return tas_read_register(&self->super,
-                                 (uint)reg_num,
-                                 register_width(reg_num),
-                                 data);
-}
-
-static inline int
-tas3001c_fast_load(struct tas3001c_data_t *self, int fast)
-{
-        if (fast)
-                self->super.shadow[TAS3001C_REG_MCR][0] |= 0x80;
-        else
-                self->super.shadow[TAS3001C_REG_MCR][0] &= 0x7f;
-        return tas3001c_sync_register(self,TAS3001C_REG_MCR);
-}
-
-static uint
-tas3001c_supported_mixers(struct tas3001c_data_t *self)
-{
-        return SOUND_MASK_VOLUME |
-                SOUND_MASK_PCM |
-                SOUND_MASK_ALTPCM |
-                SOUND_MASK_TREBLE |
-                SOUND_MASK_BASS;
-}
-
-static int
-tas3001c_mixer_is_stereo(struct tas3001c_data_t *self,int mixer)
-{
-        switch(mixer) {
-        case SOUND_MIXER_VOLUME:
-                return 1;
-        default:
-                return 0;
-        }
-}
-
-static uint
-tas3001c_stereo_mixers(struct tas3001c_data_t *self)
-{
-        uint r=tas3001c_supported_mixers(self);
-        uint i;
-        
-        for (i=1; i<SOUND_MIXER_NRDEVICES; i++)
-                if (r&(1<<i) && !tas3001c_mixer_is_stereo(self,i))
-                        r &= ~(1<<i);
-        return r;
-}
-
-static int
-tas3001c_get_mixer_level(struct tas3001c_data_t *self,int mixer,uint *level)
-{
-        if (!self)
-                return -1;
-                
-        *level=self->super.mixer[mixer];
-        
-        return 0;
-}
-
-static int
-tas3001c_set_mixer_level(struct tas3001c_data_t *self,int mixer,uint level)
-{
-        int rc;
-        tas_shadow_t *shadow;
-
-        uint temp;
-        uint offset=0;
-
-        if (!self)
-                return -1;
-                
-        shadow=self->super.shadow;
-
-        if (!tas3001c_mixer_is_stereo(self,mixer))
-                level = tas_mono_to_stereo(level);
-
-        switch(mixer) {
-        case SOUND_MIXER_VOLUME:
-                temp = tas3001c_gain.master[level&0xff];
-                shadow[TAS3001C_REG_VOLUME][0] = (temp >> 16) & 0xff;
-                shadow[TAS3001C_REG_VOLUME][1] = (temp >> 8)  & 0xff;
-                shadow[TAS3001C_REG_VOLUME][2] = (temp >> 0)  & 0xff;
-                temp = tas3001c_gain.master[(level>>8)&0xff];
-                shadow[TAS3001C_REG_VOLUME][3] = (temp >> 16) & 0xff;
-                shadow[TAS3001C_REG_VOLUME][4] = (temp >> 8)  & 0xff;
-                shadow[TAS3001C_REG_VOLUME][5] = (temp >> 0)  & 0xff;
-                rc = tas3001c_sync_register(self,TAS3001C_REG_VOLUME);
-                break;
-        case SOUND_MIXER_ALTPCM:
-                /* tas3001c_fast_load(self, 1); */
-                level = tas_mono_to_stereo(level);
-                temp = tas3001c_gain.mixer[level&0xff];
-                shadow[TAS3001C_REG_MIXER2][offset+0] = (temp >> 16) & 0xff;
-                shadow[TAS3001C_REG_MIXER2][offset+1] = (temp >> 8)  & 0xff;
-                shadow[TAS3001C_REG_MIXER2][offset+2] = (temp >> 0)  & 0xff;
-                rc = tas3001c_sync_register(self,TAS3001C_REG_MIXER2);
-                /* tas3001c_fast_load(self, 0); */
-                break;
-        case SOUND_MIXER_PCM:
-                /* tas3001c_fast_load(self, 1); */
-                level = tas_mono_to_stereo(level);
-                temp = tas3001c_gain.mixer[level&0xff];
-                shadow[TAS3001C_REG_MIXER1][offset+0] = (temp >> 16) & 0xff;
-                shadow[TAS3001C_REG_MIXER1][offset+1] = (temp >> 8)  & 0xff;
-                shadow[TAS3001C_REG_MIXER1][offset+2] = (temp >> 0)  & 0xff;
-                rc = tas3001c_sync_register(self,TAS3001C_REG_MIXER1);
-                /* tas3001c_fast_load(self, 0); */
-                break;
-        case SOUND_MIXER_TREBLE:
-                temp = tas3001c_gain.treble[level&0xff];
-                shadow[TAS3001C_REG_TREBLE][0]=temp&0xff;
-                rc = tas3001c_sync_register(self,TAS3001C_REG_TREBLE);
-                break;
-        case SOUND_MIXER_BASS:
-                temp = tas3001c_gain.bass[level&0xff];
-                shadow[TAS3001C_REG_BASS][0]=temp&0xff;
-                rc = tas3001c_sync_register(self,TAS3001C_REG_BASS);
-                break;
-        default:
-                rc = -1;
-                break;
-        }
-        if (rc < 0)
-                return rc;
-        self->super.mixer[mixer]=level;
-        return 0;
-}
-
-static int
-tas3001c_leave_sleep(struct tas3001c_data_t *self)
-{
-        unsigned char mcr = (1<<6)+(2<<4)+(2<<2);
-
-        if (!self)
-                return -1;
-
-        /* Make sure something answers on the i2c bus */
-        if (tas3001c_write_register(self, TAS3001C_REG_MCR, &mcr,
-            WRITE_NORMAL|FORCE_WRITE) < 0)
-                return -1;
-
-        tas3001c_fast_load(self, 1);
-
-        (void)tas3001c_sync_register(self,TAS3001C_REG_RIGHT_BIQUAD0);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_RIGHT_BIQUAD1);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_RIGHT_BIQUAD2);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_RIGHT_BIQUAD3);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_RIGHT_BIQUAD4);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_RIGHT_BIQUAD5);
-
-        (void)tas3001c_sync_register(self,TAS3001C_REG_LEFT_BIQUAD0);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_LEFT_BIQUAD1);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_LEFT_BIQUAD2);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_LEFT_BIQUAD3);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_LEFT_BIQUAD4);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_LEFT_BIQUAD5);
-
-        tas3001c_fast_load(self, 0);
-
-        (void)tas3001c_sync_register(self,TAS3001C_REG_BASS);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_TREBLE);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_MIXER1);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_MIXER2);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_VOLUME);
-
-        return 0;
-}
-
-static int
-tas3001c_enter_sleep(struct tas3001c_data_t *self)
-{
-        /* Stub for now, but I have the details on low-power mode */
-        if (!self)
-                return -1; 
-        return 0;
-}
-
-static int
-tas3001c_sync_biquad(   struct tas3001c_data_t *self,
-                        u_int channel,
-                        u_int filter)
-{
-        enum tas3001c_reg_t reg;
-
-        if (channel >= TAS3001C_BIQUAD_CHANNEL_COUNT ||
-            filter  >= TAS3001C_BIQUAD_FILTER_COUNT) return -EINVAL;
-
-        reg=( channel ? TAS3001C_REG_RIGHT_BIQUAD0 : TAS3001C_REG_LEFT_BIQUAD0 ) + filter;
-
-        return tas3001c_sync_register(self,reg);
-}
-
-static int
-tas3001c_write_biquad_shadow(   struct tas3001c_data_t *self,
-                                u_int channel,
-                                u_int filter,
-                                const union tas_biquad_t *biquad)
-{
-        tas_shadow_t *shadow=self->super.shadow;
-        enum tas3001c_reg_t reg;
-
-        if (channel >= TAS3001C_BIQUAD_CHANNEL_COUNT ||
-            filter  >= TAS3001C_BIQUAD_FILTER_COUNT) return -EINVAL;
-
-        reg=( channel ? TAS3001C_REG_RIGHT_BIQUAD0 : TAS3001C_REG_LEFT_BIQUAD0 ) + filter;
-
-        SET_4_20(shadow[reg], 0,biquad->coeff.b0);
-        SET_4_20(shadow[reg], 3,biquad->coeff.b1);
-        SET_4_20(shadow[reg], 6,biquad->coeff.b2);
-        SET_4_20(shadow[reg], 9,biquad->coeff.a1);
-        SET_4_20(shadow[reg],12,biquad->coeff.a2);
-
-        return 0;
-}
-
-static int
-tas3001c_write_biquad(  struct tas3001c_data_t *self,
-                        u_int channel,
-                        u_int filter,
-                        const union tas_biquad_t *biquad)
-{
-        int rc;
-
-        rc=tas3001c_write_biquad_shadow(self, channel, filter, biquad);
-        if (rc < 0) return rc;
-
-        return tas3001c_sync_biquad(self, channel, filter);
-}
-
-static int
-tas3001c_write_biquad_list(     struct tas3001c_data_t *self,
-                                u_int filter_count,
-                                u_int flags,
-                                struct tas_biquad_ctrl_t *biquads)
-{
-        int i;
-        int rc;
-
-        if (flags & TAS_BIQUAD_FAST_LOAD) tas3001c_fast_load(self,1);
-
-        for (i=0; i<filter_count; i++) {
-                rc=tas3001c_write_biquad(self,
-                                         biquads[i].channel,
-                                         biquads[i].filter,
-                                         &biquads[i].data);
-                if (rc < 0) break;
-        }
-
-        if (flags & TAS_BIQUAD_FAST_LOAD) {
-                tas3001c_fast_load(self,0);
-
-                (void)tas3001c_sync_register(self,TAS3001C_REG_BASS);
-                (void)tas3001c_sync_register(self,TAS3001C_REG_TREBLE);
-                (void)tas3001c_sync_register(self,TAS3001C_REG_MIXER1);
-                (void)tas3001c_sync_register(self,TAS3001C_REG_MIXER2);
-                (void)tas3001c_sync_register(self,TAS3001C_REG_VOLUME);
-        }
-
-        return rc;
-}
-
-static int
-tas3001c_read_biquad(   struct tas3001c_data_t *self,
-                        u_int channel,
-                        u_int filter,
-                        union tas_biquad_t *biquad)
-{
-        tas_shadow_t *shadow=self->super.shadow;
-        enum tas3001c_reg_t reg;
-
-        if (channel >= TAS3001C_BIQUAD_CHANNEL_COUNT ||
-            filter  >= TAS3001C_BIQUAD_FILTER_COUNT) return -EINVAL;
-
-        reg=( channel ? TAS3001C_REG_RIGHT_BIQUAD0 : TAS3001C_REG_LEFT_BIQUAD0 ) + filter;
-
-        biquad->coeff.b0=GET_4_20(shadow[reg], 0);
-        biquad->coeff.b1=GET_4_20(shadow[reg], 3);
-        biquad->coeff.b2=GET_4_20(shadow[reg], 6);
-        biquad->coeff.a1=GET_4_20(shadow[reg], 9);
-        biquad->coeff.a2=GET_4_20(shadow[reg],12);
-        
-        return 0;       
-}
-
-static int
-tas3001c_eq_rw( struct tas3001c_data_t *self,
-                u_int cmd,
-                u_long arg)
-{
-        int rc;
-        struct tas_biquad_ctrl_t biquad;
-        void __user *argp = (void __user *)arg;
-
-        if (copy_from_user(&biquad, argp, sizeof(struct tas_biquad_ctrl_t))) {
-                return -EFAULT;
-        }
-
-        if (cmd & SIOC_IN) {
-                rc=tas3001c_write_biquad(self, biquad.channel, biquad.filter, &biquad.data);
-                if (rc != 0) return rc;
-        }
-
-        if (cmd & SIOC_OUT) {
-                rc=tas3001c_read_biquad(self, biquad.channel, biquad.filter, &biquad.data);
-                if (rc != 0) return rc;
-
-                if (copy_to_user(argp, &biquad, sizeof(struct tas_biquad_ctrl_t))) {
-                        return -EFAULT;
-                }
-
-        }
-        return 0;
-}
-
-static int
-tas3001c_eq_list_rw(    struct tas3001c_data_t *self,
-                        u_int cmd,
-                        u_long arg)
-{
-        int rc;
-        int filter_count;
-        int flags;
-        int i,j;
-        char sync_required[2][6];
-        struct tas_biquad_ctrl_t biquad;
-        struct tas_biquad_ctrl_list_t __user *argp = (void __user *)arg;
-
-        memset(sync_required,0,sizeof(sync_required));
-
-        if (copy_from_user(&filter_count, &argp->filter_count, sizeof(int)))
-                return -EFAULT;
-
-        if (copy_from_user(&flags, &argp->flags, sizeof(int)))
-                return -EFAULT;
-
-        if (cmd & SIOC_IN) {
-        }
-
-        for (i=0; i < filter_count; i++) {
-                if (copy_from_user(&biquad, &argp->biquads[i],
-                                   sizeof(struct tas_biquad_ctrl_t))) {
-                        return -EFAULT;
-                }
-
-                if (cmd & SIOC_IN) {
-                        sync_required[biquad.channel][biquad.filter]=1;
-                        rc=tas3001c_write_biquad_shadow(self, biquad.channel, biquad.filter, &biquad.data);
-                        if (rc != 0) return rc;
-                }
-
-                if (cmd & SIOC_OUT) {
-                        rc=tas3001c_read_biquad(self, biquad.channel, biquad.filter, &biquad.data);
-                        if (rc != 0) return rc;
-
-                        if (copy_to_user(&argp->biquads[i], &biquad,
-                                         sizeof(struct tas_biquad_ctrl_t))) {
-                                return -EFAULT;
-                        }
-                }
-        }
-
-        if (cmd & SIOC_IN) {
-                if (flags & TAS_BIQUAD_FAST_LOAD) tas3001c_fast_load(self,1);
-                for (i=0; i<2; i++) {
-                        for (j=0; j<6; j++) {
-                                if (sync_required[i][j]) {
-                                        rc=tas3001c_sync_biquad(self, i, j);
-                                        if (rc < 0) return rc;
-                                }
-                        }
-                }
-                if (flags & TAS_BIQUAD_FAST_LOAD) {
-                        tas3001c_fast_load(self,0);
-                        /* now we need to set up the mixers again,
-                           because leaving fast mode resets them. */
-                        (void)tas3001c_sync_register(self,TAS3001C_REG_BASS);
-                        (void)tas3001c_sync_register(self,TAS3001C_REG_TREBLE);
-                        (void)tas3001c_sync_register(self,TAS3001C_REG_MIXER1);
-                        (void)tas3001c_sync_register(self,TAS3001C_REG_MIXER2);
-                        (void)tas3001c_sync_register(self,TAS3001C_REG_VOLUME);
-                }
-        }
-
-        return 0;
-}
-
-static int
-tas3001c_update_drce(   struct tas3001c_data_t *self,
-                        int flags,
-                        struct tas_drce_t *drce)
-{
-        tas_shadow_t *shadow;
-        shadow=self->super.shadow;
-
-        shadow[TAS3001C_REG_DRC][1] = 0xc1;
-
-        if (flags & TAS_DRCE_THRESHOLD) {
-                self->drce_state.threshold=quantize_db(drce->threshold);
-                shadow[TAS3001C_REG_DRC][2] = db_to_regval(self->drce_state.threshold);
-        }
-
-        if (flags & TAS_DRCE_ENABLE) {
-                self->drce_state.enable = drce->enable;
-        }
-
-        if (!self->drce_state.enable) {
-                shadow[TAS3001C_REG_DRC][0] = 0xf0;
-        }
-
-#ifdef DEBUG_DRCE
-        printk("DRCE IOCTL: set [ ENABLE:%x THRESH:%x\n",
-               self->drce_state.enable,
-               self->drce_state.threshold);
-
-        printk("DRCE IOCTL: reg [ %02x %02x ]\n",
-               (unsigned char)shadow[TAS3001C_REG_DRC][0],
-               (unsigned char)shadow[TAS3001C_REG_DRC][1]);
-#endif
-
-        return tas3001c_sync_register(self, TAS3001C_REG_DRC);
-}
-
-static int
-tas3001c_drce_rw(       struct tas3001c_data_t *self,
-                        u_int cmd,
-                        u_long arg)
-{
-        int rc;
-        struct tas_drce_ctrl_t drce_ctrl;
-        void __user *argp = (void __user *)arg;
-
-        if (copy_from_user(&drce_ctrl, argp, sizeof(struct tas_drce_ctrl_t)))
-                return -EFAULT;
-
-#ifdef DEBUG_DRCE
-        printk("DRCE IOCTL: input [ FLAGS:%x ENABLE:%x THRESH:%x\n",
-               drce_ctrl.flags,
-               drce_ctrl.data.enable,
-               drce_ctrl.data.threshold);
-#endif
-
-        if (cmd & SIOC_IN) {
-                rc = tas3001c_update_drce(self, drce_ctrl.flags, &drce_ctrl.data);
-                if (rc < 0)
-                        return rc;
-        }
-
-        if (cmd & SIOC_OUT) {
-                if (drce_ctrl.flags & TAS_DRCE_ENABLE)
-                        drce_ctrl.data.enable = self->drce_state.enable;
-
-                if (drce_ctrl.flags & TAS_DRCE_THRESHOLD)
-                        drce_ctrl.data.threshold = self->drce_state.threshold;
-
-                if (copy_to_user(argp, &drce_ctrl,
-                                 sizeof(struct tas_drce_ctrl_t))) {
-                        return -EFAULT;
-                }
-        }
-
-        return 0;
-}
-
-static void
-tas3001c_update_device_parameters(struct tas3001c_data_t *self)
-{
-        int i,j;
-
-        if (!self) return;
-
-        if (self->output_id == TAS_OUTPUT_HEADPHONES) {
-                tas3001c_fast_load(self, 1);
-
-                for (i=0; i<TAS3001C_BIQUAD_CHANNEL_COUNT; i++) {
-                        for (j=0; j<TAS3001C_BIQUAD_FILTER_COUNT; j++) {
-                                tas3001c_write_biquad(self, i, j, &tas3001c_eq_unity);
-                        }
-                }
-
-                tas3001c_fast_load(self, 0);
-
-                (void)tas3001c_sync_register(self,TAS3001C_REG_BASS);
-                (void)tas3001c_sync_register(self,TAS3001C_REG_TREBLE);
-                (void)tas3001c_sync_register(self,TAS3001C_REG_MIXER1);
-                (void)tas3001c_sync_register(self,TAS3001C_REG_MIXER2);
-                (void)tas3001c_sync_register(self,TAS3001C_REG_VOLUME);
-
-                return;
-        }
-
-        for (i=0; tas3001c_eq_prefs[i]; i++) {
-                struct tas_eq_pref_t *eq = tas3001c_eq_prefs[i];
-
-                if (eq->device_id == self->device_id &&
-                    (eq->output_id == 0 || eq->output_id == self->output_id) &&
-                    (eq->speaker_id == 0 || eq->speaker_id == self->speaker_id)) {
-
-                        tas3001c_update_drce(self, TAS_DRCE_ALL, eq->drce);
-                        tas3001c_write_biquad_list(self, eq->filter_count, TAS_BIQUAD_FAST_LOAD, eq->biquads);
-
-                        break;
-                }
-        }
-}
-
-static void
-tas3001c_device_change_handler(struct work_struct *work)
-{
-        struct tas3001c_data_t *self;
-        self = container_of(work, struct tas3001c_data_t, change);
-        tas3001c_update_device_parameters(self);
-}
-
-static int
-tas3001c_output_device_change(  struct tas3001c_data_t *self,
-                                int device_id,
-                                int output_id,
-                                int speaker_id)
-{
-        self->device_id=device_id;
-        self->output_id=output_id;
-        self->speaker_id=speaker_id;
-
-        schedule_work(&self->change);
-        return 0;
-}
-
-static int
-tas3001c_device_ioctl(  struct tas3001c_data_t *self,
-                        u_int cmd,
-                        u_long arg)
-{
-        uint __user *argp = (void __user *)arg;
-        switch (cmd) {
-        case TAS_READ_EQ:
-        case TAS_WRITE_EQ:
-                return tas3001c_eq_rw(self, cmd, arg);
-
-        case TAS_READ_EQ_LIST:
-        case TAS_WRITE_EQ_LIST:
-                return tas3001c_eq_list_rw(self, cmd, arg);
-
-        case TAS_READ_EQ_FILTER_COUNT:
-                put_user(TAS3001C_BIQUAD_FILTER_COUNT, argp);
-                return 0;
-
-        case TAS_READ_EQ_CHANNEL_COUNT:
-                put_user(TAS3001C_BIQUAD_CHANNEL_COUNT, argp);
-                return 0;
-
-        case TAS_READ_DRCE:
-        case TAS_WRITE_DRCE:
-                return tas3001c_drce_rw(self, cmd, arg);
-
-        case TAS_READ_DRCE_CAPS:
-                put_user(TAS_DRCE_ENABLE | TAS_DRCE_THRESHOLD, argp);
-                return 0;
-
-        case TAS_READ_DRCE_MIN:
-        case TAS_READ_DRCE_MAX: {
-                struct tas_drce_ctrl_t drce_ctrl;
-
-                if (copy_from_user(&drce_ctrl, argp,
-                                   sizeof(struct tas_drce_ctrl_t))) {
-                        return -EFAULT;
-                }
-
-                if (drce_ctrl.flags & TAS_DRCE_THRESHOLD) {
-                        if (cmd == TAS_READ_DRCE_MIN) {
-                                drce_ctrl.data.threshold=-36<<8;
-                        } else {
-                                drce_ctrl.data.threshold=-6<<8;
-                        }
-                }
-
-                if (copy_to_user(argp, &drce_ctrl,
-                                 sizeof(struct tas_drce_ctrl_t))) {
-                        return -EFAULT;
-                }
-        }
-        }
-
-        return -EINVAL;
-}
-
-static int
-tas3001c_init_mixer(struct tas3001c_data_t *self)
-{
-        unsigned char mcr = (1<<6)+(2<<4)+(2<<2);
-
-        /* Make sure something answers on the i2c bus */
-        if (tas3001c_write_register(self, TAS3001C_REG_MCR, &mcr,
-            WRITE_NORMAL|FORCE_WRITE) < 0)
-                return -1;
-
-        tas3001c_fast_load(self, 1);
-
-        (void)tas3001c_sync_register(self,TAS3001C_REG_RIGHT_BIQUAD0);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_RIGHT_BIQUAD1);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_RIGHT_BIQUAD2);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_RIGHT_BIQUAD3);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_RIGHT_BIQUAD4);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_RIGHT_BIQUAD5);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_RIGHT_BIQUAD6);
-
-        (void)tas3001c_sync_register(self,TAS3001C_REG_LEFT_BIQUAD0);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_LEFT_BIQUAD1);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_LEFT_BIQUAD2);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_LEFT_BIQUAD3);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_LEFT_BIQUAD4);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_LEFT_BIQUAD5);
-        (void)tas3001c_sync_register(self,TAS3001C_REG_LEFT_BIQUAD6);
-
-        tas3001c_fast_load(self, 0);
-
-        tas3001c_set_mixer_level(self, SOUND_MIXER_VOLUME, VOL_DEFAULT<<8 | VOL_DEFAULT);
-        tas3001c_set_mixer_level(self, SOUND_MIXER_PCM, INPUT_DEFAULT<<8 | INPUT_DEFAULT);
-        tas3001c_set_mixer_level(self, SOUND_MIXER_ALTPCM, 0);
-
-        tas3001c_set_mixer_level(self, SOUND_MIXER_BASS, BASS_DEFAULT);
-        tas3001c_set_mixer_level(self, SOUND_MIXER_TREBLE, TREBLE_DEFAULT);
-
-        return 0;
-}
-
-static int
-tas3001c_uninit_mixer(struct tas3001c_data_t *self)
-{
-        tas3001c_set_mixer_level(self, SOUND_MIXER_VOLUME, 0);
-        tas3001c_set_mixer_level(self, SOUND_MIXER_PCM,    0);
-        tas3001c_set_mixer_level(self, SOUND_MIXER_ALTPCM, 0);
-
-        tas3001c_set_mixer_level(self, SOUND_MIXER_BASS,   0);
-        tas3001c_set_mixer_level(self, SOUND_MIXER_TREBLE, 0);
-
-        return 0;
-}
-
-static int
-tas3001c_init(struct i2c_client *client)
-{
-        struct tas3001c_data_t *self;
-        size_t sz = sizeof(*self) + (TAS3001C_REG_MAX*sizeof(tas_shadow_t));
-        int i, j;
-
-        self = kzalloc(sz, GFP_KERNEL);
-        if (!self)
-                return -ENOMEM;
-
-        self->super.client = client;
-        self->super.shadow = (tas_shadow_t *)(self+1);
-        self->output_id = TAS_OUTPUT_HEADPHONES;
-
-        dev_set_drvdata(&client->dev, self);
-
-        for (i = 0; i < TAS3001C_BIQUAD_CHANNEL_COUNT; i++)
-                for (j = 0; j < TAS3001C_BIQUAD_FILTER_COUNT; j++)
-                        tas3001c_write_biquad_shadow(self, i, j,
-                                &tas3001c_eq_unity);
-
-        INIT_WORK(&self->change, tas3001c_device_change_handler);
-        return 0;
-}
-
-static void
-tas3001c_uninit(struct tas3001c_data_t *self)
-{
-        tas3001c_uninit_mixer(self);
-        kfree(self);
-}
-
-struct tas_driver_hooks_t tas3001c_hooks = {
-        .init                   = (tas_hook_init_t)tas3001c_init,
-        .post_init              = (tas_hook_post_init_t)tas3001c_init_mixer,
-        .uninit                 = (tas_hook_uninit_t)tas3001c_uninit,
-        .get_mixer_level        = (tas_hook_get_mixer_level_t)tas3001c_get_mixer_level,
-        .set_mixer_level        = (tas_hook_set_mixer_level_t)tas3001c_set_mixer_level,
-        .enter_sleep            = (tas_hook_enter_sleep_t)tas3001c_enter_sleep,
-        .leave_sleep            = (tas_hook_leave_sleep_t)tas3001c_leave_sleep,
-        .supported_mixers       = (tas_hook_supported_mixers_t)tas3001c_supported_mixers,
-        .mixer_is_stereo        = (tas_hook_mixer_is_stereo_t)tas3001c_mixer_is_stereo,
-        .stereo_mixers          = (tas_hook_stereo_mixers_t)tas3001c_stereo_mixers,
-        .output_device_change   = (tas_hook_output_device_change_t)tas3001c_output_device_change,
-        .device_ioctl           = (tas_hook_device_ioctl_t)tas3001c_device_ioctl
-};
diff --git a/sound/oss/dmasound/tas3001c.h b/sound/oss/dmasound/tas3001c.h
deleted file mode 100644
index 3660da33a2db..000000000000
--- a/sound/oss/dmasound/tas3001c.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Header file for the i2c/i2s based TA3001c sound chip used
- * on some Apple hardware. Also known as "tumbler".
- *
- *  This file is subject to the terms and conditions of the GNU General Public
- *  License.  See the file COPYING in the main directory of this archive
- *  for more details.
- *
- * Written by Christopher C. Chimelis <chris@debian.org>
- */
-
-#ifndef _TAS3001C_H_
-#define _TAS3001C_H_
-
-#include <linux/types.h>
-
-#include "tas_common.h"
-#include "tas_eq_prefs.h"
-
-/*
- * Macros that correspond to the registers that we write to
- * when setting the various values.
- */
-
-#define TAS3001C_VERSION        "0.3"
-#define TAS3001C_DATE           "20011214"
-
-#define I2C_DRIVERNAME_TAS3001C "TAS3001c driver V " TAS3001C_VERSION
-#define I2C_DRIVERID_TAS3001C   (I2C_DRIVERID_TAS_BASE+0)
-
-extern  struct tas_driver_hooks_t tas3001c_hooks;
-extern struct tas_gain_t tas3001c_gain;
-extern struct tas_eq_pref_t *tas3001c_eq_prefs[];
-
-enum tas3001c_reg_t {
-  TAS3001C_REG_MCR                    = 0x01,
-  TAS3001C_REG_DRC                    = 0x02,
-
-  TAS3001C_REG_VOLUME                 = 0x04,
-  TAS3001C_REG_TREBLE                 = 0x05,
-  TAS3001C_REG_BASS                   = 0x06,
-  TAS3001C_REG_MIXER1                 = 0x07,
-  TAS3001C_REG_MIXER2                 = 0x08,
-
-  TAS3001C_REG_LEFT_BIQUAD0           = 0x0a,
-  TAS3001C_REG_LEFT_BIQUAD1           = 0x0b,
-  TAS3001C_REG_LEFT_BIQUAD2           = 0x0c,
-  TAS3001C_REG_LEFT_BIQUAD3           = 0x0d,
-  TAS3001C_REG_LEFT_BIQUAD4           = 0x0e,
-  TAS3001C_REG_LEFT_BIQUAD5           = 0x0f,
-  TAS3001C_REG_LEFT_BIQUAD6           = 0x10,
-  
-  TAS3001C_REG_RIGHT_BIQUAD0          = 0x13,
-  TAS3001C_REG_RIGHT_BIQUAD1          = 0x14,
-  TAS3001C_REG_RIGHT_BIQUAD2          = 0x15,
-  TAS3001C_REG_RIGHT_BIQUAD3          = 0x16,
-  TAS3001C_REG_RIGHT_BIQUAD4          = 0x17,
-  TAS3001C_REG_RIGHT_BIQUAD5          = 0x18,
-  TAS3001C_REG_RIGHT_BIQUAD6          = 0x19,
-
-  TAS3001C_REG_MAX                    = 0x20
-};
-
-#endif /* _TAS3001C_H_ */
diff --git a/sound/oss/dmasound/tas3001c_tables.c b/sound/oss/dmasound/tas3001c_tables.c
deleted file mode 100644
index 1768fa95f25b..000000000000
--- a/sound/oss/dmasound/tas3001c_tables.c
+++ /dev/null
@@ -1,375 +0,0 @@
-#include "tas_common.h"
-#include "tas_eq_prefs.h"
-
-static struct tas_drce_t eqp_0e_2_1_drce = {
-  .enable     = 1,
-  .above      = { .val = 3.0 * (1<<8), .expand = 0 },
-  .below      = { .val = 1.0 * (1<<8), .expand = 0 },
-  .threshold  = -15.33  * (1<<8),
-  .energy     = 2.4     * (1<<12),
-  .attack     = 0.013   * (1<<12),
-  .decay      = 0.212   * (1<<12),
-};
-
-static struct tas_biquad_ctrl_t eqp_0e_2_1_biquads[]={
-  { .channel = 0, .filter = 0, .data = { .coeff = { 0x0FCAD3, 0xE06A58, 0x0FCAD3, 0xE06B09, 0x0F9657 } } },
-  { .channel = 0, .filter = 1, .data = { .coeff = { 0x041731, 0x082E63, 0x041731, 0xFD8D08, 0x02CFBD } } },
-  { .channel = 0, .filter = 2, .data = { .coeff = { 0x0FFDC7, 0xE0524C, 0x0FBFAA, 0xE0524C, 0x0FBD72 } } },
-  { .channel = 0, .filter = 3, .data = { .coeff = { 0x0F3D35, 0xE228CA, 0x0EC7B2, 0xE228CA, 0x0E04E8 } } },
-  { .channel = 0, .filter = 4, .data = { .coeff = { 0x0FCEBF, 0xE181C2, 0x0F2656, 0xE181C2, 0x0EF516 } } },
-  { .channel = 0, .filter = 5, .data = { .coeff = { 0x0EC417, 0x073E22, 0x0B0633, 0x073E22, 0x09CA4A } } },
-
-  { .channel = 1, .filter = 0, .data = { .coeff = { 0x0FCAD3, 0xE06A58, 0x0FCAD3, 0xE06B09, 0x0F9657 } } },
-  { .channel = 1, .filter = 1, .data = { .coeff = { 0x041731, 0x082E63, 0x041731, 0xFD8D08, 0x02CFBD } } },
-  { .channel = 1, .filter = 2, .data = { .coeff = { 0x0FFDC7, 0xE0524C, 0x0FBFAA, 0xE0524C, 0x0FBD72 } } },
-  { .channel = 1, .filter = 3, .data = { .coeff = { 0x0F3D35, 0xE228CA, 0x0EC7B2, 0xE228CA, 0x0E04E8 } } },
-  { .channel = 1, .filter = 4, .data = { .coeff = { 0x0FCEBF, 0xE181C2, 0x0F2656, 0xE181C2, 0x0EF516 } } },
-  { .channel = 1, .filter = 5, .data = { .coeff = { 0x0EC417, 0x073E22, 0x0B0633, 0x073E22, 0x09CA4A } } },
-};
-
-static struct tas_eq_pref_t eqp_0e_2_1 = {
-  .sample_rate   = 44100,
-  .device_id     = 0x0e,
-  .output_id     = TAS_OUTPUT_EXTERNAL_SPKR,
-  .speaker_id    = 0x01,
-
-  .drce          = &eqp_0e_2_1_drce,
-
-  .filter_count  = 12,
-  .biquads       = eqp_0e_2_1_biquads
-};
-
-/* ======================================================================== */
-
-static struct tas_drce_t eqp_10_1_0_drce={
-  .enable     = 1,
-  .above      = { .val = 3.0 * (1<<8), .expand = 0 },
-  .below      = { .val = 1.0 * (1<<8), .expand = 0 },
-  .threshold  = -12.46  * (1<<8),
-  .energy     = 2.4     * (1<<12),
-  .attack     = 0.013   * (1<<12),
-  .decay      = 0.212   * (1<<12),
-};
-
-static struct tas_biquad_ctrl_t eqp_10_1_0_biquads[]={
-  { .channel = 0, .filter = 0, .data = { .coeff = { 0x0F4A12, 0xE16BDA, 0x0F4A12, 0xE173F0, 0x0E9C3A } } },
-  { .channel = 0, .filter = 1, .data = { .coeff = { 0x02DD54, 0x05BAA8, 0x02DD54, 0xF8001D, 0x037532 } } },
-  { .channel = 0, .filter = 2, .data = { .coeff = { 0x0E2FC7, 0xE4D5DC, 0x0D7477, 0xE4D5DC, 0x0BA43F } } },
-  { .channel = 0, .filter = 3, .data = { .coeff = { 0x0E7899, 0xE67CCA, 0x0D0E93, 0xE67CCA, 0x0B872D } } },
-  { .channel = 0, .filter = 4, .data = { .coeff = { 0x100000, 0x000000, 0x000000, 0x000000, 0x000000 } } },
-  { .channel = 0, .filter = 5, .data = { .coeff = { 0x100000, 0x000000, 0x000000, 0x000000, 0x000000 } } },
-
-  { .channel = 1, .filter = 0, .data = { .coeff = { 0x0F4A12, 0xE16BDA, 0x0F4A12, 0xE173F0, 0x0E9C3A } } },
-  { .channel = 1, .filter = 1, .data = { .coeff = { 0x02DD54, 0x05BAA8, 0x02DD54, 0xF8001D, 0x037532 } } },
-  { .channel = 1, .filter = 2, .data = { .coeff = { 0x0E2FC7, 0xE4D5DC, 0x0D7477, 0xE4D5DC, 0x0BA43F } } },
-  { .channel = 1, .filter = 3, .data = { .coeff = { 0x0E7899, 0xE67CCA, 0x0D0E93, 0xE67CCA, 0x0B872D } } },
-  { .channel = 1, .filter = 4, .data = { .coeff = { 0x100000, 0x000000, 0x000000, 0x000000, 0x000000 } } },
-  { .channel = 1, .filter = 5, .data = { .coeff = { 0x100000, 0x000000, 0x000000, 0x000000, 0x000000 } } },
-};
-
-static struct tas_eq_pref_t eqp_10_1_0 = {
-  .sample_rate   = 44100,
-  .device_id     = 0x10,
-  .output_id     = TAS_OUTPUT_INTERNAL_SPKR,
-  .speaker_id    = 0x00,
-
-  .drce          = &eqp_10_1_0_drce,
-
-  .filter_count  = 12,
-  .biquads       = eqp_10_1_0_biquads
-};
-
-/* ======================================================================== */
-
-static struct tas_drce_t eqp_15_2_1_drce={
-  .enable     = 1,
-  .above      = { .val = 3.0 * (1<<8), .expand = 0 },
-  .below      = { .val = 1.0 * (1<<8), .expand = 0 },
-  .threshold  = -15.33  * (1<<8),
-  .energy     = 2.4     * (1<<12),
-  .attack     = 0.013   * (1<<12),
-  .decay      = 0.212   * (1<<12),
-};
-
-static struct tas_biquad_ctrl_t eqp_15_2_1_biquads[]={
-  { .channel = 0, .filter = 0, .data = { .coeff = { 0x0FE143, 0xE05204, 0x0FCCC5, 0xE05266, 0x0FAE6B } } },
-  { .channel = 0, .filter = 1, .data = { .coeff = { 0x102383, 0xE03A03, 0x0FA325, 0xE03A03, 0x0FC6A8 } } },
-  { .channel = 0, .filter = 2, .data = { .coeff = { 0x0FF2AB, 0xE06285, 0x0FB20A, 0xE06285, 0x0FA4B5 } } },
-  { .channel = 0, .filter = 3, .data = { .coeff = { 0x0F544D, 0xE35971, 0x0D8F3A, 0xE35971, 0x0CE388 } } },
-  { .channel = 0, .filter = 4, .data = { .coeff = { 0x13E1D3, 0xF3ECB5, 0x042227, 0xF3ECB5, 0x0803FA } } },
-  { .channel = 0, .filter = 5, .data = { .coeff = { 0x0AC119, 0x034181, 0x078AB1, 0x034181, 0x024BCA } } },
-
-  { .channel = 1, .filter = 0, .data = { .coeff = { 0x0FE143, 0xE05204, 0x0FCCC5, 0xE05266, 0x0FAE6B } } },
-  { .channel = 1, .filter = 1, .data = { .coeff = { 0x102383, 0xE03A03, 0x0FA325, 0xE03A03, 0x0FC6A8 } } },
-  { .channel = 1, .filter = 2, .data = { .coeff = { 0x0FF2AB, 0xE06285, 0x0FB20A, 0xE06285, 0x0FA4B5 } } },
-  { .channel = 1, .filter = 3, .data = { .coeff = { 0x0F544D, 0xE35971, 0x0D8F3A, 0xE35971, 0x0CE388 } } },
-  { .channel = 1, .filter = 4, .data = { .coeff = { 0x13E1D3, 0xF3ECB5, 0x042227, 0xF3ECB5, 0x0803FA } } },
-  { .channel = 1, .filter = 5, .data = { .coeff = { 0x0AC119, 0x034181, 0x078AB1, 0x034181, 0x024BCA } } },
-};
-
-static struct tas_eq_pref_t eqp_15_2_1 = {
-  .sample_rate   = 44100,
-  .device_id     = 0x15,
-  .output_id     = TAS_OUTPUT_EXTERNAL_SPKR,
-  .speaker_id    = 0x01,
-
-  .drce          = &eqp_15_2_1_drce,
-
-  .filter_count  = 12,
-  .biquads       = eqp_15_2_1_biquads
-};
-
-/* ======================================================================== */
-
-static struct tas_drce_t eqp_15_1_0_drce={
-  .enable     = 1,
-  .above      = { .val = 3.0 * (1<<8), .expand = 0 },
-  .below      = { .val = 1.0 * (1<<8), .expand = 0 },
-  .threshold  = 0.0     * (1<<8),
-  .energy     = 2.4     * (1<<12),
-  .attack     = 0.013   * (1<<12),
-  .decay      = 0.212   * (1<<12),
-};
-
-static struct tas_biquad_ctrl_t eqp_15_1_0_biquads[]={
-  { .channel = 0, .filter = 0, .data = { .coeff = { 0x0FAD08, 0xE0A5EF, 0x0FAD08, 0xE0A79D, 0x0F5BBE } } },
-  { .channel = 0, .filter = 1, .data = { .coeff = { 0x04B38D, 0x09671B, 0x04B38D, 0x000F71, 0x02BEC5 } } },
-  { .channel = 0, .filter = 2, .data = { .coeff = { 0x0FDD32, 0xE0A56F, 0x0F8A69, 0xE0A56F, 0x0F679C } } },
-  { .channel = 0, .filter = 3, .data = { .coeff = { 0x0FD284, 0xE135FB, 0x0F2161, 0xE135FB, 0x0EF3E5 } } },
-  { .channel = 0, .filter = 4, .data = { .coeff = { 0x0E81B1, 0xE6283F, 0x0CE49D, 0xE6283F, 0x0B664F } } },
-  { .channel = 0, .filter = 5, .data = { .coeff = { 0x0F2D62, 0xE98797, 0x0D1E19, 0xE98797, 0x0C4B7B } } },
-
-  { .channel = 1, .filter = 0, .data = { .coeff = { 0x0FAD08, 0xE0A5EF, 0x0FAD08, 0xE0A79D, 0x0F5BBE } } },
-  { .channel = 1, .filter = 1, .data = { .coeff = { 0x04B38D, 0x09671B, 0x04B38D, 0x000F71, 0x02BEC5 } } },
-  { .channel = 1, .filter = 2, .data = { .coeff = { 0x0FDD32, 0xE0A56F, 0x0F8A69, 0xE0A56F, 0x0F679C } } },
-  { .channel = 1, .filter = 3, .data = { .coeff = { 0x0FD284, 0xE135FB, 0x0F2161, 0xE135FB, 0x0EF3E5 } } },
-  { .channel = 1, .filter = 4, .data = { .coeff = { 0x0E81B1, 0xE6283F, 0x0CE49D, 0xE6283F, 0x0B664F } } },
-  { .channel = 1, .filter = 5, .data = { .coeff = { 0x0F2D62, 0xE98797, 0x0D1E19, 0xE98797, 0x0C4B7B } } },
-};
-
-static struct tas_eq_pref_t eqp_15_1_0 = {
-  .sample_rate   = 44100,
-  .device_id     = 0x15,
-  .output_id     = TAS_OUTPUT_INTERNAL_SPKR,
-  .speaker_id    = 0x00,
-
-  .drce          = &eqp_15_1_0_drce,
-
-  .filter_count  = 12,
-  .biquads       = eqp_15_1_0_biquads
-};
-
-/* ======================================================================== */
-
-static struct tas_drce_t eqp_0f_2_1_drce={
-  .enable     = 1,
-  .above      = { .val = 3.0 * (1<<8), .expand = 0 },
-  .below      = { .val = 1.0 * (1<<8), .expand = 0 },
-  .threshold  = -15.33  * (1<<8),
-  .energy     = 2.4     * (1<<12),
-  .attack     = 0.013   * (1<<12),
-  .decay      = 0.212   * (1<<12),
-};
-
-static struct tas_biquad_ctrl_t eqp_0f_2_1_biquads[]={
-  { .channel = 0, .filter = 0, .data = { .coeff = { 0x0FE143, 0xE05204, 0x0FCCC5, 0xE05266, 0x0FAE6B } } },
-  { .channel = 0, .filter = 1, .data = { .coeff = { 0x102383, 0xE03A03, 0x0FA325, 0xE03A03, 0x0FC6A8 } } },
-  { .channel = 0, .filter = 2, .data = { .coeff = { 0x0FF2AB, 0xE06285, 0x0FB20A, 0xE06285, 0x0FA4B5 } } },
-  { .channel = 0, .filter = 3, .data = { .coeff = { 0x0F544D, 0xE35971, 0x0D8F3A, 0xE35971, 0x0CE388 } } },
-  { .channel = 0, .filter = 4, .data = { .coeff = { 0x13E1D3, 0xF3ECB5, 0x042227, 0xF3ECB5, 0x0803FA } } },
-  { .channel = 0, .filter = 5, .data = { .coeff = { 0x0AC119, 0x034181, 0x078AB1, 0x034181, 0x024BCA } } },
-
-  { .channel = 1, .filter = 0, .data = { .coeff = { 0x0FE143, 0xE05204, 0x0FCCC5, 0xE05266, 0x0FAE6B } } },
-  { .channel = 1, .filter = 1, .data = { .coeff = { 0x102383, 0xE03A03, 0x0FA325, 0xE03A03, 0x0FC6A8 } } },
-  { .channel = 1, .filter = 2, .data = { .coeff = { 0x0FF2AB, 0xE06285, 0x0FB20A, 0xE06285, 0x0FA4B5 } } },
-  { .channel = 1, .filter = 3, .data = { .coeff = { 0x0F544D, 0xE35971, 0x0D8F3A, 0xE35971, 0x0CE388 } } },
-  { .channel = 1, .filter = 4, .data = { .coeff = { 0x13E1D3, 0xF3ECB5, 0x042227, 0xF3ECB5, 0x0803FA } } },
-  { .channel = 1, .filter = 5, .data = { .coeff = { 0x0AC119, 0x034181, 0x078AB1, 0x034181, 0x024BCA } } },
-};
-
-static struct tas_eq_pref_t eqp_0f_2_1 = {
-  .sample_rate   = 44100,
-  .device_id     = 0x0f,
-  .output_id     = TAS_OUTPUT_EXTERNAL_SPKR,
-  .speaker_id    = 0x01,
-
-  .drce          = &eqp_0f_2_1_drce,
-
-  .filter_count  = 12,
-  .biquads       = eqp_0f_2_1_biquads
-};
-
-/* ======================================================================== */
-
-static struct tas_drce_t eqp_0f_1_0_drce={
-  .enable     = 1,
-  .above      = { .val = 3.0 * (1<<8), .expand = 0 },
-  .below      = { .val = 1.0 * (1<<8), .expand = 0 },
-  .threshold  = -15.33  * (1<<8),
-  .energy     = 2.4     * (1<<12),
-  .attack     = 0.013   * (1<<12),
-  .decay      = 0.212   * (1<<12),
-};
-
-static struct tas_biquad_ctrl_t eqp_0f_1_0_biquads[]={
-  { .channel = 0, .filter = 0, .data = { .coeff = { 0x0FCAD3, 0xE06A58, 0x0FCAD3, 0xE06B09, 0x0F9657 } } },
-  { .channel = 0, .filter = 1, .data = { .coeff = { 0x041731, 0x082E63, 0x041731, 0xFD8D08, 0x02CFBD } } },
-  { .channel = 0, .filter = 2, .data = { .coeff = { 0x0FFDC7, 0xE0524C, 0x0FBFAA, 0xE0524C, 0x0FBD72 } } },
-  { .channel = 0, .filter = 3, .data = { .coeff = { 0x0F3D35, 0xE228CA, 0x0EC7B2, 0xE228CA, 0x0E04E8 } } },
-  { .channel = 0, .filter = 4, .data = { .coeff = { 0x0FCEBF, 0xE181C2, 0x0F2656, 0xE181C2, 0x0EF516 } } },
-  { .channel = 0, .filter = 5, .data = { .coeff = { 0x0EC417, 0x073E22, 0x0B0633, 0x073E22, 0x09CA4A } } },
-
-  { .channel = 1, .filter = 0, .data = { .coeff = { 0x0FCAD3, 0xE06A58, 0x0FCAD3, 0xE06B09, 0x0F9657 } } },
-  { .channel = 1, .filter = 1, .data = { .coeff = { 0x041731, 0x082E63, 0x041731, 0xFD8D08, 0x02CFBD } } },
-  { .channel = 1, .filter = 2, .data = { .coeff = { 0x0FFDC7, 0xE0524C, 0x0FBFAA, 0xE0524C, 0x0FBD72 } } },
-  { .channel = 1, .filter = 3, .data = { .coeff = { 0x0F3D35, 0xE228CA, 0x0EC7B2, 0xE228CA, 0x0E04E8 } } },
-  { .channel = 1, .filter = 4, .data = { .coeff = { 0x0FCEBF, 0xE181C2, 0x0F2656, 0xE181C2, 0x0EF516 } } },
-  { .channel = 1, .filter = 5, .data = { .coeff = { 0x0EC417, 0x073E22, 0x0B0633, 0x073E22, 0x09CA4A } } },
-};
-
-static struct tas_eq_pref_t eqp_0f_1_0 = {
-  .sample_rate   = 44100,
-  .device_id     = 0x0f,
-  .output_id     = TAS_OUTPUT_INTERNAL_SPKR,
-  .speaker_id    = 0x00,
-
-  .drce          = &eqp_0f_1_0_drce,
-
-  .filter_count  = 12,
-  .biquads       = eqp_0f_1_0_biquads
-};
-
-/* ======================================================================== */
-
-static uint tas3001c_master_tab[]={
-               0x0,       0x75,       0x9c,       0xbb,
-              0xdb,       0xfb,      0x11e,      0x143,
-             0x16b,      0x196,      0x1c3,      0x1f5,
-             0x229,      0x263,      0x29f,      0x2e1,
-             0x328,      0x373,      0x3c5,      0x41b,
-             0x478,      0x4dc,      0x547,      0x5b8,
-             0x633,      0x6b5,      0x740,      0x7d5,
-             0x873,      0x91c,      0x9d2,      0xa92,
-             0xb5e,      0xc39,      0xd22,      0xe19,
-             0xf20,     0x1037,     0x1161,     0x129e,
-            0x13ed,     0x1551,     0x16ca,     0x185d,
-            0x1a08,     0x1bcc,     0x1dac,     0x1fa7,
-            0x21c1,     0x23fa,     0x2655,     0x28d6,
-            0x2b7c,     0x2e4a,     0x3141,     0x3464,
-            0x37b4,     0x3b35,     0x3ee9,     0x42d3,
-            0x46f6,     0x4b53,     0x4ff0,     0x54ce,
-            0x59f2,     0x5f5f,     0x6519,     0x6b24,
-            0x7183,     0x783c,     0x7f53,     0x86cc,
-            0x8ead,     0x96fa,     0x9fba,     0xa8f2,
-            0xb2a7,     0xbce1,     0xc7a5,     0xd2fa,
-            0xdee8,     0xeb75,     0xf8aa,    0x1068e,
-           0x1152a,    0x12487,    0x134ad,    0x145a5,
-           0x1577b,    0x16a37,    0x17df5,    0x192bd,
-           0x1a890,    0x1bf7b,    0x1d78d,    0x1f0d1,
-           0x20b55,    0x22727,    0x24456,    0x262f2,
-           0x2830b
-};
-
-static uint tas3001c_mixer_tab[]={
-               0x0,      0x748,      0x9be,      0xbaf,
-             0xda4,      0xfb1,     0x11de,     0x1431,
-            0x16ad,     0x1959,     0x1c37,     0x1f4b,
-            0x2298,     0x2628,     0x29fb,     0x2e12,
-            0x327d,     0x3734,     0x3c47,     0x41b4,
-            0x4787,     0x4dbe,     0x546d,     0x5b86,
-            0x632e,     0x6b52,     0x7400,     0x7d54,
-            0x873b,     0x91c6,     0x9d1a,     0xa920,
-            0xb5e5,     0xc38c,     0xd21b,     0xe18f,
-            0xf1f5,    0x1036a,    0x1160f,    0x129d6,
-           0x13ed0,    0x1550c,    0x16ca0,    0x185c9,
-           0x1a07b,    0x1bcc3,    0x1dab9,    0x1fa75,
-           0x21c0f,    0x23fa3,    0x26552,    0x28d64,
-           0x2b7c9,    0x2e4a2,    0x31411,    0x3463b,
-           0x37b44,    0x3b353,    0x3ee94,    0x42d30,
-           0x46f55,    0x4b533,    0x4fefc,    0x54ce5,
-           0x59f25,    0x5f5f6,    0x65193,    0x6b23c,
-           0x71835,    0x783c3,    0x7f52c,    0x86cc0,
-           0x8eacc,    0x96fa5,    0x9fba0,    0xa8f1a,
-           0xb2a71,    0xbce0a,    0xc7a4a,    0xd2fa0,
-           0xdee7b,    0xeb752,    0xf8a9f,   0x1068e4,
-          0x1152a3,   0x12486a,   0x134ac8,   0x145a55,
-          0x1577ac,   0x16a370,   0x17df51,   0x192bc2,
-          0x1a88f8,   0x1bf7b7,   0x1d78c9,   0x1f0d04,
-          0x20b542,   0x227268,   0x244564,   0x262f26,
-          0x2830af
-};
-
-static uint tas3001c_treble_tab[]={
-              0x96,       0x95,       0x95,       0x94,
-              0x93,       0x92,       0x92,       0x91,
-              0x90,       0x90,       0x8f,       0x8e,
-              0x8d,       0x8d,       0x8c,       0x8b,
-              0x8a,       0x8a,       0x89,       0x88,
-              0x88,       0x87,       0x86,       0x85,
-              0x85,       0x84,       0x83,       0x83,
-              0x82,       0x81,       0x80,       0x80,
-              0x7f,       0x7e,       0x7e,       0x7d,
-              0x7c,       0x7b,       0x7b,       0x7a,
-              0x79,       0x78,       0x78,       0x77,
-              0x76,       0x76,       0x75,       0x74,
-              0x73,       0x73,       0x72,       0x71,
-              0x71,       0x70,       0x6e,       0x6d,
-              0x6d,       0x6c,       0x6b,       0x6a,
-              0x69,       0x68,       0x67,       0x66,
-              0x65,       0x63,       0x62,       0x62,
-              0x60,       0x5f,       0x5d,       0x5c,
-              0x5a,       0x58,       0x56,       0x55,
-              0x53,       0x51,       0x4f,       0x4c,
-              0x4a,       0x48,       0x45,       0x43,
-              0x40,       0x3d,       0x3a,       0x37,
-              0x35,       0x32,       0x2e,       0x2a,
-              0x27,       0x22,       0x1e,       0x1a,
-              0x15,       0x11,        0xc,        0x7,
-               0x1
-};
-
-static uint tas3001c_bass_tab[]={
-              0x86,       0x83,       0x81,       0x7f,
-              0x7d,       0x7b,       0x79,       0x78,
-              0x76,       0x75,       0x74,       0x72,
-              0x71,       0x6f,       0x6e,       0x6d,
-              0x6c,       0x6b,       0x69,       0x67,
-              0x65,       0x64,       0x61,       0x60,
-              0x5e,       0x5d,       0x5c,       0x5b,
-              0x5a,       0x59,       0x58,       0x57,
-              0x56,       0x55,       0x55,       0x54,
-              0x53,       0x52,       0x50,       0x4f,
-              0x4d,       0x4c,       0x4b,       0x49,
-              0x47,       0x45,       0x44,       0x42,
-              0x41,       0x3f,       0x3e,       0x3d,
-              0x3c,       0x3b,       0x39,       0x38,
-              0x37,       0x36,       0x35,       0x34,
-              0x33,       0x31,       0x30,       0x2f,
-              0x2e,       0x2c,       0x2b,       0x2b,
-              0x29,       0x28,       0x27,       0x26,
-              0x25,       0x24,       0x22,       0x21,
-              0x20,       0x1e,       0x1c,       0x19,
-              0x18,       0x18,       0x17,       0x16,
-              0x15,       0x14,       0x13,       0x12,
-              0x11,       0x10,        0xf,        0xe,
-               0xd,        0xb,        0xa,        0x9,
-               0x8,        0x6,        0x4,        0x2,
-               0x1
-};
-
-struct tas_gain_t tas3001c_gain = {
-  .master  = tas3001c_master_tab,
-  .treble  = tas3001c_treble_tab,
-  .bass    = tas3001c_bass_tab,
-  .mixer   = tas3001c_mixer_tab
-};
-
-struct tas_eq_pref_t *tas3001c_eq_prefs[]={
-  &eqp_0e_2_1,
-  &eqp_10_1_0,
-  &eqp_15_2_1,
-  &eqp_15_1_0,
-  &eqp_0f_2_1,
-  &eqp_0f_1_0,
-  NULL
-};
diff --git a/sound/oss/dmasound/tas3004.c b/sound/oss/dmasound/tas3004.c
deleted file mode 100644
index 678bf0ff6da2..000000000000
--- a/sound/oss/dmasound/tas3004.c
+++ /dev/null
@@ -1,1138 +0,0 @@
-/*
- * Driver for the i2c/i2s based TA3004 sound chip used
- * on some Apple hardware. Also known as "snapper".
- *
- * Tobias Sargeant <tobias.sargeant@bigpond.com>
- * Based upon tas3001c.c by Christopher C. Chimelis <chris@debian.org>:
- *
- * Input support by Renzo Davoli <renzo@cs.unibo.it>
- *
- */
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/proc_fs.h>
-#include <linux/ioport.h>
-#include <linux/sysctl.h>
-#include <linux/types.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/soundcard.h>
-#include <linux/interrupt.h>
-#include <linux/workqueue.h>
-
-#include <asm/uaccess.h>
-#include <asm/errno.h>
-#include <asm/io.h>
-#include <asm/prom.h>
-
-#include "dmasound.h"
-#include "tas_common.h"
-#include "tas3004.h"
-
-#include "tas_ioctl.h"
-
-/* #define DEBUG_DRCE */
-
-#define TAS3004_BIQUAD_FILTER_COUNT  7
-#define TAS3004_BIQUAD_CHANNEL_COUNT 2
-
-#define VOL_DEFAULT     (100 * 4 / 5)
-#define INPUT_DEFAULT   (100 * 4 / 5)
-#define BASS_DEFAULT    (100 / 2)
-#define TREBLE_DEFAULT  (100 / 2)
-
-struct tas3004_data_t {
-        struct tas_data_t super;
-        int device_id;
-        int output_id;
-        int speaker_id;
-        struct tas_drce_t drce_state;
-        struct work_struct change;
-};
-
-#define MAKE_TIME(sec,usec) (((sec)<<12) + (50000+(usec/10)*(1<<12))/100000)
-
-#define MAKE_RATIO(i,f) (((i)<<8) + ((500+(f)*(1<<8))/1000))
-
-
-static const union tas_biquad_t tas3004_eq_unity = {
-        .buf             = { 0x100000, 0x000000, 0x000000, 0x000000, 0x000000 },
-};
-
-
-static const struct tas_drce_t tas3004_drce_min = {
-        .enable         = 1,
-        .above          = { .val = MAKE_RATIO(16,0), .expand = 0 },
-        .below          = { .val = MAKE_RATIO(2,0), .expand = 0 },
-        .threshold      = -0x59a0,
-        .energy         = MAKE_TIME(0,  1700),
-        .attack         = MAKE_TIME(0,  1700),
-        .decay          = MAKE_TIME(0,  1700),
-};
-
-
-static const struct tas_drce_t tas3004_drce_max = {
-        .enable         = 1,
-        .above          = { .val = MAKE_RATIO(1,500), .expand = 1 },
-        .below          = { .val = MAKE_RATIO(2,0), .expand = 1 },
-        .threshold      = -0x0,
-        .energy         = MAKE_TIME(2,400000),
-        .attack         = MAKE_TIME(2,400000),
-        .decay          = MAKE_TIME(2,400000),
-};
-
-
-static const unsigned short time_constants[]={
-        MAKE_TIME(0,  1700),
-        MAKE_TIME(0,  3500),
-        MAKE_TIME(0,  6700),
-        MAKE_TIME(0, 13000),
-        MAKE_TIME(0, 26000),
-        MAKE_TIME(0, 53000),
-        MAKE_TIME(0,106000),
-        MAKE_TIME(0,212000),
-        MAKE_TIME(0,425000),
-        MAKE_TIME(0,850000),
-        MAKE_TIME(1,700000),
-        MAKE_TIME(2,400000),
-};
-
-static const unsigned short above_threshold_compression_ratio[]={
-        MAKE_RATIO( 1, 70),
-        MAKE_RATIO( 1,140),
-        MAKE_RATIO( 1,230),
-        MAKE_RATIO( 1,330),
-        MAKE_RATIO( 1,450),
-        MAKE_RATIO( 1,600),
-        MAKE_RATIO( 1,780),
-        MAKE_RATIO( 2,  0),
-        MAKE_RATIO( 2,290),
-        MAKE_RATIO( 2,670),
-        MAKE_RATIO( 3,200),
-        MAKE_RATIO( 4,  0),
-        MAKE_RATIO( 5,330),
-        MAKE_RATIO( 8,  0),
-        MAKE_RATIO(16,  0),
-};
-
-static const unsigned short above_threshold_expansion_ratio[]={
-        MAKE_RATIO(1, 60),
-        MAKE_RATIO(1,130),
-        MAKE_RATIO(1,190),
-        MAKE_RATIO(1,250),
-        MAKE_RATIO(1,310),
-        MAKE_RATIO(1,380),
-        MAKE_RATIO(1,440),
-        MAKE_RATIO(1,500)
-};
-
-static const unsigned short below_threshold_compression_ratio[]={
-        MAKE_RATIO(1, 70),
-        MAKE_RATIO(1,140),
-        MAKE_RATIO(1,230),
-        MAKE_RATIO(1,330),
-        MAKE_RATIO(1,450),
-        MAKE_RATIO(1,600),
-        MAKE_RATIO(1,780),
-        MAKE_RATIO(2,  0)
-};
-
-static const unsigned short below_threshold_expansion_ratio[]={
-        MAKE_RATIO(1, 60),
-        MAKE_RATIO(1,130),
-        MAKE_RATIO(1,190),
-        MAKE_RATIO(1,250),
-        MAKE_RATIO(1,310),
-        MAKE_RATIO(1,380),
-        MAKE_RATIO(1,440),
-        MAKE_RATIO(1,500),
-        MAKE_RATIO(1,560),
-        MAKE_RATIO(1,630),
-        MAKE_RATIO(1,690),
-        MAKE_RATIO(1,750),
-        MAKE_RATIO(1,810),
-        MAKE_RATIO(1,880),
-        MAKE_RATIO(1,940),
-        MAKE_RATIO(2,  0)
-};
-
-static inline int
-search( unsigned short val,
-        const unsigned short *arr,
-        const int arrsize) {
-        /*
-         * This could be a binary search, but for small tables,
-         * a linear search is likely to be faster
-         */
-
-        int i;
-
-        for (i=0; i < arrsize; i++)
-                if (arr[i] >= val)
-                        goto _1;
-        return arrsize-1;
- _1:
-        if (i == 0)
-                return 0;
-        return (arr[i]-val < val-arr[i-1]) ? i : i-1;
-}
-
-#define SEARCH(a, b) search(a, b, ARRAY_SIZE(b))
-
-static inline int
-time_index(unsigned short time)
-{
-        return SEARCH(time, time_constants);
-}
-
-
-static inline int
-above_threshold_compression_index(unsigned short ratio)
-{
-        return SEARCH(ratio, above_threshold_compression_ratio);
-}
-
-
-static inline int
-above_threshold_expansion_index(unsigned short ratio)
-{
-        return SEARCH(ratio, above_threshold_expansion_ratio);
-}
-
-
-static inline int
-below_threshold_compression_index(unsigned short ratio)
-{
-        return SEARCH(ratio, below_threshold_compression_ratio);
-}
-
-
-static inline int
-below_threshold_expansion_index(unsigned short ratio)
-{
-        return SEARCH(ratio, below_threshold_expansion_ratio);
-}
-
-static inline unsigned char db_to_regval(short db) {
-        int r=0;
-
-        r=(db+0x59a0) / 0x60;
-
-        if (r < 0x91) return 0x91;
-        if (r > 0xef) return 0xef;
-        return r;
-}
-
-static inline short quantize_db(short db)
-{
-        return db_to_regval(db) * 0x60 - 0x59a0;
-}
-
-static inline int
-register_width(enum tas3004_reg_t r)
-{
-        switch(r) {
-        case TAS3004_REG_MCR:
-        case TAS3004_REG_TREBLE:
-        case TAS3004_REG_BASS:
-        case TAS3004_REG_ANALOG_CTRL:
-        case TAS3004_REG_TEST1:
-        case TAS3004_REG_TEST2:
-        case TAS3004_REG_MCR2:
-                return 1;
-
-        case TAS3004_REG_LEFT_LOUD_BIQUAD_GAIN:
-        case TAS3004_REG_RIGHT_LOUD_BIQUAD_GAIN:
-                return 3;
-
-        case TAS3004_REG_DRC:
-        case TAS3004_REG_VOLUME:
-                return 6;
-
-        case TAS3004_REG_LEFT_MIXER:
-        case TAS3004_REG_RIGHT_MIXER:
-                return 9;
-
-        case TAS3004_REG_TEST:
-                return 10;
-
-        case TAS3004_REG_LEFT_BIQUAD0:
-        case TAS3004_REG_LEFT_BIQUAD1:
-        case TAS3004_REG_LEFT_BIQUAD2:
-        case TAS3004_REG_LEFT_BIQUAD3:
-        case TAS3004_REG_LEFT_BIQUAD4:
-        case TAS3004_REG_LEFT_BIQUAD5:
-        case TAS3004_REG_LEFT_BIQUAD6:
-
-        case TAS3004_REG_RIGHT_BIQUAD0:
-        case TAS3004_REG_RIGHT_BIQUAD1:
-        case TAS3004_REG_RIGHT_BIQUAD2:
-        case TAS3004_REG_RIGHT_BIQUAD3:
-        case TAS3004_REG_RIGHT_BIQUAD4:
-        case TAS3004_REG_RIGHT_BIQUAD5:
-        case TAS3004_REG_RIGHT_BIQUAD6:
-
-        case TAS3004_REG_LEFT_LOUD_BIQUAD:
-        case TAS3004_REG_RIGHT_LOUD_BIQUAD:
-                return 15;
-
-        default:
-                return 0;
-        }
-}
-
-static int
-tas3004_write_register( struct tas3004_data_t *self,
-                        enum tas3004_reg_t reg_num,
-                        char *data,
-                        uint write_mode)
-{
-        if (reg_num==TAS3004_REG_MCR ||
-            reg_num==TAS3004_REG_BASS ||
-            reg_num==TAS3004_REG_TREBLE ||
-            reg_num==TAS3004_REG_ANALOG_CTRL) {
-                return tas_write_byte_register(&self->super,
-                                               (uint)reg_num,
-                                               *data,
-                                               write_mode);
-        } else {
-                return tas_write_register(&self->super,
-                                          (uint)reg_num,
-                                          register_width(reg_num),
-                                          data,
-                                          write_mode);
-        }
-}
-
-static int
-tas3004_sync_register(  struct tas3004_data_t *self,
-                        enum tas3004_reg_t reg_num)
-{
-        if (reg_num==TAS3004_REG_MCR ||
-            reg_num==TAS3004_REG_BASS ||
-            reg_num==TAS3004_REG_TREBLE ||
-            reg_num==TAS3004_REG_ANALOG_CTRL) {
-                return tas_sync_byte_register(&self->super,
-                                              (uint)reg_num,
-                                              register_width(reg_num));
-        } else {
-                return tas_sync_register(&self->super,
-                                         (uint)reg_num,
-                                         register_width(reg_num));
-        }
-}
-
-static int
-tas3004_read_register(  struct tas3004_data_t *self,
-                        enum tas3004_reg_t reg_num,
-                        char *data,
-                        uint write_mode)
-{
-        return tas_read_register(&self->super,
-                                 (uint)reg_num,
-                                 register_width(reg_num),
-                                 data);
-}
-
-static inline int
-tas3004_fast_load(struct tas3004_data_t *self, int fast)
-{
-        if (fast)
-                self->super.shadow[TAS3004_REG_MCR][0] |= 0x80;
-        else
-                self->super.shadow[TAS3004_REG_MCR][0] &= 0x7f;
-        return tas3004_sync_register(self,TAS3004_REG_MCR);
-}
-
-static uint
-tas3004_supported_mixers(struct tas3004_data_t *self)
-{
-        return SOUND_MASK_VOLUME |
-                SOUND_MASK_PCM |
-                SOUND_MASK_ALTPCM |
-                SOUND_MASK_IMIX |
-                SOUND_MASK_TREBLE |
-                SOUND_MASK_BASS |
-                SOUND_MASK_MIC |
-                SOUND_MASK_LINE;
-}
-
-static int
-tas3004_mixer_is_stereo(struct tas3004_data_t *self, int mixer)
-{
-        switch(mixer) {
-        case SOUND_MIXER_VOLUME:
-        case SOUND_MIXER_PCM:
-        case SOUND_MIXER_ALTPCM:
-        case SOUND_MIXER_IMIX:
-                return 1;
-        default:
-                return 0;
-        }
-}
-
-static uint
-tas3004_stereo_mixers(struct tas3004_data_t *self)
-{
-        uint r = tas3004_supported_mixers(self);
-        uint i;
-        
-        for (i=1; i<SOUND_MIXER_NRDEVICES; i++)
-                if (r&(1<<i) && !tas3004_mixer_is_stereo(self,i))
-                        r &= ~(1<<i);
-        return r;
-}
-
-static int
-tas3004_get_mixer_level(struct tas3004_data_t *self, int mixer, uint *level)
-{
-        if (!self)
-                return -1;
-
-        *level = self->super.mixer[mixer];
-
-        return 0;
-}
-
-static int
-tas3004_set_mixer_level(struct tas3004_data_t *self, int mixer, uint level)
-{
-        int rc;
-        tas_shadow_t *shadow;
-        uint temp;
-        uint offset=0;
-
-        if (!self)
-                return -1;
-
-        shadow = self->super.shadow;
-
-        if (!tas3004_mixer_is_stereo(self,mixer))
-                level = tas_mono_to_stereo(level);
-        switch(mixer) {
-        case SOUND_MIXER_VOLUME:
-                temp = tas3004_gain.master[level&0xff];
-                SET_4_20(shadow[TAS3004_REG_VOLUME], 0, temp);
-                temp = tas3004_gain.master[(level>>8)&0xff];
-                SET_4_20(shadow[TAS3004_REG_VOLUME], 3, temp);
-                rc = tas3004_sync_register(self,TAS3004_REG_VOLUME);
-                break;
-        case SOUND_MIXER_IMIX:
-                offset += 3;
-        case SOUND_MIXER_ALTPCM:
-                offset += 3;
-        case SOUND_MIXER_PCM:
-                /*
-                 * Don't load these in fast mode. The documentation
-                 * says it can be done in either mode, but testing it
-                 * shows that fast mode produces ugly clicking.
-                */
-                /* tas3004_fast_load(self,1); */
-                temp = tas3004_gain.mixer[level&0xff];
-                SET_4_20(shadow[TAS3004_REG_LEFT_MIXER], offset, temp);
-                temp = tas3004_gain.mixer[(level>>8)&0xff];
-                SET_4_20(shadow[TAS3004_REG_RIGHT_MIXER], offset, temp);
-                rc = tas3004_sync_register(self,TAS3004_REG_LEFT_MIXER);
-                if (rc == 0)
-                        rc=tas3004_sync_register(self,TAS3004_REG_RIGHT_MIXER);
-                /* tas3004_fast_load(self,0); */
-                break;
-        case SOUND_MIXER_TREBLE:
-                temp = tas3004_gain.treble[level&0xff];
-                shadow[TAS3004_REG_TREBLE][0]=temp&0xff;
-                rc = tas3004_sync_register(self,TAS3004_REG_TREBLE);
-                break;
-        case SOUND_MIXER_BASS:
-                temp = tas3004_gain.bass[level&0xff];
-                shadow[TAS3004_REG_BASS][0]=temp&0xff;
-                rc = tas3004_sync_register(self,TAS3004_REG_BASS);
-                break;
-        case SOUND_MIXER_MIC:
-                if ((level&0xff)>0) {
-                        software_input_volume = SW_INPUT_VOLUME_SCALE * (level&0xff);
-                        if (self->super.mixer[mixer] == 0) {
-                                self->super.mixer[SOUND_MIXER_LINE] = 0;
-                                shadow[TAS3004_REG_ANALOG_CTRL][0]=0xc2;
-                                rc = tas3004_sync_register(self,TAS3004_REG_ANALOG_CTRL);
-                        } else rc=0;
-                } else {
-                        self->super.mixer[SOUND_MIXER_LINE] = SW_INPUT_VOLUME_DEFAULT;
-                        software_input_volume = SW_INPUT_VOLUME_SCALE *
-                                (self->super.mixer[SOUND_MIXER_LINE]&0xff);
-                        shadow[TAS3004_REG_ANALOG_CTRL][0]=0x00;
-                        rc = tas3004_sync_register(self,TAS3004_REG_ANALOG_CTRL);
-                }
-                break;
-        case SOUND_MIXER_LINE:
-                if (self->super.mixer[SOUND_MIXER_MIC] == 0) {
-                        software_input_volume = SW_INPUT_VOLUME_SCALE * (level&0xff);
-                        rc=0;
-                }
-                break;
-        default:
-                rc = -1;
-                break;
-        }
-        if (rc < 0)
-                return rc;
-        self->super.mixer[mixer] = level;
-        
-        return 0;
-}
-
-static int
-tas3004_leave_sleep(struct tas3004_data_t *self)
-{
-        unsigned char mcr = (1<<6)+(2<<4)+(2<<2);
-
-        if (!self)
-                return -1;
-
-        /* Make sure something answers on the i2c bus */
-        if (tas3004_write_register(self, TAS3004_REG_MCR, &mcr,
-            WRITE_NORMAL | FORCE_WRITE) < 0)
-                return -1;
-
-        tas3004_fast_load(self, 1);
-
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_BIQUAD0);
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_BIQUAD1);
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_BIQUAD2);
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_BIQUAD3);
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_BIQUAD4);
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_BIQUAD5);
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_BIQUAD6);
-
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_BIQUAD0);
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_BIQUAD1);
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_BIQUAD2);
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_BIQUAD3);
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_BIQUAD4);
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_BIQUAD5);
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_BIQUAD6);
-
-        tas3004_fast_load(self, 0);
-
-        (void)tas3004_sync_register(self,TAS3004_REG_VOLUME);
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_MIXER);
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_MIXER);
-        (void)tas3004_sync_register(self,TAS3004_REG_TREBLE);
-        (void)tas3004_sync_register(self,TAS3004_REG_BASS);
-        (void)tas3004_sync_register(self,TAS3004_REG_ANALOG_CTRL);
-
-        return 0;
-}
-
-static int
-tas3004_enter_sleep(struct tas3004_data_t *self)
-{
-        if (!self)
-                return -1; 
-        return 0;
-}
-
-static int
-tas3004_sync_biquad(    struct tas3004_data_t *self,
-                        u_int channel,
-                        u_int filter)
-{
-        enum tas3004_reg_t reg;
-
-        if (channel >= TAS3004_BIQUAD_CHANNEL_COUNT ||
-            filter  >= TAS3004_BIQUAD_FILTER_COUNT) return -EINVAL;
-
-        reg=( channel ? TAS3004_REG_RIGHT_BIQUAD0 : TAS3004_REG_LEFT_BIQUAD0 ) + filter;
-
-        return tas3004_sync_register(self,reg);
-}
-
-static int
-tas3004_write_biquad_shadow(    struct tas3004_data_t *self,
-                                u_int channel,
-                                u_int filter,
-                                const union tas_biquad_t *biquad)
-{
-        tas_shadow_t *shadow=self->super.shadow;
-        enum tas3004_reg_t reg;
-
-        if (channel >= TAS3004_BIQUAD_CHANNEL_COUNT ||
-            filter  >= TAS3004_BIQUAD_FILTER_COUNT) return -EINVAL;
-
-        reg=( channel ? TAS3004_REG_RIGHT_BIQUAD0 : TAS3004_REG_LEFT_BIQUAD0 ) + filter;
-
-        SET_4_20(shadow[reg], 0,biquad->coeff.b0);
-        SET_4_20(shadow[reg], 3,biquad->coeff.b1);
-        SET_4_20(shadow[reg], 6,biquad->coeff.b2);
-        SET_4_20(shadow[reg], 9,biquad->coeff.a1);
-        SET_4_20(shadow[reg],12,biquad->coeff.a2);
-
-        return 0;
-}
-
-static int
-tas3004_write_biquad(   struct tas3004_data_t *self,
-                        u_int channel,
-                        u_int filter,
-                        const union tas_biquad_t *biquad)
-{
-        int rc;
-
-        rc=tas3004_write_biquad_shadow(self, channel, filter, biquad);
-        if (rc < 0) return rc;
-
-        return tas3004_sync_biquad(self, channel, filter);
-}
-
-static int
-tas3004_write_biquad_list(      struct tas3004_data_t *self,
-                                u_int filter_count,
-                                u_int flags,
-                                struct tas_biquad_ctrl_t *biquads)
-{
-        int i;
-        int rc;
-
-        if (flags & TAS_BIQUAD_FAST_LOAD) tas3004_fast_load(self,1);
-
-        for (i=0; i<filter_count; i++) {
-                rc=tas3004_write_biquad(self,
-                                        biquads[i].channel,
-                                        biquads[i].filter,
-                                        &biquads[i].data);
-                if (rc < 0) break;
-        }
-
-        if (flags & TAS_BIQUAD_FAST_LOAD) tas3004_fast_load(self,0);
-
-        return rc;
-}
-
-static int
-tas3004_read_biquad(    struct tas3004_data_t *self,
-                        u_int channel,
-                        u_int filter,
-                        union tas_biquad_t *biquad)
-{
-        tas_shadow_t *shadow=self->super.shadow;
-        enum tas3004_reg_t reg;
-
-        if (channel >= TAS3004_BIQUAD_CHANNEL_COUNT ||
-            filter  >= TAS3004_BIQUAD_FILTER_COUNT) return -EINVAL;
-
-        reg=( channel ? TAS3004_REG_RIGHT_BIQUAD0 : TAS3004_REG_LEFT_BIQUAD0 ) + filter;
-
-        biquad->coeff.b0=GET_4_20(shadow[reg], 0);
-        biquad->coeff.b1=GET_4_20(shadow[reg], 3);
-        biquad->coeff.b2=GET_4_20(shadow[reg], 6);
-        biquad->coeff.a1=GET_4_20(shadow[reg], 9);
-        biquad->coeff.a2=GET_4_20(shadow[reg],12);
-        
-        return 0;       
-}
-
-static int
-tas3004_eq_rw(  struct tas3004_data_t *self,
-                u_int cmd,
-                u_long arg)
-{
-        void __user *argp = (void __user *)arg;
-        int rc;
-        struct tas_biquad_ctrl_t biquad;
-
-        if (copy_from_user((void *)&biquad, argp, sizeof(struct tas_biquad_ctrl_t))) {
-                return -EFAULT;
-        }
-
-        if (cmd & SIOC_IN) {
-                rc=tas3004_write_biquad(self, biquad.channel, biquad.filter, &biquad.data);
-                if (rc != 0) return rc;
-        }
-
-        if (cmd & SIOC_OUT) {
-                rc=tas3004_read_biquad(self, biquad.channel, biquad.filter, &biquad.data);
-                if (rc != 0) return rc;
-
-                if (copy_to_user(argp, &biquad, sizeof(struct tas_biquad_ctrl_t))) {
-                        return -EFAULT;
-                }
-
-        }
-        return 0;
-}
-
-static int
-tas3004_eq_list_rw(     struct tas3004_data_t *self,
-                        u_int cmd,
-                        u_long arg)
-{
-        int rc = 0;
-        int filter_count;
-        int flags;
-        int i,j;
-        char sync_required[TAS3004_BIQUAD_CHANNEL_COUNT][TAS3004_BIQUAD_FILTER_COUNT];
-        struct tas_biquad_ctrl_t biquad;
-        struct tas_biquad_ctrl_list_t __user *argp = (void __user *)arg;
-
-        memset(sync_required,0,sizeof(sync_required));
-
-        if (copy_from_user(&filter_count, &argp->filter_count, sizeof(int)))
-                return -EFAULT;
-
-        if (copy_from_user(&flags, &argp->flags, sizeof(int)))
-                return -EFAULT;
-
-        if (cmd & SIOC_IN) {
-        }
-
-        for (i=0; i < filter_count; i++) {
-                if (copy_from_user(&biquad, &argp->biquads[i],
-                                   sizeof(struct tas_biquad_ctrl_t))) {
-                        return -EFAULT;
-                }
-
-                if (cmd & SIOC_IN) {
-                        sync_required[biquad.channel][biquad.filter]=1;
-                        rc=tas3004_write_biquad_shadow(self, biquad.channel, biquad.filter, &biquad.data);
-                        if (rc != 0) return rc;
-                }
-
-                if (cmd & SIOC_OUT) {
-                        rc=tas3004_read_biquad(self, biquad.channel, biquad.filter, &biquad.data);
-                        if (rc != 0) return rc;
-
-                        if (copy_to_user(&argp->biquads[i], &biquad,
-                                         sizeof(struct tas_biquad_ctrl_t))) {
-                                return -EFAULT;
-                        }
-                }
-        }
-
-        if (cmd & SIOC_IN) {
-                /*
-                 * This is OK for the tas3004. For the
-                 * tas3001c, going into fast load mode causes
-                 * the treble and bass to be reset to 0dB, and
-                 * volume controls to be muted.
-                 */
-                if (flags & TAS_BIQUAD_FAST_LOAD) tas3004_fast_load(self,1);
-                for (i=0; i<TAS3004_BIQUAD_CHANNEL_COUNT; i++) {
-                        for (j=0; j<TAS3004_BIQUAD_FILTER_COUNT; j++) {
-                                if (sync_required[i][j]) {
-                                        rc=tas3004_sync_biquad(self, i, j);
-                                        if (rc < 0) goto out;
-                                }
-                        }
-                }
-        out:
-                if (flags & TAS_BIQUAD_FAST_LOAD)
-                        tas3004_fast_load(self,0);
-        }
-
-        return rc;
-}
-
-static int
-tas3004_update_drce(    struct tas3004_data_t *self,
-                        int flags,
-                        struct tas_drce_t *drce)
-{
-        tas_shadow_t *shadow;
-        int i;
-        shadow=self->super.shadow;
-
-        if (flags & TAS_DRCE_ABOVE_RATIO) {
-                self->drce_state.above.expand = drce->above.expand;
-                if (drce->above.val == (1<<8)) {
-                        self->drce_state.above.val = 1<<8;
-                        shadow[TAS3004_REG_DRC][0] = 0x02;
-                                        
-                } else if (drce->above.expand) {
-                        i=above_threshold_expansion_index(drce->above.val);
-                        self->drce_state.above.val=above_threshold_expansion_ratio[i];
-                        shadow[TAS3004_REG_DRC][0] = 0x0a + (i<<3);
-                } else {
-                        i=above_threshold_compression_index(drce->above.val);
-                        self->drce_state.above.val=above_threshold_compression_ratio[i];
-                        shadow[TAS3004_REG_DRC][0] = 0x08 + (i<<3);
-                }
-        }
-
-        if (flags & TAS_DRCE_BELOW_RATIO) {
-                self->drce_state.below.expand = drce->below.expand;
-                if (drce->below.val == (1<<8)) {
-                        self->drce_state.below.val = 1<<8;
-                        shadow[TAS3004_REG_DRC][1] = 0x02;
-                                        
-                } else if (drce->below.expand) {
-                        i=below_threshold_expansion_index(drce->below.val);
-                        self->drce_state.below.val=below_threshold_expansion_ratio[i];
-                        shadow[TAS3004_REG_DRC][1] = 0x08 + (i<<3);
-                } else {
-                        i=below_threshold_compression_index(drce->below.val);
-                        self->drce_state.below.val=below_threshold_compression_ratio[i];
-                        shadow[TAS3004_REG_DRC][1] = 0x0a + (i<<3);
-                }
-        }
-
-        if (flags & TAS_DRCE_THRESHOLD) {
-                self->drce_state.threshold=quantize_db(drce->threshold);
-                shadow[TAS3004_REG_DRC][2] = db_to_regval(self->drce_state.threshold);
-        }
-
-        if (flags & TAS_DRCE_ENERGY) {
-                i=time_index(drce->energy);
-                self->drce_state.energy=time_constants[i];
-                shadow[TAS3004_REG_DRC][3] = 0x40 + (i<<4);
-        }
-
-        if (flags & TAS_DRCE_ATTACK) {
-                i=time_index(drce->attack);
-                self->drce_state.attack=time_constants[i];
-                shadow[TAS3004_REG_DRC][4] = 0x40 + (i<<4);
-        }
-
-        if (flags & TAS_DRCE_DECAY) {
-                i=time_index(drce->decay);
-                self->drce_state.decay=time_constants[i];
-                shadow[TAS3004_REG_DRC][5] = 0x40 + (i<<4);
-        }
-
-        if (flags & TAS_DRCE_ENABLE) {
-                self->drce_state.enable = drce->enable;
-        }
-
-        if (!self->drce_state.enable) {
-                shadow[TAS3004_REG_DRC][0] |= 0x01;
-        }
-
-#ifdef DEBUG_DRCE
-        printk("DRCE: set [ ENABLE:%x ABOVE:%x/%x BELOW:%x/%x THRESH:%x ENERGY:%x ATTACK:%x DECAY:%x\n",
-               self->drce_state.enable,
-               self->drce_state.above.expand,self->drce_state.above.val,
-               self->drce_state.below.expand,self->drce_state.below.val,
-               self->drce_state.threshold,
-               self->drce_state.energy,
-               self->drce_state.attack,
-               self->drce_state.decay);
-
-        printk("DRCE: reg [ %02x %02x %02x %02x %02x %02x ]\n",
-               (unsigned char)shadow[TAS3004_REG_DRC][0],
-               (unsigned char)shadow[TAS3004_REG_DRC][1],
-               (unsigned char)shadow[TAS3004_REG_DRC][2],
-               (unsigned char)shadow[TAS3004_REG_DRC][3],
-               (unsigned char)shadow[TAS3004_REG_DRC][4],
-               (unsigned char)shadow[TAS3004_REG_DRC][5]);
-#endif
-
-        return tas3004_sync_register(self, TAS3004_REG_DRC);
-}
-
-static int
-tas3004_drce_rw(        struct tas3004_data_t *self,
-                        u_int cmd,
-                        u_long arg)
-{
-        int rc;
-        struct tas_drce_ctrl_t drce_ctrl;
-        void __user *argp = (void __user *)arg;
-
-        if (copy_from_user(&drce_ctrl, argp, sizeof(struct tas_drce_ctrl_t)))
-                return -EFAULT;
-
-#ifdef DEBUG_DRCE
-        printk("DRCE: input [ FLAGS:%x ENABLE:%x ABOVE:%x/%x BELOW:%x/%x THRESH:%x ENERGY:%x ATTACK:%x DECAY:%x\n",
-               drce_ctrl.flags,
-               drce_ctrl.data.enable,
-               drce_ctrl.data.above.expand,drce_ctrl.data.above.val,
-               drce_ctrl.data.below.expand,drce_ctrl.data.below.val,
-               drce_ctrl.data.threshold,
-               drce_ctrl.data.energy,
-               drce_ctrl.data.attack,
-               drce_ctrl.data.decay);
-#endif
-
-        if (cmd & SIOC_IN) {
-                rc = tas3004_update_drce(self, drce_ctrl.flags, &drce_ctrl.data);
-                if (rc < 0) return rc;
-        }
-
-        if (cmd & SIOC_OUT) {
-                if (drce_ctrl.flags & TAS_DRCE_ENABLE)
-                        drce_ctrl.data.enable = self->drce_state.enable;
-                if (drce_ctrl.flags & TAS_DRCE_ABOVE_RATIO)
-                        drce_ctrl.data.above = self->drce_state.above;
-                if (drce_ctrl.flags & TAS_DRCE_BELOW_RATIO)
-                        drce_ctrl.data.below = self->drce_state.below;
-                if (drce_ctrl.flags & TAS_DRCE_THRESHOLD)
-                        drce_ctrl.data.threshold = self->drce_state.threshold;
-                if (drce_ctrl.flags & TAS_DRCE_ENERGY)
-                        drce_ctrl.data.energy = self->drce_state.energy;
-                if (drce_ctrl.flags & TAS_DRCE_ATTACK)
-                        drce_ctrl.data.attack = self->drce_state.attack;
-                if (drce_ctrl.flags & TAS_DRCE_DECAY)
-                        drce_ctrl.data.decay = self->drce_state.decay;
-
-                if (copy_to_user(argp, &drce_ctrl,
-                                 sizeof(struct tas_drce_ctrl_t))) {
-                        return -EFAULT;
-                }
-        }
-
-        return 0;
-}
-
-static void
-tas3004_update_device_parameters(struct tas3004_data_t *self)
-{
-        char data;
-        int i;
-
-        if (!self) return;
-
-        if (self->output_id == TAS_OUTPUT_HEADPHONES) {
-                /* turn on allPass when headphones are plugged in */
-                data = 0x02;
-        } else {
-                data = 0x00;
-        }
-
-        tas3004_write_register(self, TAS3004_REG_MCR2, &data, WRITE_NORMAL | FORCE_WRITE);
-
-        for (i=0; tas3004_eq_prefs[i]; i++) {
-                struct tas_eq_pref_t *eq = tas3004_eq_prefs[i];
-
-                if (eq->device_id == self->device_id &&
-                    (eq->output_id == 0 || eq->output_id == self->output_id) &&
-                    (eq->speaker_id == 0 || eq->speaker_id == self->speaker_id)) {
-
-                        tas3004_update_drce(self, TAS_DRCE_ALL, eq->drce);
-                        tas3004_write_biquad_list(self, eq->filter_count, TAS_BIQUAD_FAST_LOAD, eq->biquads);
-
-                        break;
-                }
-        }
-}
-
-static void
-tas3004_device_change_handler(struct work_struct *work)
-{
-        struct tas3004_data_t *self;
-        self = container_of(work, struct tas3004_data_t, change);
-        tas3004_update_device_parameters(self);
-}
-
-static int
-tas3004_output_device_change(   struct tas3004_data_t *self,
-                                int device_id,
-                                int output_id,
-                                int speaker_id)
-{
-        self->device_id=device_id;
-        self->output_id=output_id;
-        self->speaker_id=speaker_id;
-
-        schedule_work(&self->change);
-
-        return 0;
-}
-
-static int
-tas3004_device_ioctl(   struct tas3004_data_t *self,
-                        u_int cmd,
-                        u_long arg)
-{
-        uint __user *argp = (void __user *)arg;
-        switch (cmd) {
-        case TAS_READ_EQ:
-        case TAS_WRITE_EQ:
-                return tas3004_eq_rw(self, cmd, arg);
-
-        case TAS_READ_EQ_LIST:
-        case TAS_WRITE_EQ_LIST:
-                return tas3004_eq_list_rw(self, cmd, arg);
-
-        case TAS_READ_EQ_FILTER_COUNT:
-                put_user(TAS3004_BIQUAD_FILTER_COUNT, argp);
-                return 0;
-
-        case TAS_READ_EQ_CHANNEL_COUNT:
-                put_user(TAS3004_BIQUAD_CHANNEL_COUNT, argp);
-                return 0;
-
-        case TAS_READ_DRCE:
-        case TAS_WRITE_DRCE:
-                return tas3004_drce_rw(self, cmd, arg);
-
-        case TAS_READ_DRCE_CAPS:
-                put_user(TAS_DRCE_ENABLE         |
-                         TAS_DRCE_ABOVE_RATIO    |
-                         TAS_DRCE_BELOW_RATIO    |
-                         TAS_DRCE_THRESHOLD      |
-                         TAS_DRCE_ENERGY         |
-                         TAS_DRCE_ATTACK         |
-                         TAS_DRCE_DECAY,
-                         argp);
-                return 0;
-
-        case TAS_READ_DRCE_MIN:
-        case TAS_READ_DRCE_MAX: {
-                struct tas_drce_ctrl_t drce_ctrl;
-                const struct tas_drce_t *drce_copy;
-
-                if (copy_from_user(&drce_ctrl, argp,
-                                   sizeof(struct tas_drce_ctrl_t))) {
-                        return -EFAULT;
-                }
-
-                if (cmd == TAS_READ_DRCE_MIN) {
-                        drce_copy=&tas3004_drce_min;
-                } else {
-                        drce_copy=&tas3004_drce_max;
-                }
-
-                if (drce_ctrl.flags & TAS_DRCE_ABOVE_RATIO) {
-                        drce_ctrl.data.above=drce_copy->above;
-                }
-                if (drce_ctrl.flags & TAS_DRCE_BELOW_RATIO) {
-                        drce_ctrl.data.below=drce_copy->below;
-                }
-                if (drce_ctrl.flags & TAS_DRCE_THRESHOLD) {
-                        drce_ctrl.data.threshold=drce_copy->threshold;
-                }
-                if (drce_ctrl.flags & TAS_DRCE_ENERGY) {
-                        drce_ctrl.data.energy=drce_copy->energy;
-                }
-                if (drce_ctrl.flags & TAS_DRCE_ATTACK) {
-                        drce_ctrl.data.attack=drce_copy->attack;
-                }
-                if (drce_ctrl.flags & TAS_DRCE_DECAY) {
-                        drce_ctrl.data.decay=drce_copy->decay;
-                }
-
-                if (copy_to_user(argp, &drce_ctrl,
-                                 sizeof(struct tas_drce_ctrl_t))) {
-                        return -EFAULT;
-                }
-        }
-        }
-
-        return -EINVAL;
-}
-
-static int
-tas3004_init_mixer(struct tas3004_data_t *self)
-{
-        unsigned char mcr = (1<<6)+(2<<4)+(2<<2);
-
-        /* Make sure something answers on the i2c bus */
-        if (tas3004_write_register(self, TAS3004_REG_MCR, &mcr,
-            WRITE_NORMAL | FORCE_WRITE) < 0)
-                return -1;
-
-        tas3004_fast_load(self, 1);
-
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_BIQUAD0);
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_BIQUAD1);
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_BIQUAD2);
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_BIQUAD3);
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_BIQUAD4);
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_BIQUAD5);
-        (void)tas3004_sync_register(self,TAS3004_REG_RIGHT_BIQUAD6);
-
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_BIQUAD0);
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_BIQUAD1);
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_BIQUAD2);
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_BIQUAD3);
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_BIQUAD4);
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_BIQUAD5);
-        (void)tas3004_sync_register(self,TAS3004_REG_LEFT_BIQUAD6);
-
-        tas3004_sync_register(self, TAS3004_REG_DRC);
-
-        tas3004_sync_register(self, TAS3004_REG_MCR2);
-
-        tas3004_fast_load(self, 0);
-
-        tas3004_set_mixer_level(self, SOUND_MIXER_VOLUME, VOL_DEFAULT<<8 | VOL_DEFAULT);
-        tas3004_set_mixer_level(self, SOUND_MIXER_PCM, INPUT_DEFAULT<<8 | INPUT_DEFAULT);
-        tas3004_set_mixer_level(self, SOUND_MIXER_ALTPCM, 0);
-        tas3004_set_mixer_level(self, SOUND_MIXER_IMIX, 0);
-
-        tas3004_set_mixer_level(self, SOUND_MIXER_BASS, BASS_DEFAULT);
-        tas3004_set_mixer_level(self, SOUND_MIXER_TREBLE, TREBLE_DEFAULT);
-
-        tas3004_set_mixer_level(self, SOUND_MIXER_LINE,SW_INPUT_VOLUME_DEFAULT);
-
-        return 0;
-}
-
-static int
-tas3004_uninit_mixer(struct tas3004_data_t *self)
-{
-        tas3004_set_mixer_level(self, SOUND_MIXER_VOLUME, 0);
-        tas3004_set_mixer_level(self, SOUND_MIXER_PCM, 0);
-        tas3004_set_mixer_level(self, SOUND_MIXER_ALTPCM, 0);
-        tas3004_set_mixer_level(self, SOUND_MIXER_IMIX, 0);
-
-        tas3004_set_mixer_level(self, SOUND_MIXER_BASS, 0);
-        tas3004_set_mixer_level(self, SOUND_MIXER_TREBLE, 0);
-
-        tas3004_set_mixer_level(self, SOUND_MIXER_LINE, 0);
-
-        return 0;
-}
-
-static int
-tas3004_init(struct i2c_client *client)
-{
-        struct tas3004_data_t *self;
-        size_t sz = sizeof(*self) + (TAS3004_REG_MAX*sizeof(tas_shadow_t));
-        char drce_init[] = { 0x69, 0x22, 0x9f, 0xb0, 0x60, 0xa0 };
-        char mcr2 = 0;
-        int i, j;
-
-        self = kzalloc(sz, GFP_KERNEL);
-        if (!self)
-                return -ENOMEM;
-
-        self->super.client = client;
-        self->super.shadow = (tas_shadow_t *)(self+1);
-        self->output_id = TAS_OUTPUT_HEADPHONES;
-
-        dev_set_drvdata(&client->dev, self);
-
-        for (i = 0; i < TAS3004_BIQUAD_CHANNEL_COUNT; i++)
-                for (j = 0; j<TAS3004_BIQUAD_FILTER_COUNT; j++)
-                        tas3004_write_biquad_shadow(self, i, j,
-                                        &tas3004_eq_unity);
-
-        tas3004_write_register(self, TAS3004_REG_MCR2, &mcr2, WRITE_SHADOW);
-        tas3004_write_register(self, TAS3004_REG_DRC, drce_init, WRITE_SHADOW);
-
-        INIT_WORK(&self->change, tas3004_device_change_handler);
-        return 0;
-}
-
-static void 
-tas3004_uninit(struct tas3004_data_t *self)
-{
-        tas3004_uninit_mixer(self);
-        kfree(self);
-}
-
-
-struct tas_driver_hooks_t tas3004_hooks = {
-        .init                   = (tas_hook_init_t)tas3004_init,
-        .post_init              = (tas_hook_post_init_t)tas3004_init_mixer,
-        .uninit                 = (tas_hook_uninit_t)tas3004_uninit,
-        .get_mixer_level        = (tas_hook_get_mixer_level_t)tas3004_get_mixer_level,
-        .set_mixer_level        = (tas_hook_set_mixer_level_t)tas3004_set_mixer_level,
-        .enter_sleep            = (tas_hook_enter_sleep_t)tas3004_enter_sleep,
-        .leave_sleep            = (tas_hook_leave_sleep_t)tas3004_leave_sleep,
-        .supported_mixers       = (tas_hook_supported_mixers_t)tas3004_supported_mixers,
-        .mixer_is_stereo        = (tas_hook_mixer_is_stereo_t)tas3004_mixer_is_stereo,
-        .stereo_mixers          = (tas_hook_stereo_mixers_t)tas3004_stereo_mixers,
-        .output_device_change   = (tas_hook_output_device_change_t)tas3004_output_device_change,
-        .device_ioctl           = (tas_hook_device_ioctl_t)tas3004_device_ioctl
-};
diff --git a/sound/oss/dmasound/tas3004.h b/sound/oss/dmasound/tas3004.h
deleted file mode 100644
index c6d584bf2ca4..000000000000
--- a/sound/oss/dmasound/tas3004.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Header file for the i2c/i2s based TA3004 sound chip used
- * on some Apple hardware. Also known as "tumbler".
- *
- *  This file is subject to the terms and conditions of the GNU General Public
- *  License.  See the file COPYING in the main directory of this archive
- *  for more details.
- *
- * Written by Christopher C. Chimelis <chris@debian.org>
- */
-
-#ifndef _TAS3004_H_
-#define _TAS3004_H_
-
-#include <linux/types.h>
-
-#include "tas_common.h"
-#include "tas_eq_prefs.h"
-
-/*
- * Macros that correspond to the registers that we write to
- * when setting the various values.
- */
-
-#define TAS3004_VERSION         "0.3"
-#define TAS3004_DATE            "20011214"
-
-#define I2C_DRIVERNAME_TAS3004 "TAS3004 driver V " TAS3004_VERSION
-#define I2C_DRIVERID_TAS3004    (I2C_DRIVERID_TAS_BASE+1)
-
-extern  struct tas_driver_hooks_t tas3004_hooks;
-extern struct tas_gain_t tas3004_gain;
-extern struct tas_eq_pref_t *tas3004_eq_prefs[];
-
-enum tas3004_reg_t {
-  TAS3004_REG_MCR                    = 0x01,
-  TAS3004_REG_DRC                    = 0x02,
-
-  TAS3004_REG_VOLUME                 = 0x04,
-  TAS3004_REG_TREBLE                 = 0x05,
-  TAS3004_REG_BASS                   = 0x06,
-  TAS3004_REG_LEFT_MIXER             = 0x07,
-  TAS3004_REG_RIGHT_MIXER            = 0x08,
-
-  TAS3004_REG_LEFT_BIQUAD0           = 0x0a,
-  TAS3004_REG_LEFT_BIQUAD1           = 0x0b,
-  TAS3004_REG_LEFT_BIQUAD2           = 0x0c,
-  TAS3004_REG_LEFT_BIQUAD3           = 0x0d,
-  TAS3004_REG_LEFT_BIQUAD4           = 0x0e,
-  TAS3004_REG_LEFT_BIQUAD5           = 0x0f,
-  TAS3004_REG_LEFT_BIQUAD6           = 0x10,
-  
-  TAS3004_REG_RIGHT_BIQUAD0          = 0x13,
-  TAS3004_REG_RIGHT_BIQUAD1          = 0x14,
-  TAS3004_REG_RIGHT_BIQUAD2          = 0x15,
-  TAS3004_REG_RIGHT_BIQUAD3          = 0x16,
-  TAS3004_REG_RIGHT_BIQUAD4          = 0x17,
-  TAS3004_REG_RIGHT_BIQUAD5          = 0x18,
-  TAS3004_REG_RIGHT_BIQUAD6          = 0x19,
-
-  TAS3004_REG_LEFT_LOUD_BIQUAD       = 0x21,
-  TAS3004_REG_RIGHT_LOUD_BIQUAD      = 0x22,
-
-  TAS3004_REG_LEFT_LOUD_BIQUAD_GAIN  = 0x23,
-  TAS3004_REG_RIGHT_LOUD_BIQUAD_GAIN = 0x24,
-
-  TAS3004_REG_TEST                   = 0x29,
-
-  TAS3004_REG_ANALOG_CTRL            = 0x40,
-  TAS3004_REG_TEST1                  = 0x41,
-  TAS3004_REG_TEST2                  = 0x42,
-  TAS3004_REG_MCR2                   = 0x43,
-
-  TAS3004_REG_MAX                    = 0x44
-};
-
-#endif /* _TAS3004_H_ */
diff --git a/sound/oss/dmasound/tas3004_tables.c b/sound/oss/dmasound/tas3004_tables.c
deleted file mode 100644
index b910e0a66775..000000000000
--- a/sound/oss/dmasound/tas3004_tables.c
+++ /dev/null
@@ -1,301 +0,0 @@
-#include "tas3004.h"
-#include "tas_eq_prefs.h"
-
-static struct tas_drce_t eqp_17_1_0_drce={
-    .enable     = 1,
-    .above      = { .val = 3.0 * (1<<8), .expand = 0 },
-    .below      = { .val = 1.0 * (1<<8), .expand = 0 },
-    .threshold  = -19.12  * (1<<8),
-    .energy     = 2.4     * (1<<12),
-    .attack     = 0.013   * (1<<12),
-    .decay      = 0.212   * (1<<12),
-};
-
-static struct tas_biquad_ctrl_t eqp_17_1_0_biquads[]={
-  { .channel = 0, .filter = 0, .data = { .coeff = { 0x0fd0d4, 0xe05e56, 0x0fd0d4, 0xe05ee1, 0x0fa234 } } },
-  { .channel = 0, .filter = 1, .data = { .coeff = { 0x0910d7, 0x088e1a, 0x030651, 0x01dcb1, 0x02c892 } } },
-  { .channel = 0, .filter = 2, .data = { .coeff = { 0x0ff895, 0xe0970b, 0x0f7f00, 0xe0970b, 0x0f7795 } } },
-  { .channel = 0, .filter = 3, .data = { .coeff = { 0x0fd1c4, 0xe1ac22, 0x0ec8cf, 0xe1ac22, 0x0e9a94 } } },
-  { .channel = 0, .filter = 4, .data = { .coeff = { 0x0f7c1c, 0xe3cc03, 0x0df786, 0xe3cc03, 0x0d73a2 } } },
-  { .channel = 0, .filter = 5, .data = { .coeff = { 0x11fb92, 0xf5a1a0, 0x073cd2, 0xf5a1a0, 0x093865 } } },
-  { .channel = 0, .filter = 6, .data = { .coeff = { 0x0e17a9, 0x068b6c, 0x08a0e5, 0x068b6c, 0x06b88e } } },
-
-  { .channel = 1, .filter = 0, .data = { .coeff = { 0x0fd0d4, 0xe05e56, 0x0fd0d4, 0xe05ee1, 0x0fa234 } } },
-  { .channel = 1, .filter = 1, .data = { .coeff = { 0x0910d7, 0x088e1a, 0x030651, 0x01dcb1, 0x02c892 } } },
-  { .channel = 1, .filter = 2, .data = { .coeff = { 0x0ff895, 0xe0970b, 0x0f7f00, 0xe0970b, 0x0f7795 } } },
-  { .channel = 1, .filter = 3, .data = { .coeff = { 0x0fd1c4, 0xe1ac22, 0x0ec8cf, 0xe1ac22, 0x0e9a94 } } },
-  { .channel = 1, .filter = 4, .data = { .coeff = { 0x0f7c1c, 0xe3cc03, 0x0df786, 0xe3cc03, 0x0d73a2 } } },
-  { .channel = 1, .filter = 5, .data = { .coeff = { 0x11fb92, 0xf5a1a0, 0x073cd2, 0xf5a1a0, 0x093865 } } },
-  { .channel = 1, .filter = 6, .data = { .coeff = { 0x0e17a9, 0x068b6c, 0x08a0e5, 0x068b6c, 0x06b88e } } }
-};
-
-static struct tas_eq_pref_t eqp_17_1_0 = {
-  .sample_rate   = 44100,
-  .device_id     = 0x17,
-  .output_id     = TAS_OUTPUT_INTERNAL_SPKR,
-  .speaker_id    = 0x00,
-
-  .drce          = &eqp_17_1_0_drce,
-
-  .filter_count  = 14,
-  .biquads       = eqp_17_1_0_biquads
-};
-
-/* ======================================================================== */
-
-static struct tas_drce_t eqp_18_1_0_drce={
-  .enable     = 1,
-  .above      = { .val = 3.0 * (1<<8), .expand = 0 },
-  .below      = { .val = 1.0 * (1<<8), .expand = 0 },
-  .threshold  = -13.14  * (1<<8),
-  .energy     = 2.4     * (1<<12),
-  .attack     = 0.013   * (1<<12),
-  .decay      = 0.212   * (1<<12),
-};
-
-static struct tas_biquad_ctrl_t eqp_18_1_0_biquads[]={
-  { .channel = 0, .filter = 0, .data = { .coeff = { 0x0f5514, 0xe155d7, 0x0f5514, 0xe15cfa, 0x0eb14b } } },
-  { .channel = 0, .filter = 1, .data = { .coeff = { 0x06ec33, 0x02abe3, 0x015eef, 0xf764d9, 0x03922d } } },
-  { .channel = 0, .filter = 2, .data = { .coeff = { 0x0ef5f2, 0xe67d1f, 0x0bcf37, 0xe67d1f, 0x0ac529 } } },
-  { .channel = 0, .filter = 3, .data = { .coeff = { 0x0db050, 0xe5be4d, 0x0d0c78, 0xe5be4d, 0x0abcc8 } } },
-  { .channel = 0, .filter = 4, .data = { .coeff = { 0x0f1298, 0xe64ec6, 0x0cc03e, 0xe64ec6, 0x0bd2d7 } } },
-  { .channel = 0, .filter = 5, .data = { .coeff = { 0x0c641a, 0x06537a, 0x08d155, 0x06537a, 0x053570 } } },
-  { .channel = 0, .filter = 6, .data = { .coeff = { 0x100000, 0x000000, 0x000000, 0x000000, 0x000000 } } },
-
-  { .channel = 1, .filter = 0, .data = { .coeff = { 0x0f5514, 0xe155d7, 0x0f5514, 0xe15cfa, 0x0eb14b } } },
-  { .channel = 1, .filter = 1, .data = { .coeff = { 0x06ec33, 0x02abe3, 0x015eef, 0xf764d9, 0x03922d } } },
-  { .channel = 1, .filter = 2, .data = { .coeff = { 0x0ef5f2, 0xe67d1f, 0x0bcf37, 0xe67d1f, 0x0ac529 } } },
-  { .channel = 1, .filter = 3, .data = { .coeff = { 0x0db050, 0xe5be4d, 0x0d0c78, 0xe5be4d, 0x0abcc8 } } },
-  { .channel = 1, .filter = 4, .data = { .coeff = { 0x0f1298, 0xe64ec6, 0x0cc03e, 0xe64ec6, 0x0bd2d7 } } },
-  { .channel = 1, .filter = 5, .data = { .coeff = { 0x0c641a, 0x06537a, 0x08d155, 0x06537a, 0x053570 } } },
-  { .channel = 1, .filter = 6, .data = { .coeff = { 0x100000, 0x000000, 0x000000, 0x000000, 0x000000 } } }
-};
-
-static struct tas_eq_pref_t eqp_18_1_0 = {
-  .sample_rate   = 44100,
-  .device_id     = 0x18,
-  .output_id     = TAS_OUTPUT_INTERNAL_SPKR,
-  .speaker_id    = 0x00,
-
-  .drce          = &eqp_18_1_0_drce,
-
-  .filter_count  = 14,
-  .biquads       = eqp_18_1_0_biquads
-};
-
-/* ======================================================================== */
-
-static struct tas_drce_t eqp_1a_1_0_drce={
-  .enable     = 1,
-  .above      = { .val = 3.0 * (1<<8), .expand = 0 },
-  .below      = { .val = 1.0 * (1<<8), .expand = 0 },
-  .threshold  = -10.75  * (1<<8),
-  .energy     = 2.4     * (1<<12),
-  .attack     = 0.013   * (1<<12),
-  .decay      = 0.212   * (1<<12),
-};
-
-static struct tas_biquad_ctrl_t eqp_1a_1_0_biquads[]={
-  { .channel = 0, .filter = 0, .data = { .coeff = { 0x0fb8fd, 0xe08e04, 0x0fb8fd, 0xe08f40, 0x0f7336 } } },
-  { .channel = 0, .filter = 1, .data = { .coeff = { 0x06371d, 0x0c6e3a, 0x06371d, 0x05bfd3, 0x031ca2 } } },
-  { .channel = 0, .filter = 2, .data = { .coeff = { 0x0fa1c0, 0xe18692, 0x0f030e, 0xe18692, 0x0ea4ce } } },
-  { .channel = 0, .filter = 3, .data = { .coeff = { 0x0fe495, 0xe17eff, 0x0f0452, 0xe17eff, 0x0ee8e7 } } },
-  { .channel = 0, .filter = 4, .data = { .coeff = { 0x100857, 0xe7e71c, 0x0e9599, 0xe7e71c, 0x0e9df1 } } },
-  { .channel = 0, .filter = 5, .data = { .coeff = { 0x0fb26e, 0x06a82c, 0x0db2b4, 0x06a82c, 0x0d6522 } } },
-  { .channel = 0, .filter = 6, .data = { .coeff = { 0x11419d, 0xf06cbf, 0x0a4f6e, 0xf06cbf, 0x0b910c } } },
-
-  { .channel = 1, .filter = 0, .data = { .coeff = { 0x0fb8fd, 0xe08e04, 0x0fb8fd, 0xe08f40, 0x0f7336 } } },
-  { .channel = 1, .filter = 1, .data = { .coeff = { 0x06371d, 0x0c6e3a, 0x06371d, 0x05bfd3, 0x031ca2 } } },
-  { .channel = 1, .filter = 2, .data = { .coeff = { 0x0fa1c0, 0xe18692, 0x0f030e, 0xe18692, 0x0ea4ce } } },
-  { .channel = 1, .filter = 3, .data = { .coeff = { 0x0fe495, 0xe17eff, 0x0f0452, 0xe17eff, 0x0ee8e7 } } },
-  { .channel = 1, .filter = 4, .data = { .coeff = { 0x100857, 0xe7e71c, 0x0e9599, 0xe7e71c, 0x0e9df1 } } },
-  { .channel = 1, .filter = 5, .data = { .coeff = { 0x0fb26e, 0x06a82c, 0x0db2b4, 0x06a82c, 0x0d6522 } } },
-  { .channel = 1, .filter = 6, .data = { .coeff = { 0x11419d, 0xf06cbf, 0x0a4f6e, 0xf06cbf, 0x0b910c } } }
-};
-
-static struct tas_eq_pref_t eqp_1a_1_0 = {
-  .sample_rate   = 44100,
-  .device_id     = 0x1a,
-  .output_id     = TAS_OUTPUT_INTERNAL_SPKR,
-  .speaker_id    = 0x00,
-
-  .drce          = &eqp_1a_1_0_drce,
-
-  .filter_count  = 14,
-  .biquads       = eqp_1a_1_0_biquads
-};
-
-/* ======================================================================== */
-
-static struct tas_drce_t eqp_1c_1_0_drce={
-  .enable     = 1,
-  .above      = { .val = 3.0 * (1<<8), .expand = 0 },
-  .below      = { .val = 1.0 * (1<<8), .expand = 0 },
-  .threshold  = -14.34  * (1<<8),
-  .energy     = 2.4     * (1<<12),
-  .attack     = 0.013   * (1<<12),
-  .decay      = 0.212   * (1<<12),
-};
-
-static struct tas_biquad_ctrl_t eqp_1c_1_0_biquads[]={
-  { .channel = 0, .filter = 0, .data = { .coeff = { 0x0f4f95, 0xe160d4, 0x0f4f95, 0xe1686e, 0x0ea6c5 } } },
-  { .channel = 0, .filter = 1, .data = { .coeff = { 0x066b92, 0x0290d4, 0x0148a0, 0xf6853f, 0x03bfc7 } } },
-  { .channel = 0, .filter = 2, .data = { .coeff = { 0x0f57dc, 0xe51c91, 0x0dd1cb, 0xe51c91, 0x0d29a8 } } },
-  { .channel = 0, .filter = 3, .data = { .coeff = { 0x0df1cb, 0xe4fa84, 0x0d7cdc, 0xe4fa84, 0x0b6ea7 } } },
-  { .channel = 0, .filter = 4, .data = { .coeff = { 0x0eba36, 0xe6aa48, 0x0b9f52, 0xe6aa48, 0x0a5989 } } },
-  { .channel = 0, .filter = 5, .data = { .coeff = { 0x0caf02, 0x05ef9d, 0x084beb, 0x05ef9d, 0x04faee } } },
-  { .channel = 0, .filter = 6, .data = { .coeff = { 0x0fc686, 0xe22947, 0x0e4b5d, 0xe22947, 0x0e11e4 } } },
-
-  { .channel = 1, .filter = 0, .data = { .coeff = { 0x0f4f95, 0xe160d4, 0x0f4f95, 0xe1686e, 0x0ea6c5 } } },
-  { .channel = 1, .filter = 1, .data = { .coeff = { 0x066b92, 0x0290d4, 0x0148a0, 0xf6853f, 0x03bfc7 } } },
-  { .channel = 1, .filter = 2, .data = { .coeff = { 0x0f57dc, 0xe51c91, 0x0dd1cb, 0xe51c91, 0x0d29a8 } } },
-  { .channel = 1, .filter = 3, .data = { .coeff = { 0x0df1cb, 0xe4fa84, 0x0d7cdc, 0xe4fa84, 0x0b6ea7 } } },
-  { .channel = 1, .filter = 4, .data = { .coeff = { 0x0eba36, 0xe6aa48, 0x0b9f52, 0xe6aa48, 0x0a5989 } } },
-  { .channel = 1, .filter = 5, .data = { .coeff = { 0x0caf02, 0x05ef9d, 0x084beb, 0x05ef9d, 0x04faee } } },
-  { .channel = 1, .filter = 6, .data = { .coeff = { 0x0fc686, 0xe22947, 0x0e4b5d, 0xe22947, 0x0e11e4 } } }
-};
-
-static struct tas_eq_pref_t eqp_1c_1_0 = {
-  .sample_rate   = 44100,
-  .device_id     = 0x1c,
-  .output_id     = TAS_OUTPUT_INTERNAL_SPKR,
-  .speaker_id    = 0x00,
-
-  .drce          = &eqp_1c_1_0_drce,
-
-  .filter_count  = 14,
-  .biquads       = eqp_1c_1_0_biquads
-};
-
-/* ======================================================================== */
-
-static uint tas3004_master_tab[]={
-               0x0,       0x75,       0x9c,       0xbb,
-              0xdb,       0xfb,      0x11e,      0x143,
-             0x16b,      0x196,      0x1c3,      0x1f5,
-             0x229,      0x263,      0x29f,      0x2e1,
-             0x328,      0x373,      0x3c5,      0x41b,
-             0x478,      0x4dc,      0x547,      0x5b8,
-             0x633,      0x6b5,      0x740,      0x7d5,
-             0x873,      0x91c,      0x9d2,      0xa92,
-             0xb5e,      0xc39,      0xd22,      0xe19,
-             0xf20,     0x1037,     0x1161,     0x129e,
-            0x13ed,     0x1551,     0x16ca,     0x185d,
-            0x1a08,     0x1bcc,     0x1dac,     0x1fa7,
-            0x21c1,     0x23fa,     0x2655,     0x28d6,
-            0x2b7c,     0x2e4a,     0x3141,     0x3464,
-            0x37b4,     0x3b35,     0x3ee9,     0x42d3,
-            0x46f6,     0x4b53,     0x4ff0,     0x54ce,
-            0x59f2,     0x5f5f,     0x6519,     0x6b24,
-            0x7183,     0x783c,     0x7f53,     0x86cc,
-            0x8ead,     0x96fa,     0x9fba,     0xa8f2,
-            0xb2a7,     0xbce1,     0xc7a5,     0xd2fa,
-            0xdee8,     0xeb75,     0xf8aa,    0x1068e,
-           0x1152a,    0x12487,    0x134ad,    0x145a5,
-           0x1577b,    0x16a37,    0x17df5,    0x192bd,
-           0x1a890,    0x1bf7b,    0x1d78d,    0x1f0d1,
-           0x20b55,    0x22727,    0x24456,    0x262f2,
-           0x2830b
-};
-
-static uint tas3004_mixer_tab[]={
-               0x0,      0x748,      0x9be,      0xbaf,
-             0xda4,      0xfb1,     0x11de,     0x1431,
-            0x16ad,     0x1959,     0x1c37,     0x1f4b,
-            0x2298,     0x2628,     0x29fb,     0x2e12,
-            0x327d,     0x3734,     0x3c47,     0x41b4,
-            0x4787,     0x4dbe,     0x546d,     0x5b86,
-            0x632e,     0x6b52,     0x7400,     0x7d54,
-            0x873b,     0x91c6,     0x9d1a,     0xa920,
-            0xb5e5,     0xc38c,     0xd21b,     0xe18f,
-            0xf1f5,    0x1036a,    0x1160f,    0x129d6,
-           0x13ed0,    0x1550c,    0x16ca0,    0x185c9,
-           0x1a07b,    0x1bcc3,    0x1dab9,    0x1fa75,
-           0x21c0f,    0x23fa3,    0x26552,    0x28d64,
-           0x2b7c9,    0x2e4a2,    0x31411,    0x3463b,
-           0x37b44,    0x3b353,    0x3ee94,    0x42d30,
-           0x46f55,    0x4b533,    0x4fefc,    0x54ce5,
-           0x59f25,    0x5f5f6,    0x65193,    0x6b23c,
-           0x71835,    0x783c3,    0x7f52c,    0x86cc0,
-           0x8eacc,    0x96fa5,    0x9fba0,    0xa8f1a,
-           0xb2a71,    0xbce0a,    0xc7a4a,    0xd2fa0,
-           0xdee7b,    0xeb752,    0xf8a9f,   0x1068e4,
-          0x1152a3,   0x12486a,   0x134ac8,   0x145a55,
-          0x1577ac,   0x16a370,   0x17df51,   0x192bc2,
-          0x1a88f8,   0x1bf7b7,   0x1d78c9,   0x1f0d04,
-          0x20b542,   0x227268,   0x244564,   0x262f26,
-          0x2830af
-};
-
-static uint tas3004_treble_tab[]={
-              0x96,       0x95,       0x95,       0x94,
-              0x93,       0x92,       0x92,       0x91,
-              0x90,       0x90,       0x8f,       0x8e,
-              0x8d,       0x8d,       0x8c,       0x8b,
-              0x8a,       0x8a,       0x89,       0x88,
-              0x88,       0x87,       0x86,       0x85,
-              0x85,       0x84,       0x83,       0x83,
-              0x82,       0x81,       0x80,       0x80,
-              0x7f,       0x7e,       0x7e,       0x7d,
-              0x7c,       0x7b,       0x7b,       0x7a,
-              0x79,       0x78,       0x78,       0x77,
-              0x76,       0x76,       0x75,       0x74,
-              0x73,       0x73,       0x72,       0x71,
-              0x71,       0x68,       0x45,       0x5b,
-              0x6d,       0x6c,       0x6b,       0x6a,
-              0x69,       0x68,       0x67,       0x66,
-              0x65,       0x63,       0x62,       0x62,
-              0x60,       0x5e,       0x5c,       0x5b,
-              0x59,       0x57,       0x55,       0x53,
-              0x52,       0x4f,       0x4d,       0x4a,
-              0x48,       0x46,       0x43,       0x40,
-              0x3d,       0x3a,       0x36,       0x33,
-              0x2f,       0x2c,       0x27,       0x23,
-              0x1f,       0x1a,       0x15,        0xf,
-               0x8,        0x5,        0x2,        0x1,
-               0x1
-};
-
-static uint tas3004_bass_tab[]={
-              0x96,       0x95,       0x95,       0x94,
-              0x93,       0x92,       0x92,       0x91,
-              0x90,       0x90,       0x8f,       0x8e,
-              0x8d,       0x8d,       0x8c,       0x8b,
-              0x8a,       0x8a,       0x89,       0x88,
-              0x88,       0x87,       0x86,       0x85,
-              0x85,       0x84,       0x83,       0x83,
-              0x82,       0x81,       0x80,       0x80,
-              0x7f,       0x7e,       0x7e,       0x7d,
-              0x7c,       0x7b,       0x7b,       0x7a,
-              0x79,       0x78,       0x78,       0x77,
-              0x76,       0x76,       0x75,       0x74,
-              0x73,       0x73,       0x72,       0x71,
-              0x70,       0x6f,       0x6e,       0x6d,
-              0x6c,       0x6b,       0x6a,       0x6a,
-              0x69,       0x67,       0x66,       0x66,
-              0x65,       0x63,       0x62,       0x62,
-              0x61,       0x60,       0x5e,       0x5d,
-              0x5b,       0x59,       0x57,       0x55,
-              0x53,       0x51,       0x4f,       0x4c,
-              0x4a,       0x48,       0x46,       0x44,
-              0x41,       0x3e,       0x3b,       0x38,
-              0x36,       0x33,       0x2f,       0x2b,
-              0x28,       0x24,       0x20,       0x1c,
-              0x17,       0x12,        0xd,        0x7,
-               0x1
-};
-
-struct tas_gain_t tas3004_gain={
-  .master  = tas3004_master_tab,
-  .treble  = tas3004_treble_tab,
-  .bass    = tas3004_bass_tab,
-  .mixer   = tas3004_mixer_tab
-};
-
-struct tas_eq_pref_t *tas3004_eq_prefs[]={
-  &eqp_17_1_0,
-  &eqp_18_1_0,
-  &eqp_1a_1_0,
-  &eqp_1c_1_0,
-  NULL
-};
diff --git a/sound/oss/dmasound/tas_common.c b/sound/oss/dmasound/tas_common.c
deleted file mode 100644
index b295ef682192..000000000000
--- a/sound/oss/dmasound/tas_common.c
+++ /dev/null
@@ -1,214 +0,0 @@
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/proc_fs.h>
-#include <linux/ioport.h>
-#include <linux/sysctl.h>
-#include <linux/types.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/soundcard.h>
-#include <asm/uaccess.h>
-#include <asm/errno.h>
-#include <asm/io.h>
-#include <asm/prom.h>
-
-#include "tas_common.h"
-
-#define CALL0(proc)                                                             \
-        do {                                                                    \
-                struct tas_data_t *self;                                        \
-                if (!tas_client || driver_hooks == NULL)                        \
-                        return -1;                                              \
-                self = dev_get_drvdata(&tas_client->dev);                       \
-                if (driver_hooks->proc)                                         \
-                        return driver_hooks->proc(self);                        \
-                else                                                            \
-                        return -EINVAL;                                         \
-        } while (0)
-
-#define CALL(proc,arg...)                                                       \
-        do {                                                                    \
-                struct tas_data_t *self;                                        \
-                if (!tas_client || driver_hooks == NULL)                        \
-                        return -1;                                              \
-                self = dev_get_drvdata(&tas_client->dev);                       \
-                if (driver_hooks->proc)                                         \
-                        return driver_hooks->proc(self, ## arg);                \
-                else                                                            \
-                        return -EINVAL;                                         \
-        } while (0)
-
-
-static u8 tas_i2c_address = 0x34;
-static struct i2c_client *tas_client;
-
-static int tas_attach_adapter(struct i2c_adapter *);
-static int tas_detach_client(struct i2c_client *);
-
-struct i2c_driver tas_driver = {
-        .driver = {
-                .name   = "tas",
-        },
-        .attach_adapter = tas_attach_adapter,
-        .detach_client  = tas_detach_client,
-};
-
-struct tas_driver_hooks_t *driver_hooks;
-
-int
-tas_register_driver(struct tas_driver_hooks_t *hooks)
-{
-        driver_hooks = hooks;
-        return 0;
-}
-
-int
-tas_get_mixer_level(int mixer, uint *level)
-{
-        CALL(get_mixer_level,mixer,level);
-}
-
-int
-tas_set_mixer_level(int mixer,uint level)
-{
-        CALL(set_mixer_level,mixer,level);
-}
-
-int
-tas_enter_sleep(void)
-{
-        CALL0(enter_sleep);
-}
-
-int
-tas_leave_sleep(void)
-{
-        CALL0(leave_sleep);
-}
-
-int
-tas_supported_mixers(void)
-{
-        CALL0(supported_mixers);
-}
-
-int
-tas_mixer_is_stereo(int mixer)
-{
-        CALL(mixer_is_stereo,mixer);
-}
-
-int
-tas_stereo_mixers(void)
-{
-        CALL0(stereo_mixers);
-}
-
-int
-tas_output_device_change(int device_id,int layout_id,int speaker_id)
-{
-        CALL(output_device_change,device_id,layout_id,speaker_id);
-}
-
-int
-tas_device_ioctl(u_int cmd, u_long arg)
-{
-        CALL(device_ioctl,cmd,arg);
-}
-
-int
-tas_post_init(void)
-{
-        CALL0(post_init);
-}
-
-static int
-tas_detect_client(struct i2c_adapter *adapter, int address)
-{
-        static const char *client_name = "tas Digital Equalizer";
-        struct i2c_client *new_client;
-        int rc = -ENODEV;
-
-        if (!driver_hooks) {
-                printk(KERN_ERR "tas_detect_client called with no hooks !\n");
-                return -ENODEV;
-        }
-        
-        new_client = kzalloc(sizeof(*new_client), GFP_KERNEL);
-        if (!new_client)
-                return -ENOMEM;
-
-        new_client->addr = address;
-        new_client->adapter = adapter;
-        new_client->driver = &tas_driver;
-        strlcpy(new_client->name, client_name, DEVICE_NAME_SIZE);
-
-        if (driver_hooks->init(new_client))
-                goto bail;
-
-        /* Tell the i2c layer a new client has arrived */
-        if (i2c_attach_client(new_client)) {
-                driver_hooks->uninit(dev_get_drvdata(&new_client->dev));
-                goto bail;
-        }
-
-        tas_client = new_client;
-        return 0;
- bail:
-        tas_client = NULL;
-        kfree(new_client);
-        return rc;
-}
-
-static int
-tas_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!strncmp(adapter->name, "mac-io", 6))
-                return tas_detect_client(adapter, tas_i2c_address);
-        return 0;
-}
-
-static int
-tas_detach_client(struct i2c_client *client)
-{
-        if (client == tas_client) {
-                driver_hooks->uninit(dev_get_drvdata(&client->dev));
-
-                i2c_detach_client(client);
-                kfree(client);
-        }
-        return 0;
-}
-
-void
-tas_cleanup(void)
-{
-        i2c_del_driver(&tas_driver);
-}
-
-int __init
-tas_init(int driver_id, const char *driver_name)
-{
-        const u32* paddr;
-        struct device_node *tas_node;
-
-        printk(KERN_INFO "tas driver [%s])\n", driver_name);
-
-#ifndef CONFIG_I2C_POWERMAC
-        request_module("i2c-powermac");
-#endif
-        tas_node = of_find_node_by_name("deq");
-        if (tas_node == NULL)
-                return -ENODEV;
-        paddr = of_get_property(tas_node, "i2c-address", NULL);
-        if (paddr) {
-                tas_i2c_address = (*paddr) >> 1;
-                printk(KERN_INFO "using i2c address: 0x%x from device-tree\n",
-                                tas_i2c_address);
-        } else    
-                printk(KERN_INFO "using i2c address: 0x%x (default)\n",
-                                tas_i2c_address);
-        of_node_put(tas_node);
-
-        return i2c_add_driver(&tas_driver);
-}
diff --git a/sound/oss/dmasound/tas_common.h b/sound/oss/dmasound/tas_common.h
deleted file mode 100644
index 0741c28e56ce..000000000000
--- a/sound/oss/dmasound/tas_common.h
+++ /dev/null
@@ -1,284 +0,0 @@
-#ifndef _TAS_COMMON_H_
-#define _TAS_COMMON_H_
-
-#include <linux/i2c.h>
-#include <linux/soundcard.h>
-#include <asm/string.h>
-
-#define I2C_DRIVERID_TAS_BASE   (0xFEBA)
-
-#define SET_4_20(shadow, offset, val)                        \
-        do {                                                 \
-                (shadow)[(offset)+0] = ((val) >> 16) & 0xff; \
-                (shadow)[(offset)+1] = ((val) >> 8)  & 0xff; \
-                (shadow)[(offset)+2] = ((val) >> 0)  & 0xff; \
-        } while (0)
-
-#define GET_4_20(shadow, offset)                             \
-        (((u_int)((shadow)[(offset)+0]) << 16) |             \
-         ((u_int)((shadow)[(offset)+1]) <<  8) |             \
-         ((u_int)((shadow)[(offset)+2]) <<  0))
-
-
-#define TAS_BIQUAD_FAST_LOAD 0x01
-
-#define TAS_DRCE_ENABLE           0x01
-#define TAS_DRCE_ABOVE_RATIO      0x02
-#define TAS_DRCE_BELOW_RATIO      0x04
-#define TAS_DRCE_THRESHOLD        0x08
-#define TAS_DRCE_ENERGY           0x10
-#define TAS_DRCE_ATTACK           0x20
-#define TAS_DRCE_DECAY            0x40
-
-#define TAS_DRCE_ALL              0x7f
-
-
-#define TAS_OUTPUT_HEADPHONES     0x00
-#define TAS_OUTPUT_INTERNAL_SPKR  0x01
-#define TAS_OUTPUT_EXTERNAL_SPKR  0x02
-
-
-union tas_biquad_t {
-        struct {
-                int b0,b1,b2,a1,a2;
-        } coeff;
-        int buf[5];
-};
-
-struct tas_biquad_ctrl_t {
-        u_int channel:4;
-        u_int filter:4;
-
-        union tas_biquad_t data;
-};
-
-struct tas_biquad_ctrl_list_t {
-        int flags;
-        int filter_count;
-        struct tas_biquad_ctrl_t biquads[0];
-};
-
-struct tas_ratio_t {
-        unsigned short val;    /* 8.8                        */
-        unsigned short expand; /* 0 = compress, !0 = expand. */
-};
-
-struct tas_drce_t {
-        unsigned short enable;
-        struct tas_ratio_t above;
-        struct tas_ratio_t below;
-        short threshold;       /* dB,       8.8 signed    */
-        unsigned short energy; /* seconds,  4.12 unsigned */
-        unsigned short attack; /* seconds,  4.12 unsigned */
-        unsigned short decay;  /* seconds,  4.12 unsigned */
-};
-
-struct tas_drce_ctrl_t {
-        uint flags;
-
-        struct tas_drce_t data;
-};
-
-struct tas_gain_t
-{
-  unsigned int *master;
-  unsigned int *treble;
-  unsigned int *bass;
-  unsigned int *mixer;
-};
-
-typedef char tas_shadow_t[0x45];
-
-struct tas_data_t
-{
-        struct i2c_client *client;
-        tas_shadow_t *shadow;
-        uint mixer[SOUND_MIXER_NRDEVICES];
-};
-
-typedef int (*tas_hook_init_t)(struct i2c_client *);
-typedef int (*tas_hook_post_init_t)(struct tas_data_t *);
-typedef void (*tas_hook_uninit_t)(struct tas_data_t *);
-
-typedef int (*tas_hook_get_mixer_level_t)(struct tas_data_t *,int,uint *);
-typedef int (*tas_hook_set_mixer_level_t)(struct tas_data_t *,int,uint);
-
-typedef int (*tas_hook_enter_sleep_t)(struct tas_data_t *);
-typedef int (*tas_hook_leave_sleep_t)(struct tas_data_t *);
-
-typedef int (*tas_hook_supported_mixers_t)(struct tas_data_t *);
-typedef int (*tas_hook_mixer_is_stereo_t)(struct tas_data_t *,int);
-typedef int (*tas_hook_stereo_mixers_t)(struct tas_data_t *);
-
-typedef int (*tas_hook_output_device_change_t)(struct tas_data_t *,int,int,int);
-typedef int (*tas_hook_device_ioctl_t)(struct tas_data_t *,u_int,u_long);
-
-struct tas_driver_hooks_t {
-        /*
-         * All hardware initialisation must be performed in
-         * post_init(), as tas_dmasound_init() does a hardware reset.
-         *
-         * init() is called before tas_dmasound_init() so that
-         * ouput_device_change() is always called after i2c driver
-         * initialisation. The implication is that
-         * output_device_change() must cope with the fact that it
-         * may be called before post_init().
-         */
-
-        tas_hook_init_t                   init;
-        tas_hook_post_init_t              post_init;
-        tas_hook_uninit_t                 uninit;
-
-        tas_hook_get_mixer_level_t        get_mixer_level;
-        tas_hook_set_mixer_level_t        set_mixer_level;
-
-        tas_hook_enter_sleep_t            enter_sleep;
-        tas_hook_leave_sleep_t            leave_sleep;
-
-        tas_hook_supported_mixers_t       supported_mixers;
-        tas_hook_mixer_is_stereo_t        mixer_is_stereo;
-        tas_hook_stereo_mixers_t          stereo_mixers;
-
-        tas_hook_output_device_change_t   output_device_change;
-        tas_hook_device_ioctl_t           device_ioctl;
-};
-
-enum tas_write_mode_t {
-        WRITE_HW     = 0x01,
-        WRITE_SHADOW = 0x02,
-        WRITE_NORMAL = 0x03,
-        FORCE_WRITE  = 0x04
-};
-
-static inline uint
-tas_mono_to_stereo(uint mono)
-{
-        mono &=0xff;
-        return mono | (mono<<8);
-}
-
-/*
- * Todo: make these functions a bit more efficient !
- */
-static inline int
-tas_write_register(     struct tas_data_t *self,
-                        uint reg_num,
-                        uint reg_width,
-                        char *data,
-                        uint write_mode)
-{
-        int rc;
-
-        if (reg_width==0 || data==NULL || self==NULL)
-                return -EINVAL;
-        if (!(write_mode & FORCE_WRITE) &&
-            !memcmp(data,self->shadow[reg_num],reg_width))
-                return 0;
-
-        if (write_mode & WRITE_SHADOW)
-                memcpy(self->shadow[reg_num],data,reg_width);
-        if (write_mode & WRITE_HW) {
-                rc=i2c_smbus_write_i2c_block_data(self->client,
-                                                  reg_num,
-                                                  reg_width,
-                                                  data);
-                if (rc < 0) {
-                        printk("tas: I2C block write failed \n");  
-                        return rc; 
-                }
-        }
-        return 0;
-}
-
-static inline int
-tas_sync_register(      struct tas_data_t *self,
-                        uint reg_num,
-                        uint reg_width)
-{
-        int rc;
-
-        if (reg_width==0 || self==NULL)
-                return -EINVAL;
-        rc=i2c_smbus_write_i2c_block_data(self->client,
-                                          reg_num,
-                                          reg_width,
-                                          self->shadow[reg_num]);
-        if (rc < 0) {
-                printk("tas: I2C block write failed \n");
-                return rc;
-        }
-        return 0;
-}
-
-static inline int
-tas_write_byte_register(        struct tas_data_t *self,
-                                uint reg_num,
-                                char data,
-                                uint write_mode)
-{
-        if (self==NULL)
-                return -1;
-        if (!(write_mode & FORCE_WRITE) && data != self->shadow[reg_num][0])
-                return 0;
-        if (write_mode & WRITE_SHADOW)
-                self->shadow[reg_num][0]=data;
-        if (write_mode & WRITE_HW) {
-                if (i2c_smbus_write_byte_data(self->client, reg_num, data) < 0) {
-                        printk("tas: I2C byte write failed \n");  
-                        return -1; 
-                }
-        }
-        return 0;
-}
-
-static inline int
-tas_sync_byte_register( struct tas_data_t *self,
-                        uint reg_num,
-                        uint reg_width)
-{
-        if (reg_width==0 || self==NULL)
-                return -1;
-        if (i2c_smbus_write_byte_data(
-            self->client, reg_num, self->shadow[reg_num][0]) < 0) {
-                printk("tas: I2C byte write failed \n");
-                return -1;
-        }
-        return 0;
-}
-
-static inline int
-tas_read_register(      struct tas_data_t *self,
-                        uint reg_num,
-                        uint reg_width,
-                        char *data)
-{
-        if (reg_width==0 || data==NULL || self==NULL)
-                return -1;
-        memcpy(data,self->shadow[reg_num],reg_width);
-        return 0;
-}
-
-extern int tas_register_driver(struct tas_driver_hooks_t *hooks);
-
-extern int tas_get_mixer_level(int mixer,uint *level);
-extern int tas_set_mixer_level(int mixer,uint level);
-extern int tas_enter_sleep(void);
-extern int tas_leave_sleep(void);
-extern int tas_supported_mixers(void);
-extern int tas_mixer_is_stereo(int mixer);
-extern int tas_stereo_mixers(void);
-extern int tas_output_device_change(int,int,int);
-extern int tas_device_ioctl(u_int, u_long);
-
-extern void tas_cleanup(void);
-extern int tas_init(int driver_id,const char *driver_name);
-extern int tas_post_init(void);
-
-#endif /* _TAS_COMMON_H_ */
-/*
- * Local Variables:
- * tab-width: 8
- * indent-tabs-mode: t
- * c-basic-offset: 8
- * End:
- */
diff --git a/sound/oss/dmasound/tas_eq_prefs.h b/sound/oss/dmasound/tas_eq_prefs.h
deleted file mode 100644
index 3a994eda6abc..000000000000
--- a/sound/oss/dmasound/tas_eq_prefs.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _TAS_EQ_PREFS_H_
-#define _TAS_EQ_PREFS_H_
-
-struct tas_eq_pref_t {
-        u_int sample_rate;
-        u_int device_id;
-        u_int output_id;
-        u_int speaker_id;
-
-        struct tas_drce_t *drce;
-
-        u_int filter_count;
-        struct tas_biquad_ctrl_t *biquads;
-};
-
-#endif /* _TAS_EQ_PREFS_H_ */
-
-/*
- * Local Variables:
- * tab-width: 8
- * indent-tabs-mode: t
- * c-basic-offset: 8
- * End:
- */
diff --git a/sound/oss/dmasound/tas_ioctl.h b/sound/oss/dmasound/tas_ioctl.h
deleted file mode 100644
index 9d12b373b4a9..000000000000
--- a/sound/oss/dmasound/tas_ioctl.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _TAS_IOCTL_H_
-#define _TAS_IOCTL_H_
-
-#include <linux/soundcard.h>
-
-
-#define TAS_READ_EQ              _SIOR('t',0,struct tas_biquad_ctrl_t)
-#define TAS_WRITE_EQ             _SIOW('t',0,struct tas_biquad_ctrl_t)
-
-#define TAS_READ_EQ_LIST         _SIOR('t',1,struct tas_biquad_ctrl_t)
-#define TAS_WRITE_EQ_LIST        _SIOW('t',1,struct tas_biquad_ctrl_t)
-
-#define TAS_READ_EQ_FILTER_COUNT  _SIOR('t',2,int)
-#define TAS_READ_EQ_CHANNEL_COUNT _SIOR('t',3,int)
-
-#define TAS_READ_DRCE            _SIOR('t',4,struct tas_drce_ctrl_t)
-#define TAS_WRITE_DRCE           _SIOW('t',4,struct tas_drce_ctrl_t)
-
-#define TAS_READ_DRCE_CAPS       _SIOR('t',5,int)
-#define TAS_READ_DRCE_MIN        _SIOR('t',6,int)
-#define TAS_READ_DRCE_MAX        _SIOR('t',7,int)
-
-#endif
diff --git a/sound/oss/dmasound/trans_16.c b/sound/oss/dmasound/trans_16.c
deleted file mode 100644
index ca973ac2a30a..000000000000
--- a/sound/oss/dmasound/trans_16.c
+++ /dev/null
@@ -1,898 +0,0 @@
-/*
- *  linux/sound/oss/dmasound/trans_16.c
- *
- *  16 bit translation routines.  Only used by Power mac at present.
- *
- *  See linux/sound/oss/dmasound/dmasound_core.c for copyright and
- *  history prior to 08/02/2001.
- *
- *  08/02/2001 Iain Sandoe
- *              split from dmasound_awacs.c
- *  11/29/2003 Renzo Davoli (King Enzo)
- *      - input resampling (for soft rate < hard rate)
- *      - software line in gain control
- */
-
-#include <linux/soundcard.h>
-#include <asm/uaccess.h>
-#include "dmasound.h"
-
-extern int expand_bal;  /* Balance factor for expanding (not volume!) */
-static short dmasound_alaw2dma16[] ;
-static short dmasound_ulaw2dma16[] ;
-
-static ssize_t pmac_ct_law(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft);
-static ssize_t pmac_ct_s8(const u_char __user *userPtr, size_t userCount,
-                          u_char frame[], ssize_t *frameUsed,
-                          ssize_t frameLeft);
-static ssize_t pmac_ct_u8(const u_char __user *userPtr, size_t userCount,
-                          u_char frame[], ssize_t *frameUsed,
-                          ssize_t frameLeft);
-static ssize_t pmac_ct_s16(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft);
-static ssize_t pmac_ct_u16(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft);
-
-static ssize_t pmac_ctx_law(const u_char __user *userPtr, size_t userCount,
-                            u_char frame[], ssize_t *frameUsed,
-                            ssize_t frameLeft);
-static ssize_t pmac_ctx_s8(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft);
-static ssize_t pmac_ctx_u8(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft);
-static ssize_t pmac_ctx_s16(const u_char __user *userPtr, size_t userCount,
-                            u_char frame[], ssize_t *frameUsed,
-                            ssize_t frameLeft);
-static ssize_t pmac_ctx_u16(const u_char __user *userPtr, size_t userCount,
-                            u_char frame[], ssize_t *frameUsed,
-                            ssize_t frameLeft);
-
-static ssize_t pmac_ct_s16_read(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft);
-static ssize_t pmac_ct_u16_read(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft);
-
-/*** Translations ************************************************************/
-
-static int expand_data; /* Data for expanding */
-
-static ssize_t pmac_ct_law(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft)
-{
-        short *table = dmasound.soft.format == AFMT_MU_LAW
-                ? dmasound_ulaw2dma16 : dmasound_alaw2dma16;
-        ssize_t count, used;
-        short *p = (short *) &frame[*frameUsed];
-        int val, stereo = dmasound.soft.stereo;
-
-        frameLeft >>= 2;
-        if (stereo)
-                userCount >>= 1;
-        used = count = min_t(unsigned long, userCount, frameLeft);
-        while (count > 0) {
-                u_char data;
-                if (get_user(data, userPtr++))
-                        return -EFAULT;
-                val = table[data];
-                *p++ = val;
-                if (stereo) {
-                        if (get_user(data, userPtr++))
-                                return -EFAULT;
-                        val = table[data];
-                }
-                *p++ = val;
-                count--;
-        }
-        *frameUsed += used * 4;
-        return stereo? used * 2: used;
-}
-
-
-static ssize_t pmac_ct_s8(const u_char __user *userPtr, size_t userCount,
-                          u_char frame[], ssize_t *frameUsed,
-                          ssize_t frameLeft)
-{
-        ssize_t count, used;
-        short *p = (short *) &frame[*frameUsed];
-        int val, stereo = dmasound.soft.stereo;
-
-        frameLeft >>= 2;
-        if (stereo)
-                userCount >>= 1;
-        used = count = min_t(unsigned long, userCount, frameLeft);
-        while (count > 0) {
-                u_char data;
-                if (get_user(data, userPtr++))
-                        return -EFAULT;
-                val = data << 8;
-                *p++ = val;
-                if (stereo) {
-                        if (get_user(data, userPtr++))
-                                return -EFAULT;
-                        val = data << 8;
-                }
-                *p++ = val;
-                count--;
-        }
-        *frameUsed += used * 4;
-        return stereo? used * 2: used;
-}
-
-
-static ssize_t pmac_ct_u8(const u_char __user *userPtr, size_t userCount,
-                          u_char frame[], ssize_t *frameUsed,
-                          ssize_t frameLeft)
-{
-        ssize_t count, used;
-        short *p = (short *) &frame[*frameUsed];
-        int val, stereo = dmasound.soft.stereo;
-
-        frameLeft >>= 2;
-        if (stereo)
-                userCount >>= 1;
-        used = count = min_t(unsigned long, userCount, frameLeft);
-        while (count > 0) {
-                u_char data;
-                if (get_user(data, userPtr++))
-                        return -EFAULT;
-                val = (data ^ 0x80) << 8;
-                *p++ = val;
-                if (stereo) {
-                        if (get_user(data, userPtr++))
-                                return -EFAULT;
-                        val = (data ^ 0x80) << 8;
-                }
-                *p++ = val;
-                count--;
-        }
-        *frameUsed += used * 4;
-        return stereo? used * 2: used;
-}
-
-
-static ssize_t pmac_ct_s16(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft)
-{
-        ssize_t count, used;
-        int stereo = dmasound.soft.stereo;
-        short *fp = (short *) &frame[*frameUsed];
-
-        frameLeft >>= 2;
-        userCount >>= (stereo? 2: 1);
-        used = count = min_t(unsigned long, userCount, frameLeft);
-        if (!stereo) {
-                short __user *up = (short __user *) userPtr;
-                while (count > 0) {
-                        short data;
-                        if (get_user(data, up++))
-                                return -EFAULT;
-                        *fp++ = data;
-                        *fp++ = data;
-                        count--;
-                }
-        } else {
-                if (copy_from_user(fp, userPtr, count * 4))
-                        return -EFAULT;
-        }
-        *frameUsed += used * 4;
-        return stereo? used * 4: used * 2;
-}
-
-static ssize_t pmac_ct_u16(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft)
-{
-        ssize_t count, used;
-        int mask = (dmasound.soft.format == AFMT_U16_LE? 0x0080: 0x8000);
-        int stereo = dmasound.soft.stereo;
-        short *fp = (short *) &frame[*frameUsed];
-        short __user *up = (short __user *) userPtr;
-
-        frameLeft >>= 2;
-        userCount >>= (stereo? 2: 1);
-        used = count = min_t(unsigned long, userCount, frameLeft);
-        while (count > 0) {
-                short data;
-                if (get_user(data, up++))
-                        return -EFAULT;
-                data ^= mask;
-                *fp++ = data;
-                if (stereo) {
-                        if (get_user(data, up++))
-                                return -EFAULT;
-                        data ^= mask;
-                }
-                *fp++ = data;
-                count--;
-        }
-        *frameUsed += used * 4;
-        return stereo? used * 4: used * 2;
-}
-
-
-static ssize_t pmac_ctx_law(const u_char __user *userPtr, size_t userCount,
-                            u_char frame[], ssize_t *frameUsed,
-                            ssize_t frameLeft)
-{
-        unsigned short *table = (unsigned short *)
-                (dmasound.soft.format == AFMT_MU_LAW
-                 ? dmasound_ulaw2dma16 : dmasound_alaw2dma16);
-        unsigned int data = expand_data;
-        unsigned int *p = (unsigned int *) &frame[*frameUsed];
-        int bal = expand_bal;
-        int hSpeed = dmasound.hard.speed, sSpeed = dmasound.soft.speed;
-        int utotal, ftotal;
-        int stereo = dmasound.soft.stereo;
-
-        frameLeft >>= 2;
-        if (stereo)
-                userCount >>= 1;
-        ftotal = frameLeft;
-        utotal = userCount;
-        while (frameLeft) {
-                u_char c;
-                if (bal < 0) {
-                        if (userCount == 0)
-                                break;
-                        if (get_user(c, userPtr++))
-                                return -EFAULT;
-                        data = table[c];
-                        if (stereo) {
-                                if (get_user(c, userPtr++))
-                                        return -EFAULT;
-                                data = (data << 16) + table[c];
-                        } else
-                                data = (data << 16) + data;
-                        userCount--;
-                        bal += hSpeed;
-                }
-                *p++ = data;
-                frameLeft--;
-                bal -= sSpeed;
-        }
-        expand_bal = bal;
-        expand_data = data;
-        *frameUsed += (ftotal - frameLeft) * 4;
-        utotal -= userCount;
-        return stereo? utotal * 2: utotal;
-}
-
-static ssize_t pmac_ctx_s8(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft)
-{
-        unsigned int *p = (unsigned int *) &frame[*frameUsed];
-        unsigned int data = expand_data;
-        int bal = expand_bal;
-        int hSpeed = dmasound.hard.speed, sSpeed = dmasound.soft.speed;
-        int stereo = dmasound.soft.stereo;
-        int utotal, ftotal;
-
-        frameLeft >>= 2;
-        if (stereo)
-                userCount >>= 1;
-        ftotal = frameLeft;
-        utotal = userCount;
-        while (frameLeft) {
-                u_char c;
-                if (bal < 0) {
-                        if (userCount == 0)
-                                break;
-                        if (get_user(c, userPtr++))
-                                return -EFAULT;
-                        data = c << 8;
-                        if (stereo) {
-                                if (get_user(c, userPtr++))
-                                        return -EFAULT;
-                                data = (data << 16) + (c << 8);
-                        } else
-                                data = (data << 16) + data;
-                        userCount--;
-                        bal += hSpeed;
-                }
-                *p++ = data;
-                frameLeft--;
-                bal -= sSpeed;
-        }
-        expand_bal = bal;
-        expand_data = data;
-        *frameUsed += (ftotal - frameLeft) * 4;
-        utotal -= userCount;
-        return stereo? utotal * 2: utotal;
-}
-
-
-static ssize_t pmac_ctx_u8(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft)
-{
-        unsigned int *p = (unsigned int *) &frame[*frameUsed];
-        unsigned int data = expand_data;
-        int bal = expand_bal;
-        int hSpeed = dmasound.hard.speed, sSpeed = dmasound.soft.speed;
-        int stereo = dmasound.soft.stereo;
-        int utotal, ftotal;
-
-        frameLeft >>= 2;
-        if (stereo)
-                userCount >>= 1;
-        ftotal = frameLeft;
-        utotal = userCount;
-        while (frameLeft) {
-                u_char c;
-                if (bal < 0) {
-                        if (userCount == 0)
-                                break;
-                        if (get_user(c, userPtr++))
-                                return -EFAULT;
-                        data = (c ^ 0x80) << 8;
-                        if (stereo) {
-                                if (get_user(c, userPtr++))
-                                        return -EFAULT;
-                                data = (data << 16) + ((c ^ 0x80) << 8);
-                        } else
-                                data = (data << 16) + data;
-                        userCount--;
-                        bal += hSpeed;
-                }
-                *p++ = data;
-                frameLeft--;
-                bal -= sSpeed;
-        }
-        expand_bal = bal;
-        expand_data = data;
-        *frameUsed += (ftotal - frameLeft) * 4;
-        utotal -= userCount;
-        return stereo? utotal * 2: utotal;
-}
-
-
-static ssize_t pmac_ctx_s16(const u_char __user *userPtr, size_t userCount,
-                            u_char frame[], ssize_t *frameUsed,
-                            ssize_t frameLeft)
-{
-        unsigned int *p = (unsigned int *) &frame[*frameUsed];
-        unsigned int data = expand_data;
-        unsigned short __user *up = (unsigned short __user *) userPtr;
-        int bal = expand_bal;
-        int hSpeed = dmasound.hard.speed, sSpeed = dmasound.soft.speed;
-        int stereo = dmasound.soft.stereo;
-        int utotal, ftotal;
-
-        frameLeft >>= 2;
-        userCount >>= (stereo? 2: 1);
-        ftotal = frameLeft;
-        utotal = userCount;
-        while (frameLeft) {
-                unsigned short c;
-                if (bal < 0) {
-                        if (userCount == 0)
-                                break;
-                        if (get_user(data, up++))
-                                return -EFAULT;
-                        if (stereo) {
-                                if (get_user(c, up++))
-                                        return -EFAULT;
-                                data = (data << 16) + c;
-                        } else
-                                data = (data << 16) + data;
-                        userCount--;
-                        bal += hSpeed;
-                }
-                *p++ = data;
-                frameLeft--;
-                bal -= sSpeed;
-        }
-        expand_bal = bal;
-        expand_data = data;
-        *frameUsed += (ftotal - frameLeft) * 4;
-        utotal -= userCount;
-        return stereo? utotal * 4: utotal * 2;
-}
-
-
-static ssize_t pmac_ctx_u16(const u_char __user *userPtr, size_t userCount,
-                            u_char frame[], ssize_t *frameUsed,
-                            ssize_t frameLeft)
-{
-        int mask = (dmasound.soft.format == AFMT_U16_LE? 0x0080: 0x8000);
-        unsigned int *p = (unsigned int *) &frame[*frameUsed];
-        unsigned int data = expand_data;
-        unsigned short __user *up = (unsigned short __user *) userPtr;
-        int bal = expand_bal;
-        int hSpeed = dmasound.hard.speed, sSpeed = dmasound.soft.speed;
-        int stereo = dmasound.soft.stereo;
-        int utotal, ftotal;
-
-        frameLeft >>= 2;
-        userCount >>= (stereo? 2: 1);
-        ftotal = frameLeft;
-        utotal = userCount;
-        while (frameLeft) {
-                unsigned short c;
-                if (bal < 0) {
-                        if (userCount == 0)
-                                break;
-                        if (get_user(data, up++))
-                                return -EFAULT;
-                        data ^= mask;
-                        if (stereo) {
-                                if (get_user(c, up++))
-                                        return -EFAULT;
-                                data = (data << 16) + (c ^ mask);
-                        } else
-                                data = (data << 16) + data;
-                        userCount--;
-                        bal += hSpeed;
-                }
-                *p++ = data;
-                frameLeft--;
-                bal -= sSpeed;
-        }
-        expand_bal = bal;
-        expand_data = data;
-        *frameUsed += (ftotal - frameLeft) * 4;
-        utotal -= userCount;
-        return stereo? utotal * 4: utotal * 2;
-}
-
-/* data in routines... */
-
-static ssize_t pmac_ct_s8_read(const u_char __user *userPtr, size_t userCount,
-                          u_char frame[], ssize_t *frameUsed,
-                          ssize_t frameLeft)
-{
-        ssize_t count, used;
-        short *p = (short *) &frame[*frameUsed];
-        int val, stereo = dmasound.soft.stereo;
-
-        frameLeft >>= 2;
-        if (stereo)
-                userCount >>= 1;
-        used = count = min_t(unsigned long, userCount, frameLeft);
-        while (count > 0) {
-                u_char data;
-
-                val = *p++;
-                val = (val * software_input_volume) >> 7;
-                data = val >> 8;
-                if (put_user(data, (u_char __user *)userPtr++))
-                        return -EFAULT;
-                if (stereo) {
-                        val = *p;
-                        val = (val * software_input_volume) >> 7;
-                        data = val >> 8;
-                        if (put_user(data, (u_char __user *)userPtr++))
-                                return -EFAULT;
-                }
-                p++;
-                count--;
-        }
-        *frameUsed += used * 4;
-        return stereo? used * 2: used;
-}
-
-
-static ssize_t pmac_ct_u8_read(const u_char __user *userPtr, size_t userCount,
-                          u_char frame[], ssize_t *frameUsed,
-                          ssize_t frameLeft)
-{
-        ssize_t count, used;
-        short *p = (short *) &frame[*frameUsed];
-        int val, stereo = dmasound.soft.stereo;
-
-        frameLeft >>= 2;
-        if (stereo)
-                userCount >>= 1;
-        used = count = min_t(unsigned long, userCount, frameLeft);
-        while (count > 0) {
-                u_char data;
-
-                val = *p++;
-                val = (val * software_input_volume) >> 7;
-                data = (val >> 8) ^ 0x80;
-                if (put_user(data, (u_char __user *)userPtr++))
-                        return -EFAULT;
-                if (stereo) {
-                        val = *p;
-                        val = (val * software_input_volume) >> 7;
-                        data = (val >> 8) ^ 0x80;
-                        if (put_user(data, (u_char __user *)userPtr++))
-                                return -EFAULT;
-                }
-                p++;
-                count--;
-        }
-        *frameUsed += used * 4;
-        return stereo? used * 2: used;
-}
-
-static ssize_t pmac_ct_s16_read(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft)
-{
-        ssize_t count, used;
-        int stereo = dmasound.soft.stereo;
-        short *fp = (short *) &frame[*frameUsed];
-        short __user *up = (short __user *) userPtr;
-
-        frameLeft >>= 2;
-        userCount >>= (stereo? 2: 1);
-        used = count = min_t(unsigned long, userCount, frameLeft);
-        while (count > 0) {
-                short data;
-
-                data = *fp++;
-                data = (data * software_input_volume) >> 7;
-                if (put_user(data, up++))
-                        return -EFAULT;
-                if (stereo) {
-                        data = *fp;
-                        data = (data * software_input_volume) >> 7;
-                        if (put_user(data, up++))
-                                return -EFAULT;
-                }
-                fp++;
-                count--;
-        }
-        *frameUsed += used * 4;
-        return stereo? used * 4: used * 2;
-}
-
-static ssize_t pmac_ct_u16_read(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft)
-{
-        ssize_t count, used;
-        int mask = (dmasound.soft.format == AFMT_U16_LE? 0x0080: 0x8000);
-        int stereo = dmasound.soft.stereo;
-        short *fp = (short *) &frame[*frameUsed];
-        short __user *up = (short __user *) userPtr;
-
-        frameLeft >>= 2;
-        userCount >>= (stereo? 2: 1);
-        used = count = min_t(unsigned long, userCount, frameLeft);
-        while (count > 0) {
-                int data;
-
-                data = *fp++;
-                data = (data * software_input_volume) >> 7;
-                data ^= mask;
-                if (put_user(data, up++))
-                        return -EFAULT;
-                if (stereo) {
-                        data = *fp;
-                        data = (data * software_input_volume) >> 7;
-                        data ^= mask;
-                        if (put_user(data, up++))
-                                return -EFAULT;
-                }
-                fp++;
-                count--;
-        }
-        *frameUsed += used * 4;
-        return stereo? used * 4: used * 2;
-}
-
-/* data in routines (reducing speed)... */
-
-static ssize_t pmac_ctx_s8_read(const u_char __user *userPtr, size_t userCount,
-                          u_char frame[], ssize_t *frameUsed,
-                          ssize_t frameLeft)
-{
-        short *p = (short *) &frame[*frameUsed];
-        int bal = expand_read_bal;
-        int vall,valr, stereo = dmasound.soft.stereo;
-        int hSpeed = dmasound.hard.speed, sSpeed = dmasound.soft.speed;
-        int utotal, ftotal;
-
-        frameLeft >>= 2;
-        if (stereo)
-                userCount >>= 1;
-        ftotal = frameLeft;
-        utotal = userCount;
-        while (frameLeft) {
-                u_char data;
-
-                if (bal<0 && userCount == 0)
-                        break;
-                vall = *p++;
-                vall = (vall * software_input_volume) >> 7;
-                if (stereo) {
-                        valr = *p;
-                        valr = (valr * software_input_volume) >> 7;
-                }
-                p++;
-                if (bal < 0) {
-                        data = vall >> 8;
-                        if (put_user(data, (u_char __user *)userPtr++))
-                                return -EFAULT;
-                        if (stereo) {
-                                data = valr >> 8;
-                                if (put_user(data, (u_char __user *)userPtr++))
-                                        return -EFAULT;
-                        }
-                        userCount--;
-                        bal += hSpeed;
-                }
-                frameLeft--;
-                bal -= sSpeed;
-        }
-        expand_read_bal=bal;
-        *frameUsed += (ftotal - frameLeft) * 4;
-        utotal -= userCount;
-        return stereo? utotal * 2: utotal;
-}
-
-
-static ssize_t pmac_ctx_u8_read(const u_char __user *userPtr, size_t userCount,
-                          u_char frame[], ssize_t *frameUsed,
-                          ssize_t frameLeft)
-{
-        short *p = (short *) &frame[*frameUsed];
-        int bal = expand_read_bal;
-        int vall,valr, stereo = dmasound.soft.stereo;
-        int hSpeed = dmasound.hard.speed, sSpeed = dmasound.soft.speed;
-        int utotal, ftotal;
-
-        frameLeft >>= 2;
-        if (stereo)
-                userCount >>= 1;
-        ftotal = frameLeft;
-        utotal = userCount;
-        while (frameLeft) {
-                u_char data;
-
-                if (bal<0 && userCount == 0)
-                        break;
-
-                vall = *p++;
-                vall = (vall * software_input_volume) >> 7;
-                if (stereo) {
-                        valr = *p;
-                        valr = (valr * software_input_volume) >> 7;
-                }
-                p++;
-                if (bal < 0) {
-                        data = (vall >> 8) ^ 0x80;
-                        if (put_user(data, (u_char __user *)userPtr++))
-                                return -EFAULT;
-                        if (stereo) {
-                                data = (valr >> 8) ^ 0x80;
-                                if (put_user(data, (u_char __user *)userPtr++))
-                                        return -EFAULT;
-                        }
-                        userCount--;
-                        bal += hSpeed;
-                }
-                frameLeft--;
-                bal -= sSpeed;
-        }
-        expand_read_bal=bal;
-        *frameUsed += (ftotal - frameLeft) * 4;
-        utotal -= userCount;
-        return stereo? utotal * 2: utotal;
-}
-
-static ssize_t pmac_ctx_s16_read(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft)
-{
-        int bal = expand_read_bal;
-        short *fp = (short *) &frame[*frameUsed];
-        short __user *up = (short __user *) userPtr;
-        int stereo = dmasound.soft.stereo;
-        int hSpeed = dmasound.hard.speed, sSpeed = dmasound.soft.speed;
-        int utotal, ftotal;
-
-        frameLeft >>= 2;
-        userCount >>= (stereo? 2: 1);
-        ftotal = frameLeft;
-        utotal = userCount;
-        while (frameLeft) {
-                int datal,datar;
-
-                if (bal<0 && userCount == 0)
-                        break;
-
-                datal = *fp++;
-                datal = (datal * software_input_volume) >> 7;
-                if (stereo) {
-                        datar = *fp;
-                        datar = (datar * software_input_volume) >> 7;
-                }
-                fp++;
-                if (bal < 0) {
-                        if (put_user(datal, up++))
-                                return -EFAULT;
-                        if (stereo) {
-                                if (put_user(datar, up++))
-                                        return -EFAULT;
-                        }
-                        userCount--;
-                        bal += hSpeed;
-                }
-                frameLeft--;
-                bal -= sSpeed;
-        }
-        expand_read_bal=bal;
-        *frameUsed += (ftotal - frameLeft) * 4;
-        utotal -= userCount;
-        return stereo? utotal * 4: utotal * 2;
-}
-
-static ssize_t pmac_ctx_u16_read(const u_char __user *userPtr, size_t userCount,
-                           u_char frame[], ssize_t *frameUsed,
-                           ssize_t frameLeft)
-{
-        int bal = expand_read_bal;
-        int mask = (dmasound.soft.format == AFMT_U16_LE? 0x0080: 0x8000);
-        short *fp = (short *) &frame[*frameUsed];
-        short __user *up = (short __user *) userPtr;
-        int stereo = dmasound.soft.stereo;
-        int hSpeed = dmasound.hard.speed, sSpeed = dmasound.soft.speed;
-        int utotal, ftotal;
-
-        frameLeft >>= 2;
-        userCount >>= (stereo? 2: 1);
-        ftotal = frameLeft;
-        utotal = userCount;
-        while (frameLeft) {
-                int datal,datar;
-
-                if (bal<0 && userCount == 0)
-                        break;
-
-                datal = *fp++;
-                datal = (datal * software_input_volume) >> 7;
-                datal ^= mask;
-                if (stereo) {
-                        datar = *fp;
-                        datar = (datar * software_input_volume) >> 7;
-                        datar ^= mask;
-                }
-                fp++;
-                if (bal < 0) {
-                        if (put_user(datal, up++))
-                                return -EFAULT;
-                        if (stereo) {
-                                if (put_user(datar, up++))
-                                        return -EFAULT;
-                        }
-                        userCount--;
-                        bal += hSpeed;
-                }
-                frameLeft--;
-                bal -= sSpeed;
-        }
-        expand_read_bal=bal;
-        *frameUsed += (ftotal - frameLeft) * 4;
-        utotal -= userCount;
-        return stereo? utotal * 4: utotal * 2;
-}
-
-
-TRANS transAwacsNormal = {
-        .ct_ulaw=       pmac_ct_law,
-        .ct_alaw=       pmac_ct_law,
-        .ct_s8=         pmac_ct_s8,
-        .ct_u8=         pmac_ct_u8,
-        .ct_s16be=      pmac_ct_s16,
-        .ct_u16be=      pmac_ct_u16,
-        .ct_s16le=      pmac_ct_s16,
-        .ct_u16le=      pmac_ct_u16,
-};
-
-TRANS transAwacsExpand = {
-        .ct_ulaw=       pmac_ctx_law,
-        .ct_alaw=       pmac_ctx_law,
-        .ct_s8=         pmac_ctx_s8,
-        .ct_u8=         pmac_ctx_u8,
-        .ct_s16be=      pmac_ctx_s16,
-        .ct_u16be=      pmac_ctx_u16,
-        .ct_s16le=      pmac_ctx_s16,
-        .ct_u16le=      pmac_ctx_u16,
-};
-
-TRANS transAwacsNormalRead = {
-        .ct_s8=         pmac_ct_s8_read,
-        .ct_u8=         pmac_ct_u8_read,
-        .ct_s16be=      pmac_ct_s16_read,
-        .ct_u16be=      pmac_ct_u16_read,
-        .ct_s16le=      pmac_ct_s16_read,
-        .ct_u16le=      pmac_ct_u16_read,
-};
-
-TRANS transAwacsExpandRead = {
-        .ct_s8=         pmac_ctx_s8_read,
-        .ct_u8=         pmac_ctx_u8_read,
-        .ct_s16be=      pmac_ctx_s16_read,
-        .ct_u16be=      pmac_ctx_u16_read,
-        .ct_s16le=      pmac_ctx_s16_read,
-        .ct_u16le=      pmac_ctx_u16_read,
-};
-
-/* translation tables */
-/* 16 bit mu-law */
-
-static short dmasound_ulaw2dma16[] = {
-        -32124, -31100, -30076, -29052, -28028, -27004, -25980, -24956,
-        -23932, -22908, -21884, -20860, -19836, -18812, -17788, -16764,
-        -15996, -15484, -14972, -14460, -13948, -13436, -12924, -12412,
-        -11900, -11388, -10876, -10364, -9852,  -9340,  -8828,  -8316,
-        -7932,  -7676,  -7420,  -7164,  -6908,  -6652,  -6396,  -6140,
-        -5884,  -5628,  -5372,  -5116,  -4860,  -4604,  -4348,  -4092,
-        -3900,  -3772,  -3644,  -3516,  -3388,  -3260,  -3132,  -3004,
-        -2876,  -2748,  -2620,  -2492,  -2364,  -2236,  -2108,  -1980,
-        -1884,  -1820,  -1756,  -1692,  -1628,  -1564,  -1500,  -1436,
-        -1372,  -1308,  -1244,  -1180,  -1116,  -1052,  -988,   -924,
-        -876,   -844,   -812,   -780,   -748,   -716,   -684,   -652,
-        -620,   -588,   -556,   -524,   -492,   -460,   -428,   -396,
-        -372,   -356,   -340,   -324,   -308,   -292,   -276,   -260,
-        -244,   -228,   -212,   -196,   -180,   -164,   -148,   -132,
-        -120,   -112,   -104,   -96,    -88,    -80,    -72,    -64,
-        -56,    -48,    -40,    -32,    -24,    -16,    -8,     0,
-        32124,  31100,  30076,  29052,  28028,  27004,  25980,  24956,
-        23932,  22908,  21884,  20860,  19836,  18812,  17788,  16764,
-        15996,  15484,  14972,  14460,  13948,  13436,  12924,  12412,
-        11900,  11388,  10876,  10364,  9852,   9340,   8828,   8316,
-        7932,   7676,   7420,   7164,   6908,   6652,   6396,   6140,
-        5884,   5628,   5372,   5116,   4860,   4604,   4348,   4092,
-        3900,   3772,   3644,   3516,   3388,   3260,   3132,   3004,
-        2876,   2748,   2620,   2492,   2364,   2236,   2108,   1980,
-        1884,   1820,   1756,   1692,   1628,   1564,   1500,   1436,
-        1372,   1308,   1244,   1180,   1116,   1052,   988,    924,
-        876,    844,    812,    780,    748,    716,    684,    652,
-        620,    588,    556,    524,    492,    460,    428,    396,
-        372,    356,    340,    324,    308,    292,    276,    260,
-        244,    228,    212,    196,    180,    164,    148,    132,
-        120,    112,    104,    96,     88,     80,     72,     64,
-        56,     48,     40,     32,     24,     16,     8,      0,
-};
-
-/* 16 bit A-law */
-
-static short dmasound_alaw2dma16[] = {
-        -5504,  -5248,  -6016,  -5760,  -4480,  -4224,  -4992,  -4736,
-        -7552,  -7296,  -8064,  -7808,  -6528,  -6272,  -7040,  -6784,
-        -2752,  -2624,  -3008,  -2880,  -2240,  -2112,  -2496,  -2368,
-        -3776,  -3648,  -4032,  -3904,  -3264,  -3136,  -3520,  -3392,
-        -22016, -20992, -24064, -23040, -17920, -16896, -19968, -18944,
-        -30208, -29184, -32256, -31232, -26112, -25088, -28160, -27136,
-        -11008, -10496, -12032, -11520, -8960,  -8448,  -9984,  -9472,
-        -15104, -14592, -16128, -15616, -13056, -12544, -14080, -13568,
-        -344,   -328,   -376,   -360,   -280,   -264,   -312,   -296,
-        -472,   -456,   -504,   -488,   -408,   -392,   -440,   -424,
-        -88,    -72,    -120,   -104,   -24,    -8,     -56,    -40,
-        -216,   -200,   -248,   -232,   -152,   -136,   -184,   -168,
-        -1376,  -1312,  -1504,  -1440,  -1120,  -1056,  -1248,  -1184,
-        -1888,  -1824,  -2016,  -1952,  -1632,  -1568,  -1760,  -1696,
-        -688,   -656,   -752,   -720,   -560,   -528,   -624,   -592,
-        -944,   -912,   -1008,  -976,   -816,   -784,   -880,   -848,
-        5504,   5248,   6016,   5760,   4480,   4224,   4992,   4736,
-        7552,   7296,   8064,   7808,   6528,   6272,   7040,   6784,
-        2752,   2624,   3008,   2880,   2240,   2112,   2496,   2368,
-        3776,   3648,   4032,   3904,   3264,   3136,   3520,   3392,
-        22016,  20992,  24064,  23040,  17920,  16896,  19968,  18944,
-        30208,  29184,  32256,  31232,  26112,  25088,  28160,  27136,
-        11008,  10496,  12032,  11520,  8960,   8448,   9984,   9472,
-        15104,  14592,  16128,  15616,  13056,  12544,  14080,  13568,
-        344,    328,    376,    360,    280,    264,    312,    296,
-        472,    456,    504,    488,    408,    392,    440,    424,
-        88,     72,     120,    104,    24,     8,      56,     40,
-        216,    200,    248,    232,    152,    136,    184,    168,
-        1376,   1312,   1504,   1440,   1120,   1056,   1248,   1184,
-        1888,   1824,   2016,   1952,   1632,   1568,   1760,   1696,
-        688,    656,    752,    720,    560,    528,    624,    592,
-        944,    912,    1008,   976,    816,    784,    880,    848,
-};
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c
deleted file mode 100644
index 52648573f601..000000000000
--- a/sound/oss/es1371.c
+++ /dev/null
@@ -1,3131 +0,0 @@
-/*****************************************************************************/
-
-/*
- *      es1371.c  --  Creative Ensoniq ES1371.
- *
- *      Copyright (C) 1998-2001, 2003  Thomas Sailer (t.sailer@alumni.ethz.ch)
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Special thanks to Ensoniq
- *
- *  Supported devices:
- *  /dev/dsp    standard /dev/dsp device, (mostly) OSS compatible
- *  /dev/mixer  standard /dev/mixer device, (mostly) OSS compatible
- *  /dev/dsp1   additional DAC, like /dev/dsp, but outputs to mixer "SYNTH" setting
- *  /dev/midi   simple MIDI UART interface, no ioctl
- *
- *  NOTE: the card does not have any FM/Wavetable synthesizer, it is supposed
- *  to be done in software. That is what /dev/dac is for. By now (Q2 1998)
- *  there are several MIDI to PCM (WAV) packages, one of them is timidity.
- *
- *  Revision history
- *    04.06.1998   0.1   Initial release
- *                       Mixer stuff should be overhauled; especially optional AC97 mixer bits
- *                       should be detected. This results in strange behaviour of some mixer
- *                       settings, like master volume and mic.
- *    08.06.1998   0.2   First release using Alan Cox' soundcore instead of miscdevice
- *    03.08.1998   0.3   Do not include modversions.h
- *                       Now mixer behaviour can basically be selected between
- *                       "OSS documented" and "OSS actual" behaviour
- *    31.08.1998   0.4   Fix realplayer problems - dac.count issues
- *    27.10.1998   0.5   Fix joystick support
- *                       -- Oliver Neukum (c188@org.chemie.uni-muenchen.de)
- *    10.12.1998   0.6   Fix drain_dac trying to wait on not yet initialized DMA
- *    23.12.1998   0.7   Fix a few f_file & FMODE_ bugs
- *                       Don't wake up app until there are fragsize bytes to read/write
- *    06.01.1999   0.8   remove the silly SA_INTERRUPT flag.
- *                       hopefully killed the egcs section type conflict
- *    12.03.1999   0.9   cinfo.blocks should be reset after GETxPTR ioctl.
- *                       reported by Johan Maes <joma@telindus.be>
- *    22.03.1999   0.10  return EAGAIN instead of EBUSY when O_NONBLOCK
- *                       read/write cannot be executed
- *    07.04.1999   0.11  implemented the following ioctl's: SOUND_PCM_READ_RATE, 
- *                       SOUND_PCM_READ_CHANNELS, SOUND_PCM_READ_BITS; 
- *                       Alpha fixes reported by Peter Jones <pjones@redhat.com>
- *                       Another Alpha fix (wait_src_ready in init routine)
- *                       reported by "Ivan N. Kokshaysky" <ink@jurassic.park.msu.ru>
- *                       Note: joystick address handling might still be wrong on archs
- *                       other than i386
- *    15.06.1999   0.12  Fix bad allocation bug.
- *                       Thanks to Deti Fliegl <fliegl@in.tum.de>
- *    28.06.1999   0.13  Add pci_set_master
- *    03.08.1999   0.14  adapt to Linus' new __setup/__initcall
- *                       added kernel command line option "es1371=joystickaddr"
- *                       removed CONFIG_SOUND_ES1371_JOYPORT_BOOT kludge
- *    10.08.1999   0.15  (Re)added S/PDIF module option for cards revision >= 4.
- *                       Initial version by Dave Platt <dplatt@snulbug.mtview.ca.us>.
- *                       module_init/__setup fixes
- *    08.16.1999   0.16  Joe Cotellese <joec@ensoniq.com>
- *                       Added detection for ES1371 revision ID so that we can
- *                       detect the ES1373 and later parts.
- *                       added AC97 #defines for readability
- *                       added a /proc file system for dumping hardware state
- *                       updated SRC and CODEC w/r functions to accommodate bugs
- *                       in some versions of the ES137x chips.
- *    31.08.1999   0.17  add spin_lock_init
- *                       replaced current->state = x with set_current_state(x)
- *    03.09.1999   0.18  change read semantics for MIDI to match
- *                       OSS more closely; remove possible wakeup race
- *    21.10.1999   0.19  Round sampling rates, requested by
- *                       Kasamatsu Kenichi <t29w0267@ip.media.kyoto-u.ac.jp>
- *    27.10.1999   0.20  Added SigmaTel 3D enhancement string
- *                       Codec ID printing changes
- *    28.10.1999   0.21  More waitqueue races fixed
- *                       Joe Cotellese <joec@ensoniq.com>
- *                       Changed PCI detection routine so we can more easily
- *                       detect ES137x chip and derivatives.
- *    05.01.2000   0.22  Should now work with rev7 boards; patch by
- *                       Eric Lemar, elemar@cs.washington.edu
- *    08.01.2000   0.23  Prevent some ioctl's from returning bad count values on underrun/overrun;
- *                       Tim Janik's BSE (Bedevilled Sound Engine) found this
- *    07.02.2000   0.24  Use pci_alloc_consistent and pci_register_driver
- *    07.02.2000   0.25  Use ac97_codec
- *    01.03.2000   0.26  SPDIF patch by Mikael Bouillot <mikael.bouillot@bigfoot.com>
- *                       Use pci_module_init
- *    21.11.2000   0.27  Initialize dma buffers in poll, otherwise poll may return a bogus mask
- *    12.12.2000   0.28  More dma buffer initializations, patch from
- *                       Tjeerd Mulder <tjeerd.mulder@fujitsu-siemens.com>
- *    05.01.2001   0.29  Hopefully updates will not be required anymore when Creative bumps
- *                       the CT5880 revision.
- *                       suggested by Stephan Müller <smueller@chronox.de>
- *    31.01.2001   0.30  Register/Unregister gameport
- *                       Fix SETTRIGGER non OSS API conformity
- *    14.07.2001   0.31  Add list of laptops needing amplifier control
- *    03.01.2003   0.32  open_mode fixes from Georg Acher <acher@in.tum.de>
- */
-
-/*****************************************************************************/
-      
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/string.h>
-#include <linux/ioport.h>
-#include <linux/sched.h>
-#include <linux/delay.h>
-#include <linux/sound.h>
-#include <linux/slab.h>
-#include <linux/soundcard.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/bitops.h>
-#include <linux/proc_fs.h>
-#include <linux/spinlock.h>
-#include <linux/smp_lock.h>
-#include <linux/ac97_codec.h>
-#include <linux/gameport.h>
-#include <linux/wait.h>
-#include <linux/dma-mapping.h>
-#include <linux/mutex.h>
-#include <linux/mm.h>
-#include <linux/kernel.h>
-
-#include <asm/io.h>
-#include <asm/page.h>
-#include <asm/uaccess.h>
-
-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
-#define SUPPORT_JOYSTICK
-#endif
-
-/* --------------------------------------------------------------------- */
-
-#undef OSS_DOCUMENTED_MIXER_SEMANTICS
-#define ES1371_DEBUG
-#define DBG(x) {}
-/*#define DBG(x) {x}*/
-
-/* --------------------------------------------------------------------- */
-
-#ifndef PCI_VENDOR_ID_ENSONIQ
-#define PCI_VENDOR_ID_ENSONIQ        0x1274    
-#endif
-
-#ifndef PCI_VENDOR_ID_ECTIVA
-#define PCI_VENDOR_ID_ECTIVA         0x1102
-#endif
-
-#ifndef PCI_DEVICE_ID_ENSONIQ_ES1371
-#define PCI_DEVICE_ID_ENSONIQ_ES1371 0x1371
-#endif
-
-#ifndef PCI_DEVICE_ID_ENSONIQ_CT5880
-#define PCI_DEVICE_ID_ENSONIQ_CT5880 0x5880
-#endif
-
-#ifndef PCI_DEVICE_ID_ECTIVA_EV1938
-#define PCI_DEVICE_ID_ECTIVA_EV1938 0x8938
-#endif
-
-/* ES1371 chip ID */
-/* This is a little confusing because all ES1371 compatible chips have the
-   same DEVICE_ID, the only thing differentiating them is the REV_ID field.
-   This is only significant if you want to enable features on the later parts.
-   Yes, I know it's stupid and why didn't we use the sub IDs?
-*/
-#define ES1371REV_ES1373_A  0x04
-#define ES1371REV_ES1373_B  0x06
-#define ES1371REV_CT5880_A  0x07
-#define CT5880REV_CT5880_C  0x02
-#define CT5880REV_CT5880_D  0x03
-#define ES1371REV_ES1371_B  0x09
-#define EV1938REV_EV1938_A  0x00
-#define ES1371REV_ES1373_8  0x08
-
-#define ES1371_MAGIC  ((PCI_VENDOR_ID_ENSONIQ<<16)|PCI_DEVICE_ID_ENSONIQ_ES1371)
-
-#define ES1371_EXTENT             0x40
-#define JOY_EXTENT                8
-
-#define ES1371_REG_CONTROL        0x00
-#define ES1371_REG_STATUS         0x04 /* on the 5880 it is control/status */
-#define ES1371_REG_UART_DATA      0x08
-#define ES1371_REG_UART_STATUS    0x09
-#define ES1371_REG_UART_CONTROL   0x09
-#define ES1371_REG_UART_TEST      0x0a
-#define ES1371_REG_MEMPAGE        0x0c
-#define ES1371_REG_SRCONV         0x10
-#define ES1371_REG_CODEC          0x14
-#define ES1371_REG_LEGACY         0x18
-#define ES1371_REG_SERIAL_CONTROL 0x20
-#define ES1371_REG_DAC1_SCOUNT    0x24
-#define ES1371_REG_DAC2_SCOUNT    0x28
-#define ES1371_REG_ADC_SCOUNT     0x2c
-
-#define ES1371_REG_DAC1_FRAMEADR  0xc30
-#define ES1371_REG_DAC1_FRAMECNT  0xc34
-#define ES1371_REG_DAC2_FRAMEADR  0xc38
-#define ES1371_REG_DAC2_FRAMECNT  0xc3c
-#define ES1371_REG_ADC_FRAMEADR   0xd30
-#define ES1371_REG_ADC_FRAMECNT   0xd34
-
-#define ES1371_FMT_U8_MONO     0
-#define ES1371_FMT_U8_STEREO   1
-#define ES1371_FMT_S16_MONO    2
-#define ES1371_FMT_S16_STEREO  3
-#define ES1371_FMT_STEREO      1
-#define ES1371_FMT_S16         2
-#define ES1371_FMT_MASK        3
-
-static const unsigned sample_size[] = { 1, 2, 2, 4 };
-static const unsigned sample_shift[] = { 0, 1, 1, 2 };
-
-#define CTRL_RECEN_B    0x08000000  /* 1 = don't mix analog in to digital out */
-#define CTRL_SPDIFEN_B  0x04000000
-#define CTRL_JOY_SHIFT  24
-#define CTRL_JOY_MASK   3
-#define CTRL_JOY_200    0x00000000  /* joystick base address */
-#define CTRL_JOY_208    0x01000000
-#define CTRL_JOY_210    0x02000000
-#define CTRL_JOY_218    0x03000000
-#define CTRL_GPIO_IN0   0x00100000  /* general purpose inputs/outputs */
-#define CTRL_GPIO_IN1   0x00200000
-#define CTRL_GPIO_IN2   0x00400000
-#define CTRL_GPIO_IN3   0x00800000
-#define CTRL_GPIO_OUT0  0x00010000
-#define CTRL_GPIO_OUT1  0x00020000
-#define CTRL_GPIO_OUT2  0x00040000
-#define CTRL_GPIO_OUT3  0x00080000
-#define CTRL_MSFMTSEL   0x00008000  /* MPEG serial data fmt: 0 = Sony, 1 = I2S */
-#define CTRL_SYNCRES    0x00004000  /* AC97 warm reset */
-#define CTRL_ADCSTOP    0x00002000  /* stop ADC transfers */
-#define CTRL_PWR_INTRM  0x00001000  /* 1 = power level ints enabled */
-#define CTRL_M_CB       0x00000800  /* recording source: 0 = ADC, 1 = MPEG */
-#define CTRL_CCB_INTRM  0x00000400  /* 1 = CCB "voice" ints enabled */
-#define CTRL_PDLEV0     0x00000000  /* power down level */
-#define CTRL_PDLEV1     0x00000100
-#define CTRL_PDLEV2     0x00000200
-#define CTRL_PDLEV3     0x00000300
-#define CTRL_BREQ       0x00000080  /* 1 = test mode (internal mem test) */
-#define CTRL_DAC1_EN    0x00000040  /* enable DAC1 */
-#define CTRL_DAC2_EN    0x00000020  /* enable DAC2 */
-#define CTRL_ADC_EN     0x00000010  /* enable ADC */
-#define CTRL_UART_EN    0x00000008  /* enable MIDI uart */
-#define CTRL_JYSTK_EN   0x00000004  /* enable Joystick port */
-#define CTRL_XTALCLKDIS 0x00000002  /* 1 = disable crystal clock input */
-#define CTRL_PCICLKDIS  0x00000001  /* 1 = disable PCI clock distribution */
-
-
-#define STAT_INTR       0x80000000  /* wired or of all interrupt bits */
-#define CSTAT_5880_AC97_RST 0x20000000 /* CT5880 Reset bit */
-#define STAT_EN_SPDIF   0x00040000  /* enable S/PDIF circuitry */
-#define STAT_TS_SPDIF   0x00020000  /* test S/PDIF circuitry */
-#define STAT_TESTMODE   0x00010000  /* test ASIC */
-#define STAT_SYNC_ERR   0x00000100  /* 1 = codec sync error */
-#define STAT_VC         0x000000c0  /* CCB int source, 0=DAC1, 1=DAC2, 2=ADC, 3=undef */
-#define STAT_SH_VC      6
-#define STAT_MPWR       0x00000020  /* power level interrupt */
-#define STAT_MCCB       0x00000010  /* CCB int pending */
-#define STAT_UART       0x00000008  /* UART int pending */
-#define STAT_DAC1       0x00000004  /* DAC1 int pending */
-#define STAT_DAC2       0x00000002  /* DAC2 int pending */
-#define STAT_ADC        0x00000001  /* ADC int pending */
-
-#define USTAT_RXINT     0x80        /* UART rx int pending */
-#define USTAT_TXINT     0x04        /* UART tx int pending */
-#define USTAT_TXRDY     0x02        /* UART tx ready */
-#define USTAT_RXRDY     0x01        /* UART rx ready */
-
-#define UCTRL_RXINTEN   0x80        /* 1 = enable RX ints */
-#define UCTRL_TXINTEN   0x60        /* TX int enable field mask */
-#define UCTRL_ENA_TXINT 0x20        /* enable TX int */
-#define UCTRL_CNTRL     0x03        /* control field */
-#define UCTRL_CNTRL_SWR 0x03        /* software reset command */
-
-/* sample rate converter */
-#define SRC_OKSTATE        1
-
-#define SRC_RAMADDR_MASK   0xfe000000
-#define SRC_RAMADDR_SHIFT  25
-#define SRC_DAC1FREEZE     (1UL << 21)
-#define SRC_DAC2FREEZE      (1UL << 20)
-#define SRC_ADCFREEZE      (1UL << 19)
-
-
-#define SRC_WE             0x01000000  /* read/write control for SRC RAM */
-#define SRC_BUSY           0x00800000  /* SRC busy */
-#define SRC_DIS            0x00400000  /* 1 = disable SRC */
-#define SRC_DDAC1          0x00200000  /* 1 = disable accum update for DAC1 */
-#define SRC_DDAC2          0x00100000  /* 1 = disable accum update for DAC2 */
-#define SRC_DADC           0x00080000  /* 1 = disable accum update for ADC2 */
-#define SRC_CTLMASK        0x00780000
-#define SRC_RAMDATA_MASK   0x0000ffff
-#define SRC_RAMDATA_SHIFT  0
-
-#define SRCREG_ADC      0x78
-#define SRCREG_DAC1     0x70
-#define SRCREG_DAC2     0x74
-#define SRCREG_VOL_ADC  0x6c
-#define SRCREG_VOL_DAC1 0x7c
-#define SRCREG_VOL_DAC2 0x7e
-
-#define SRCREG_TRUNC_N     0x00
-#define SRCREG_INT_REGS    0x01
-#define SRCREG_ACCUM_FRAC  0x02
-#define SRCREG_VFREQ_FRAC  0x03
-
-#define CODEC_PIRD        0x00800000  /* 0 = write AC97 register */
-#define CODEC_PIADD_MASK  0x007f0000
-#define CODEC_PIADD_SHIFT 16
-#define CODEC_PIDAT_MASK  0x0000ffff
-#define CODEC_PIDAT_SHIFT 0
-
-#define CODEC_RDY         0x80000000  /* AC97 read data valid */
-#define CODEC_WIP         0x40000000  /* AC97 write in progress */
-#define CODEC_PORD        0x00800000  /* 0 = write AC97 register */
-#define CODEC_POADD_MASK  0x007f0000
-#define CODEC_POADD_SHIFT 16
-#define CODEC_PODAT_MASK  0x0000ffff
-#define CODEC_PODAT_SHIFT 0
-
-
-#define LEGACY_JFAST      0x80000000  /* fast joystick timing */
-#define LEGACY_FIRQ       0x01000000  /* force IRQ */
-
-#define SCTRL_DACTEST     0x00400000  /* 1 = DAC test, test vector generation purposes */
-#define SCTRL_P2ENDINC    0x00380000  /*  */
-#define SCTRL_SH_P2ENDINC 19
-#define SCTRL_P2STINC     0x00070000  /*  */
-#define SCTRL_SH_P2STINC  16
-#define SCTRL_R1LOOPSEL   0x00008000  /* 0 = loop mode */
-#define SCTRL_P2LOOPSEL   0x00004000  /* 0 = loop mode */
-#define SCTRL_P1LOOPSEL   0x00002000  /* 0 = loop mode */
-#define SCTRL_P2PAUSE     0x00001000  /* 1 = pause mode */
-#define SCTRL_P1PAUSE     0x00000800  /* 1 = pause mode */
-#define SCTRL_R1INTEN     0x00000400  /* enable interrupt */
-#define SCTRL_P2INTEN     0x00000200  /* enable interrupt */
-#define SCTRL_P1INTEN     0x00000100  /* enable interrupt */
-#define SCTRL_P1SCTRLD    0x00000080  /* reload sample count register for DAC1 */
-#define SCTRL_P2DACSEN    0x00000040  /* 1 = DAC2 play back last sample when disabled */
-#define SCTRL_R1SEB       0x00000020  /* 1 = 16bit */
-#define SCTRL_R1SMB       0x00000010  /* 1 = stereo */
-#define SCTRL_R1FMT       0x00000030  /* format mask */
-#define SCTRL_SH_R1FMT    4
-#define SCTRL_P2SEB       0x00000008  /* 1 = 16bit */
-#define SCTRL_P2SMB       0x00000004  /* 1 = stereo */
-#define SCTRL_P2FMT       0x0000000c  /* format mask */
-#define SCTRL_SH_P2FMT    2
-#define SCTRL_P1SEB       0x00000002  /* 1 = 16bit */
-#define SCTRL_P1SMB       0x00000001  /* 1 = stereo */
-#define SCTRL_P1FMT       0x00000003  /* format mask */
-#define SCTRL_SH_P1FMT    0
-
-
-/* misc stuff */
-#define POLL_COUNT   0x1000
-#define FMODE_DAC         4           /* slight misuse of mode_t */
-
-/* MIDI buffer sizes */
-
-#define MIDIINBUF  256
-#define MIDIOUTBUF 256
-
-#define FMODE_MIDI_SHIFT 3
-#define FMODE_MIDI_READ  (FMODE_READ << FMODE_MIDI_SHIFT)
-#define FMODE_MIDI_WRITE (FMODE_WRITE << FMODE_MIDI_SHIFT)
-
-#define ES1371_MODULE_NAME "es1371"
-#define PFX ES1371_MODULE_NAME ": "
-
-/* --------------------------------------------------------------------- */
-
-struct es1371_state {
-        /* magic */
-        unsigned int magic;
-
-        /* list of es1371 devices */
-        struct list_head devs;
-
-        /* the corresponding pci_dev structure */
-        struct pci_dev *dev;
-
-        /* soundcore stuff */
-        int dev_audio;
-        int dev_dac;
-        int dev_midi;
-        
-        /* hardware resources */
-        unsigned long io; /* long for SPARC */
-        unsigned int irq;
-
-        /* PCI ID's */
-        u16 vendor;
-        u16 device;
-        u8 rev; /* the chip revision */
-
-        /* options */
-        int spdif_volume; /* S/PDIF output is enabled if != -1 */
-
-#ifdef ES1371_DEBUG
-        /* debug /proc entry */
-        struct proc_dir_entry *ps;
-#endif /* ES1371_DEBUG */
-
-        struct ac97_codec *codec;
-
-        /* wave stuff */
-        unsigned ctrl;
-        unsigned sctrl;
-        unsigned dac1rate, dac2rate, adcrate;
-
-        spinlock_t lock;
-        struct mutex open_mutex;
-        mode_t open_mode;
-        wait_queue_head_t open_wait;
-
-        struct dmabuf {
-                void *rawbuf;
-                dma_addr_t dmaaddr;
-                unsigned buforder;
-                unsigned numfrag;
-                unsigned fragshift;
-                unsigned hwptr, swptr;
-                unsigned total_bytes;
-                int count;
-                unsigned error; /* over/underrun */
-                wait_queue_head_t wait;
-                /* redundant, but makes calculations easier */
-                unsigned fragsize;
-                unsigned dmasize;
-                unsigned fragsamples;
-                /* OSS stuff */
-                unsigned mapped:1;
-                unsigned ready:1;
-                unsigned endcleared:1;
-                unsigned enabled:1;
-                unsigned ossfragshift;
-                int ossmaxfrags;
-                unsigned subdivision;
-        } dma_dac1, dma_dac2, dma_adc;
-
-        /* midi stuff */
-        struct {
-                unsigned ird, iwr, icnt;
-                unsigned ord, owr, ocnt;
-                wait_queue_head_t iwait;
-                wait_queue_head_t owait;
-                unsigned char ibuf[MIDIINBUF];
-                unsigned char obuf[MIDIOUTBUF];
-        } midi;
-
-#ifdef SUPPORT_JOYSTICK
-        struct gameport *gameport;
-#endif
-
-        struct mutex sem;
-};
-
-/* --------------------------------------------------------------------- */
-
-static LIST_HEAD(devs);
-
-/* --------------------------------------------------------------------- */
-
-static inline unsigned ld2(unsigned int x)
-{
-        unsigned r = 0;
-        
-        if (x >= 0x10000) {
-                x >>= 16;
-                r += 16;
-        }
-        if (x >= 0x100) {
-                x >>= 8;
-                r += 8;
-        }
-        if (x >= 0x10) {
-                x >>= 4;
-                r += 4;
-        }
-        if (x >= 4) {
-                x >>= 2;
-                r += 2;
-        }
-        if (x >= 2)
-                r++;
-        return r;
-}
-
-/* --------------------------------------------------------------------- */
-
-static unsigned wait_src_ready(struct es1371_state *s)
-{
-        unsigned int t, r;
-
-        for (t = 0; t < POLL_COUNT; t++) {
-                if (!((r = inl(s->io + ES1371_REG_SRCONV)) & SRC_BUSY))
-                        return r;
-                udelay(1);
-        }
-        printk(KERN_DEBUG PFX "sample rate converter timeout r = 0x%08x\n", r);
-        return r;
-}
-
-static unsigned src_read(struct es1371_state *s, unsigned reg)
-{
-        unsigned int temp,i,orig;
-
-        /* wait for ready */
-        temp = wait_src_ready (s);
-
-        /* we can only access the SRC at certain times, make sure
-           we're allowed to before we read */
-           
-        orig = temp;
-        /* expose the SRC state bits */
-        outl ( (temp & SRC_CTLMASK) | (reg << SRC_RAMADDR_SHIFT) | 0x10000UL,
-               s->io + ES1371_REG_SRCONV);
-
-        /* now, wait for busy and the correct time to read */
-        temp = wait_src_ready (s);
-
-        if ( (temp & 0x00870000UL ) != ( SRC_OKSTATE << 16 )){
-                /* wait for the right state */
-                for (i=0; i<POLL_COUNT; i++){
-                        temp = inl (s->io + ES1371_REG_SRCONV);
-                        if ( (temp & 0x00870000UL ) == ( SRC_OKSTATE << 16 ))
-                                break;
-                }
-        }
-
-        /* hide the state bits */
-        outl ((orig & SRC_CTLMASK) | (reg << SRC_RAMADDR_SHIFT), s->io + ES1371_REG_SRCONV);
-        return temp;
-                        
-                
-}
-
-static void src_write(struct es1371_state *s, unsigned reg, unsigned data)
-{
-      
-        unsigned int r;
-
-        r = wait_src_ready(s) & (SRC_DIS | SRC_DDAC1 | SRC_DDAC2 | SRC_DADC);
-        r |= (reg << SRC_RAMADDR_SHIFT) & SRC_RAMADDR_MASK;
-        r |= (data << SRC_RAMDATA_SHIFT) & SRC_RAMDATA_MASK;
-        outl(r | SRC_WE, s->io + ES1371_REG_SRCONV);
-
-}
-
-/* --------------------------------------------------------------------- */
-
-/* most of the following here is black magic */
-static void set_adc_rate(struct es1371_state *s, unsigned rate)
-{
-        unsigned long flags;
-        unsigned int n, truncm, freq;
-
-        if (rate > 48000)
-                rate = 48000;
-        if (rate < 4000)
-                rate = 4000;
-        n = rate / 3000;
-        if ((1 << n) & ((1 << 15) | (1 << 13) | (1 << 11) | (1 << 9)))
-                n--;
-        truncm = (21 * n - 1) | 1;
-        freq = ((48000UL << 15) / rate) * n;
-        s->adcrate = (48000UL << 15) / (freq / n);
-        spin_lock_irqsave(&s->lock, flags);
-        if (rate >= 24000) {
-                if (truncm > 239)
-                        truncm = 239;
-                src_write(s, SRCREG_ADC+SRCREG_TRUNC_N, 
-                          (((239 - truncm) >> 1) << 9) | (n << 4));
-        } else {
-                if (truncm > 119)
-                        truncm = 119;
-                src_write(s, SRCREG_ADC+SRCREG_TRUNC_N, 
-                          0x8000 | (((119 - truncm) >> 1) << 9) | (n << 4));
-        }               
-        src_write(s, SRCREG_ADC+SRCREG_INT_REGS, 
-                  (src_read(s, SRCREG_ADC+SRCREG_INT_REGS) & 0x00ff) |
-                  ((freq >> 5) & 0xfc00));
-        src_write(s, SRCREG_ADC+SRCREG_VFREQ_FRAC, freq & 0x7fff);
-        src_write(s, SRCREG_VOL_ADC, n << 8);
-        src_write(s, SRCREG_VOL_ADC+1, n << 8);
-        spin_unlock_irqrestore(&s->lock, flags);
-}
-
-
-static void set_dac1_rate(struct es1371_state *s, unsigned rate)
-{
-        unsigned long flags;
-        unsigned int freq, r;
-
-        if (rate > 48000)
-                rate = 48000;
-        if (rate < 4000)
-                rate = 4000;
-        freq = ((rate << 15) + 1500) / 3000;
-        s->dac1rate = (freq * 3000 + 16384) >> 15;
-        spin_lock_irqsave(&s->lock, flags);
-        r = (wait_src_ready(s) & (SRC_DIS | SRC_DDAC2 | SRC_DADC)) | SRC_DDAC1;
-        outl(r, s->io + ES1371_REG_SRCONV);
-        src_write(s, SRCREG_DAC1+SRCREG_INT_REGS, 
-                  (src_read(s, SRCREG_DAC1+SRCREG_INT_REGS) & 0x00ff) |
-                  ((freq >> 5) & 0xfc00));
-        src_write(s, SRCREG_DAC1+SRCREG_VFREQ_FRAC, freq & 0x7fff);
-        r = (wait_src_ready(s) & (SRC_DIS | SRC_DDAC2 | SRC_DADC));
-        outl(r, s->io + ES1371_REG_SRCONV);
-        spin_unlock_irqrestore(&s->lock, flags);
-}
-
-static void set_dac2_rate(struct es1371_state *s, unsigned rate)
-{
-        unsigned long flags;
-        unsigned int freq, r;
-
-        if (rate > 48000)
-                rate = 48000;
-        if (rate < 4000)
-                rate = 4000;
-        freq = ((rate << 15) + 1500) / 3000;
-        s->dac2rate = (freq * 3000 + 16384) >> 15;
-        spin_lock_irqsave(&s->lock, flags);
-        r = (wait_src_ready(s) & (SRC_DIS | SRC_DDAC1 | SRC_DADC)) | SRC_DDAC2;
-        outl(r, s->io + ES1371_REG_SRCONV);
-        src_write(s, SRCREG_DAC2+SRCREG_INT_REGS, 
-                  (src_read(s, SRCREG_DAC2+SRCREG_INT_REGS) & 0x00ff) |
-                  ((freq >> 5) & 0xfc00));
-        src_write(s, SRCREG_DAC2+SRCREG_VFREQ_FRAC, freq & 0x7fff);
-        r = (wait_src_ready(s) & (SRC_DIS | SRC_DDAC1 | SRC_DADC));
-        outl(r, s->io + ES1371_REG_SRCONV);
-        spin_unlock_irqrestore(&s->lock, flags);
-}
-
-/* --------------------------------------------------------------------- */
-
-static void __devinit src_init(struct es1371_state *s)
-{
-        unsigned int i;
-
-        /* before we enable or disable the SRC we need
-           to wait for it to become ready */
-        wait_src_ready(s);
-
-        outl(SRC_DIS, s->io + ES1371_REG_SRCONV);
-
-        for (i = 0; i < 0x80; i++)
-                src_write(s, i, 0);
-
-        src_write(s, SRCREG_DAC1+SRCREG_TRUNC_N, 16 << 4);
-        src_write(s, SRCREG_DAC1+SRCREG_INT_REGS, 16 << 10);
-        src_write(s, SRCREG_DAC2+SRCREG_TRUNC_N, 16 << 4);
-        src_write(s, SRCREG_DAC2+SRCREG_INT_REGS, 16 << 10);
-        src_write(s, SRCREG_VOL_ADC, 1 << 12);
-        src_write(s, SRCREG_VOL_ADC+1, 1 << 12);
-        src_write(s, SRCREG_VOL_DAC1, 1 << 12);
-        src_write(s, SRCREG_VOL_DAC1+1, 1 << 12);
-        src_write(s, SRCREG_VOL_DAC2, 1 << 12);
-        src_write(s, SRCREG_VOL_DAC2+1, 1 << 12);
-        set_adc_rate(s, 22050);
-        set_dac1_rate(s, 22050);
-        set_dac2_rate(s, 22050);
-
-        /* WARNING:
-         * enabling the sample rate converter without properly programming
-         * its parameters causes the chip to lock up (the SRC busy bit will
-         * be stuck high, and I've found no way to rectify this other than
-         * power cycle)
-         */
-        wait_src_ready(s);
-        outl(0, s->io+ES1371_REG_SRCONV);
-}
-
-/* --------------------------------------------------------------------- */
-
-static void wrcodec(struct ac97_codec *codec, u8 addr, u16 data)
-{
-        struct es1371_state *s = (struct es1371_state *)codec->private_data;
-        unsigned long flags;
-        unsigned t, x;
-        
-        spin_lock_irqsave(&s->lock, flags);
-        for (t = 0; t < POLL_COUNT; t++)
-                if (!(inl(s->io+ES1371_REG_CODEC) & CODEC_WIP))
-                        break;
-
-        /* save the current state for later */
-        x = wait_src_ready(s);
-
-        /* enable SRC state data in SRC mux */
-        outl((x & (SRC_DIS | SRC_DDAC1 | SRC_DDAC2 | SRC_DADC)) | 0x00010000,
-             s->io+ES1371_REG_SRCONV);
-
-        /* wait for not busy (state 0) first to avoid
-           transition states */
-        for (t=0; t<POLL_COUNT; t++){
-                if((inl(s->io+ES1371_REG_SRCONV) & 0x00870000) ==0 )
-                    break;
-                udelay(1);
-        }
-        
-        /* wait for a SAFE time to write addr/data and then do it, dammit */
-        for (t=0; t<POLL_COUNT; t++){
-                if((inl(s->io+ES1371_REG_SRCONV) & 0x00870000) ==0x00010000)
-                    break;
-                udelay(1);
-        }
-
-        outl(((addr << CODEC_POADD_SHIFT) & CODEC_POADD_MASK) |
-             ((data << CODEC_PODAT_SHIFT) & CODEC_PODAT_MASK), s->io+ES1371_REG_CODEC);
-
-        /* restore SRC reg */
-        wait_src_ready(s);
-        outl(x, s->io+ES1371_REG_SRCONV);
-        spin_unlock_irqrestore(&s->lock, flags);
-}
-
-static u16 rdcodec(struct ac97_codec *codec, u8 addr)
-{
-        struct es1371_state *s = (struct es1371_state *)codec->private_data;
-        unsigned long flags;
-        unsigned t, x;
-
-        spin_lock_irqsave(&s->lock, flags);
-        
-        /* wait for WIP to go away */
-        for (t = 0; t < 0x1000; t++)
-                if (!(inl(s->io+ES1371_REG_CODEC) & CODEC_WIP))
-                        break;
-
-        /* save the current state for later */
-        x = (wait_src_ready(s) & (SRC_DIS | SRC_DDAC1 | SRC_DDAC2 | SRC_DADC));
-
-        /* enable SRC state data in SRC mux */
-        outl( x | 0x00010000,
-              s->io+ES1371_REG_SRCONV);
-
-        /* wait for not busy (state 0) first to avoid
-           transition states */
-        for (t=0; t<POLL_COUNT; t++){
-                if((inl(s->io+ES1371_REG_SRCONV) & 0x00870000) ==0 )
-                    break;
-                udelay(1);
-        }
-        
-        /* wait for a SAFE time to write addr/data and then do it, dammit */
-        for (t=0; t<POLL_COUNT; t++){
-                if((inl(s->io+ES1371_REG_SRCONV) & 0x00870000) ==0x00010000)
-                    break;
-                udelay(1);
-        }
-
-        outl(((addr << CODEC_POADD_SHIFT) & CODEC_POADD_MASK) | CODEC_PORD, s->io+ES1371_REG_CODEC);
-        /* restore SRC reg */
-        wait_src_ready(s);
-        outl(x, s->io+ES1371_REG_SRCONV);
-
-        /* wait for WIP again */
-        for (t = 0; t < 0x1000; t++)
-                if (!(inl(s->io+ES1371_REG_CODEC) & CODEC_WIP))
-                        break;
-        
-        /* now wait for the stinkin' data (RDY) */
-        for (t = 0; t < POLL_COUNT; t++)
-                if ((x = inl(s->io+ES1371_REG_CODEC)) & CODEC_RDY)
-                        break;
-        
-        spin_unlock_irqrestore(&s->lock, flags);
-        return ((x & CODEC_PIDAT_MASK) >> CODEC_PIDAT_SHIFT);
-}
-
-/* --------------------------------------------------------------------- */
-
-static inline void stop_adc(struct es1371_state *s)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&s->lock, flags);
-        s->ctrl &= ~CTRL_ADC_EN;
-        outl(s->ctrl, s->io+ES1371_REG_CONTROL);
-        spin_unlock_irqrestore(&s->lock, flags);
-}       
-
-static inline void stop_dac1(struct es1371_state *s)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&s->lock, flags);
-        s->ctrl &= ~CTRL_DAC1_EN;
-        outl(s->ctrl, s->io+ES1371_REG_CONTROL);
-        spin_unlock_irqrestore(&s->lock, flags);
-}       
-
-static inline void stop_dac2(struct es1371_state *s)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&s->lock, flags);
-        s->ctrl &= ~CTRL_DAC2_EN;
-        outl(s->ctrl, s->io+ES1371_REG_CONTROL);
-        spin_unlock_irqrestore(&s->lock, flags);
-}       
-
-static void start_dac1(struct es1371_state *s)
-{
-        unsigned long flags;
-        unsigned fragremain, fshift;
-
-        spin_lock_irqsave(&s->lock, flags);
-        if (!(s->ctrl & CTRL_DAC1_EN) && (s->dma_dac1.mapped || s->dma_dac1.count > 0)
-            && s->dma_dac1.ready) {
-                s->ctrl |= CTRL_DAC1_EN;
-                s->sctrl = (s->sctrl & ~(SCTRL_P1LOOPSEL | SCTRL_P1PAUSE | SCTRL_P1SCTRLD)) | SCTRL_P1INTEN;
-                outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-                fragremain = ((- s->dma_dac1.hwptr) & (s->dma_dac1.fragsize-1));
-                fshift = sample_shift[(s->sctrl & SCTRL_P1FMT) >> SCTRL_SH_P1FMT];
-                if (fragremain < 2*fshift)
-                        fragremain = s->dma_dac1.fragsize;
-                outl((fragremain >> fshift) - 1, s->io+ES1371_REG_DAC1_SCOUNT);
-                outl(s->ctrl, s->io+ES1371_REG_CONTROL);
-                outl((s->dma_dac1.fragsize >> fshift) - 1, s->io+ES1371_REG_DAC1_SCOUNT);
-        }
-        spin_unlock_irqrestore(&s->lock, flags);
-}       
-
-static void start_dac2(struct es1371_state *s)
-{
-        unsigned long flags;
-        unsigned fragremain, fshift;
-
-        spin_lock_irqsave(&s->lock, flags);
-        if (!(s->ctrl & CTRL_DAC2_EN) && (s->dma_dac2.mapped || s->dma_dac2.count > 0)
-            && s->dma_dac2.ready) {
-                s->ctrl |= CTRL_DAC2_EN;
-                s->sctrl = (s->sctrl & ~(SCTRL_P2LOOPSEL | SCTRL_P2PAUSE | SCTRL_P2DACSEN | 
-                                         SCTRL_P2ENDINC | SCTRL_P2STINC)) | SCTRL_P2INTEN |
-                        (((s->sctrl & SCTRL_P2FMT) ? 2 : 1) << SCTRL_SH_P2ENDINC) | 
-                        (0 << SCTRL_SH_P2STINC);
-                outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-                fragremain = ((- s->dma_dac2.hwptr) & (s->dma_dac2.fragsize-1));
-                fshift = sample_shift[(s->sctrl & SCTRL_P2FMT) >> SCTRL_SH_P2FMT];
-                if (fragremain < 2*fshift)
-                        fragremain = s->dma_dac2.fragsize;
-                outl((fragremain >> fshift) - 1, s->io+ES1371_REG_DAC2_SCOUNT);
-                outl(s->ctrl, s->io+ES1371_REG_CONTROL);
-                outl((s->dma_dac2.fragsize >> fshift) - 1, s->io+ES1371_REG_DAC2_SCOUNT);
-        }
-        spin_unlock_irqrestore(&s->lock, flags);
-}       
-
-static void start_adc(struct es1371_state *s)
-{
-        unsigned long flags;
-        unsigned fragremain, fshift;
-
-        spin_lock_irqsave(&s->lock, flags);
-        if (!(s->ctrl & CTRL_ADC_EN) && (s->dma_adc.mapped || s->dma_adc.count < (signed)(s->dma_adc.dmasize - 2*s->dma_adc.fragsize))
-            && s->dma_adc.ready) {
-                s->ctrl |= CTRL_ADC_EN;
-                s->sctrl = (s->sctrl & ~SCTRL_R1LOOPSEL) | SCTRL_R1INTEN;
-                outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-                fragremain = ((- s->dma_adc.hwptr) & (s->dma_adc.fragsize-1));
-                fshift = sample_shift[(s->sctrl & SCTRL_R1FMT) >> SCTRL_SH_R1FMT];
-                if (fragremain < 2*fshift)
-                        fragremain = s->dma_adc.fragsize;
-                outl((fragremain >> fshift) - 1, s->io+ES1371_REG_ADC_SCOUNT);
-                outl(s->ctrl, s->io+ES1371_REG_CONTROL);
-                outl((s->dma_adc.fragsize >> fshift) - 1, s->io+ES1371_REG_ADC_SCOUNT);
-        }
-        spin_unlock_irqrestore(&s->lock, flags);
-}       
-
-/* --------------------------------------------------------------------- */
-
-#define DMABUF_DEFAULTORDER (17-PAGE_SHIFT)
-#define DMABUF_MINORDER 1
-
-
-static inline void dealloc_dmabuf(struct es1371_state *s, struct dmabuf *db)
-{
-        struct page *page, *pend;
-
-        if (db->rawbuf) {
-                /* undo marking the pages as reserved */
-                pend = virt_to_page(db->rawbuf + (PAGE_SIZE << db->buforder) - 1);
-                for (page = virt_to_page(db->rawbuf); page <= pend; page++)
-                        ClearPageReserved(page);
-                pci_free_consistent(s->dev, PAGE_SIZE << db->buforder, db->rawbuf, db->dmaaddr);
-        }
-        db->rawbuf = NULL;
-        db->mapped = db->ready = 0;
-}
-
-static int prog_dmabuf(struct es1371_state *s, struct dmabuf *db, unsigned rate, unsigned fmt, unsigned reg)
-{
-        int order;
-        unsigned bytepersec;
-        unsigned bufs;
-        struct page *page, *pend;
-
-        db->hwptr = db->swptr = db->total_bytes = db->count = db->error = db->endcleared = 0;
-        if (!db->rawbuf) {
-                db->ready = db->mapped = 0;
-                for (order = DMABUF_DEFAULTORDER; order >= DMABUF_MINORDER; order--)
-                        if ((db->rawbuf = pci_alloc_consistent(s->dev, PAGE_SIZE << order, &db->dmaaddr)))
-                                break;
-                if (!db->rawbuf)
-                        return -ENOMEM;
-                db->buforder = order;
-                /* now mark the pages as reserved; otherwise remap_pfn_range doesn't do what we want */
-                pend = virt_to_page(db->rawbuf + (PAGE_SIZE << db->buforder) - 1);
-                for (page = virt_to_page(db->rawbuf); page <= pend; page++)
-                        SetPageReserved(page);
-        }
-        fmt &= ES1371_FMT_MASK;
-        bytepersec = rate << sample_shift[fmt];
-        bufs = PAGE_SIZE << db->buforder;
-        if (db->ossfragshift) {
-                if ((1000 << db->ossfragshift) < bytepersec)
-                        db->fragshift = ld2(bytepersec/1000);
-                else
-                        db->fragshift = db->ossfragshift;
-        } else {
-                db->fragshift = ld2(bytepersec/100/(db->subdivision ? db->subdivision : 1));
-                if (db->fragshift < 3)
-                        db->fragshift = 3;
-        }
-        db->numfrag = bufs >> db->fragshift;
-        while (db->numfrag < 4 && db->fragshift > 3) {
-                db->fragshift--;
-                db->numfrag = bufs >> db->fragshift;
-        }
-        db->fragsize = 1 << db->fragshift;
-        if (db->ossmaxfrags >= 4 && db->ossmaxfrags < db->numfrag)
-                db->numfrag = db->ossmaxfrags;
-        db->fragsamples = db->fragsize >> sample_shift[fmt];
-        db->dmasize = db->numfrag << db->fragshift;
-        memset(db->rawbuf, (fmt & ES1371_FMT_S16) ? 0 : 0x80, db->dmasize);
-        outl((reg >> 8) & 15, s->io+ES1371_REG_MEMPAGE);
-        outl(db->dmaaddr, s->io+(reg & 0xff));
-        outl((db->dmasize >> 2)-1, s->io+((reg + 4) & 0xff));
-        db->enabled = 1;
-        db->ready = 1;
-        return 0;
-}
-
-static inline int prog_dmabuf_adc(struct es1371_state *s)
-{
-        stop_adc(s);
-        return prog_dmabuf(s, &s->dma_adc, s->adcrate, (s->sctrl >> SCTRL_SH_R1FMT) & ES1371_FMT_MASK, 
-                           ES1371_REG_ADC_FRAMEADR);
-}
-
-static inline int prog_dmabuf_dac2(struct es1371_state *s)
-{
-        stop_dac2(s);
-        return prog_dmabuf(s, &s->dma_dac2, s->dac2rate, (s->sctrl >> SCTRL_SH_P2FMT) & ES1371_FMT_MASK, 
-                           ES1371_REG_DAC2_FRAMEADR);
-}
-
-static inline int prog_dmabuf_dac1(struct es1371_state *s)
-{
-        stop_dac1(s);
-        return prog_dmabuf(s, &s->dma_dac1, s->dac1rate, (s->sctrl >> SCTRL_SH_P1FMT) & ES1371_FMT_MASK,
-                           ES1371_REG_DAC1_FRAMEADR);
-}
-
-static inline unsigned get_hwptr(struct es1371_state *s, struct dmabuf *db, unsigned reg)
-{
-        unsigned hwptr, diff;
-
-        outl((reg >> 8) & 15, s->io+ES1371_REG_MEMPAGE);
-        hwptr = (inl(s->io+(reg & 0xff)) >> 14) & 0x3fffc;
-        diff = (db->dmasize + hwptr - db->hwptr) % db->dmasize;
-        db->hwptr = hwptr;
-        return diff;
-}
-
-static inline void clear_advance(void *buf, unsigned bsize, unsigned bptr, unsigned len, unsigned char c)
-{
-        if (bptr + len > bsize) {
-                unsigned x = bsize - bptr;
-                memset(((char *)buf) + bptr, c, x);
-                bptr = 0;
-                len -= x;
-        }
-        memset(((char *)buf) + bptr, c, len);
-}
-
-/* call with spinlock held! */
-static void es1371_update_ptr(struct es1371_state *s)
-{
-        int diff;
-
-        /* update ADC pointer */
-        if (s->ctrl & CTRL_ADC_EN) {
-                diff = get_hwptr(s, &s->dma_adc, ES1371_REG_ADC_FRAMECNT);
-                s->dma_adc.total_bytes += diff;
-                s->dma_adc.count += diff;
-                if (s->dma_adc.count >= (signed)s->dma_adc.fragsize) 
-                        wake_up(&s->dma_adc.wait);
-                if (!s->dma_adc.mapped) {
-                        if (s->dma_adc.count > (signed)(s->dma_adc.dmasize - ((3 * s->dma_adc.fragsize) >> 1))) {
-                                s->ctrl &= ~CTRL_ADC_EN;
-                                outl(s->ctrl, s->io+ES1371_REG_CONTROL);
-                                s->dma_adc.error++;
-                        }
-                }
-        }
-        /* update DAC1 pointer */
-        if (s->ctrl & CTRL_DAC1_EN) {
-                diff = get_hwptr(s, &s->dma_dac1, ES1371_REG_DAC1_FRAMECNT);
-                s->dma_dac1.total_bytes += diff;
-                if (s->dma_dac1.mapped) {
-                        s->dma_dac1.count += diff;
-                        if (s->dma_dac1.count >= (signed)s->dma_dac1.fragsize)
-                                wake_up(&s->dma_dac1.wait);
-                } else {
-                        s->dma_dac1.count -= diff;
-                        if (s->dma_dac1.count <= 0) {
-                                s->ctrl &= ~CTRL_DAC1_EN;
-                                outl(s->ctrl, s->io+ES1371_REG_CONTROL);
-                                s->dma_dac1.error++;
-                        } else if (s->dma_dac1.count <= (signed)s->dma_dac1.fragsize && !s->dma_dac1.endcleared) {
-                                clear_advance(s->dma_dac1.rawbuf, s->dma_dac1.dmasize, s->dma_dac1.swptr, 
-                                              s->dma_dac1.fragsize, (s->sctrl & SCTRL_P1SEB) ? 0 : 0x80);
-                                s->dma_dac1.endcleared = 1;
-                        }
-                        if (s->dma_dac1.count + (signed)s->dma_dac1.fragsize <= (signed)s->dma_dac1.dmasize)
-                                wake_up(&s->dma_dac1.wait);
-                }
-        }
-        /* update DAC2 pointer */
-        if (s->ctrl & CTRL_DAC2_EN) {
-                diff = get_hwptr(s, &s->dma_dac2, ES1371_REG_DAC2_FRAMECNT);
-                s->dma_dac2.total_bytes += diff;
-                if (s->dma_dac2.mapped) {
-                        s->dma_dac2.count += diff;
-                        if (s->dma_dac2.count >= (signed)s->dma_dac2.fragsize)
-                                wake_up(&s->dma_dac2.wait);
-                } else {
-                        s->dma_dac2.count -= diff;
-                        if (s->dma_dac2.count <= 0) {
-                                s->ctrl &= ~CTRL_DAC2_EN;
-                                outl(s->ctrl, s->io+ES1371_REG_CONTROL);
-                                s->dma_dac2.error++;
-                        } else if (s->dma_dac2.count <= (signed)s->dma_dac2.fragsize && !s->dma_dac2.endcleared) {
-                                clear_advance(s->dma_dac2.rawbuf, s->dma_dac2.dmasize, s->dma_dac2.swptr, 
-                                              s->dma_dac2.fragsize, (s->sctrl & SCTRL_P2SEB) ? 0 : 0x80);
-                                s->dma_dac2.endcleared = 1;
-                        }
-                        if (s->dma_dac2.count + (signed)s->dma_dac2.fragsize <= (signed)s->dma_dac2.dmasize)
-                                wake_up(&s->dma_dac2.wait);
-                }
-        }
-}
-
-/* hold spinlock for the following! */
-static void es1371_handle_midi(struct es1371_state *s)
-{
-        unsigned char ch;
-        int wake;
-
-        if (!(s->ctrl & CTRL_UART_EN))
-                return;
-        wake = 0;
-        while (inb(s->io+ES1371_REG_UART_STATUS) & USTAT_RXRDY) {
-                ch = inb(s->io+ES1371_REG_UART_DATA);
-                if (s->midi.icnt < MIDIINBUF) {
-                        s->midi.ibuf[s->midi.iwr] = ch;
-                        s->midi.iwr = (s->midi.iwr + 1) % MIDIINBUF;
-                        s->midi.icnt++;
-                }
-                wake = 1;
-        }
-        if (wake)
-                wake_up(&s->midi.iwait);
-        wake = 0;
-        while ((inb(s->io+ES1371_REG_UART_STATUS) & USTAT_TXRDY) && s->midi.ocnt > 0) {
-                outb(s->midi.obuf[s->midi.ord], s->io+ES1371_REG_UART_DATA);
-                s->midi.ord = (s->midi.ord + 1) % MIDIOUTBUF;
-                s->midi.ocnt--;
-                if (s->midi.ocnt < MIDIOUTBUF-16)
-                        wake = 1;
-        }
-        if (wake)
-                wake_up(&s->midi.owait);
-        outb((s->midi.ocnt > 0) ? UCTRL_RXINTEN | UCTRL_ENA_TXINT : UCTRL_RXINTEN, s->io+ES1371_REG_UART_CONTROL);
-}
-
-static irqreturn_t es1371_interrupt(int irq, void *dev_id)
-{
-        struct es1371_state *s = dev_id;
-        unsigned int intsrc, sctl;
-        
-        /* fastpath out, to ease interrupt sharing */
-        intsrc = inl(s->io+ES1371_REG_STATUS);
-        if (!(intsrc & 0x80000000))
-                return IRQ_NONE;
-        spin_lock(&s->lock);
-        /* clear audio interrupts first */
-        sctl = s->sctrl;
-        if (intsrc & STAT_ADC)
-                sctl &= ~SCTRL_R1INTEN;
-        if (intsrc & STAT_DAC1)
-                sctl &= ~SCTRL_P1INTEN;
-        if (intsrc & STAT_DAC2)
-                sctl &= ~SCTRL_P2INTEN;
-        outl(sctl, s->io+ES1371_REG_SERIAL_CONTROL);
-        outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-        es1371_update_ptr(s);
-        es1371_handle_midi(s);
-        spin_unlock(&s->lock);
-        return IRQ_HANDLED;
-}
-
-/* --------------------------------------------------------------------- */
-
-static const char invalid_magic[] = KERN_CRIT PFX "invalid magic value\n";
-
-#define VALIDATE_STATE(s)                         \
-({                                                \
-        if (!(s) || (s)->magic != ES1371_MAGIC) { \
-                printk(invalid_magic);            \
-                return -ENXIO;                    \
-        }                                         \
-})
-
-/* --------------------------------------------------------------------- */
-
-/* Conversion table for S/PDIF PCM volume emulation through the SRC */
-/* dB-linear table of DAC vol values; -0dB to -46.5dB with mute */
-static const unsigned short DACVolTable[101] =
-{
-        0x1000, 0x0f2a, 0x0e60, 0x0da0, 0x0cea, 0x0c3e, 0x0b9a, 0x0aff,
-        0x0a6d, 0x09e1, 0x095e, 0x08e1, 0x086a, 0x07fa, 0x078f, 0x072a,
-        0x06cb, 0x0670, 0x061a, 0x05c9, 0x057b, 0x0532, 0x04ed, 0x04ab,
-        0x046d, 0x0432, 0x03fa, 0x03c5, 0x0392, 0x0363, 0x0335, 0x030b,
-        0x02e2, 0x02bc, 0x0297, 0x0275, 0x0254, 0x0235, 0x0217, 0x01fb,
-        0x01e1, 0x01c8, 0x01b0, 0x0199, 0x0184, 0x0170, 0x015d, 0x014b,
-        0x0139, 0x0129, 0x0119, 0x010b, 0x00fd, 0x00f0, 0x00e3, 0x00d7,
-        0x00cc, 0x00c1, 0x00b7, 0x00ae, 0x00a5, 0x009c, 0x0094, 0x008c,
-        0x0085, 0x007e, 0x0077, 0x0071, 0x006b, 0x0066, 0x0060, 0x005b,
-        0x0057, 0x0052, 0x004e, 0x004a, 0x0046, 0x0042, 0x003f, 0x003c,
-        0x0038, 0x0036, 0x0033, 0x0030, 0x002e, 0x002b, 0x0029, 0x0027,
-        0x0025, 0x0023, 0x0021, 0x001f, 0x001e, 0x001c, 0x001b, 0x0019,
-        0x0018, 0x0017, 0x0016, 0x0014, 0x0000
-};
-
-/*
- * when we are in S/PDIF mode, we want to disable any analog output so
- * we filter the mixer ioctls 
- */
-static int mixdev_ioctl(struct ac97_codec *codec, unsigned int cmd, unsigned long arg)
-{
-        struct es1371_state *s = (struct es1371_state *)codec->private_data;
-        int val;
-        unsigned long flags;
-        unsigned int left, right;
-
-        VALIDATE_STATE(s);
-        /* filter mixer ioctls to catch PCM and MASTER volume when in S/PDIF mode */
-        if (s->spdif_volume == -1)
-                return codec->mixer_ioctl(codec, cmd, arg);
-        switch (cmd) {
-        case SOUND_MIXER_WRITE_VOLUME:
-                return 0;
-
-        case SOUND_MIXER_WRITE_PCM:   /* use SRC for PCM volume */
-                if (get_user(val, (int __user *)arg))
-                        return -EFAULT;
-                right = ((val >> 8)  & 0xff);
-                left = (val  & 0xff);
-                if (right > 100)
-                        right = 100;
-                if (left > 100)
-                        left = 100;
-                s->spdif_volume = (right << 8) | left;
-                spin_lock_irqsave(&s->lock, flags);
-                src_write(s, SRCREG_VOL_DAC2, DACVolTable[100 - left]);
-                src_write(s, SRCREG_VOL_DAC2+1, DACVolTable[100 - right]);
-                spin_unlock_irqrestore(&s->lock, flags);
-                return 0;
-        
-        case SOUND_MIXER_READ_PCM:
-                return put_user(s->spdif_volume, (int __user *)arg);
-        }
-        return codec->mixer_ioctl(codec, cmd, arg);
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * AC97 Mixer Register to Connections mapping of the Concert 97 board
- *
- * AC97_MASTER_VOL_STEREO   Line Out
- * AC97_MASTER_VOL_MONO     TAD Output
- * AC97_PCBEEP_VOL          none
- * AC97_PHONE_VOL           TAD Input (mono)
- * AC97_MIC_VOL             MIC Input (mono)
- * AC97_LINEIN_VOL          Line Input (stereo)
- * AC97_CD_VOL              CD Input (stereo)
- * AC97_VIDEO_VOL           none
- * AC97_AUX_VOL             Aux Input (stereo)
- * AC97_PCMOUT_VOL          Wave Output (stereo)
- */
-
-static int es1371_open_mixdev(struct inode *inode, struct file *file)
-{
-        int minor = iminor(inode);
-        struct list_head *list;
-        struct es1371_state *s;
-
-        for (list = devs.next; ; list = list->next) {
-                if (list == &devs)
-                        return -ENODEV;
-                s = list_entry(list, struct es1371_state, devs);
-                if (s->codec->dev_mixer == minor)
-                        break;
-        }
-        VALIDATE_STATE(s);
-        file->private_data = s;
-        return nonseekable_open(inode, file);
-}
-
-static int es1371_release_mixdev(struct inode *inode, struct file *file)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        
-        VALIDATE_STATE(s);
-        return 0;
-}
-
-static int es1371_ioctl_mixdev(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        struct ac97_codec *codec = s->codec;
-
-        return mixdev_ioctl(codec, cmd, arg);
-}
-
-static /*const*/ struct file_operations es1371_mixer_fops = {
-        .owner          = THIS_MODULE,
-        .llseek         = no_llseek,
-        .ioctl          = es1371_ioctl_mixdev,
-        .open           = es1371_open_mixdev,
-        .release        = es1371_release_mixdev,
-};
-
-/* --------------------------------------------------------------------- */
-
-static int drain_dac1(struct es1371_state *s, int nonblock)
-{
-        DECLARE_WAITQUEUE(wait, current);
-        unsigned long flags;
-        int count, tmo;
-        
-        if (s->dma_dac1.mapped || !s->dma_dac1.ready)
-                return 0;
-        add_wait_queue(&s->dma_dac1.wait, &wait);
-        for (;;) {
-                __set_current_state(TASK_INTERRUPTIBLE);
-                spin_lock_irqsave(&s->lock, flags);
-                count = s->dma_dac1.count;
-                spin_unlock_irqrestore(&s->lock, flags);
-                if (count <= 0)
-                        break;
-                if (signal_pending(current))
-                        break;
-                if (nonblock) {
-                        remove_wait_queue(&s->dma_dac1.wait, &wait);
-                        set_current_state(TASK_RUNNING);
-                        return -EBUSY;
-                }
-                tmo = 3 * HZ * (count + s->dma_dac1.fragsize) / 2 / s->dac1rate;
-                tmo >>= sample_shift[(s->sctrl & SCTRL_P1FMT) >> SCTRL_SH_P1FMT];
-                if (!schedule_timeout(tmo + 1))
-                        DBG(printk(KERN_DEBUG PFX "dac1 dma timed out??\n");)
-        }
-        remove_wait_queue(&s->dma_dac1.wait, &wait);
-        set_current_state(TASK_RUNNING);
-        if (signal_pending(current))
-                return -ERESTARTSYS;
-        return 0;
-}
-
-static int drain_dac2(struct es1371_state *s, int nonblock)
-{
-        DECLARE_WAITQUEUE(wait, current);
-        unsigned long flags;
-        int count, tmo;
-
-        if (s->dma_dac2.mapped || !s->dma_dac2.ready)
-                return 0;
-        add_wait_queue(&s->dma_dac2.wait, &wait);
-        for (;;) {
-                __set_current_state(TASK_UNINTERRUPTIBLE);
-                spin_lock_irqsave(&s->lock, flags);
-                count = s->dma_dac2.count;
-                spin_unlock_irqrestore(&s->lock, flags);
-                if (count <= 0)
-                        break;
-                if (signal_pending(current))
-                        break;
-                if (nonblock) {
-                        remove_wait_queue(&s->dma_dac2.wait, &wait);
-                        set_current_state(TASK_RUNNING);
-                        return -EBUSY;
-                }
-                tmo = 3 * HZ * (count + s->dma_dac2.fragsize) / 2 / s->dac2rate;
-                tmo >>= sample_shift[(s->sctrl & SCTRL_P2FMT) >> SCTRL_SH_P2FMT];
-                if (!schedule_timeout(tmo + 1))
-                        DBG(printk(KERN_DEBUG PFX "dac2 dma timed out??\n");)
-        }
-        remove_wait_queue(&s->dma_dac2.wait, &wait);
-        set_current_state(TASK_RUNNING);
-        if (signal_pending(current))
-                return -ERESTARTSYS;
-        return 0;
-}
-
-/* --------------------------------------------------------------------- */
-
-static ssize_t es1371_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        DECLARE_WAITQUEUE(wait, current);
-        ssize_t ret = 0;
-        unsigned long flags;
-        unsigned swptr;
-        int cnt;
-
-        VALIDATE_STATE(s);
-        if (s->dma_adc.mapped)
-                return -ENXIO;
-        if (!access_ok(VERIFY_WRITE, buffer, count))
-                return -EFAULT;
-        mutex_lock(&s->sem);
-        if (!s->dma_adc.ready && (ret = prog_dmabuf_adc(s)))
-                goto out2;
-        
-        add_wait_queue(&s->dma_adc.wait, &wait);
-        while (count > 0) {
-                spin_lock_irqsave(&s->lock, flags);
-                swptr = s->dma_adc.swptr;
-                cnt = s->dma_adc.dmasize-swptr;
-                if (s->dma_adc.count < cnt)
-                        cnt = s->dma_adc.count;
-                if (cnt <= 0)
-                        __set_current_state(TASK_INTERRUPTIBLE);
-                spin_unlock_irqrestore(&s->lock, flags);
-                if (cnt > count)
-                        cnt = count;
-                if (cnt <= 0) {
-                        if (s->dma_adc.enabled)
-                                start_adc(s);
-                        if (file->f_flags & O_NONBLOCK) {
-                                if (!ret)
-                                        ret = -EAGAIN;
-                                goto out;
-                        }
-                        mutex_unlock(&s->sem);
-                        schedule();
-                        if (signal_pending(current)) {
-                                if (!ret)
-                                        ret = -ERESTARTSYS;
-                                goto out2;
-                        }
-                        mutex_lock(&s->sem);
-                        if (s->dma_adc.mapped)
-                        {
-                                ret = -ENXIO;
-                                goto out;
-                        }
-                        continue;
-                }
-                if (copy_to_user(buffer, s->dma_adc.rawbuf + swptr, cnt)) {
-                        if (!ret)
-                                ret = -EFAULT;
-                        goto out;
-                }
-                swptr = (swptr + cnt) % s->dma_adc.dmasize;
-                spin_lock_irqsave(&s->lock, flags);
-                s->dma_adc.swptr = swptr;
-                s->dma_adc.count -= cnt;
-                spin_unlock_irqrestore(&s->lock, flags);
-                count -= cnt;
-                buffer += cnt;
-                ret += cnt;
-                if (s->dma_adc.enabled)
-                        start_adc(s);
-        }
-out:
-        mutex_unlock(&s->sem);
-out2:
-        remove_wait_queue(&s->dma_adc.wait, &wait);
-        set_current_state(TASK_RUNNING);
-        return ret;
-}
-
-static ssize_t es1371_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        DECLARE_WAITQUEUE(wait, current);
-        ssize_t ret;
-        unsigned long flags;
-        unsigned swptr;
-        int cnt;
-
-        VALIDATE_STATE(s);
-        if (s->dma_dac2.mapped)
-                return -ENXIO;
-        if (!access_ok(VERIFY_READ, buffer, count))
-                return -EFAULT;
-        mutex_lock(&s->sem);
-        if (!s->dma_dac2.ready && (ret = prog_dmabuf_dac2(s)))
-                goto out3;
-        ret = 0;
-        add_wait_queue(&s->dma_dac2.wait, &wait);
-        while (count > 0) {
-                spin_lock_irqsave(&s->lock, flags);
-                if (s->dma_dac2.count < 0) {
-                        s->dma_dac2.count = 0;
-                        s->dma_dac2.swptr = s->dma_dac2.hwptr;
-                }
-                swptr = s->dma_dac2.swptr;
-                cnt = s->dma_dac2.dmasize-swptr;
-                if (s->dma_dac2.count + cnt > s->dma_dac2.dmasize)
-                        cnt = s->dma_dac2.dmasize - s->dma_dac2.count;
-                if (cnt <= 0)
-                        __set_current_state(TASK_INTERRUPTIBLE);
-                spin_unlock_irqrestore(&s->lock, flags);
-                if (cnt > count)
-                        cnt = count;
-                if (cnt <= 0) {
-                        if (s->dma_dac2.enabled)
-                                start_dac2(s);
-                        if (file->f_flags & O_NONBLOCK) {
-                                if (!ret)
-                                        ret = -EAGAIN;
-                                goto out;
-                        }       
-                        mutex_unlock(&s->sem);
-                        schedule();
-                        if (signal_pending(current)) {
-                                if (!ret)
-                                        ret = -ERESTARTSYS;
-                                goto out2;
-                        }
-                        mutex_lock(&s->sem);
-                        if (s->dma_dac2.mapped)
-                        {
-                                ret = -ENXIO;
-                                goto out;
-                        }
-                        continue;
-                }
-                if (copy_from_user(s->dma_dac2.rawbuf + swptr, buffer, cnt)) {
-                        if (!ret)
-                                ret = -EFAULT;
-                        goto out;
-                }
-                swptr = (swptr + cnt) % s->dma_dac2.dmasize;
-                spin_lock_irqsave(&s->lock, flags);
-                s->dma_dac2.swptr = swptr;
-                s->dma_dac2.count += cnt;
-                s->dma_dac2.endcleared = 0;
-                spin_unlock_irqrestore(&s->lock, flags);
-                count -= cnt;
-                buffer += cnt;
-                ret += cnt;
-                if (s->dma_dac2.enabled)
-                        start_dac2(s);
-        }
-out:
-        mutex_unlock(&s->sem);
-out2:
-        remove_wait_queue(&s->dma_dac2.wait, &wait);
-out3:   
-        set_current_state(TASK_RUNNING);
-        return ret;
-}
-
-/* No kernel lock - we have our own spinlock */
-static unsigned int es1371_poll(struct file *file, struct poll_table_struct *wait)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        unsigned long flags;
-        unsigned int mask = 0;
-
-        VALIDATE_STATE(s);
-        if (file->f_mode & FMODE_WRITE) {
-                if (!s->dma_dac2.ready && prog_dmabuf_dac2(s))
-                        return 0;
-                poll_wait(file, &s->dma_dac2.wait, wait);
-        }
-        if (file->f_mode & FMODE_READ) {
-                if (!s->dma_adc.ready && prog_dmabuf_adc(s))
-                        return 0;
-                poll_wait(file, &s->dma_adc.wait, wait);
-        }
-        spin_lock_irqsave(&s->lock, flags);
-        es1371_update_ptr(s);
-        if (file->f_mode & FMODE_READ) {
-                        if (s->dma_adc.count >= (signed)s->dma_adc.fragsize)
-                                mask |= POLLIN | POLLRDNORM;
-        }
-        if (file->f_mode & FMODE_WRITE) {
-                if (s->dma_dac2.mapped) {
-                        if (s->dma_dac2.count >= (signed)s->dma_dac2.fragsize) 
-                                mask |= POLLOUT | POLLWRNORM;
-                } else {
-                        if ((signed)s->dma_dac2.dmasize >= s->dma_dac2.count + (signed)s->dma_dac2.fragsize)
-                                mask |= POLLOUT | POLLWRNORM;
-                }
-        }
-        spin_unlock_irqrestore(&s->lock, flags);
-        return mask;
-}
-
-static int es1371_mmap(struct file *file, struct vm_area_struct *vma)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        struct dmabuf *db;
-        int ret = 0;
-        unsigned long size;
-
-        VALIDATE_STATE(s);
-        lock_kernel();
-        mutex_lock(&s->sem);
-        
-        if (vma->vm_flags & VM_WRITE) {
-                if ((ret = prog_dmabuf_dac2(s)) != 0) {
-                        goto out;
-                }
-                db = &s->dma_dac2;
-        } else if (vma->vm_flags & VM_READ) {
-                if ((ret = prog_dmabuf_adc(s)) != 0) {
-                        goto out;
-                }
-                db = &s->dma_adc;
-        } else {
-                ret = -EINVAL;
-                goto out;
-        }
-        if (vma->vm_pgoff != 0) {
-                ret = -EINVAL;
-                goto out;
-        }
-        size = vma->vm_end - vma->vm_start;
-        if (size > (PAGE_SIZE << db->buforder)) {
-                ret = -EINVAL;
-                goto out;
-        }
-        if (remap_pfn_range(vma, vma->vm_start,
-                                virt_to_phys(db->rawbuf) >> PAGE_SHIFT,
-                                size, vma->vm_page_prot)) {
-                ret = -EAGAIN;
-                goto out;
-        }
-        db->mapped = 1;
-out:
-        mutex_unlock(&s->sem);
-        unlock_kernel();
-        return ret;
-}
-
-static int es1371_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        unsigned long flags;
-        audio_buf_info abinfo;
-        count_info cinfo;
-        int count;
-        int val, mapped, ret;
-        void __user *argp = (void __user *)arg;
-        int __user *p = argp;
-
-        VALIDATE_STATE(s);
-        mapped = ((file->f_mode & FMODE_WRITE) && s->dma_dac2.mapped) ||
-                ((file->f_mode & FMODE_READ) && s->dma_adc.mapped);
-        switch (cmd) {
-        case OSS_GETVERSION:
-                return put_user(SOUND_VERSION, p);
-
-        case SNDCTL_DSP_SYNC:
-                if (file->f_mode & FMODE_WRITE)
-                        return drain_dac2(s, 0/*file->f_flags & O_NONBLOCK*/);
-                return 0;
-                
-        case SNDCTL_DSP_SETDUPLEX:
-                return 0;
-
-        case SNDCTL_DSP_GETCAPS:
-                return put_user(DSP_CAP_DUPLEX | DSP_CAP_REALTIME | DSP_CAP_TRIGGER | DSP_CAP_MMAP, p);
-                
-        case SNDCTL_DSP_RESET:
-                if (file->f_mode & FMODE_WRITE) {
-                        stop_dac2(s);
-                        synchronize_irq(s->irq);
-                        s->dma_dac2.swptr = s->dma_dac2.hwptr = s->dma_dac2.count = s->dma_dac2.total_bytes = 0;
-                }
-                if (file->f_mode & FMODE_READ) {
-                        stop_adc(s);
-                        synchronize_irq(s->irq);
-                        s->dma_adc.swptr = s->dma_adc.hwptr = s->dma_adc.count = s->dma_adc.total_bytes = 0;
-                }
-                return 0;
-
-        case SNDCTL_DSP_SPEED:
-                if (get_user(val, p))
-                        return -EFAULT;
-                if (val >= 0) {
-                        if (file->f_mode & FMODE_READ) {
-                                stop_adc(s);
-                                s->dma_adc.ready = 0;
-                                set_adc_rate(s, val);
-                        }
-                        if (file->f_mode & FMODE_WRITE) {
-                                stop_dac2(s);
-                                s->dma_dac2.ready = 0;
-                                set_dac2_rate(s, val);
-                        }
-                }
-                return put_user((file->f_mode & FMODE_READ) ? s->adcrate : s->dac2rate, p);
-
-        case SNDCTL_DSP_STEREO:
-                if (get_user(val, p))
-                        return -EFAULT;
-                if (file->f_mode & FMODE_READ) {
-                        stop_adc(s);
-                        s->dma_adc.ready = 0;
-                        spin_lock_irqsave(&s->lock, flags);
-                        if (val)
-                                s->sctrl |= SCTRL_R1SMB;
-                        else
-                                s->sctrl &= ~SCTRL_R1SMB;
-                        outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-                        spin_unlock_irqrestore(&s->lock, flags);
-                }
-                if (file->f_mode & FMODE_WRITE) {
-                        stop_dac2(s);
-                        s->dma_dac2.ready = 0;
-                        spin_lock_irqsave(&s->lock, flags);
-                        if (val)
-                                s->sctrl |= SCTRL_P2SMB;
-                        else
-                                s->sctrl &= ~SCTRL_P2SMB;
-                        outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-                        spin_unlock_irqrestore(&s->lock, flags);
-                }
-                return 0;
-
-        case SNDCTL_DSP_CHANNELS:
-                if (get_user(val, p))
-                        return -EFAULT;
-                if (val != 0) {
-                        if (file->f_mode & FMODE_READ) {
-                                stop_adc(s);
-                                s->dma_adc.ready = 0;
-                                spin_lock_irqsave(&s->lock, flags);
-                                if (val >= 2)
-                                        s->sctrl |= SCTRL_R1SMB;
-                                else
-                                        s->sctrl &= ~SCTRL_R1SMB;
-                                outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-                                spin_unlock_irqrestore(&s->lock, flags);
-                        }
-                        if (file->f_mode & FMODE_WRITE) {
-                                stop_dac2(s);
-                                s->dma_dac2.ready = 0;
-                                spin_lock_irqsave(&s->lock, flags);
-                                if (val >= 2)
-                                        s->sctrl |= SCTRL_P2SMB;
-                                else
-                                        s->sctrl &= ~SCTRL_P2SMB;
-                                outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-                                spin_unlock_irqrestore(&s->lock, flags);
-                        }
-                }
-                return put_user((s->sctrl & ((file->f_mode & FMODE_READ) ? SCTRL_R1SMB : SCTRL_P2SMB)) ? 2 : 1, p);
-                
-        case SNDCTL_DSP_GETFMTS: /* Returns a mask */
-                return put_user(AFMT_S16_LE|AFMT_U8, p);
-                
-        case SNDCTL_DSP_SETFMT: /* Selects ONE fmt*/
-                if (get_user(val, p))
-                        return -EFAULT;
-                if (val != AFMT_QUERY) {
-                        if (file->f_mode & FMODE_READ) {
-                                stop_adc(s);
-                                s->dma_adc.ready = 0;
-                                spin_lock_irqsave(&s->lock, flags);
-                                if (val == AFMT_S16_LE)
-                                        s->sctrl |= SCTRL_R1SEB;
-                                else
-                                        s->sctrl &= ~SCTRL_R1SEB;
-                                outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-                                spin_unlock_irqrestore(&s->lock, flags);
-                        }
-                        if (file->f_mode & FMODE_WRITE) {
-                                stop_dac2(s);
-                                s->dma_dac2.ready = 0;
-                                spin_lock_irqsave(&s->lock, flags);
-                                if (val == AFMT_S16_LE)
-                                        s->sctrl |= SCTRL_P2SEB;
-                                else
-                                        s->sctrl &= ~SCTRL_P2SEB;
-                                outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-                                spin_unlock_irqrestore(&s->lock, flags);
-                        }
-                }
-                return put_user((s->sctrl & ((file->f_mode & FMODE_READ) ? SCTRL_R1SEB : SCTRL_P2SEB)) ? 
-                                AFMT_S16_LE : AFMT_U8, p);
-                
-        case SNDCTL_DSP_POST:
-                return 0;
-
-        case SNDCTL_DSP_GETTRIGGER:
-                val = 0;
-                if (file->f_mode & FMODE_READ && s->ctrl & CTRL_ADC_EN) 
-                        val |= PCM_ENABLE_INPUT;
-                if (file->f_mode & FMODE_WRITE && s->ctrl & CTRL_DAC2_EN) 
-                        val |= PCM_ENABLE_OUTPUT;
-                return put_user(val, p);
-                
-        case SNDCTL_DSP_SETTRIGGER:
-                if (get_user(val, p))
-                        return -EFAULT;
-                if (file->f_mode & FMODE_READ) {
-                        if (val & PCM_ENABLE_INPUT) {
-                                if (!s->dma_adc.ready && (ret = prog_dmabuf_adc(s)))
-                                        return ret;
-                                s->dma_adc.enabled = 1;
-                                start_adc(s);
-                        } else {
-                                s->dma_adc.enabled = 0;
-                                stop_adc(s);
-                        }
-                }
-                if (file->f_mode & FMODE_WRITE) {
-                        if (val & PCM_ENABLE_OUTPUT) {
-                                if (!s->dma_dac2.ready && (ret = prog_dmabuf_dac2(s)))
-                                        return ret;
-                                s->dma_dac2.enabled = 1;
-                                start_dac2(s);
-                        } else {
-                                s->dma_dac2.enabled = 0;
-                                stop_dac2(s);
-                        }
-                }
-                return 0;
-
-        case SNDCTL_DSP_GETOSPACE:
-                if (!(file->f_mode & FMODE_WRITE))
-                        return -EINVAL;
-                if (!s->dma_dac2.ready && (val = prog_dmabuf_dac2(s)) != 0)
-                        return val;
-                spin_lock_irqsave(&s->lock, flags);
-                es1371_update_ptr(s);
-                abinfo.fragsize = s->dma_dac2.fragsize;
-                count = s->dma_dac2.count;
-                if (count < 0)
-                        count = 0;
-                abinfo.bytes = s->dma_dac2.dmasize - count;
-                abinfo.fragstotal = s->dma_dac2.numfrag;
-                abinfo.fragments = abinfo.bytes >> s->dma_dac2.fragshift;      
-                spin_unlock_irqrestore(&s->lock, flags);
-                return copy_to_user(argp, &abinfo, sizeof(abinfo)) ? -EFAULT : 0;
-
-        case SNDCTL_DSP_GETISPACE:
-                if (!(file->f_mode & FMODE_READ))
-                        return -EINVAL;
-                if (!s->dma_adc.ready && (val = prog_dmabuf_adc(s)) != 0)
-                        return val;
-                spin_lock_irqsave(&s->lock, flags);
-                es1371_update_ptr(s);
-                abinfo.fragsize = s->dma_adc.fragsize;
-                count = s->dma_adc.count;
-                if (count < 0)
-                        count = 0;
-                abinfo.bytes = count;
-                abinfo.fragstotal = s->dma_adc.numfrag;
-                abinfo.fragments = abinfo.bytes >> s->dma_adc.fragshift;      
-                spin_unlock_irqrestore(&s->lock, flags);
-                return copy_to_user(argp, &abinfo, sizeof(abinfo)) ? -EFAULT : 0;
-                
-        case SNDCTL_DSP_NONBLOCK:
-                file->f_flags |= O_NONBLOCK;
-                return 0;
-
-        case SNDCTL_DSP_GETODELAY:
-                if (!(file->f_mode & FMODE_WRITE))
-                        return -EINVAL;
-                if (!s->dma_dac2.ready && (val = prog_dmabuf_dac2(s)) != 0)
-                        return val;
-                spin_lock_irqsave(&s->lock, flags);
-                es1371_update_ptr(s);
-                count = s->dma_dac2.count;
-                spin_unlock_irqrestore(&s->lock, flags);
-                if (count < 0)
-                        count = 0;
-                return put_user(count, p);
-
-        case SNDCTL_DSP_GETIPTR:
-                if (!(file->f_mode & FMODE_READ))
-                        return -EINVAL;
-                if (!s->dma_adc.ready && (val = prog_dmabuf_adc(s)) != 0)
-                        return val;
-                spin_lock_irqsave(&s->lock, flags);
-                es1371_update_ptr(s);
-                cinfo.bytes = s->dma_adc.total_bytes;
-                count = s->dma_adc.count;
-                if (count < 0)
-                        count = 0;
-                cinfo.blocks = count >> s->dma_adc.fragshift;
-                cinfo.ptr = s->dma_adc.hwptr;
-                if (s->dma_adc.mapped)
-                        s->dma_adc.count &= s->dma_adc.fragsize-1;
-                spin_unlock_irqrestore(&s->lock, flags);
-                if (copy_to_user(argp, &cinfo, sizeof(cinfo)))
-                        return -EFAULT;
-                return 0;
-
-        case SNDCTL_DSP_GETOPTR:
-                if (!(file->f_mode & FMODE_WRITE))
-                        return -EINVAL;
-                if (!s->dma_dac2.ready && (val = prog_dmabuf_dac2(s)) != 0)
-                        return val;
-                spin_lock_irqsave(&s->lock, flags);
-                es1371_update_ptr(s);
-                cinfo.bytes = s->dma_dac2.total_bytes;
-                count = s->dma_dac2.count;
-                if (count < 0)
-                        count = 0;
-                cinfo.blocks = count >> s->dma_dac2.fragshift;
-                cinfo.ptr = s->dma_dac2.hwptr;
-                if (s->dma_dac2.mapped)
-                        s->dma_dac2.count &= s->dma_dac2.fragsize-1;
-                spin_unlock_irqrestore(&s->lock, flags);
-                if (copy_to_user(argp, &cinfo, sizeof(cinfo)))
-                        return -EFAULT;
-                return 0;
-
-        case SNDCTL_DSP_GETBLKSIZE:
-                if (file->f_mode & FMODE_WRITE) {
-                        if ((val = prog_dmabuf_dac2(s)))
-                                return val;
-                        return put_user(s->dma_dac2.fragsize, p);
-                }
-                if ((val = prog_dmabuf_adc(s)))
-                        return val;
-                return put_user(s->dma_adc.fragsize, p);
-
-        case SNDCTL_DSP_SETFRAGMENT:
-                if (get_user(val, p))
-                        return -EFAULT;
-                if (file->f_mode & FMODE_READ) {
-                        s->dma_adc.ossfragshift = val & 0xffff;
-                        s->dma_adc.ossmaxfrags = (val >> 16) & 0xffff;
-                        if (s->dma_adc.ossfragshift < 4)
-                                s->dma_adc.ossfragshift = 4;
-                        if (s->dma_adc.ossfragshift > 15)
-                                s->dma_adc.ossfragshift = 15;
-                        if (s->dma_adc.ossmaxfrags < 4)
-                                s->dma_adc.ossmaxfrags = 4;
-                }
-                if (file->f_mode & FMODE_WRITE) {
-                        s->dma_dac2.ossfragshift = val & 0xffff;
-                        s->dma_dac2.ossmaxfrags = (val >> 16) & 0xffff;
-                        if (s->dma_dac2.ossfragshift < 4)
-                                s->dma_dac2.ossfragshift = 4;
-                        if (s->dma_dac2.ossfragshift > 15)
-                                s->dma_dac2.ossfragshift = 15;
-                        if (s->dma_dac2.ossmaxfrags < 4)
-                                s->dma_dac2.ossmaxfrags = 4;
-                }
-                return 0;
-
-        case SNDCTL_DSP_SUBDIVIDE:
-                if ((file->f_mode & FMODE_READ && s->dma_adc.subdivision) ||
-                    (file->f_mode & FMODE_WRITE && s->dma_dac2.subdivision))
-                        return -EINVAL;
-                if (get_user(val, p))
-                        return -EFAULT;
-                if (val != 1 && val != 2 && val != 4)
-                        return -EINVAL;
-                if (file->f_mode & FMODE_READ)
-                        s->dma_adc.subdivision = val;
-                if (file->f_mode & FMODE_WRITE)
-                        s->dma_dac2.subdivision = val;
-                return 0;
-
-        case SOUND_PCM_READ_RATE:
-                return put_user((file->f_mode & FMODE_READ) ? s->adcrate : s->dac2rate, p);
-
-        case SOUND_PCM_READ_CHANNELS:
-                return put_user((s->sctrl & ((file->f_mode & FMODE_READ) ? SCTRL_R1SMB : SCTRL_P2SMB)) ? 2 : 1, p);
-                
-        case SOUND_PCM_READ_BITS:
-                return put_user((s->sctrl & ((file->f_mode & FMODE_READ) ? SCTRL_R1SEB : SCTRL_P2SEB)) ? 16 : 8, p);
-
-        case SOUND_PCM_WRITE_FILTER:
-        case SNDCTL_DSP_SETSYNCRO:
-        case SOUND_PCM_READ_FILTER:
-                return -EINVAL;
-                
-        }
-        return mixdev_ioctl(s->codec, cmd, arg);
-}
-
-static int es1371_open(struct inode *inode, struct file *file)
-{
-        int minor = iminor(inode);
-        DECLARE_WAITQUEUE(wait, current);
-        unsigned long flags;
-        struct list_head *list;
-        struct es1371_state *s;
-
-        for (list = devs.next; ; list = list->next) {
-                if (list == &devs)
-                        return -ENODEV;
-                s = list_entry(list, struct es1371_state, devs);
-                if (!((s->dev_audio ^ minor) & ~0xf))
-                        break;
-        }
-        VALIDATE_STATE(s);
-        file->private_data = s;
-        /* wait for device to become free */
-        mutex_lock(&s->open_mutex);
-        while (s->open_mode & file->f_mode) {
-                if (file->f_flags & O_NONBLOCK) {
-                        mutex_unlock(&s->open_mutex);
-                        return -EBUSY;
-                }
-                add_wait_queue(&s->open_wait, &wait);
-                __set_current_state(TASK_INTERRUPTIBLE);
-                mutex_unlock(&s->open_mutex);
-                schedule();
-                remove_wait_queue(&s->open_wait, &wait);
-                set_current_state(TASK_RUNNING);
-                if (signal_pending(current))
-                        return -ERESTARTSYS;
-                mutex_lock(&s->open_mutex);
-        }
-        if (file->f_mode & FMODE_READ) {
-                s->dma_adc.ossfragshift = s->dma_adc.ossmaxfrags = s->dma_adc.subdivision = 0;
-                s->dma_adc.enabled = 1;
-                set_adc_rate(s, 8000);
-        }
-        if (file->f_mode & FMODE_WRITE) {
-                s->dma_dac2.ossfragshift = s->dma_dac2.ossmaxfrags = s->dma_dac2.subdivision = 0;
-                s->dma_dac2.enabled = 1;
-                set_dac2_rate(s, 8000);
-        }
-        spin_lock_irqsave(&s->lock, flags);
-        if (file->f_mode & FMODE_READ) {
-                s->sctrl &= ~SCTRL_R1FMT;
-                if ((minor & 0xf) == SND_DEV_DSP16)
-                        s->sctrl |= ES1371_FMT_S16_MONO << SCTRL_SH_R1FMT;
-                else
-                        s->sctrl |= ES1371_FMT_U8_MONO << SCTRL_SH_R1FMT;
-        }
-        if (file->f_mode & FMODE_WRITE) {
-                s->sctrl &= ~SCTRL_P2FMT;
-                if ((minor & 0xf) == SND_DEV_DSP16)
-                        s->sctrl |= ES1371_FMT_S16_MONO << SCTRL_SH_P2FMT;
-                else
-                        s->sctrl |= ES1371_FMT_U8_MONO << SCTRL_SH_P2FMT;
-        }
-        outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-        spin_unlock_irqrestore(&s->lock, flags);
-        s->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
-        mutex_unlock(&s->open_mutex);
-        mutex_init(&s->sem);
-        return nonseekable_open(inode, file);
-}
-
-static int es1371_release(struct inode *inode, struct file *file)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-
-        VALIDATE_STATE(s);
-        lock_kernel();
-        if (file->f_mode & FMODE_WRITE)
-                drain_dac2(s, file->f_flags & O_NONBLOCK);
-        mutex_lock(&s->open_mutex);
-        if (file->f_mode & FMODE_WRITE) {
-                stop_dac2(s);
-                dealloc_dmabuf(s, &s->dma_dac2);
-        }
-        if (file->f_mode & FMODE_READ) {
-                stop_adc(s);
-                dealloc_dmabuf(s, &s->dma_adc);
-        }
-        s->open_mode &= ~(file->f_mode & (FMODE_READ|FMODE_WRITE));
-        mutex_unlock(&s->open_mutex);
-        wake_up(&s->open_wait);
-        unlock_kernel();
-        return 0;
-}
-
-static /*const*/ struct file_operations es1371_audio_fops = {
-        .owner          = THIS_MODULE,
-        .llseek         = no_llseek,
-        .read           = es1371_read,
-        .write          = es1371_write,
-        .poll           = es1371_poll,
-        .ioctl          = es1371_ioctl,
-        .mmap           = es1371_mmap,
-        .open           = es1371_open,
-        .release        = es1371_release,
-};
-
-/* --------------------------------------------------------------------- */
-
-static ssize_t es1371_write_dac(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        DECLARE_WAITQUEUE(wait, current);
-        ssize_t ret = 0;
-        unsigned long flags;
-        unsigned swptr;
-        int cnt;
-
-        VALIDATE_STATE(s);
-        if (s->dma_dac1.mapped)
-                return -ENXIO;
-        if (!s->dma_dac1.ready && (ret = prog_dmabuf_dac1(s)))
-                return ret;
-        if (!access_ok(VERIFY_READ, buffer, count))
-                return -EFAULT;
-        add_wait_queue(&s->dma_dac1.wait, &wait);
-        while (count > 0) {
-                spin_lock_irqsave(&s->lock, flags);
-                if (s->dma_dac1.count < 0) {
-                        s->dma_dac1.count = 0;
-                        s->dma_dac1.swptr = s->dma_dac1.hwptr;
-                }
-                swptr = s->dma_dac1.swptr;
-                cnt = s->dma_dac1.dmasize-swptr;
-                if (s->dma_dac1.count + cnt > s->dma_dac1.dmasize)
-                        cnt = s->dma_dac1.dmasize - s->dma_dac1.count;
-                if (cnt <= 0)
-                        __set_current_state(TASK_INTERRUPTIBLE);
-                spin_unlock_irqrestore(&s->lock, flags);
-                if (cnt > count)
-                        cnt = count;
-                if (cnt <= 0) {
-                        if (s->dma_dac1.enabled)
-                                start_dac1(s);
-                        if (file->f_flags & O_NONBLOCK) {
-                                if (!ret)
-                                        ret = -EAGAIN;
-                                break;
-                        }
-                        schedule();
-                        if (signal_pending(current)) {
-                                if (!ret)
-                                        ret = -ERESTARTSYS;
-                                break;
-                        }
-                        continue;
-                }
-                if (copy_from_user(s->dma_dac1.rawbuf + swptr, buffer, cnt)) {
-                        if (!ret)
-                                ret = -EFAULT;
-                        break;
-                }
-                swptr = (swptr + cnt) % s->dma_dac1.dmasize;
-                spin_lock_irqsave(&s->lock, flags);
-                s->dma_dac1.swptr = swptr;
-                s->dma_dac1.count += cnt;
-                s->dma_dac1.endcleared = 0;
-                spin_unlock_irqrestore(&s->lock, flags);
-                count -= cnt;
-                buffer += cnt;
-                ret += cnt;
-                if (s->dma_dac1.enabled)
-                        start_dac1(s);
-        }
-        remove_wait_queue(&s->dma_dac1.wait, &wait);
-        set_current_state(TASK_RUNNING);
-        return ret;
-}
-
-/* No kernel lock - we have our own spinlock */
-static unsigned int es1371_poll_dac(struct file *file, struct poll_table_struct *wait)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        unsigned long flags;
-        unsigned int mask = 0;
-
-        VALIDATE_STATE(s);
-        if (!s->dma_dac1.ready && prog_dmabuf_dac1(s))
-                return 0;
-        poll_wait(file, &s->dma_dac1.wait, wait);
-        spin_lock_irqsave(&s->lock, flags);
-        es1371_update_ptr(s);
-        if (s->dma_dac1.mapped) {
-                if (s->dma_dac1.count >= (signed)s->dma_dac1.fragsize)
-                        mask |= POLLOUT | POLLWRNORM;
-        } else {
-                if ((signed)s->dma_dac1.dmasize >= s->dma_dac1.count + (signed)s->dma_dac1.fragsize)
-                        mask |= POLLOUT | POLLWRNORM;
-        }
-        spin_unlock_irqrestore(&s->lock, flags);
-        return mask;
-}
-
-static int es1371_mmap_dac(struct file *file, struct vm_area_struct *vma)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        int ret;
-        unsigned long size;
-
-        VALIDATE_STATE(s);
-        if (!(vma->vm_flags & VM_WRITE))
-                return -EINVAL;
-        lock_kernel();
-        if ((ret = prog_dmabuf_dac1(s)) != 0)
-                goto out;
-        ret = -EINVAL;
-        if (vma->vm_pgoff != 0)
-                goto out;
-        size = vma->vm_end - vma->vm_start;
-        if (size > (PAGE_SIZE << s->dma_dac1.buforder))
-                goto out;
-        ret = -EAGAIN;
-        if (remap_pfn_range(vma, vma->vm_start,
-                        virt_to_phys(s->dma_dac1.rawbuf) >> PAGE_SHIFT,
-                        size, vma->vm_page_prot))
-                goto out;
-        s->dma_dac1.mapped = 1;
-        ret = 0;
-out:
-        unlock_kernel();
-        return ret;
-}
-
-static int es1371_ioctl_dac(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        unsigned long flags;
-        audio_buf_info abinfo;
-        count_info cinfo;
-        int count;
-        int val, ret;
-        int __user *p = (int __user *)arg;
-
-        VALIDATE_STATE(s);
-        switch (cmd) {
-        case OSS_GETVERSION:
-                return put_user(SOUND_VERSION, p);
-
-        case SNDCTL_DSP_SYNC:
-                return drain_dac1(s, 0/*file->f_flags & O_NONBLOCK*/);
-                
-        case SNDCTL_DSP_SETDUPLEX:
-                return -EINVAL;
-
-        case SNDCTL_DSP_GETCAPS:
-                return put_user(DSP_CAP_REALTIME | DSP_CAP_TRIGGER | DSP_CAP_MMAP, p);
-                
-        case SNDCTL_DSP_RESET:
-                stop_dac1(s);
-                synchronize_irq(s->irq);
-                s->dma_dac1.swptr = s->dma_dac1.hwptr = s->dma_dac1.count = s->dma_dac1.total_bytes = 0;
-                return 0;
-
-        case SNDCTL_DSP_SPEED:
-                if (get_user(val, p))
-                        return -EFAULT;
-                if (val >= 0) {
-                        stop_dac1(s);
-                        s->dma_dac1.ready = 0;
-                        set_dac1_rate(s, val);
-                }
-                return put_user(s->dac1rate, p);
-
-        case SNDCTL_DSP_STEREO:
-                if (get_user(val, p))
-                        return -EFAULT;
-                stop_dac1(s);
-                s->dma_dac1.ready = 0;
-                spin_lock_irqsave(&s->lock, flags);
-                if (val)
-                        s->sctrl |= SCTRL_P1SMB;
-                else
-                        s->sctrl &= ~SCTRL_P1SMB;
-                outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-                spin_unlock_irqrestore(&s->lock, flags);
-                return 0;
-
-        case SNDCTL_DSP_CHANNELS:
-                if (get_user(val, p))
-                        return -EFAULT;
-                if (val != 0) {
-                        stop_dac1(s);
-                        s->dma_dac1.ready = 0;
-                        spin_lock_irqsave(&s->lock, flags);
-                        if (val >= 2)
-                                s->sctrl |= SCTRL_P1SMB;
-                        else
-                                s->sctrl &= ~SCTRL_P1SMB;
-                        outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-                        spin_unlock_irqrestore(&s->lock, flags);
-                }
-                return put_user((s->sctrl & SCTRL_P1SMB) ? 2 : 1, p);
-                
-        case SNDCTL_DSP_GETFMTS: /* Returns a mask */
-                return put_user(AFMT_S16_LE|AFMT_U8, p);
-                
-        case SNDCTL_DSP_SETFMT: /* Selects ONE fmt*/
-                if (get_user(val, p))
-                        return -EFAULT;
-                if (val != AFMT_QUERY) {
-                        stop_dac1(s);
-                        s->dma_dac1.ready = 0;
-                        spin_lock_irqsave(&s->lock, flags);
-                        if (val == AFMT_S16_LE)
-                                s->sctrl |= SCTRL_P1SEB;
-                        else
-                                s->sctrl &= ~SCTRL_P1SEB;
-                        outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-                        spin_unlock_irqrestore(&s->lock, flags);
-                }
-                return put_user((s->sctrl & SCTRL_P1SEB) ? AFMT_S16_LE : AFMT_U8, p);
-
-        case SNDCTL_DSP_POST:
-                return 0;
-
-        case SNDCTL_DSP_GETTRIGGER:
-                return put_user((s->ctrl & CTRL_DAC1_EN) ? PCM_ENABLE_OUTPUT : 0, p);
-                                                
-        case SNDCTL_DSP_SETTRIGGER:
-                if (get_user(val, p))
-                        return -EFAULT;
-                if (val & PCM_ENABLE_OUTPUT) {
-                        if (!s->dma_dac1.ready && (ret = prog_dmabuf_dac1(s)))
-                                return ret;
-                        s->dma_dac1.enabled = 1;
-                        start_dac1(s);
-                } else {
-                        s->dma_dac1.enabled = 0;
-                        stop_dac1(s);
-                }
-                return 0;
-
-        case SNDCTL_DSP_GETOSPACE:
-                if (!s->dma_dac1.ready && (val = prog_dmabuf_dac1(s)) != 0)
-                        return val;
-                spin_lock_irqsave(&s->lock, flags);
-                es1371_update_ptr(s);
-                abinfo.fragsize = s->dma_dac1.fragsize;
-                count = s->dma_dac1.count;
-                if (count < 0)
-                        count = 0;
-                abinfo.bytes = s->dma_dac1.dmasize - count;
-                abinfo.fragstotal = s->dma_dac1.numfrag;
-                abinfo.fragments = abinfo.bytes >> s->dma_dac1.fragshift;      
-                spin_unlock_irqrestore(&s->lock, flags);
-                return copy_to_user((void __user *)arg, &abinfo, sizeof(abinfo)) ? -EFAULT : 0;
-
-        case SNDCTL_DSP_NONBLOCK:
-                file->f_flags |= O_NONBLOCK;
-                return 0;
-
-        case SNDCTL_DSP_GETODELAY:
-                if (!s->dma_dac1.ready && (val = prog_dmabuf_dac1(s)) != 0)
-                        return val;
-                spin_lock_irqsave(&s->lock, flags);
-                es1371_update_ptr(s);
-                count = s->dma_dac1.count;
-                spin_unlock_irqrestore(&s->lock, flags);
-                if (count < 0)
-                        count = 0;
-                return put_user(count, p);
-
-        case SNDCTL_DSP_GETOPTR:
-                if (!s->dma_dac1.ready && (val = prog_dmabuf_dac1(s)) != 0)
-                        return val;
-                spin_lock_irqsave(&s->lock, flags);
-                es1371_update_ptr(s);
-                cinfo.bytes = s->dma_dac1.total_bytes;
-                count = s->dma_dac1.count;
-                if (count < 0)
-                        count = 0;
-                cinfo.blocks = count >> s->dma_dac1.fragshift;
-                cinfo.ptr = s->dma_dac1.hwptr;
-                if (s->dma_dac1.mapped)
-                        s->dma_dac1.count &= s->dma_dac1.fragsize-1;
-                spin_unlock_irqrestore(&s->lock, flags);
-                if (copy_to_user((void __user *)arg, &cinfo, sizeof(cinfo)))
-                        return -EFAULT;
-                return 0;
-
-        case SNDCTL_DSP_GETBLKSIZE:
-                if ((val = prog_dmabuf_dac1(s)))
-                        return val;
-                return put_user(s->dma_dac1.fragsize, p);
-
-        case SNDCTL_DSP_SETFRAGMENT:
-                if (get_user(val, p))
-                        return -EFAULT;
-                s->dma_dac1.ossfragshift = val & 0xffff;
-                s->dma_dac1.ossmaxfrags = (val >> 16) & 0xffff;
-                if (s->dma_dac1.ossfragshift < 4)
-                        s->dma_dac1.ossfragshift = 4;
-                if (s->dma_dac1.ossfragshift > 15)
-                        s->dma_dac1.ossfragshift = 15;
-                if (s->dma_dac1.ossmaxfrags < 4)
-                        s->dma_dac1.ossmaxfrags = 4;
-                return 0;
-
-        case SNDCTL_DSP_SUBDIVIDE:
-                if (s->dma_dac1.subdivision)
-                        return -EINVAL;
-                if (get_user(val, p))
-                        return -EFAULT;
-                if (val != 1 && val != 2 && val != 4)
-                        return -EINVAL;
-                s->dma_dac1.subdivision = val;
-                return 0;
-
-        case SOUND_PCM_READ_RATE:
-                return put_user(s->dac1rate, p);
-
-        case SOUND_PCM_READ_CHANNELS:
-                return put_user((s->sctrl & SCTRL_P1SMB) ? 2 : 1, p);
-
-        case SOUND_PCM_READ_BITS:
-                return put_user((s->sctrl & SCTRL_P1SEB) ? 16 : 8, p);
-
-        case SOUND_PCM_WRITE_FILTER:
-        case SNDCTL_DSP_SETSYNCRO:
-        case SOUND_PCM_READ_FILTER:
-                return -EINVAL;
-                
-        }
-        return mixdev_ioctl(s->codec, cmd, arg);
-}
-
-static int es1371_open_dac(struct inode *inode, struct file *file)
-{
-        int minor = iminor(inode);
-        DECLARE_WAITQUEUE(wait, current);
-        unsigned long flags;
-        struct list_head *list;
-        struct es1371_state *s;
-
-        for (list = devs.next; ; list = list->next) {
-                if (list == &devs)
-                        return -ENODEV;
-                s = list_entry(list, struct es1371_state, devs);
-                if (!((s->dev_dac ^ minor) & ~0xf))
-                        break;
-        }
-        VALIDATE_STATE(s);
-        /* we allow opening with O_RDWR, most programs do it although they will only write */
-#if 0
-        if (file->f_mode & FMODE_READ)
-                return -EPERM;
-#endif
-        if (!(file->f_mode & FMODE_WRITE))
-                return -EINVAL;
-        file->private_data = s;
-        /* wait for device to become free */
-        mutex_lock(&s->open_mutex);
-        while (s->open_mode & FMODE_DAC) {
-                if (file->f_flags & O_NONBLOCK) {
-                        mutex_unlock(&s->open_mutex);
-                        return -EBUSY;
-                }
-                add_wait_queue(&s->open_wait, &wait);
-                __set_current_state(TASK_INTERRUPTIBLE);
-                mutex_unlock(&s->open_mutex);
-                schedule();
-                remove_wait_queue(&s->open_wait, &wait);
-                set_current_state(TASK_RUNNING);
-                if (signal_pending(current))
-                        return -ERESTARTSYS;
-                mutex_lock(&s->open_mutex);
-        }
-        s->dma_dac1.ossfragshift = s->dma_dac1.ossmaxfrags = s->dma_dac1.subdivision = 0;
-        s->dma_dac1.enabled = 1;
-        set_dac1_rate(s, 8000);
-        spin_lock_irqsave(&s->lock, flags);
-        s->sctrl &= ~SCTRL_P1FMT;
-        if ((minor & 0xf) == SND_DEV_DSP16)
-                s->sctrl |= ES1371_FMT_S16_MONO << SCTRL_SH_P1FMT;
-        else
-                s->sctrl |= ES1371_FMT_U8_MONO << SCTRL_SH_P1FMT;
-        outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-        spin_unlock_irqrestore(&s->lock, flags);
-        s->open_mode |= FMODE_DAC;
-        mutex_unlock(&s->open_mutex);
-        return nonseekable_open(inode, file);
-}
-
-static int es1371_release_dac(struct inode *inode, struct file *file)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-
-        VALIDATE_STATE(s);
-        lock_kernel();
-        drain_dac1(s, file->f_flags & O_NONBLOCK);
-        mutex_lock(&s->open_mutex);
-        stop_dac1(s);
-        dealloc_dmabuf(s, &s->dma_dac1);
-        s->open_mode &= ~FMODE_DAC;
-        mutex_unlock(&s->open_mutex);
-        wake_up(&s->open_wait);
-        unlock_kernel();
-        return 0;
-}
-
-static /*const*/ struct file_operations es1371_dac_fops = {
-        .owner          = THIS_MODULE,
-        .llseek         = no_llseek,
-        .write          = es1371_write_dac,
-        .poll           = es1371_poll_dac,
-        .ioctl          = es1371_ioctl_dac,
-        .mmap           = es1371_mmap_dac,
-        .open           = es1371_open_dac,
-        .release        = es1371_release_dac,
-};
-
-/* --------------------------------------------------------------------- */
-
-static ssize_t es1371_midi_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        DECLARE_WAITQUEUE(wait, current);
-        ssize_t ret;
-        unsigned long flags;
-        unsigned ptr;
-        int cnt;
-
-        VALIDATE_STATE(s);
-        if (!access_ok(VERIFY_WRITE, buffer, count))
-                return -EFAULT;
-        if (count == 0)
-                return 0;
-        ret = 0;
-        add_wait_queue(&s->midi.iwait, &wait);
-        while (count > 0) {
-                spin_lock_irqsave(&s->lock, flags);
-                ptr = s->midi.ird;
-                cnt = MIDIINBUF - ptr;
-                if (s->midi.icnt < cnt)
-                        cnt = s->midi.icnt;
-                if (cnt <= 0)
-                        __set_current_state(TASK_INTERRUPTIBLE);
-                spin_unlock_irqrestore(&s->lock, flags);
-                if (cnt > count)
-                        cnt = count;
-                if (cnt <= 0) {
-                        if (file->f_flags & O_NONBLOCK) {
-                                if (!ret)
-                                        ret = -EAGAIN;
-                                break;
-                        }
-                        schedule();
-                        if (signal_pending(current)) {
-                                if (!ret)
-                                        ret = -ERESTARTSYS;
-                                break;
-                        }
-                        continue;
-                }
-                if (copy_to_user(buffer, s->midi.ibuf + ptr, cnt)) {
-                        if (!ret)
-                                ret = -EFAULT;
-                        break;
-                }
-                ptr = (ptr + cnt) % MIDIINBUF;
-                spin_lock_irqsave(&s->lock, flags);
-                s->midi.ird = ptr;
-                s->midi.icnt -= cnt;
-                spin_unlock_irqrestore(&s->lock, flags);
-                count -= cnt;
-                buffer += cnt;
-                ret += cnt;
-                break;
-        }
-        __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&s->midi.iwait, &wait);
-        return ret;
-}
-
-static ssize_t es1371_midi_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        DECLARE_WAITQUEUE(wait, current);
-        ssize_t ret;
-        unsigned long flags;
-        unsigned ptr;
-        int cnt;
-
-        VALIDATE_STATE(s);
-        if (!access_ok(VERIFY_READ, buffer, count))
-                return -EFAULT;
-        if (count == 0)
-                return 0;
-        ret = 0;
-        add_wait_queue(&s->midi.owait, &wait);
-        while (count > 0) {
-                spin_lock_irqsave(&s->lock, flags);
-                ptr = s->midi.owr;
-                cnt = MIDIOUTBUF - ptr;
-                if (s->midi.ocnt + cnt > MIDIOUTBUF)
-                        cnt = MIDIOUTBUF - s->midi.ocnt;
-                if (cnt <= 0) {
-                        __set_current_state(TASK_INTERRUPTIBLE);
-                        es1371_handle_midi(s);
-                }
-                spin_unlock_irqrestore(&s->lock, flags);
-                if (cnt > count)
-                        cnt = count;
-                if (cnt <= 0) {
-                        if (file->f_flags & O_NONBLOCK) {
-                                if (!ret)
-                                        ret = -EAGAIN;
-                                break;
-                        }
-                        schedule();
-                        if (signal_pending(current)) {
-                                if (!ret)
-                                        ret = -ERESTARTSYS;
-                                break;
-                        }
-                        continue;
-                }
-                if (copy_from_user(s->midi.obuf + ptr, buffer, cnt)) {
-                        if (!ret)
-                                ret = -EFAULT;
-                        break;
-                }
-                ptr = (ptr + cnt) % MIDIOUTBUF;
-                spin_lock_irqsave(&s->lock, flags);
-                s->midi.owr = ptr;
-                s->midi.ocnt += cnt;
-                spin_unlock_irqrestore(&s->lock, flags);
-                count -= cnt;
-                buffer += cnt;
-                ret += cnt;
-                spin_lock_irqsave(&s->lock, flags);
-                es1371_handle_midi(s);
-                spin_unlock_irqrestore(&s->lock, flags);
-        }
-        __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&s->midi.owait, &wait);
-        return ret;
-}
-
-/* No kernel lock - we have our own spinlock */
-static unsigned int es1371_midi_poll(struct file *file, struct poll_table_struct *wait)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        unsigned long flags;
-        unsigned int mask = 0;
-
-        VALIDATE_STATE(s);
-        if (file->f_mode & FMODE_WRITE)
-                poll_wait(file, &s->midi.owait, wait);
-        if (file->f_mode & FMODE_READ)
-                poll_wait(file, &s->midi.iwait, wait);
-        spin_lock_irqsave(&s->lock, flags);
-        if (file->f_mode & FMODE_READ) {
-                if (s->midi.icnt > 0)
-                        mask |= POLLIN | POLLRDNORM;
-        }
-        if (file->f_mode & FMODE_WRITE) {
-                if (s->midi.ocnt < MIDIOUTBUF)
-                        mask |= POLLOUT | POLLWRNORM;
-        }
-        spin_unlock_irqrestore(&s->lock, flags);
-        return mask;
-}
-
-static int es1371_midi_open(struct inode *inode, struct file *file)
-{
-        int minor = iminor(inode);
-        DECLARE_WAITQUEUE(wait, current);
-        unsigned long flags;
-        struct list_head *list;
-        struct es1371_state *s;
-
-        for (list = devs.next; ; list = list->next) {
-                if (list == &devs)
-                        return -ENODEV;
-                s = list_entry(list, struct es1371_state, devs);
-                if (s->dev_midi == minor)
-                        break;
-        }
-        VALIDATE_STATE(s);
-        file->private_data = s;
-        /* wait for device to become free */
-        mutex_lock(&s->open_mutex);
-        while (s->open_mode & (file->f_mode << FMODE_MIDI_SHIFT)) {
-                if (file->f_flags & O_NONBLOCK) {
-                        mutex_unlock(&s->open_mutex);
-                        return -EBUSY;
-                }
-                add_wait_queue(&s->open_wait, &wait);
-                __set_current_state(TASK_INTERRUPTIBLE);
-                mutex_unlock(&s->open_mutex);
-                schedule();
-                remove_wait_queue(&s->open_wait, &wait);
-                set_current_state(TASK_RUNNING);
-                if (signal_pending(current))
-                        return -ERESTARTSYS;
-                mutex_lock(&s->open_mutex);
-        }
-        spin_lock_irqsave(&s->lock, flags);
-        if (!(s->open_mode & (FMODE_MIDI_READ | FMODE_MIDI_WRITE))) {
-                s->midi.ird = s->midi.iwr = s->midi.icnt = 0;
-                s->midi.ord = s->midi.owr = s->midi.ocnt = 0;
-                outb(UCTRL_CNTRL_SWR, s->io+ES1371_REG_UART_CONTROL);
-                outb(0, s->io+ES1371_REG_UART_CONTROL);
-                outb(0, s->io+ES1371_REG_UART_TEST);
-        }
-        if (file->f_mode & FMODE_READ) {
-                s->midi.ird = s->midi.iwr = s->midi.icnt = 0;
-        }
-        if (file->f_mode & FMODE_WRITE) {
-                s->midi.ord = s->midi.owr = s->midi.ocnt = 0;
-        }
-        s->ctrl |= CTRL_UART_EN;
-        outl(s->ctrl, s->io+ES1371_REG_CONTROL);
-        es1371_handle_midi(s);
-        spin_unlock_irqrestore(&s->lock, flags);
-        s->open_mode |= (file->f_mode << FMODE_MIDI_SHIFT) & (FMODE_MIDI_READ | FMODE_MIDI_WRITE);
-        mutex_unlock(&s->open_mutex);
-        return nonseekable_open(inode, file);
-}
-
-static int es1371_midi_release(struct inode *inode, struct file *file)
-{
-        struct es1371_state *s = (struct es1371_state *)file->private_data;
-        DECLARE_WAITQUEUE(wait, current);
-        unsigned long flags;
-        unsigned count, tmo;
-
-        VALIDATE_STATE(s);
-        lock_kernel();
-        if (file->f_mode & FMODE_WRITE) {
-                add_wait_queue(&s->midi.owait, &wait);
-                for (;;) {
-                        __set_current_state(TASK_INTERRUPTIBLE);
-                        spin_lock_irqsave(&s->lock, flags);
-                        count = s->midi.ocnt;
-                        spin_unlock_irqrestore(&s->lock, flags);
-                        if (count <= 0)
-                                break;
-                        if (signal_pending(current))
-                                break;
-                        if (file->f_flags & O_NONBLOCK)
-                                break;
-                        tmo = (count * HZ) / 3100;
-                        if (!schedule_timeout(tmo ? : 1) && tmo)
-                                printk(KERN_DEBUG PFX "midi timed out??\n");
-                }
-                remove_wait_queue(&s->midi.owait, &wait);
-                set_current_state(TASK_RUNNING);
-        }
-        mutex_lock(&s->open_mutex);
-        s->open_mode &= ~((file->f_mode << FMODE_MIDI_SHIFT) & (FMODE_MIDI_READ|FMODE_MIDI_WRITE));
-        spin_lock_irqsave(&s->lock, flags);
-        if (!(s->open_mode & (FMODE_MIDI_READ | FMODE_MIDI_WRITE))) {
-                s->ctrl &= ~CTRL_UART_EN;
-                outl(s->ctrl, s->io+ES1371_REG_CONTROL);
-        }
-        spin_unlock_irqrestore(&s->lock, flags);
-        mutex_unlock(&s->open_mutex);
-        wake_up(&s->open_wait);
-        unlock_kernel();
-        return 0;
-}
-
-static /*const*/ struct file_operations es1371_midi_fops = {
-        .owner          = THIS_MODULE,
-        .llseek         = no_llseek,
-        .read           = es1371_midi_read,
-        .write          = es1371_midi_write,
-        .poll           = es1371_midi_poll,
-        .open           = es1371_midi_open,
-        .release        = es1371_midi_release,
-};
-
-/* --------------------------------------------------------------------- */
-
-/*
- * for debugging purposes, we'll create a proc device that dumps the
- * CODEC chipstate
- */
-
-#ifdef ES1371_DEBUG
-static int proc_es1371_dump (char *buf, char **start, off_t fpos, int length, int *eof, void *data)
-{
-        struct es1371_state *s;
-        int cnt, len = 0;
-
-        if (list_empty(&devs))
-                return 0;
-        s = list_entry(devs.next, struct es1371_state, devs);
-        /* print out header */
-        len += sprintf(buf + len, "\t\tCreative ES137x Debug Dump-o-matic\n");
-
-        /* print out CODEC state */
-        len += sprintf (buf + len, "AC97 CODEC state\n");
-        for (cnt=0; cnt <= 0x7e; cnt = cnt +2)
-                len+= sprintf (buf + len, "reg:0x%02x  val:0x%04x\n", cnt, rdcodec(s->codec, cnt));
-
-        if (fpos >=len){
-                *start = buf;
-                *eof =1;
-                return 0;
-        }
-        *start = buf + fpos;
-        if ((len -= fpos) > length)
-                return length;
-        *eof =1;
-        return len;
-
-}
-#endif /* ES1371_DEBUG */
-
-/* --------------------------------------------------------------------- */
-
-/* maximum number of devices; only used for command line params */
-#define NR_DEVICE 5
-
-static int spdif[NR_DEVICE];
-static int nomix[NR_DEVICE];
-static int amplifier[NR_DEVICE];
-
-static unsigned int devindex;
-
-module_param_array(spdif, bool, NULL, 0);
-MODULE_PARM_DESC(spdif, "if 1 the output is in S/PDIF digital mode");
-module_param_array(nomix, bool, NULL, 0);
-MODULE_PARM_DESC(nomix, "if 1 no analog audio is mixed to the digital output");
-module_param_array(amplifier, bool, NULL, 0);
-MODULE_PARM_DESC(amplifier, "Set to 1 if the machine needs the amp control enabling (many laptops)");
-
-MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");
-MODULE_DESCRIPTION("ES1371 AudioPCI97 Driver");
-MODULE_LICENSE("GPL");
-
-
-/* --------------------------------------------------------------------- */
-
-static struct initvol {
-        int mixch;
-        int vol;
-} initvol[] __devinitdata = {
-        { SOUND_MIXER_WRITE_LINE, 0x4040 },
-        { SOUND_MIXER_WRITE_CD, 0x4040 },
-        { MIXER_WRITE(SOUND_MIXER_VIDEO), 0x4040 },
-        { SOUND_MIXER_WRITE_LINE1, 0x4040 },
-        { SOUND_MIXER_WRITE_PCM, 0x4040 },
-        { SOUND_MIXER_WRITE_VOLUME, 0x4040 },
-        { MIXER_WRITE(SOUND_MIXER_PHONEOUT), 0x4040 },
-        { SOUND_MIXER_WRITE_OGAIN, 0x4040 },
-        { MIXER_WRITE(SOUND_MIXER_PHONEIN), 0x4040 },
-        { SOUND_MIXER_WRITE_SPEAKER, 0x4040 },
-        { SOUND_MIXER_WRITE_MIC, 0x4040 },
-        { SOUND_MIXER_WRITE_RECLEV, 0x4040 },
-        { SOUND_MIXER_WRITE_IGAIN, 0x4040 }
-};
-
-static struct
-{
-        short svid, sdid;
-} amplifier_needed[] = 
-{
-        { 0x107B, 0x2150 },             /* Gateway Solo 2150 */
-        { 0x13BD, 0x100C },             /* Mebius PC-MJ100V */
-        { 0x1102, 0x5938 },             /* Targa Xtender 300 */
-        { 0x1102, 0x8938 },             /* IPC notebook */
-        { PCI_ANY_ID, PCI_ANY_ID }
-};
-
-#ifdef SUPPORT_JOYSTICK
-
-static int __devinit es1371_register_gameport(struct es1371_state *s)
-{
-        struct gameport *gp;
-        int gpio;
-
-        for (gpio = 0x218; gpio >= 0x200; gpio -= 0x08)
-                if (request_region(gpio, JOY_EXTENT, "es1371"))
-                        break;
-
-        if (gpio < 0x200) {
-                printk(KERN_ERR PFX "no free joystick address found\n");
-                return -EBUSY;
-        }
-
-        s->gameport = gp = gameport_allocate_port();
-        if (!gp) {
-                printk(KERN_ERR PFX "can not allocate memory for gameport\n");
-                release_region(gpio, JOY_EXTENT);
-                return -ENOMEM;
-        }
-
-        gameport_set_name(gp, "ESS1371 Gameport");
-        gameport_set_phys(gp, "isa%04x/gameport0", gpio);
-        gp->dev.parent = &s->dev->dev;
-        gp->io = gpio;
-
-        s->ctrl |= CTRL_JYSTK_EN | (((gpio >> 3) & CTRL_JOY_MASK) << CTRL_JOY_SHIFT);
-        outl(s->ctrl, s->io + ES1371_REG_CONTROL);
-
-        gameport_register_port(gp);
-
-        return 0;
-}
-
-static inline void es1371_unregister_gameport(struct es1371_state *s)
-{
-        if (s->gameport) {
-                int gpio = s->gameport->io;
-                gameport_unregister_port(s->gameport);
-                release_region(gpio, JOY_EXTENT);
-
-        }
-}
-
-#else
-static inline int es1371_register_gameport(struct es1371_state *s) { return -ENOSYS; }
-static inline void es1371_unregister_gameport(struct es1371_state *s) { }
-#endif /* SUPPORT_JOYSTICK */
-
-
-static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_device_id *pciid)
-{
-        struct es1371_state *s;
-        mm_segment_t fs;
-        int i, val, res = -1;
-        int idx;
-        unsigned long tmo;
-        signed long tmo2;
-        unsigned int cssr;
-
-        if ((res=pci_enable_device(pcidev)))
-                return res;
-
-        if (!(pci_resource_flags(pcidev, 0) & IORESOURCE_IO))
-                return -ENODEV;
-        if (pcidev->irq == 0) 
-                return -ENODEV;
-        i = pci_set_dma_mask(pcidev, DMA_32BIT_MASK);
-        if (i) {
-                printk(KERN_WARNING "es1371: architecture does not support 32bit PCI busmaster DMA\n");
-                return i;
-        }
-        if (!(s = kzalloc(sizeof(struct es1371_state), GFP_KERNEL))) {
-                printk(KERN_WARNING PFX "out of memory\n");
-                return -ENOMEM;
-        }
-        
-        s->codec = ac97_alloc_codec();
-        if(s->codec == NULL)
-                goto err_codec;
-                
-        init_waitqueue_head(&s->dma_adc.wait);
-        init_waitqueue_head(&s->dma_dac1.wait);
-        init_waitqueue_head(&s->dma_dac2.wait);
-        init_waitqueue_head(&s->open_wait);
-        init_waitqueue_head(&s->midi.iwait);
-        init_waitqueue_head(&s->midi.owait);
-        mutex_init(&s->open_mutex);
-        spin_lock_init(&s->lock);
-        s->magic = ES1371_MAGIC;
-        s->dev = pcidev;
-        s->io = pci_resource_start(pcidev, 0);
-        s->irq = pcidev->irq;
-        s->vendor = pcidev->vendor;
-        s->device = pcidev->device;
-        s->rev = pcidev->revision;
-        s->codec->private_data = s;
-        s->codec->id = 0;
-        s->codec->codec_read = rdcodec;
-        s->codec->codec_write = wrcodec;
-        printk(KERN_INFO PFX "found chip, vendor id 0x%04x device id 0x%04x revision 0x%02x\n",
-               s->vendor, s->device, s->rev);
-        if (!request_region(s->io, ES1371_EXTENT, "es1371")) {
-                printk(KERN_ERR PFX "io ports %#lx-%#lx in use\n", s->io, s->io+ES1371_EXTENT-1);
-                res = -EBUSY;
-                goto err_region;
-        }
-        if ((res=request_irq(s->irq, es1371_interrupt, IRQF_SHARED, "es1371",s))) {
-                printk(KERN_ERR PFX "irq %u in use\n", s->irq);
-                goto err_irq;
-        }
-        printk(KERN_INFO PFX "found es1371 rev %d at io %#lx irq %u\n",
-               s->rev, s->io, s->irq);
-        /* register devices */
-        if ((res=(s->dev_audio = register_sound_dsp(&es1371_audio_fops,-1)))<0)
-                goto err_dev1;
-        if ((res=(s->codec->dev_mixer = register_sound_mixer(&es1371_mixer_fops, -1))) < 0)
-                goto err_dev2;
-        if ((res=(s->dev_dac = register_sound_dsp(&es1371_dac_fops, -1))) < 0)
-                goto err_dev3;
-        if ((res=(s->dev_midi = register_sound_midi(&es1371_midi_fops, -1)))<0 )
-                goto err_dev4;
-#ifdef ES1371_DEBUG
-        /* initialize the debug proc device */
-        s->ps = create_proc_read_entry("es1371",0,NULL,proc_es1371_dump,NULL);
-#endif /* ES1371_DEBUG */
-        
-        /* initialize codec registers */
-        s->ctrl = 0;
-
-        /* Check amplifier requirements */
-        
-        if (amplifier[devindex])
-                s->ctrl |= CTRL_GPIO_OUT0;
-        else for(idx = 0; amplifier_needed[idx].svid != PCI_ANY_ID; idx++)
-        {
-                if(pcidev->subsystem_vendor == amplifier_needed[idx].svid &&
-                   pcidev->subsystem_device == amplifier_needed[idx].sdid)
-                {
-                        s->ctrl |= CTRL_GPIO_OUT0;   /* turn internal amplifier on */
-                        printk(KERN_INFO PFX "Enabling internal amplifier.\n");
-                }
-        }
-
-        s->sctrl = 0;
-        cssr = 0;
-        s->spdif_volume = -1;
-        /* check to see if s/pdif mode is being requested */
-        if (spdif[devindex]) {
-                if (s->rev >= 4) {
-                        printk(KERN_INFO PFX "enabling S/PDIF output\n");
-                        s->spdif_volume = 0;
-                        cssr |= STAT_EN_SPDIF;
-                        s->ctrl |= CTRL_SPDIFEN_B;
-                        if (nomix[devindex]) /* don't mix analog inputs to s/pdif output */
-                                s->ctrl |= CTRL_RECEN_B;
-                } else {
-                        printk(KERN_ERR PFX "revision %d does not support S/PDIF\n", s->rev);
-                }
-        }
-        /* initialize the chips */
-        outl(s->ctrl, s->io+ES1371_REG_CONTROL);
-        outl(s->sctrl, s->io+ES1371_REG_SERIAL_CONTROL);
-        outl(LEGACY_JFAST, s->io+ES1371_REG_LEGACY);
-        pci_set_master(pcidev);  /* enable bus mastering */
-        /* if we are a 5880 turn on the AC97 */
-        if (s->vendor == PCI_VENDOR_ID_ENSONIQ &&
-            ((s->device == PCI_DEVICE_ID_ENSONIQ_CT5880 && s->rev >= CT5880REV_CT5880_C) || 
-             (s->device == PCI_DEVICE_ID_ENSONIQ_ES1371 && s->rev == ES1371REV_CT5880_A) || 
-             (s->device == PCI_DEVICE_ID_ENSONIQ_ES1371 && s->rev == ES1371REV_ES1373_8))) { 
-                cssr |= CSTAT_5880_AC97_RST;
-                outl(cssr, s->io+ES1371_REG_STATUS);
-                /* need to delay around 20ms(bleech) to give
-                   some CODECs enough time to wakeup */
-                tmo = jiffies + (HZ / 50) + 1;
-                for (;;) {
-                        tmo2 = tmo - jiffies;
-                        if (tmo2 <= 0)
-                                break;
-                        schedule_timeout(tmo2);
-                }
-        }
-        /* AC97 warm reset to start the bitclk */
-        outl(s->ctrl | CTRL_SYNCRES, s->io+ES1371_REG_CONTROL);
-        udelay(2);
-        outl(s->ctrl, s->io+ES1371_REG_CONTROL);
-        /* init the sample rate converter */
-        src_init(s);
-        /* codec init */
-        if (!ac97_probe_codec(s->codec)) {
-                res = -ENODEV;
-                goto err_gp;
-        }
-        /* set default values */
-
-        fs = get_fs();
-        set_fs(KERNEL_DS);
-        val = SOUND_MASK_LINE;
-        mixdev_ioctl(s->codec, SOUND_MIXER_WRITE_RECSRC, (unsigned long)&val);
-        for (i = 0; i < ARRAY_SIZE(initvol); i++) {
-                val = initvol[i].vol;
-                mixdev_ioctl(s->codec, initvol[i].mixch, (unsigned long)&val);
-        }
-        /* mute master and PCM when in S/PDIF mode */
-        if (s->spdif_volume != -1) {
-                val = 0x0000;
-                s->codec->mixer_ioctl(s->codec, SOUND_MIXER_WRITE_VOLUME, (unsigned long)&val);
-                s->codec->mixer_ioctl(s->codec, SOUND_MIXER_WRITE_PCM, (unsigned long)&val);
-        }
-        set_fs(fs);
-        /* turn on S/PDIF output driver if requested */
-        outl(cssr, s->io+ES1371_REG_STATUS);
-
-        es1371_register_gameport(s);
-
-        /* store it in the driver field */
-        pci_set_drvdata(pcidev, s);
-        /* put it into driver list */
-        list_add_tail(&s->devs, &devs);
-        /* increment devindex */
-        if (devindex < NR_DEVICE-1)
-                devindex++;
-        return 0;
-
- err_gp:
-#ifdef ES1371_DEBUG
-        if (s->ps)
-                remove_proc_entry("es1371", NULL);
-#endif
-        unregister_sound_midi(s->dev_midi);
- err_dev4:
-        unregister_sound_dsp(s->dev_dac);
- err_dev3:
-        unregister_sound_mixer(s->codec->dev_mixer);
- err_dev2:
-        unregister_sound_dsp(s->dev_audio);
- err_dev1:
-        printk(KERN_ERR PFX "cannot register misc device\n");
-        free_irq(s->irq, s);
- err_irq:
-        release_region(s->io, ES1371_EXTENT);
- err_region:
- err_codec:
-        ac97_release_codec(s->codec);
-        kfree(s);
-        return res;
-}
-
-static void __devexit es1371_remove(struct pci_dev *dev)
-{
-        struct es1371_state *s = pci_get_drvdata(dev);
-
-        if (!s)
-                return;
-        list_del(&s->devs);
-#ifdef ES1371_DEBUG
-        if (s->ps)
-                remove_proc_entry("es1371", NULL);
-#endif /* ES1371_DEBUG */
-        outl(0, s->io+ES1371_REG_CONTROL); /* switch everything off */
-        outl(0, s->io+ES1371_REG_SERIAL_CONTROL); /* clear serial interrupts */
-        synchronize_irq(s->irq);
-        free_irq(s->irq, s);
-        es1371_unregister_gameport(s);
-        release_region(s->io, ES1371_EXTENT);
-        unregister_sound_dsp(s->dev_audio);
-        unregister_sound_mixer(s->codec->dev_mixer);
-        unregister_sound_dsp(s->dev_dac);
-        unregister_sound_midi(s->dev_midi);
-        ac97_release_codec(s->codec);
-        kfree(s);
-        pci_set_drvdata(dev, NULL);
-}
-
-static struct pci_device_id id_table[] = {
-        { PCI_VENDOR_ID_ENSONIQ, PCI_DEVICE_ID_ENSONIQ_ES1371, PCI_ANY_ID, PCI_ANY_ID, 0, 0 },
-        { PCI_VENDOR_ID_ENSONIQ, PCI_DEVICE_ID_ENSONIQ_CT5880, PCI_ANY_ID, PCI_ANY_ID, 0, 0 },
-        { PCI_VENDOR_ID_ECTIVA, PCI_DEVICE_ID_ECTIVA_EV1938, PCI_ANY_ID, PCI_ANY_ID, 0, 0 },
-        { 0, }
-};
-
-MODULE_DEVICE_TABLE(pci, id_table);
-
-static struct pci_driver es1371_driver = {
-        .name           = "es1371",
-        .id_table       = id_table,
-        .probe          = es1371_probe,
-        .remove         = __devexit_p(es1371_remove),
-};
-
-static int __init init_es1371(void)
-{
-        printk(KERN_INFO PFX "version v0.32 time " __TIME__ " " __DATE__ "\n");
-        return pci_register_driver(&es1371_driver);
-}
-
-static void __exit cleanup_es1371(void)
-{
-        printk(KERN_INFO PFX "unloading\n");
-        pci_unregister_driver(&es1371_driver);
-}
-
-module_init(init_es1371);
-module_exit(cleanup_es1371);
-
-/* --------------------------------------------------------------------- */
-
-#ifndef MODULE
-
-/* format is: es1371=[spdif,[nomix,[amplifier]]] */
-
-static int __init es1371_setup(char *str)
-{
-        static unsigned __initdata nr_dev = 0;
-
-        if (nr_dev >= NR_DEVICE)
-                return 0;
-
-        (void)
-        ((get_option(&str, &spdif[nr_dev]) == 2)
-         && (get_option(&str, &nomix[nr_dev]) == 2)
-         && (get_option(&str, &amplifier[nr_dev])));
-
-        nr_dev++;
-        return 1;
-}
-
-__setup("es1371=", es1371_setup);
-
-#endif /* MODULE */