470 files changed, 6829 insertions, 6182 deletions
diff --git a/Documentation/arm/00-INDEX b/Documentation/arm/00-INDEX
index d753fe59a248..2c6a3b38967e 100644
--- a/Documentation/arm/00-INDEX
+++ b/Documentation/arm/00-INDEX
@@ -16,5 +16,7 @@ empeg
        - Empeg documentation
 mem_alignment
        - alignment abort handler documentation
+memory.txt
+        - description of the virtual memory layout
 nwfpe
        - NWFPE floating point emulator documentation
diff --git a/Documentation/dvb/README.dvb-usb b/Documentation/dvb/README.dvb-usb
index ac0797ea646c..46b78b7331c2 100644
--- a/Documentation/dvb/README.dvb-usb
+++ b/Documentation/dvb/README.dvb-usb
@@ -50,12 +50,12 @@ http://www.linuxtv.org/wiki/index.php/DVB_USB
 0. History & News:
  2005-06-30 - added support for WideView WT-220U (Thanks to Steve Chang)
  2005-05-30 - added basic isochronous support to the dvb-usb-framework
-               added support for Conexant Hybrid reference design and Nebula DigiTV USB
+               added support for Conexant Hybrid reference design and Nebula DigiTV USB
  2005-04-17 - all dibusb devices ported to make use of the dvb-usb-framework
  2005-04-02 - re-enabled and improved remote control code.
  2005-03-31 - ported the Yakumo/Hama/Typhoon DVB-T USB2.0 device to dvb-usb.
  2005-03-30 - first commit of the dvb-usb-module based on the dibusb-source. First device is a new driver for the
-               TwinhanDTV Alpha / MagicBox II USB2.0-only DVB-T device.
+               TwinhanDTV Alpha / MagicBox II USB2.0-only DVB-T device.
  (change from dvb-dibusb to dvb-usb)
  2005-03-28 - added support for the AVerMedia AverTV DVB-T USB2.0 device (Thanks to Glen Harris and Jiun-Kuei Jung, AVerMedia)
@@ -64,50 +64,50 @@ http://www.linuxtv.org/wiki/index.php/DVB_USB
  2005-02-02 - added support for the Hauppauge Win-TV Nova-T USB2
  2005-01-31 - distorted streaming is gone for USB1.1 devices
  2005-01-13 - moved the mirrored pid_filter_table back to dvb-dibusb
-             - first almost working version for HanfTek UMT-010
+             - first almost working version for HanfTek UMT-010
-             - found out, that Yakumo/HAMA/Typhoon are predecessors of the HanfTek UMT-010
+             - found out, that Yakumo/HAMA/Typhoon are predecessors of the HanfTek UMT-010
  2005-01-10 - refactoring completed, now everything is very delightful
-             - tuner quirks for some weird devices (Artec T1 AN2235 device has sometimes a
+             - tuner quirks for some weird devices (Artec T1 AN2235 device has sometimes a
-               Panasonic Tuner assembled). Tunerprobing implemented. Thanks a lot to Gunnar Wittich.
+               Panasonic Tuner assembled). Tunerprobing implemented. Thanks a lot to Gunnar Wittich.
  2004-12-29 - after several days of struggling around bug of no returning URBs fixed.
  2004-12-26 - refactored the dibusb-driver, splitted into separate files
-             - i2c-probing enabled
+             - i2c-probing enabled
  2004-12-06 - possibility for demod i2c-address probing
-             - new usb IDs (Compro, Artec)
+             - new usb IDs (Compro, Artec)
  2004-11-23 - merged changes from DiB3000MC_ver2.1
-             - revised the debugging
+             - revised the debugging
-             - possibility to deliver the complete TS for USB2.0
+             - possibility to deliver the complete TS for USB2.0
  2004-11-21 - first working version of the dib3000mc/p frontend driver.
  2004-11-12 - added additional remote control keys. Thanks to Uwe Hanke.
  2004-11-07 - added remote control support. Thanks to David Matthews.
  2004-11-05 - added support for a new devices (Grandtec/Avermedia/Artec)
-             - merged my changes (for dib3000mb/dibusb) to the FE_REFACTORING, because it became HEAD
+             - merged my changes (for dib3000mb/dibusb) to the FE_REFACTORING, because it became HEAD
-             - moved transfer control (pid filter, fifo control) from usb driver to frontend, it seems
+             - moved transfer control (pid filter, fifo control) from usb driver to frontend, it seems
-               better settled there (added xfer_ops-struct)
+               better settled there (added xfer_ops-struct)
-             - created a common files for frontends (mc/p/mb)
+             - created a common files for frontends (mc/p/mb)
  2004-09-28 - added support for a new device (Unkown, vendor ID is Hyper-Paltek)
  2004-09-20 - added support for a new device (Compro DVB-U2000), thanks
-               to Amaury Demol for reporting
+               to Amaury Demol for reporting
-             - changed usb TS transfer method (several urbs, stopping transfer
+             - changed usb TS transfer method (several urbs, stopping transfer
-               before setting a new pid)
+               before setting a new pid)
  2004-09-13 - added support for a new device (Artec T1 USB TVBOX), thanks
-               to Christian Motschke for reporting
+               to Christian Motschke for reporting
  2004-09-05 - released the dibusb device and dib3000mb-frontend driver
  (old news for vp7041.c)
  2004-07-15 - found out, by accident, that the device has a TUA6010XS for
-               PLL
+               PLL
  2004-07-12 - figured out, that the driver should also work with the
-               CTS Portable (Chinese Television System)
+               CTS Portable (Chinese Television System)
  2004-07-08 - firmware-extraction-2.422-problem solved, driver is now working
-               properly with firmware extracted from 2.422
+               properly with firmware extracted from 2.422
-             - #if for 2.6.4 (dvb), compile issue
+             - #if for 2.6.4 (dvb), compile issue
-             - changed firmware handling, see vp7041.txt sec 1.1
+             - changed firmware handling, see vp7041.txt sec 1.1
  2004-07-02 - some tuner modifications, v0.1, cleanups, first public
  2004-06-28 - now using the dvb_dmx_swfilter_packets, everything
-               runs fine now
+               runs fine now
  2004-06-27 - able to watch and switching channels (pre-alpha)
-             - no section filtering yet
+             - no section filtering yet
  2004-06-06 - first TS received, but kernel oops :/
  2004-05-14 - firmware loader is working
  2004-05-11 - start writing the driver
diff --git a/Documentation/dvb/README.flexcop b/Documentation/dvb/README.flexcop
index a50c70f9ca72..5515469de7cf 100644
--- a/Documentation/dvb/README.flexcop
+++ b/Documentation/dvb/README.flexcop
@@ -174,7 +174,7 @@ Debugging
 Everything which is identical in the following table, can be put into a common
 flexcop-module.
-                  PCI                  USB
+                  PCI                  USB
 -------------------------------------------------------------------------------
 Different:
 Register access:  accessing IO memory  USB control message
diff --git a/Documentation/dvb/avermedia.txt b/Documentation/dvb/avermedia.txt
index 09020ebd202b..2dc260b2b0a4 100644
--- a/Documentation/dvb/avermedia.txt
+++ b/Documentation/dvb/avermedia.txt
@@ -1,6 +1,6 @@
 HOWTO: Get An Avermedia DVB-T working under Linux
-           ______________________________________________
+           ______________________________________________
   Table of Contents
   Assumptions and Introduction
diff --git a/Documentation/dvb/cards.txt b/Documentation/dvb/cards.txt
index 19329cf7b097..9e10092440e1 100644
--- a/Documentation/dvb/cards.txt
+++ b/Documentation/dvb/cards.txt
@@ -16,7 +16,7 @@ Hardware supported by the linuxtv.org DVB drivers
  shielding, and the whole metal box has its own part number.
-o Frontends drivers: 
+o Frontends drivers:
  - dvb_dummy_fe: for testing...
  DVB-S:
   - ves1x93            : Alps BSRV2 (ves1893 demodulator) and dbox2 (ves1993)
@@ -24,7 +24,7 @@ o Frontends drivers:
   - grundig_29504-491  : Grundig 29504-491 (Philips TDA8083 demodulator), tsa5522 PLL
   - mt312              : Zarlink mt312 or Mitel vp310 demodulator, sl1935 or tsa5059 PLL
   - stv0299            : Alps BSRU6 (tsa5059 PLL), LG TDQB-S00x (tsa5059 PLL),
-                          LG TDQF-S001F (sl1935 PLL), Philips SU1278 (tua6100 PLL), 
+                          LG TDQF-S001F (sl1935 PLL), Philips SU1278 (tua6100 PLL),
                          Philips SU1278SH (tsa5059 PLL), Samsung TBMU24112IMB
  DVB-C:
   - ves1820            : various (ves1820 demodulator, sp5659c or spXXXX PLL)
@@ -35,8 +35,8 @@ o Frontends drivers:
   - grundig_29504-401  : Grundig 29504-401 (LSI L64781 demodulator), tsa5060 PLL
   - tda1004x           : Philips tda10045h (td1344 or tdm1316l PLL)
   - nxt6000            : Alps TDME7 (MITEL SP5659 PLL), Alps TDED4 (TI ALP510 PLL),
-                          Comtech DVBT-6k07 (SP5730 PLL)
+                          Comtech DVBT-6k07 (SP5730 PLL)
-                          (NxtWave Communications NXT6000 demodulator)
+                          (NxtWave Communications NXT6000 demodulator)
   - sp887x             : Microtune 7202D
   - dib3000mb  : DiBcom 3000-MB demodulator
  DVB-S/C/T:
diff --git a/Documentation/dvb/contributors.txt b/Documentation/dvb/contributors.txt
index 2cbd2d0f6fdf..4c33cced5f65 100644
--- a/Documentation/dvb/contributors.txt
+++ b/Documentation/dvb/contributors.txt
@@ -15,7 +15,7 @@ Michael Holzt <kju@debian.org>
 Diego Picciani <d.picciani@novacomp.it>
  for CyberLogin for Linux which allows logging onto EON
-  (in case you are wondering where CyberLogin is, EON changed its login 
+  (in case you are wondering where CyberLogin is, EON changed its login
  procedure and CyberLogin is no longer used.)
 Martin Schaller <martin@smurf.franken.de>
@@ -57,7 +57,7 @@ Augusto Cardoso <augusto@carhil.net>
 Davor Emard <emard@softhome.net>
  for his work on the budget drivers, the demux code,
  the module unloading problems, ...
-  
 Hans-Frieder Vogt <hfvogt@arcor.de>
  for his work on calculating and checking the crc's for the
  TechnoTrend/Hauppauge DEC driver firmware
diff --git a/Documentation/dvb/readme.txt b/Documentation/dvb/readme.txt
index 754c98c6ad94..f5c50b22de3b 100644
--- a/Documentation/dvb/readme.txt
+++ b/Documentation/dvb/readme.txt
@@ -20,7 +20,7 @@ http://linuxtv.org/downloads/
 What's inside this directory:
-"cards.txt" 
+"cards.txt"
 contains a list of supported hardware.
 "contributors.txt"
@@ -37,7 +37,7 @@ that require it.
 contains detailed informations about the
 TT DEC2000/DEC3000 USB DVB hardware.
-"bt8xx.txt" 
+"bt8xx.txt"
 contains detailed installation instructions for the
 various bt8xx based "budget" DVB cards
 (Nebula, Pinnacle PCTV, Twinhan DST)
diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt
index 9ab7f446f7ad..9840d5b8d5b9 100644
--- a/Documentation/filesystems/ext3.txt
+++ b/Documentation/filesystems/ext3.txt
@@ -57,19 +57,19 @@ oldalloc		This disables the Orlov block allocator and enables the
                        we'd like to get some feedback if it's the contrary for
                        you.
-user_xattr      (*)     Enables POSIX Extended Attributes. It's enabled by
+user_xattr              Enables Extended User Attributes. Additionally, you need
-                        default, however you need to confifure its support
+                        to have extended attribute support enabled in the kernel
-                        (CONFIG_EXT3_FS_XATTR). This is neccesary if you want
+                        configuration (CONFIG_EXT3_FS_XATTR). See the attr(5)
-                        to use POSIX Acces Control Lists support. You can visit
+                        manual page and http://acl.bestbits.at to learn more
-                        http://acl.bestbits.at to know more about POSIX Extended
+                        about extended attributes.
-                        attributes.
+nouser_xattr            Disables Extended User Attributes.
-nouser_xattr            Disables POSIX Extended Attributes.
+acl                     Enables POSIX Access Control Lists support.  Additionally,
-acl             (*)     Enables POSIX Access Control Lists support. This is
+                        you need to have ACL support enabled in the kernel
-                        enabled by default, however you need to configure
+                        configuration (CONFIG_EXT3_FS_POSIX_ACL). See the acl(5)
-                        its support (CONFIG_EXT3_FS_POSIX_ACL). If you want
+                        manual page and http://acl.bestbits.at for more
-                        to know more about ACLs visit http://acl.bestbits.at
+                        information.
 noacl                   This option disables POSIX Access Control List support.
diff --git a/MAINTAINERS b/MAINTAINERS
index 77bb08606912..6af683025ae0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -536,7 +536,7 @@ P:	Mauro Carvalho Chehab
 M:      mchehab@brturbo.com.br
 L:      video4linux-list@redhat.com
 W:      http://linuxtv.org
-T:      quilt http://www.linuxtv.org/download/quilt/
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:      Maintained
 BUSLOGIC SCSI DRIVER
@@ -834,7 +834,7 @@ P:	LinuxTV.org Project
 M:      linux-dvb-maintainer@linuxtv.org
 L:      linux-dvb@linuxtv.org (subscription required)
 W:      http://linuxtv.org/
-T:      quilt http://www.linuxtv.org/download/quilt/
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:      Supported
 EATA-DMA SCSI DRIVER
@@ -1284,8 +1284,8 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
 S:      Supported
 INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS
-P:      Vojtech Pavlik
+P:      Dmitry Torokhov
-M:      vojtech@suse.cz
+M:      dtor_core@ameritech.net
 L:      linux-input@atrey.karlin.mff.cuni.cz
 L:      linux-joystick@atrey.karlin.mff.cuni.cz
 T:      git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
@@ -2896,7 +2896,7 @@ P:	Mauro Carvalho Chehab
 M:      mchehab@brturbo.com.br
 L:      video4linux-list@redhat.com
 W:      http://linuxtv.org
-T:      quilt http://www.linuxtv.org/download/quilt/
+T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:      Maintained
 W1 DALLAS'S 1-WIRE BUS
diff --git a/Makefile b/Makefile
index b1c458c2522d..497884d3d556 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 15
-EXTRAVERSION =-rc5
+EXTRAVERSION =
-NAME=Affluent Albatross
+NAME=Sliding Snow Leopard
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
@@ -408,7 +408,7 @@ outputmakefile:
 # of make so .config is not included in this case either (for *config).
 no-dot-config-targets := clean mrproper distclean \
-                         cscope TAGS tags help %docs check% kernelrelease
+                         cscope TAGS tags help %docs check%
 config-targets := 0
 mixed-targets  := 0
diff --git a/arch/alpha/kernel/machvec_impl.h b/arch/alpha/kernel/machvec_impl.h
index 4959b7a3e1e6..11f996f24fde 100644
--- a/arch/alpha/kernel/machvec_impl.h
+++ b/arch/alpha/kernel/machvec_impl.h
@@ -41,7 +41,7 @@
 #define CAT1(x,y)  x##y
 #define CAT(x,y)   CAT1(x,y)
-#define DO_DEFAULT_RTC rtc_port: 0x70
+#define DO_DEFAULT_RTC .rtc_port = 0x70
 #define DO_EV4_MMU                                                      \
        .max_asn =                      EV4_MAX_ASN,                    \
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 2ad4aa2a1536..55076a75e5bf 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -131,7 +131,7 @@ __syscall_start:
                .long   sys_wait4
 /* 115 */       .long   sys_swapoff
                .long   sys_sysinfo
-                .long   sys_ipc_wrapper
+                .long   sys_ipc
                .long   sys_fsync
                .long   sys_sigreturn_wrapper
 /* 120 */       .long   sys_clone_wrapper
@@ -254,7 +254,7 @@ __syscall_start:
                .long   sys_fremovexattr
                .long   sys_tkill
                .long   sys_sendfile64
-/* 240 */       .long   sys_futex_wrapper
+/* 240 */       .long   sys_futex
                .long   sys_sched_setaffinity
                .long   sys_sched_getaffinity
                .long   sys_io_setup
@@ -284,7 +284,7 @@ __syscall_start:
                .long   sys_fstatfs64
                .long   sys_tgkill
                .long   sys_utimes
-/* 270 */       .long   sys_arm_fadvise64_64_wrapper
+/* 270 */       .long   sys_arm_fadvise64_64
                .long   sys_pciconfig_iobase
                .long   sys_pciconfig_read
                .long   sys_pciconfig_write
@@ -333,7 +333,7 @@ __syscall_start:
                .long   sys_inotify_init
                .long   sys_inotify_add_watch
                .long   sys_inotify_rm_watch
-                .long   sys_mbind_wrapper
+                .long   sys_mbind
 /* 320 */       .long   sys_get_mempolicy
                .long   sys_set_mempolicy
 __syscall_end:
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index d9fb819bf7cc..2a8d27e18fa7 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -614,6 +614,47 @@ __kuser_helper_start:
 /*
 * Reference prototype:
 *
+ *      void __kernel_memory_barrier(void)
+ *
+ * Input:
+ *
+ *      lr = return address
+ *
+ * Output:
+ *
+ *      none
+ *
+ * Clobbered:
+ *
+ *      the Z flag might be lost
+ *
+ * Definition and user space usage example:
+ *
+ *      typedef void (__kernel_dmb_t)(void);
+ *      #define __kernel_dmb (*(__kernel_dmb_t *)0xffff0fa0)
+ *
+ * Apply any needed memory barrier to preserve consistency with data modified
+ * manually and __kuser_cmpxchg usage.
+ *
+ * This could be used as follows:
+ *
+ * #define __kernel_dmb() \
+ *         asm volatile ( "mov r0, #0xffff0fff; mov lr, pc; sub pc, r0, #95" \
+ *              : : : "lr","cc" )
+ */
+__kuser_memory_barrier:                         @ 0xffff0fa0
+#if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_SMP)
+        mcr     p15, 0, r0, c7, c10, 5  @ dmb
+#endif
+        mov     pc, lr
+        .align  5
+/*
+ * Reference prototype:
+ *
 *      int __kernel_cmpxchg(int oldval, int newval, int *ptr)
 *
 * Input:
@@ -642,6 +683,8 @@ __kuser_helper_start:
 * The C flag is also set if *ptr was changed to allow for assembly
 * optimization in the calling code.
 *
+ * Note: this routine already includes memory barriers as needed.
+ *
 * For example, a user space atomic_add implementation could look like this:
 *
 * #define atomic_add(ptr, val) \
@@ -698,10 +741,16 @@ __kuser_cmpxchg:				@ 0xffff0fc0
 #else
+#ifdef CONFIG_SMP
+        mcr     p15, 0, r0, c7, c10, 5  @ dmb
+#endif
        ldrex   r3, [r2]
        subs    r3, r3, r0
        strexeq r3, r1, [r2]
        rsbs    r0, r3, #0
+#ifdef CONFIG_SMP
+        mcr     p15, 0, r0, c7, c10, 5  @ dmb
+#endif
        mov     pc, lr
 #endif
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index f7f183075237..e2b42997ad33 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -145,7 +145,7 @@ ENTRY(vector_swi)
 #endif
        enable_irq
-        str     r4, [sp, #-S_OFF]!              @ push fifth arg
+        stmdb   sp!, {r4, r5}                   @ push fifth and sixth args
        get_thread_info tsk
        ldr     ip, [tsk, #TI_FLAGS]            @ check for syscall tracing
@@ -204,7 +204,7 @@ ENTRY(sys_call_table)
 * Special system call wrappers
 */
 @ r0 = syscall number
-@ r5 = syscall table
+@ r8 = syscall table
                .type   sys_syscall, #function
 sys_syscall:
                eor     scno, r0, #__NR_SYSCALL_BASE
@@ -255,22 +255,6 @@ sys_sigaltstack_wrapper:
                ldr     r2, [sp, #S_OFF + S_SP]
                b       do_sigaltstack
-sys_futex_wrapper:
-                str     r5, [sp, #4]            @ push sixth arg
-                b       sys_futex
-sys_arm_fadvise64_64_wrapper:
-                str     r5, [sp, #4]            @ push r5 to stack
-                b       sys_arm_fadvise64_64
-sys_mbind_wrapper:
-                str     r5, [sp, #4]
-                b       sys_mbind
-sys_ipc_wrapper:
-                str     r5, [sp, #4]            @ push sixth arg
-                b       sys_ipc
 /*
 * Note: off_4k (r5) is always units of 4K.  If we can't do the requested
 * offset, we return EINVAL.
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index 6055e1427ba3..055bf5d28894 100644
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -101,6 +101,8 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
                        break;
                case R_ARM_PC24:
+                case R_ARM_CALL:
+                case R_ARM_JUMP24:
                        offset = (*(u32 *)loc & 0x00ffffff) << 2;
                        if (offset & 0x02000000)
                                offset -= 0x04000000;
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index 9a340e790da5..2b84f78d7b0f 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -242,6 +242,15 @@ get_branch_address(struct task_struct *child, unsigned long pc, unsigned long in
                 */
                long aluop1, aluop2, ccbit;
+                if ((insn & 0x0fffffd0) == 0x012fff10) {
+                        /*
+                         * bx or blx
+                         */
+                        alt = get_user_reg(child, insn & 15);
+                        break;
+                }
                if ((insn & 0xf000) != 0xf000)
                        break;
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index f74b9af112dc..852ea72d8c80 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -155,19 +155,20 @@ int pxa_pm_enter(suspend_state_t state)
        PSPR = 0;
        /* restore registers */
+        RESTORE_GPLEVEL(0); RESTORE_GPLEVEL(1); RESTORE_GPLEVEL(2);
+        RESTORE(GPDR0); RESTORE(GPDR1); RESTORE(GPDR2);
        RESTORE(GAFR0_L); RESTORE(GAFR0_U);
        RESTORE(GAFR1_L); RESTORE(GAFR1_U);
        RESTORE(GAFR2_L); RESTORE(GAFR2_U);
-        RESTORE_GPLEVEL(0); RESTORE_GPLEVEL(1); RESTORE_GPLEVEL(2);
-        RESTORE(GPDR0); RESTORE(GPDR1); RESTORE(GPDR2);
        RESTORE(GRER0); RESTORE(GRER1); RESTORE(GRER2);
        RESTORE(GFER0); RESTORE(GFER1); RESTORE(GFER2);
        RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2);
 #ifdef CONFIG_PXA27x
        RESTORE(MDREFR);
-        RESTORE(GAFR3_L); RESTORE(GAFR3_U); RESTORE_GPLEVEL(3);
+        RESTORE_GPLEVEL(3); RESTORE(GPDR3);
-        RESTORE(GPDR3); RESTORE(GRER3); RESTORE(GFER3); RESTORE(PGSR3);
+        RESTORE(GAFR3_L); RESTORE(GAFR3_U);
+        RESTORE(GRER3); RESTORE(GFER3); RESTORE(PGSR3);
        RESTORE(PWER); RESTORE(PCFR); RESTORE(PRER);
        RESTORE(PFER); RESTORE(PKWR);
 #endif
diff --git a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c
index 32b0c24ab9a6..19edcd526ba4 100644
--- a/arch/i386/kernel/kprobes.c
+++ b/arch/i386/kernel/kprobes.c
@@ -191,7 +191,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
                         */
                        save_previous_kprobe(kcb);
                        set_current_kprobe(p, regs, kcb);
-                        p->nmissed++;
+                        kprobes_inc_nmissed_count(p);
                        prepare_singlestep(p, regs);
                        kcb->kprobe_status = KPROBE_REENTER;
                        return 1;
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index df6c2bcde067..2333aead0563 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -554,7 +554,9 @@ int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
        struct pt_regs ptregs;
        
        ptregs = *(struct pt_regs *)
-                ((unsigned long)tsk->thread_info+THREAD_SIZE - sizeof(ptregs));
+                ((unsigned long)tsk->thread_info +
+                /* see comments in copy_thread() about -8 */
+                THREAD_SIZE - sizeof(ptregs) - 8);
        ptregs.xcs &= 0xffff;
        ptregs.xds &= 0xffff;
        ptregs.xes &= 0xffff;
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index d16520da4550..9ed449af8e9f 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -1338,8 +1338,7 @@ int __cpu_disable(void)
        if (cpu == 0)
                return -EBUSY;
-        /* We enable the timer again on the exit path of the death loop */
+        clear_local_APIC();
-        disable_APIC_timer();
        /* Allow any queued timer interrupts to get serviced */
        local_irq_enable();
        mdelay(1);
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index c34d1bfc5161..f0dffa03fbba 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -650,13 +650,6 @@ fastcall void do_nmi(struct pt_regs * regs, long error_code)
        cpu = smp_processor_id();
-#ifdef CONFIG_HOTPLUG_CPU
-        if (!cpu_online(cpu)) {
-                nmi_exit();
-                return;
-        }
-#endif
        ++nmi_count(cpu);
        if (!rcu_dereference(nmi_callback)(regs, cpu))
diff --git a/arch/i386/mm/ioremap.c b/arch/i386/mm/ioremap.c
index 5d09de8d1c6b..247fde76aaed 100644
--- a/arch/i386/mm/ioremap.c
+++ b/arch/i386/mm/ioremap.c
@@ -223,9 +223,15 @@ void __iomem *ioremap_nocache (unsigned long phys_addr, unsigned long size)
 }
 EXPORT_SYMBOL(ioremap_nocache);
+/**
+ * iounmap - Free a IO remapping
+ * @addr: virtual address from ioremap_*
+ *
+ * Caller must ensure there is only one unmapping for the same pointer.
+ */
 void iounmap(volatile void __iomem *addr)
 {
-        struct vm_struct *p;
+        struct vm_struct *p, *o;
        if ((void __force *)addr <= high_memory)
                return;
@@ -239,22 +245,37 @@ void iounmap(volatile void __iomem *addr)
                        addr < phys_to_virt(ISA_END_ADDRESS))
                return;
-        write_lock(&vmlist_lock);
+        addr = (volatile void __iomem *)(PAGE_MASK & (unsigned long __force)addr);
-        p = __remove_vm_area((void *)(PAGE_MASK & (unsigned long __force)addr));
-        if (!p) { 
+        /* Use the vm area unlocked, assuming the caller
-                printk(KERN_WARNING "iounmap: bad address %p\n", addr);
+           ensures there isn't another iounmap for the same address
+           in parallel. Reuse of the virtual address is prevented by
+           leaving it in the global lists until we're done with it.
+           cpa takes care of the direct mappings. */
+        read_lock(&vmlist_lock);
+        for (p = vmlist; p; p = p->next) {
+                if (p->addr == addr)
+                        break;
+        }
+        read_unlock(&vmlist_lock);
+        if (!p) {
+                printk("iounmap: bad address %p\n", addr);
                dump_stack();
-                goto out_unlock;
+                return;
        }
+        /* Reset the direct mapping. Can block */
        if ((p->flags >> 20) && p->phys_addr < virt_to_phys(high_memory) - 1) {
                change_page_attr(virt_to_page(__va(p->phys_addr)),
                                 p->size >> PAGE_SHIFT,
                                 PAGE_KERNEL);
                global_flush_tlb();
        } 
-out_unlock:
-        write_unlock(&vmlist_lock);
+        /* Finally remove it */
+        o = remove_vm_area((void *)addr);
+        BUG_ON(p != o || o == NULL);
        kfree(p); 
 }
 EXPORT_SYMBOL(iounmap);
diff --git a/arch/i386/pci/Makefile b/arch/i386/pci/Makefile
index ead6122dd06d..5461d4d5ea1e 100644
--- a/arch/i386/pci/Makefile
+++ b/arch/i386/pci/Makefile
@@ -1,7 +1,7 @@
 obj-y                           := i386.o
 obj-$(CONFIG_PCI_BIOS)          += pcbios.o
-obj-$(CONFIG_PCI_MMCONFIG)      += mmconfig.o
+obj-$(CONFIG_PCI_MMCONFIG)      += mmconfig.o direct.o
 obj-$(CONFIG_PCI_DIRECT)        += direct.o
 pci-y                           := fixup.o
diff --git a/arch/i386/pci/direct.c b/arch/i386/pci/direct.c
index 94331d6be7a3..e3ac502bf2fb 100644
--- a/arch/i386/pci/direct.c
+++ b/arch/i386/pci/direct.c
@@ -13,7 +13,7 @@
 #define PCI_CONF1_ADDRESS(bus, devfn, reg) \
        (0x80000000 | (bus << 16) | (devfn << 8) | (reg & ~3))
-static int pci_conf1_read(unsigned int seg, unsigned int bus,
+int pci_conf1_read(unsigned int seg, unsigned int bus,
                          unsigned int devfn, int reg, int len, u32 *value)
 {
        unsigned long flags;
@@ -42,7 +42,7 @@ static int pci_conf1_read(unsigned int seg, unsigned int bus,
        return 0;
 }
-static int pci_conf1_write(unsigned int seg, unsigned int bus,
+int pci_conf1_write(unsigned int seg, unsigned int bus,
                           unsigned int devfn, int reg, int len, u32 value)
 {
        unsigned long flags;
diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index dfbf80cff834..4bb4d4b0f73a 100644
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
@@ -19,21 +19,25 @@
 /* The base address of the last MMCONFIG device accessed */
 static u32 mmcfg_last_accessed_device;
+static DECLARE_BITMAP(fallback_slots, 32);
 /*
 * Functions for accessing PCI configuration space with MMCONFIG accesses
 */
-static u32 get_base_addr(unsigned int seg, int bus)
+static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn)
 {
        int cfg_num = -1;
        struct acpi_table_mcfg_config *cfg;
+        if (seg == 0 && bus == 0 &&
+            test_bit(PCI_SLOT(devfn), fallback_slots))
+                return 0;
        while (1) {
                ++cfg_num;
                if (cfg_num >= pci_mmcfg_config_num) {
-                        /* something bad is going on, no cfg table is found. */
+                        /* Not found - fallback to type 1 */
-                        /* so we fall back to the old way we used to do this */
+                        return 0;
-                        /* and just rely on the first entry to be correct. */
-                        return pci_mmcfg_config[0].base_address;
                }
                cfg = &pci_mmcfg_config[cfg_num];
                if (cfg->pci_segment_group_number != seg)
@@ -44,9 +48,9 @@ static u32 get_base_addr(unsigned int seg, int bus)
        }
 }
-static inline void pci_exp_set_dev_base(unsigned int seg, int bus, int devfn)
+static inline void pci_exp_set_dev_base(unsigned int base, int bus, int devfn)
 {
-        u32 dev_base = get_base_addr(seg, bus) | (bus << 20) | (devfn << 12);
+        u32 dev_base = base | (bus << 20) | (devfn << 12);
        if (dev_base != mmcfg_last_accessed_device) {
                mmcfg_last_accessed_device = dev_base;
                set_fixmap_nocache(FIX_PCIE_MCFG, dev_base);
@@ -57,13 +61,18 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
                          unsigned int devfn, int reg, int len, u32 *value)
 {
        unsigned long flags;
+        u32 base;
        if (!value || (bus > 255) || (devfn > 255) || (reg > 4095))
                return -EINVAL;
+        base = get_base_addr(seg, bus, devfn);
+        if (!base)
+                return pci_conf1_read(seg,bus,devfn,reg,len,value);
        spin_lock_irqsave(&pci_config_lock, flags);
-        pci_exp_set_dev_base(seg, bus, devfn);
+        pci_exp_set_dev_base(base, bus, devfn);
        switch (len) {
        case 1:
@@ -86,13 +95,18 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
                           unsigned int devfn, int reg, int len, u32 value)
 {
        unsigned long flags;
+        u32 base;
        if ((bus > 255) || (devfn > 255) || (reg > 4095)) 
                return -EINVAL;
+        base = get_base_addr(seg, bus, devfn);
+        if (!base)
+                return pci_conf1_write(seg,bus,devfn,reg,len,value);
        spin_lock_irqsave(&pci_config_lock, flags);
-        pci_exp_set_dev_base(seg, bus, devfn);
+        pci_exp_set_dev_base(base, bus, devfn);
        switch (len) {
        case 1:
@@ -116,6 +130,37 @@ static struct pci_raw_ops pci_mmcfg = {
        .write =        pci_mmcfg_write,
 };
+/* K8 systems have some devices (typically in the builtin northbridge)
+   that are only accessible using type1
+   Normally this can be expressed in the MCFG by not listing them
+   and assigning suitable _SEGs, but this isn't implemented in some BIOS.
+   Instead try to discover all devices on bus 0 that are unreachable using MM
+   and fallback for them.
+   We only do this for bus 0/seg 0 */
+static __init void unreachable_devices(void)
+{
+        int i;
+        unsigned long flags;
+        for (i = 0; i < 32; i++) {
+                u32 val1;
+                u32 addr;
+                pci_conf1_read(0, 0, PCI_DEVFN(i, 0), 0, 4, &val1);
+                if (val1 == 0xffffffff)
+                        continue;
+                /* Locking probably not needed, but safer */
+                spin_lock_irqsave(&pci_config_lock, flags);
+                addr = get_base_addr(0, 0, PCI_DEVFN(i, 0));
+                if (addr != 0)
+                        pci_exp_set_dev_base(addr, 0, PCI_DEVFN(i, 0));
+                if (addr == 0 || readl((u32 __iomem *)mmcfg_virt_addr) != val1)
+                        set_bit(i, fallback_slots);
+                spin_unlock_irqrestore(&pci_config_lock, flags);
+        }
+}
 static int __init pci_mmcfg_init(void)
 {
        if ((pci_probe & PCI_PROBE_MMCONF) == 0)
@@ -131,6 +176,8 @@ static int __init pci_mmcfg_init(void)
        raw_pci_ops = &pci_mmcfg;
        pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
+        unreachable_devices();
 out:
        return 0;
 }
diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h
index 127d53ad16be..f550781ec310 100644
--- a/arch/i386/pci/pci.h
+++ b/arch/i386/pci/pci.h
@@ -74,3 +74,10 @@ extern spinlock_t pci_config_lock;
 extern int (*pcibios_enable_irq)(struct pci_dev *dev);
 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
+extern int pci_conf1_write(unsigned int seg, unsigned int bus,
+                           unsigned int devfn, int reg, int len, u32 value);
+extern int pci_conf1_read(unsigned int seg, unsigned int bus,
+                          unsigned int devfn, int reg, int len, u32 *value);
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index b76ce1fe2e7f..199eeaf0f4e3 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -58,7 +58,7 @@ config IA64_UNCACHED_ALLOCATOR
        bool
        select GENERIC_ALLOCATOR
-config ZONE_DMA_IS_DMA32
+config DMA_IS_DMA32
        bool
        default y
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig
index 87cfd31a4a39..ff8bb3770c9d 100644
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-rc6
+# Linux kernel version: 2.6.15-rc4
-# Tue Aug 16 14:40:41 2005
+# Fri Dec  2 10:33:48 2005
 #
 #
@@ -16,6 +16,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # General setup
 #
 CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
@@ -26,6 +27,7 @@ CONFIG_HOTPLUG=y
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
 CONFIG_CPUSETS=y
+CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
@@ -56,11 +58,29 @@ CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
 #
+# Block layer
+#
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+#
 # Processor type and features
 #
 CONFIG_IA64=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
+CONFIG_SWIOTLB=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_TIME_INTERPOLATION=y
@@ -68,6 +88,7 @@ CONFIG_EFI=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_IA64_UNCACHED_ALLOCATOR=y
+CONFIG_ZONE_DMA_IS_DMA32=y
 # CONFIG_IA64_GENERIC is not set
 # CONFIG_IA64_DIG is not set
 # CONFIG_IA64_HP_ZX1 is not set
@@ -87,16 +108,12 @@ CONFIG_HZ_250=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
 CONFIG_IA64_L1_CACHE_SHIFT=7
-CONFIG_NUMA=y
-CONFIG_VIRTUAL_MEM_MAP=y
-CONFIG_HOLES_IN_ZONE=y
-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
 # CONFIG_IA64_CYCLONE is not set
 CONFIG_IOSAPIC=y
 CONFIG_IA64_SGI_SN_XP=m
-CONFIG_FORCE_MAX_ZONEORDER=18
+CONFIG_FORCE_MAX_ZONEORDER=17
 CONFIG_SMP=y
-CONFIG_NR_CPUS=512
+CONFIG_NR_CPUS=1024
 # CONFIG_HOTPLUG_CPU is not set
 CONFIG_SCHED_SMT=y
 CONFIG_PREEMPT=y
@@ -107,7 +124,17 @@ CONFIG_DISCONTIGMEM_MANUAL=y
 CONFIG_DISCONTIGMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_DEC_LOCK=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
+CONFIG_NUMA=y
+CONFIG_VIRTUAL_MEM_MAP=y
+CONFIG_HOLES_IN_ZONE=y
+CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
 CONFIG_IA32_SUPPORT=y
 CONFIG_COMPAT=y
 CONFIG_IA64_MCA_RECOVERY=y
@@ -126,28 +153,35 @@ CONFIG_BINFMT_ELF=y
 # Power management and ACPI
 #
 CONFIG_PM=y
-CONFIG_ACPI=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
+CONFIG_ACPI=y
 # CONFIG_ACPI_BUTTON is not set
 # CONFIG_ACPI_FAN is not set
 # CONFIG_ACPI_PROCESSOR is not set
 CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_POWER=y
 CONFIG_ACPI_SYSTEM=y
 # CONFIG_ACPI_CONTAINER is not set
 #
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+#
 # Bus options (PCI, PCMCIA)
 #
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_MSI is not set
 CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=y
 # CONFIG_PCI_DEBUG is not set
 #
@@ -191,8 +225,8 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
+CONFIG_INET_DIAG=m
-# CONFIG_IP_TCPDIAG_IPV6 is not set
+CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_BIC=y
 CONFIG_IPV6=m
@@ -205,6 +239,11 @@ CONFIG_IPV6=m
 # CONFIG_NETFILTER is not set
 #
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+#
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
@@ -220,8 +259,11 @@ CONFIG_IPV6=m
 # CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+#
+# QoS and/or fair queueing
+#
 # CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
 #
 # Network testing
@@ -230,6 +272,7 @@ CONFIG_IPV6=m
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
 #
 # Device Drivers
@@ -244,6 +287,11 @@ CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 #
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+#
 # Memory Technology Devices (MTD)
 #
 # CONFIG_MTD is not set
@@ -275,16 +323,7 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CDROM_PKTCDVD is not set
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
 CONFIG_ATA_OVER_ETH=m
 #
@@ -349,6 +388,7 @@ CONFIG_IDEDMA_AUTO=y
 #
 # SCSI device support
 #
+# CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
 CONFIG_SCSI_PROC_FS=y
@@ -375,11 +415,13 @@ CONFIG_SCSI_CONSTANTS=y
 #
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_SCSI_FC_ATTRS=y
-# CONFIG_SCSI_ISCSI_ATTRS is not set
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=y
 #
 # SCSI low-level drivers
 #
+CONFIG_ISCSI_TCP=m
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_ACARD is not set
@@ -389,15 +431,19 @@ CONFIG_SCSI_FC_ATTRS=y
 # CONFIG_SCSI_AIC79XX is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
 CONFIG_SCSI_SATA=y
 # CONFIG_SCSI_SATA_AHCI is not set
 # CONFIG_SCSI_SATA_SVW is not set
 # CONFIG_SCSI_ATA_PIIX is not set
+# CONFIG_SCSI_SATA_MV is not set
 # CONFIG_SCSI_SATA_NV is not set
-# CONFIG_SCSI_SATA_PROMISE is not set
+# CONFIG_SCSI_PDC_ADMA is not set
 # CONFIG_SCSI_SATA_QSTOR is not set
+# CONFIG_SCSI_SATA_PROMISE is not set
 # CONFIG_SCSI_SATA_SX4 is not set
 # CONFIG_SCSI_SATA_SIL is not set
+# CONFIG_SCSI_SATA_SIL24 is not set
 # CONFIG_SCSI_SATA_SIS is not set
 # CONFIG_SCSI_SATA_ULI is not set
 # CONFIG_SCSI_SATA_VIA is not set
@@ -411,7 +457,6 @@ CONFIG_SCSI_SATA_VITESSE=y
 # CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_QLOGIC_FC is not set
 CONFIG_SCSI_QLOGIC_1280=y
-# CONFIG_SCSI_QLOGIC_1280_1040 is not set
 CONFIG_SCSI_QLA2XXX=y
 # CONFIG_SCSI_QLA21XX is not set
 CONFIG_SCSI_QLA22XX=y
@@ -451,6 +496,7 @@ CONFIG_DM_MULTIPATH_EMC=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=y
 CONFIG_FUSION_FC=y
+CONFIG_FUSION_SAS=y
 CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_CTL=m
@@ -479,6 +525,10 @@ CONFIG_NETDEVICES=y
 # CONFIG_ARCNET is not set
 #
+# PHY device support
+#
+#
 # Ethernet (10 or 100Mbit)
 #
 # CONFIG_NET_ETHERNET is not set
@@ -493,6 +543,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 # CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SK98LIN is not set
 CONFIG_TIGON3=y
@@ -501,10 +552,10 @@ CONFIG_TIGON3=y
 #
 # Ethernet (10000 Mbit)
 #
+CONFIG_CHELSIO_T1=m
 # CONFIG_IXGB is not set
 CONFIG_S2IO=m
 # CONFIG_S2IO_NAPI is not set
-# CONFIG_2BUFF_MODE is not set
 #
 # Token Ring devices
@@ -583,6 +634,7 @@ CONFIG_HW_CONSOLE=y
 CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_ROCKETPORT is not set
 # CONFIG_CYCLADES is not set
+# CONFIG_DIGIEPCA is not set
 # CONFIG_MOXA_SMARTIO is not set
 # CONFIG_ISI is not set
 # CONFIG_SYNCLINKMP is not set
@@ -629,7 +681,8 @@ CONFIG_EFI_RTC=y
 #
 # Ftape, the floppy tape device driver
 #
-# CONFIG_AGP is not set
+CONFIG_AGP=y
+CONFIG_AGP_SGI_TIOCA=y
 # CONFIG_DRM is not set
 CONFIG_RAW_DRIVER=m
 # CONFIG_HPET is not set
@@ -641,12 +694,12 @@ CONFIG_MMTIMER=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
 #
 # I2C support
 #
 # CONFIG_I2C is not set
-# CONFIG_I2C_SENSOR is not set
 #
 # Dallas's 1-wire bus
@@ -657,12 +710,17 @@ CONFIG_MMTIMER=y
 # Hardware Monitoring support
 #
 # CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
 #
 # Misc devices
 #
 #
+# Multimedia Capabilities Port drivers
+#
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
@@ -721,12 +779,15 @@ CONFIG_USB_UHCI_HCD=m
 #
 # USB Device Class drivers
 #
-# CONFIG_USB_BLUETOOTH_TTY is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+#
+# may also be needed; see USB_STORAGE Help for more information
 #
 # CONFIG_USB_STORAGE is not set
@@ -751,9 +812,11 @@ CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_MTOUCH is not set
 # CONFIG_USB_ITMTOUCH is not set
 # CONFIG_USB_EGALAX is not set
+# CONFIG_USB_YEALINK is not set
 # CONFIG_USB_XPAD is not set
 # CONFIG_USB_ATI_REMOTE is not set
 # CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
 #
 # USB Imaging devices
@@ -824,11 +887,13 @@ CONFIG_USB_MON=y
 # InfiniBand support
 #
 CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_VERBS=m
+# CONFIG_INFINIBAND_USER_MAD is not set
+CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_MTHCA=m
 # CONFIG_INFINIBAND_MTHCA_DEBUG is not set
 CONFIG_INFINIBAND_IPOIB=m
 # CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
 #
 # SN Devices
@@ -858,16 +923,12 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-#
-# XFS support
-#
 CONFIG_XFS_FS=y
 CONFIG_XFS_EXPORT=y
-CONFIG_XFS_RT=y
 CONFIG_XFS_QUOTA=y
 # CONFIG_XFS_SECURITY is not set
 CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_INOTIFY=y
@@ -878,6 +939,7 @@ CONFIG_QUOTACTL=y
 CONFIG_DNOTIFY=y
 CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
 #
 # CD-ROM/DVD Filesystems
@@ -904,13 +966,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
 CONFIG_SYSFS=y
-# CONFIG_DEVPTS_FS_XATTR is not set
 CONFIG_TMPFS=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_TMPFS_SECURITY=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_RAMFS=y
+CONFIG_RELAYFS_FS=m
 #
 # Miscellaneous filesystems
@@ -959,6 +1019,7 @@ CONFIG_CIFS=m
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
 #
 # Partition Types
@@ -1028,18 +1089,21 @@ CONFIG_NLS_UTF8=y
 # Library routines
 #
 # CONFIG_CRC_CCITT is not set
+CONFIG_CRC16=m
 CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
+CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
 #
-# Profiling support
+# Instrumentation Support
 #
 # CONFIG_PROFILING is not set
+# CONFIG_KPROBES is not set
 #
 # Kernel hacking
@@ -1048,6 +1112,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_LOG_BUF_SHIFT=20
+CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_PREEMPT=y
@@ -1056,7 +1121,8 @@ CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_FS is not set
-# CONFIG_KPROBES is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_IA64_GRANULE_16MB=y
 # CONFIG_IA64_GRANULE_64MB is not set
 # CONFIG_IA64_PRINT_HAZARDS is not set
@@ -1097,7 +1163,7 @@ CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_DEFLATE=m
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_CRC32C is not set
+CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_TEST is not set
 #
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig
index 9bc8bcafc905..b1e8f09e9fd5 100644
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.14-rc1
+# Linux kernel version: 2.6.15-rc4
-# Wed Sep 14 15:17:57 2005
+# Fri Dec  2 16:06:32 2005
 #
 #
@@ -59,17 +59,36 @@ CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
 #
+# Block layer
+#
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+#
 # Processor type and features
 #
 CONFIG_IA64=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
+CONFIG_SWIOTLB=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_TIME_INTERPOLATION=y
 CONFIG_EFI=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ZONE_DMA_IS_DMA32=y
 # CONFIG_IA64_GENERIC is not set
 CONFIG_IA64_DIG=y
 # CONFIG_IA64_HP_ZX1 is not set
@@ -82,18 +101,16 @@ CONFIG_MCKINLEY=y
 # CONFIG_IA64_PAGE_SIZE_8KB is not set
 CONFIG_IA64_PAGE_SIZE_16KB=y
 # CONFIG_IA64_PAGE_SIZE_64KB is not set
+CONFIG_PGTABLE_3=y
+# CONFIG_PGTABLE_4 is not set
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
 CONFIG_IA64_L1_CACHE_SHIFT=7
-# CONFIG_NUMA is not set
-CONFIG_VIRTUAL_MEM_MAP=y
-CONFIG_HOLES_IN_ZONE=y
 CONFIG_IA64_CYCLONE=y
 CONFIG_IOSAPIC=y
-# CONFIG_IA64_SGI_SN_XP is not set
+CONFIG_FORCE_MAX_ZONEORDER=17
-CONFIG_FORCE_MAX_ZONEORDER=18
 CONFIG_SMP=y
 CONFIG_NR_CPUS=4
 CONFIG_HOTPLUG_CPU=y
@@ -106,7 +123,13 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_HAVE_DEC_LOCK=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_VIRTUAL_MEM_MAP=y
+CONFIG_HOLES_IN_ZONE=y
 CONFIG_IA32_SUPPORT=y
 CONFIG_COMPAT=y
 CONFIG_IA64_MCA_RECOVERY=y
@@ -118,7 +141,6 @@ CONFIG_IA64_PALINFO=y
 #
 CONFIG_EFI_VARS=y
 CONFIG_EFI_PCDP=y
-# CONFIG_DELL_RBU is not set
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=m
@@ -126,6 +148,7 @@ CONFIG_BINFMT_MISC=m
 # Power management and ACPI
 #
 CONFIG_PM=y
+CONFIG_PM_LEGACY=y
 # CONFIG_PM_DEBUG is not set
 #
@@ -226,14 +249,16 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+#
+# QoS and/or fair queueing
+#
 # CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
 #
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
@@ -295,14 +320,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
 # CONFIG_ATA_OVER_ETH is not set
 #
@@ -400,6 +417,7 @@ CONFIG_SCSI_FC_ATTRS=y
 #
 # SCSI low-level drivers
 #
+# CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_ACARD is not set
@@ -409,6 +427,7 @@ CONFIG_SCSI_FC_ATTRS=y
 # CONFIG_SCSI_AIC79XX is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
 # CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -424,7 +443,6 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_QLOGIC_FC=y
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
 CONFIG_SCSI_QLOGIC_1280=y
-# CONFIG_SCSI_QLOGIC_1280_1040 is not set
 CONFIG_SCSI_QLA2XXX=y
 CONFIG_SCSI_QLA21XX=m
 CONFIG_SCSI_QLA22XX=m
@@ -463,6 +481,7 @@ CONFIG_DM_ZERO=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=y
 CONFIG_FUSION_FC=y
+# CONFIG_FUSION_SAS is not set
 CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_CTL=y
@@ -503,6 +522,7 @@ CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
 #
@@ -727,6 +747,7 @@ CONFIG_MAX_RAW_DEVS=256
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
 #
 # I2C support
@@ -812,12 +833,15 @@ CONFIG_USB_UHCI_HCD=y
 #
 # USB Device Class drivers
 #
-# CONFIG_USB_BLUETOOTH_TTY is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+#
+# may also be needed; see USB_STORAGE Help for more information
 #
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
@@ -1123,9 +1147,10 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_PENDING_IRQ=y
 #
-# Profiling support
+# Instrumentation Support
 #
 # CONFIG_PROFILING is not set
+# CONFIG_KPROBES is not set
 #
 # Kernel hacking
@@ -1142,7 +1167,8 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_FS is not set
-# CONFIG_KPROBES is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_IA64_GRANULE_16MB=y
 # CONFIG_IA64_GRANULE_64MB is not set
 # CONFIG_IA64_PRINT_HAZARDS is not set
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
index a7280d9f6c16..4e7a6a1ec6c7 100644
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -261,8 +261,6 @@ elf32_set_personality (void)
 {
        set_personality(PER_LINUX32);
        current->thread.map_base  = IA32_PAGE_OFFSET/3;
-        current->thread.task_size = IA32_PAGE_OFFSET;   /* use what Linux/x86 uses... */
-        set_fs(USER_DS);                                /* set addr limit for new TASK_SIZE */
 }
 static unsigned long
diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h
index e3e9290e3ff2..68ceb4e690c7 100644
--- a/arch/ia64/ia32/ia32priv.h
+++ b/arch/ia64/ia32/ia32priv.h
@@ -305,7 +305,6 @@ struct old_linux32_dirent {
 #define ELF_DATA        ELFDATA2LSB
 #define ELF_ARCH        EM_386
-#define IA32_PAGE_OFFSET        0xc0000000
 #define IA32_STACK_TOP          IA32_PAGE_OFFSET
 #define IA32_GATE_OFFSET        IA32_PAGE_OFFSET
 #define IA32_GATE_END           IA32_PAGE_OFFSET + PAGE_SIZE
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 2895d6e6062f..89a70400c4f6 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -630,7 +630,7 @@ static int __kprobes pre_kprobes_handler(struct die_args *args)
                         */
                        save_previous_kprobe(kcb);
                        set_current_kprobe(p, kcb);
-                        p->nmissed++;
+                        kprobes_inc_nmissed_count(p);
                        prepare_ss(p, regs);
                        kcb->kprobe_status = KPROBE_REENTER;
                        return 1;
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 2e33665d9c18..e9904c74d2ba 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -721,8 +721,13 @@ flush_thread (void)
        /* drop floating-point and debug-register state if it exists: */
        current->thread.flags &= ~(IA64_THREAD_FPH_VALID | IA64_THREAD_DBG_VALID);
        ia64_drop_fpu(current);
-        if (IS_IA32_PROCESS(ia64_task_regs(current)))
+#ifdef CONFIG_IA32_SUPPORT
+        if (IS_IA32_PROCESS(ia64_task_regs(current))) {
                ia32_drop_partial_page_list(current);
+                current->thread.task_size = IA32_PAGE_OFFSET;
+                set_fs(USER_DS);
+        }
+#endif
 }
 /*
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index ca68e6e44a72..1461dc660b43 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -293,7 +293,7 @@ retry:
                if (file->f_flags & O_NONBLOCK)
                        return -EAGAIN;
                if (down_interruptible(&data->sem))
-                        return -ERESTARTSYS;
+                        return -EINTR;
        }
        n = data->cpu_check;
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 5b7e736f3b49..028a2b95936c 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -249,3 +249,32 @@ time_init (void)
         */
        set_normalized_timespec(&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec);
 }
+#define SMALLUSECS 100
+void
+udelay (unsigned long usecs)
+{
+        unsigned long start;
+        unsigned long cycles;
+        unsigned long smallusecs;
+        /*
+         * Execute the non-preemptible delay loop (because the ITC might
+         * not be synchronized between CPUS) in relatively short time
+         * chunks, allowing preemption between the chunks.
+         */
+        while (usecs > 0) {
+                smallusecs = (usecs > SMALLUSECS) ? SMALLUSECS : usecs;
+                preempt_disable();
+                cycles = smallusecs*local_cpu_data->cyc_per_usec;
+                start = ia64_get_itc();
+                while (ia64_get_itc() - start < cycles)
+                        cpu_relax();
+                preempt_enable();
+                usecs -= smallusecs;
+        }
+}
+EXPORT_SYMBOL(udelay);
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c
index c6d40446c2c4..b631cf86ed44 100644
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
@@ -53,7 +53,7 @@ static void uncached_ipi_visibility(void *data)
        if ((status != PAL_VISIBILITY_OK) &&
            (status != PAL_VISIBILITY_OK_REMOTE_NEEDED))
                printk(KERN_DEBUG "pal_prefetch_visibility() returns %i on "
-                       "CPU %i\n", status, get_cpu());
+                       "CPU %i\n", status, raw_smp_processor_id());
 }
@@ -63,7 +63,7 @@ static void uncached_ipi_mc_drain(void *data)
        status = ia64_pal_mc_drain();
        if (status)
                printk(KERN_WARNING "ia64_pal_mc_drain() failed with %i on "
-                       "CPU %i\n", status, get_cpu());
+                       "CPU %i\n", status, raw_smp_processor_id());
 }
@@ -105,7 +105,7 @@ uncached_get_new_chunk(struct gen_pool *poolp)
        status = ia64_pal_prefetch_visibility(PAL_VISIBILITY_PHYSICAL);
        dprintk(KERN_INFO "pal_prefetch_visibility() returns %i on cpu %i\n",
-                status, get_cpu());
+                status, raw_smp_processor_id());
        if (!status) {
                status = smp_call_function(uncached_ipi_visibility, NULL, 0, 1);
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 30d8564e9603..73af6267d2ef 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -177,6 +177,9 @@ SECTIONS
        }
  . = ALIGN(PAGE_SIZE);         /* make sure the gate page doesn't expose kernel data */
+  .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET)
+        { *(.data.read_mostly) }
  .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET)
        { *(.data.cacheline_aligned) }
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 0f776b032d31..c87d6d1d5813 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -50,8 +50,10 @@ static nodemask_t memory_less_mask __initdata;
 * To prevent cache aliasing effects, align per-node structures so that they
 * start at addresses that are strided by node number.
 */
+#define MAX_NODE_ALIGN_OFFSET   (32 * 1024 * 1024)
 #define NODEDATA_ALIGN(addr, node)                                              \
-        ((((addr) + 1024*1024-1) & ~(1024*1024-1)) + (node)*PERCPU_PAGE_SIZE)
+        ((((addr) + 1024*1024-1) & ~(1024*1024-1)) +                            \
+             (((node)*PERCPU_PAGE_SIZE) & (MAX_NODE_ALIGN_OFFSET - 1)))
 /**
 * build_node_maps - callback to setup bootmem structs for each node
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 05e4ea889981..318087e35b66 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -3,7 +3,7 @@
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 *
- * Copyright (C) 1992 - 1997, 2000-2004 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All rights reserved.
 */
 #include <linux/bootmem.h>
@@ -147,6 +147,24 @@ sal_get_pcidev_info(u64 segment, u64 bus_number, u64 devfn, u64 pci_dev,
 }
 /*
+ * sn_pcidev_info_get() - Retrieve the pcidev_info struct for the specified
+ *                        device.
+ */
+inline struct pcidev_info *
+sn_pcidev_info_get(struct pci_dev *dev)
+{
+        struct pcidev_info *pcidev;
+        list_for_each_entry(pcidev,
+                            &(SN_PCI_CONTROLLER(dev)->pcidev_info), pdi_list) {
+                if (pcidev->pdi_linux_pcidev == dev) {
+                        return pcidev;
+                }
+        }
+        return NULL;
+}
+/*
 * sn_fixup_ionodes() - This routine initializes the HUB data strcuture for 
 *      each node in the system.
 */
@@ -229,6 +247,50 @@ static void sn_fixup_ionodes(void)
 }
+/*
+ * sn_pci_window_fixup() - Create a pci_window for each device resource.
+ *                         Until ACPI support is added, we need this code
+ *                         to setup pci_windows for use by
+ *                         pcibios_bus_to_resource(),
+ *                         pcibios_resource_to_bus(), etc.
+ */
+static void
+sn_pci_window_fixup(struct pci_dev *dev, unsigned int count,
+                    int64_t * pci_addrs)
+{
+        struct pci_controller *controller = PCI_CONTROLLER(dev->bus);
+        unsigned int i;
+        unsigned int idx;
+        unsigned int new_count;
+        struct pci_window *new_window;
+        if (count == 0)
+                return;
+        idx = controller->windows;
+        new_count = controller->windows + count;
+        new_window = kcalloc(new_count, sizeof(struct pci_window), GFP_KERNEL);
+        if (new_window == NULL)
+                BUG();
+        if (controller->window) {
+                memcpy(new_window, controller->window,
+                       sizeof(struct pci_window) * controller->windows);
+                kfree(controller->window);
+        }
+        /* Setup a pci_window for each device resource. */
+        for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
+                if (pci_addrs[i] == -1)
+                        continue;
+                new_window[idx].offset = dev->resource[i].start - pci_addrs[i];
+                new_window[idx].resource = dev->resource[i];
+                idx++;
+        }
+        controller->windows = new_count;
+        controller->window = new_window;
+}
 void sn_pci_unfixup_slot(struct pci_dev *dev)
 {
        struct pci_dev *host_pci_dev = SN_PCIDEV_INFO(dev)->host_pci_dev;
@@ -246,21 +308,23 @@ void sn_pci_unfixup_slot(struct pci_dev *dev)
 */
 void sn_pci_fixup_slot(struct pci_dev *dev)
 {
+        unsigned int count = 0;
        int idx;
        int segment = pci_domain_nr(dev->bus);
        int status = 0;
        struct pcibus_bussoft *bs;
        struct pci_bus *host_pci_bus;
        struct pci_dev *host_pci_dev;
+        struct pcidev_info *pcidev_info;
+        int64_t pci_addrs[PCI_ROM_RESOURCE + 1];
        struct sn_irq_info *sn_irq_info;
        unsigned long size;
        unsigned int bus_no, devfn;
        pci_dev_get(dev); /* for the sysdata pointer */
-        dev->sysdata = kmalloc(sizeof(struct pcidev_info), GFP_KERNEL);
+        pcidev_info = kzalloc(sizeof(struct pcidev_info), GFP_KERNEL);
-        if (SN_PCIDEV_INFO(dev) <= 0)
+        if (pcidev_info <= 0)
                BUG();          /* Cannot afford to run out of memory */
-        memset(SN_PCIDEV_INFO(dev), 0, sizeof(struct pcidev_info));
        sn_irq_info = kmalloc(sizeof(struct sn_irq_info), GFP_KERNEL);
        if (sn_irq_info <= 0)
@@ -270,22 +334,34 @@ void sn_pci_fixup_slot(struct pci_dev *dev)
        /* Call to retrieve pci device information needed by kernel. */
        status = sal_get_pcidev_info((u64) segment, (u64) dev->bus->number, 
                                     dev->devfn,
-                                     (u64) __pa(SN_PCIDEV_INFO(dev)),
+                                     (u64) __pa(pcidev_info),
                                     (u64) __pa(sn_irq_info));
        if (status)
                BUG(); /* Cannot get platform pci device information */
+        /* Add pcidev_info to list in sn_pci_controller struct */
+        list_add_tail(&pcidev_info->pdi_list,
+                      &(SN_PCI_CONTROLLER(dev->bus)->pcidev_info));
        /* Copy over PIO Mapped Addresses */
        for (idx = 0; idx <= PCI_ROM_RESOURCE; idx++) {
                unsigned long start, end, addr;
-                if (!SN_PCIDEV_INFO(dev)->pdi_pio_mapped_addr[idx])
+                if (!pcidev_info->pdi_pio_mapped_addr[idx]) {
+                        pci_addrs[idx] = -1;
                        continue;
+                }
                start = dev->resource[idx].start;
                end = dev->resource[idx].end;
                size = end - start;
-                addr = SN_PCIDEV_INFO(dev)->pdi_pio_mapped_addr[idx];
+                if (size == 0) {
+                        pci_addrs[idx] = -1;
+                        continue;
+                }
+                pci_addrs[idx] = start;
+                count++;
+                addr = pcidev_info->pdi_pio_mapped_addr[idx];
                addr = ((addr << 4) >> 4) | __IA64_UNCACHED_OFFSET;
                dev->resource[idx].start = addr;
                dev->resource[idx].end = addr + size;
@@ -294,23 +370,27 @@ void sn_pci_fixup_slot(struct pci_dev *dev)
                else
                        dev->resource[idx].parent = &iomem_resource;
        }
+        /* Create a pci_window in the pci_controller struct for
+         * each device resource.
+         */
+        if (count > 0)
+                sn_pci_window_fixup(dev, count, pci_addrs);
        /*
         * Using the PROMs values for the PCI host bus, get the Linux
         * PCI host_pci_dev struct and set up host bus linkages
         */
-        bus_no = (SN_PCIDEV_INFO(dev)->pdi_slot_host_handle >> 32) & 0xff;
+        bus_no = (pcidev_info->pdi_slot_host_handle >> 32) & 0xff;
-        devfn = SN_PCIDEV_INFO(dev)->pdi_slot_host_handle & 0xffffffff;
+        devfn = pcidev_info->pdi_slot_host_handle & 0xffffffff;
        host_pci_bus = pci_find_bus(segment, bus_no);
        host_pci_dev = pci_get_slot(host_pci_bus, devfn);
-        SN_PCIDEV_INFO(dev)->host_pci_dev = host_pci_dev;
+        pcidev_info->host_pci_dev = host_pci_dev;
-        SN_PCIDEV_INFO(dev)->pdi_host_pcidev_info =
+        pcidev_info->pdi_linux_pcidev = dev;
-                                                SN_PCIDEV_INFO(host_pci_dev);
+        pcidev_info->pdi_host_pcidev_info = SN_PCIDEV_INFO(host_pci_dev);
-        SN_PCIDEV_INFO(dev)->pdi_linux_pcidev = dev;
        bs = SN_PCIBUS_BUSSOFT(dev->bus);
-        SN_PCIDEV_INFO(dev)->pdi_pcibus_info = bs;
+        pcidev_info->pdi_pcibus_info = bs;
        if (bs && bs->bs_asic_type < PCIIO_ASIC_MAX_TYPES) {
                SN_PCIDEV_BUSPROVIDER(dev) = sn_pci_provider[bs->bs_asic_type];
@@ -320,11 +400,11 @@ void sn_pci_fixup_slot(struct pci_dev *dev)
        /* Only set up IRQ stuff if this device has a host bus context */
        if (bs && sn_irq_info->irq_irq) {
-                SN_PCIDEV_INFO(dev)->pdi_sn_irq_info = sn_irq_info;
+                pcidev_info->pdi_sn_irq_info = sn_irq_info;
-                dev->irq = SN_PCIDEV_INFO(dev)->pdi_sn_irq_info->irq_irq;
+                dev->irq = pcidev_info->pdi_sn_irq_info->irq_irq;
                sn_irq_fixup(dev, sn_irq_info);
        } else {
-                SN_PCIDEV_INFO(dev)->pdi_sn_irq_info = NULL;
+                pcidev_info->pdi_sn_irq_info = NULL;
                kfree(sn_irq_info);
        }
 }
@@ -338,6 +418,7 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
        int status = 0;
        int nasid, cnode;
        struct pci_controller *controller;
+        struct sn_pci_controller *sn_controller;
        struct pcibus_bussoft *prom_bussoft_ptr;
        struct hubdev_info *hubdev_info;
        void *provider_soft = NULL;
@@ -349,10 +430,15 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
                return;         /*bus # does not exist */
        prom_bussoft_ptr = __va(prom_bussoft_ptr);
-        controller = kzalloc(sizeof(struct pci_controller), GFP_KERNEL);
+        /* Allocate a sn_pci_controller, which has a pci_controller struct
+         * as the first member.
+         */
+        sn_controller = kzalloc(sizeof(struct sn_pci_controller), GFP_KERNEL);
+        if (!sn_controller)
+                BUG();
+        INIT_LIST_HEAD(&sn_controller->pcidev_info);
+        controller = &sn_controller->pci_controller;
        controller->segment = segment;
-        if (!controller)
-                BUG();
        if (bus == NULL) {
                bus = pci_scan_bus(busnum, &pci_root_ops, controller);
@@ -390,6 +476,29 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
        }
        /*
+         * Setup pci_windows for legacy IO and MEM space.
+         * (Temporary until ACPI support is in place.)
+         */
+        controller->window = kcalloc(2, sizeof(struct pci_window), GFP_KERNEL);
+        if (controller->window == NULL)
+                BUG();
+        controller->window[0].offset = prom_bussoft_ptr->bs_legacy_io;
+        controller->window[0].resource.name = "legacy_io";
+        controller->window[0].resource.flags = IORESOURCE_IO;
+        controller->window[0].resource.start = prom_bussoft_ptr->bs_legacy_io;
+        controller->window[0].resource.end =
+            controller->window[0].resource.start + 0xffff;
+        controller->window[0].resource.parent = &ioport_resource;
+        controller->window[1].offset = prom_bussoft_ptr->bs_legacy_mem;
+        controller->window[1].resource.name = "legacy_mem";
+        controller->window[1].resource.flags = IORESOURCE_MEM;
+        controller->window[1].resource.start = prom_bussoft_ptr->bs_legacy_mem;
+        controller->window[1].resource.end =
+            controller->window[1].resource.start + (1024 * 1024) - 1;
+        controller->window[1].resource.parent = &iomem_resource;
+        controller->windows = 2;
+        /*
         * Generic bus fixup goes here.  Don't reference prom_bussoft_ptr
         * after this point.
         */
@@ -421,7 +530,7 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
 error_return:
-        kfree(controller);
+        kfree(sn_controller);
        return;
 }
@@ -434,7 +543,7 @@ void sn_bus_store_sysdata(struct pci_dev *dev)
                dev_dbg(dev, "%s: out of memory!\n", __FUNCTION__);
                return;
        }
-        element->sysdata = dev->sysdata;
+        element->sysdata = SN_PCIDEV_INFO(dev);
        list_add(&element->entry, &sn_sysdata_list);
 }
diff --git a/arch/ia64/sn/kernel/sn2/ptc_deadlock.S b/arch/ia64/sn/kernel/sn2/ptc_deadlock.S
index 3fa95065a446..bebbcc4f8dd4 100644
--- a/arch/ia64/sn/kernel/sn2/ptc_deadlock.S
+++ b/arch/ia64/sn/kernel/sn2/ptc_deadlock.S
@@ -39,9 +39,13 @@ sn2_ptc_deadlock_recovery_core:
        mov     r8=r0
 1:
+        cmp.ne  p8,p9=r0,ptc1           // Test for shub type (ptc1 non-null on shub1)
+                                        // p8 = 1 if shub1, p9 = 1 if shub2
        add     scr2=ALIAS_OFFSET,piowc // Address of WRITE_STATUS alias register 
-        ;;
+        mov     scr1=7;;                // Clear DEADLOCK, WRITE_ERROR, MULTI_WRITE_ERROR
-        ld8.acq scr1=[scr2];;
+(p8)    st8.rel [scr2]=scr1;;
+(p9)    ld8.acq scr1=[scr2];;
 5:      ld8.acq scr1=[piowc];;          // Wait for PIOs to complete.
        hint    @pause
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c
index 5d54f5f4e926..471bbaa65d1b 100644
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
@@ -202,7 +202,7 @@ sn2_global_tlb_purge(struct mm_struct *mm, unsigned long start,
                     unsigned long end, unsigned long nbits)
 {
        int i, opt, shub1, cnode, mynasid, cpu, lcpu = 0, nasid, flushed = 0;
-        int mymm = (mm == current->active_mm);
+        int mymm = (mm == current->active_mm && current->mm);
        volatile unsigned long *ptc0, *ptc1;
        unsigned long itc, itc2, flags, data0 = 0, data1 = 0, rr_value;
        short nasids[MAX_NUMNODES], nix;
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_reg.c b/arch/ia64/sn/pci/pcibr/pcibr_reg.c
index 5d534091262c..79fdb91d7259 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_reg.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_reg.c
@@ -25,7 +25,7 @@ union br_ptr {
 */
 void pcireg_control_bit_clr(struct pcibus_info *pcibus_info, uint64_t bits)
 {
-        union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base;
+        union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
        if (pcibus_info) {
                switch (pcibus_info->pbi_bridge_type) {
@@ -38,14 +38,14 @@ void pcireg_control_bit_clr(struct pcibus_info *pcibus_info, uint64_t bits)
                default:
                        panic
                            ("pcireg_control_bit_clr: unknown bridgetype bridge 0x%p",
-                             (void *)ptr);
+                             ptr);
                }
        }
 }
 void pcireg_control_bit_set(struct pcibus_info *pcibus_info, uint64_t bits)
 {
-        union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base;
+        union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
        if (pcibus_info) {
                switch (pcibus_info->pbi_bridge_type) {
@@ -58,7 +58,7 @@ void pcireg_control_bit_set(struct pcibus_info *pcibus_info, uint64_t bits)
                default:
                        panic
                            ("pcireg_control_bit_set: unknown bridgetype bridge 0x%p",
-                             (void *)ptr);
+                             ptr);
                }
        }
 }
@@ -68,7 +68,7 @@ void pcireg_control_bit_set(struct pcibus_info *pcibus_info, uint64_t bits)
 */
 uint64_t pcireg_tflush_get(struct pcibus_info *pcibus_info)
 {
-        union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base;
+        union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
        uint64_t ret = 0;
        if (pcibus_info) {
@@ -82,7 +82,7 @@ uint64_t pcireg_tflush_get(struct pcibus_info *pcibus_info)
                default:
                        panic
                            ("pcireg_tflush_get: unknown bridgetype bridge 0x%p",
-                             (void *)ptr);
+                             ptr);
                }
        }
@@ -98,7 +98,7 @@ uint64_t pcireg_tflush_get(struct pcibus_info *pcibus_info)
 */
 uint64_t pcireg_intr_status_get(struct pcibus_info * pcibus_info)
 {
-        union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base;
+        union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
        uint64_t ret = 0;
        if (pcibus_info) {
@@ -112,7 +112,7 @@ uint64_t pcireg_intr_status_get(struct pcibus_info * pcibus_info)
                default:
                        panic
                            ("pcireg_intr_status_get: unknown bridgetype bridge 0x%p",
-                             (void *)ptr);
+                             ptr);
                }
        }
        return ret;
@@ -123,7 +123,7 @@ uint64_t pcireg_intr_status_get(struct pcibus_info * pcibus_info)
 */
 void pcireg_intr_enable_bit_clr(struct pcibus_info *pcibus_info, uint64_t bits)
 {
-        union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base;
+        union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
        if (pcibus_info) {
                switch (pcibus_info->pbi_bridge_type) {
@@ -136,14 +136,14 @@ void pcireg_intr_enable_bit_clr(struct pcibus_info *pcibus_info, uint64_t bits)
                default:
                        panic
                            ("pcireg_intr_enable_bit_clr: unknown bridgetype bridge 0x%p",
-                             (void *)ptr);
+                             ptr);
                }
        }
 }
 void pcireg_intr_enable_bit_set(struct pcibus_info *pcibus_info, uint64_t bits)
 {
-        union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base;
+        union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
        if (pcibus_info) {
                switch (pcibus_info->pbi_bridge_type) {
@@ -156,7 +156,7 @@ void pcireg_intr_enable_bit_set(struct pcibus_info *pcibus_info, uint64_t bits)
                default:
                        panic
                            ("pcireg_intr_enable_bit_set: unknown bridgetype bridge 0x%p",
-                             (void *)ptr);
+                             ptr);
                }
        }
 }
@@ -167,7 +167,7 @@ void pcireg_intr_enable_bit_set(struct pcibus_info *pcibus_info, uint64_t bits)
 void pcireg_intr_addr_addr_set(struct pcibus_info *pcibus_info, int int_n,
                               uint64_t addr)
 {
-        union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base;
+        union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
        if (pcibus_info) {
                switch (pcibus_info->pbi_bridge_type) {
@@ -186,7 +186,7 @@ void pcireg_intr_addr_addr_set(struct pcibus_info *pcibus_info, int int_n,
                default:
                        panic
                            ("pcireg_intr_addr_addr_get: unknown bridgetype bridge 0x%p",
-                             (void *)ptr);
+                             ptr);
                }
        }
 }
@@ -196,7 +196,7 @@ void pcireg_intr_addr_addr_set(struct pcibus_info *pcibus_info, int int_n,
 */
 void pcireg_force_intr_set(struct pcibus_info *pcibus_info, int int_n)
 {
-        union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base;
+        union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
        if (pcibus_info) {
                switch (pcibus_info->pbi_bridge_type) {
@@ -209,7 +209,7 @@ void pcireg_force_intr_set(struct pcibus_info *pcibus_info, int int_n)
                default:
                        panic
                            ("pcireg_force_intr_set: unknown bridgetype bridge 0x%p",
-                             (void *)ptr);
+                             ptr);
                }
        }
 }
@@ -219,7 +219,7 @@ void pcireg_force_intr_set(struct pcibus_info *pcibus_info, int int_n)
 */
 uint64_t pcireg_wrb_flush_get(struct pcibus_info *pcibus_info, int device)
 {
-        union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base;
+        union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
        uint64_t ret = 0;
        if (pcibus_info) {
@@ -233,7 +233,7 @@ uint64_t pcireg_wrb_flush_get(struct pcibus_info *pcibus_info, int device)
                            __sn_readq_relaxed(&ptr->pic.p_wr_req_buf[device]);
                        break;
                default:
-                      panic("pcireg_wrb_flush_get: unknown bridgetype bridge 0x%p", (void *)ptr);
+                      panic("pcireg_wrb_flush_get: unknown bridgetype bridge 0x%p", ptr);
                }
        }
@@ -244,7 +244,7 @@ uint64_t pcireg_wrb_flush_get(struct pcibus_info *pcibus_info, int device)
 void pcireg_int_ate_set(struct pcibus_info *pcibus_info, int ate_index,
                        uint64_t val)
 {
-        union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base;
+        union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
        if (pcibus_info) {
                switch (pcibus_info->pbi_bridge_type) {
@@ -257,15 +257,15 @@ void pcireg_int_ate_set(struct pcibus_info *pcibus_info, int ate_index,
                default:
                        panic
                            ("pcireg_int_ate_set: unknown bridgetype bridge 0x%p",
-                             (void *)ptr);
+                             ptr);
                }
        }
 }
-uint64_t *pcireg_int_ate_addr(struct pcibus_info *pcibus_info, int ate_index)
+uint64_t __iomem *pcireg_int_ate_addr(struct pcibus_info *pcibus_info, int ate_index)
 {
-        union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base;
+        union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;
-        uint64_t *ret = (uint64_t *) 0;
+        uint64_t __iomem *ret = NULL;
        if (pcibus_info) {
                switch (pcibus_info->pbi_bridge_type) {
@@ -278,7 +278,7 @@ uint64_t *pcireg_int_ate_addr(struct pcibus_info *pcibus_info, int ate_index)
                default:
                        panic
                            ("pcireg_int_ate_addr: unknown bridgetype bridge 0x%p",
-                             (void *)ptr);
+                             ptr);
                }
        }
        return ret;
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index 46b646a6d345..27aa1842dacc 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -38,10 +38,10 @@ tioca_gart_init(struct tioca_kernel *tioca_kern)
        uint64_t offset;
        struct page *tmp;
        struct tioca_common *tioca_common;
-        struct tioca *ca_base;
+        struct tioca __iomem *ca_base;
        tioca_common = tioca_kern->ca_common;
-        ca_base = (struct tioca *)tioca_common->ca_common.bs_base;
+        ca_base = (struct tioca __iomem *)tioca_common->ca_common.bs_base;
        if (list_empty(tioca_kern->ca_devices))
                return 0;
@@ -215,7 +215,7 @@ tioca_fastwrite_enable(struct tioca_kernel *tioca_kern)
 {
        int cap_ptr;
        uint32_t reg;
-        struct tioca *tioca_base;
+        struct tioca __iomem *tioca_base;
        struct pci_dev *pdev;
        struct tioca_common *common;
@@ -257,7 +257,7 @@ tioca_fastwrite_enable(struct tioca_kernel *tioca_kern)
         * Set ca's fw to match
         */
-        tioca_base = (struct tioca *)common->ca_common.bs_base;
+        tioca_base = (struct tioca __iomem*)common->ca_common.bs_base;
        __sn_setq_relaxed(&tioca_base->ca_control1, CA_AGP_FW_ENABLE);
 }
@@ -322,7 +322,7 @@ static uint64_t
 tioca_dma_d48(struct pci_dev *pdev, uint64_t paddr)
 {
        struct tioca_common *tioca_common;
-        struct tioca *ca_base;
+        struct tioca __iomem *ca_base;
        uint64_t ct_addr;
        dma_addr_t bus_addr;
        uint32_t node_upper;
@@ -330,7 +330,7 @@ tioca_dma_d48(struct pci_dev *pdev, uint64_t paddr)
        struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(pdev);
        tioca_common = (struct tioca_common *)pcidev_info->pdi_pcibus_info;
-        ca_base = (struct tioca *)tioca_common->ca_common.bs_base;
+        ca_base = (struct tioca __iomem *)tioca_common->ca_common.bs_base;
        ct_addr = PHYS_TO_TIODMA(paddr);
        if (!ct_addr)
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 3a49036e0ae8..4ee91c9a556f 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -67,8 +67,8 @@ unsigned long setup_zero_pages(void)
        page = virt_to_page(empty_zero_page);
        while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) {
-                set_bit(PG_reserved, &page->flags);
+                SetPageReserved(page);
-                reset_page_mapcount(page);
+                set_page_count(page, 1);
                page++;
        }
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index bb2efdd566a9..db93dbc0e21a 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -227,7 +227,7 @@ config SMP
          If you don't know what to do here, say N.
 config NR_CPUS
-        int "Maximum number of CPUs (2-32)"
+        int "Maximum number of CPUs (2-128)"
        range 2 128
        depends on SMP
        default "32" if PPC64
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index 4b433411b9e3..b657f7e44762 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.15-rc1
+# Linux kernel version: 2.6.15-rc5
-# Tue Nov 15 14:36:20 2005
+# Tue Dec 20 15:59:26 2005
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -53,6 +53,7 @@ CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
 # CONFIG_CPUSETS is not set
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
@@ -151,7 +152,7 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_PPC_64K_PAGES is not set
 CONFIG_SCHED_SMT=y
 CONFIG_PROC_DEVICETREE=y
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index e7c23e3902b8..3c22ccb18519 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.15-rc1
+# Linux kernel version: 2.6.15-rc5
-# Tue Nov 15 14:39:20 2005
+# Tue Dec 20 15:59:30 2005
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -53,6 +53,7 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_CPUSETS is not set
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
@@ -162,7 +163,7 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_SCHED_SMT is not set
 CONFIG_PROC_DEVICETREE=y
@@ -1203,6 +1204,7 @@ CONFIG_USB_MON=y
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 # CONFIG_USB_SERIAL_AIRPRIME is not set
+# CONFIG_USB_SERIAL_ANYDATA is not set
 CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 # CONFIG_USB_SERIAL_CP2101 is not set
@@ -1233,7 +1235,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
-# CONFIG_USB_SERIAL_NOKIA_DKU2 is not set
 CONFIG_USB_SERIAL_PL2303=m
 # CONFIG_USB_SERIAL_HP4X is not set
 CONFIG_USB_SERIAL_SAFE=m
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index 5d0866707a75..751a622fb7a7 100644
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.15-rc1
+# Linux kernel version: 2.6.15-rc5
-# Tue Nov 15 14:38:09 2005
+# Tue Dec 20 15:59:32 2005
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -55,6 +55,7 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_CPUSETS is not set
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
@@ -144,7 +145,7 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_SCHED_SMT is not set
 CONFIG_PROC_DEVICETREE=y
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index 92e42613ef06..07b6d3d23360 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.15-rc1
+# Linux kernel version: 2.6.15-rc5
-# Tue Nov 15 14:38:58 2005
+# Tue Dec 20 15:59:36 2005
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -53,6 +53,7 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_CPUSETS is not set
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
@@ -149,7 +150,7 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_SCHED_SMT is not set
 CONFIG_PROC_DEVICETREE=y
@@ -242,7 +243,6 @@ CONFIG_TCP_CONG_BIC=y
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
 #
 # Network testing
@@ -794,6 +794,7 @@ CONFIG_USB_SERIAL=y
 # CONFIG_USB_SERIAL_CONSOLE is not set
 CONFIG_USB_SERIAL_GENERIC=y
 # CONFIG_USB_SERIAL_AIRPRIME is not set
+# CONFIG_USB_SERIAL_ANYDATA is not set
 # CONFIG_USB_SERIAL_BELKIN is not set
 # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
 # CONFIG_USB_SERIAL_CP2101 is not set
@@ -824,7 +825,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 # CONFIG_USB_SERIAL_KLSI is not set
 # CONFIG_USB_SERIAL_KOBIL_SCT is not set
 # CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_NOKIA_DKU2 is not set
 # CONFIG_USB_SERIAL_PL2303 is not set
 # CONFIG_USB_SERIAL_HP4X is not set
 # CONFIG_USB_SERIAL_SAFE is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index b5ba3bbd96fb..509399eab6f5 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.15-rc1
+# Linux kernel version: 2.6.15-rc5
-# Fri Nov 18 16:23:24 2005
+# Tue Dec 20 15:59:38 2005
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -54,6 +54,7 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CPUSETS=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
@@ -176,7 +177,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPARSEMEM_EXTREME=y
 # CONFIG_MEMORY_HOTPLUG is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_SCHED_SMT is not set
 CONFIG_PROC_DEVICETREE=y
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index b589b196eb3f..a50ce0fa9243 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.15-rc1
+# Linux kernel version: 2.6.15-rc5
-# Tue Nov 15 14:36:55 2005
+# Tue Dec 20 15:59:40 2005
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -55,6 +55,7 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CPUSETS=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
@@ -163,7 +164,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPARSEMEM_EXTREME=y
 # CONFIG_MEMORY_HOTPLUG is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
 # CONFIG_PPC_64K_PAGES is not set
 CONFIG_SCHED_SMT=y
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 2d22bf03484e..bce33a38399f 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -183,8 +183,8 @@ syscall_exit_trace_cont:
        ld      r13,GPR13(r1)           /* returning to usermode */
 1:      ld      r2,GPR2(r1)
        li      r12,MSR_RI
-        andc    r10,r10,r12
+        andc    r11,r10,r12
-        mtmsrd  r10,1                   /* clear MSR.RI */
+        mtmsrd  r11,1                   /* clear MSR.RI */
        ld      r1,GPR1(r1)
        mtlr    r4
        mtcr    r5
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 511af54e6230..5368f9c2e6bf 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -177,7 +177,7 @@ static inline int kprobe_handler(struct pt_regs *regs)
                        save_previous_kprobe(kcb);
                        set_current_kprobe(p, regs, kcb);
                        kcb->kprobe_saved_msr = regs->msr;
-                        p->nmissed++;
+                        kprobes_inc_nmissed_count(p);
                        prepare_singlestep(p, regs);
                        kcb->kprobe_status = KPROBE_REENTER;
                        return 1;
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 608fee7c7e20..e3fb78397dc6 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -102,7 +102,15 @@ int boot_cpuid_phys = 0;
 dev_t boot_dev;
 u64 ppc64_pft_size;
-struct ppc64_caches ppc64_caches;
+/* Pick defaults since we might want to patch instructions
+ * before we've read this from the device tree.
+ */
+struct ppc64_caches ppc64_caches = {
+        .dline_size = 0x80,
+        .log_dline_size = 7,
+        .iline_size = 0x80,
+        .log_iline_size = 7
+};
 EXPORT_SYMBOL_GPL(ppc64_caches);
 /*
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index f72ced11212d..91b93d917b64 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -247,7 +247,7 @@ long ppc64_personality(unsigned long personality)
 #define OVERRIDE_MACHINE    0
 #endif
-static inline int override_machine(char *mach)
+static inline int override_machine(char __user *mach)
 {
        if (OVERRIDE_MACHINE) {
                /* change ppc64 to ppc */
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 706e8a63ced9..a606504678bd 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -514,7 +514,7 @@ void __init htab_initialize(void)
 #undef KB
 #undef MB
-void __init htab_initialize_secondary(void)
+void htab_initialize_secondary(void)
 {
        if (!platform_is_lpar())
                mtspr(SPRN_SDR1, _SDR1);
@@ -601,7 +601,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap)
        /* Handle hugepage regions */
        if (unlikely(in_hugepage_area(mm->context, ea))) {
                DBG_LOW(" -> huge page !\n");
-                return hash_huge_page(mm, access, ea, vsid, local);
+                return hash_huge_page(mm, access, ea, vsid, local, trap);
        }
        /* Get PTE and page size from page tables */
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 6bc9dbad7dea..54131b877da3 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -148,43 +148,63 @@ int is_aligned_hugepage_range(unsigned long addr, unsigned long len)
        return 0;
 }
+struct slb_flush_info {
+        struct mm_struct *mm;
+        u16 newareas;
+};
 static void flush_low_segments(void *parm)
 {
-        u16 areas = (unsigned long) parm;
+        struct slb_flush_info *fi = parm;
        unsigned long i;
-        asm volatile("isync" : : : "memory");
+        BUILD_BUG_ON((sizeof(fi->newareas)*8) != NUM_LOW_AREAS);
+        if (current->active_mm != fi->mm)
+                return;
+        /* Only need to do anything if this CPU is working in the same
+         * mm as the one which has changed */
-        BUILD_BUG_ON((sizeof(areas)*8) != NUM_LOW_AREAS);
+        /* update the paca copy of the context struct */
+        get_paca()->context = current->active_mm->context;
+        asm volatile("isync" : : : "memory");
        for (i = 0; i < NUM_LOW_AREAS; i++) {
-                if (! (areas & (1U << i)))
+                if (! (fi->newareas & (1U << i)))
                        continue;
                asm volatile("slbie %0"
                             : : "r" ((i << SID_SHIFT) | SLBIE_C));
        }
        asm volatile("isync" : : : "memory");
 }
 static void flush_high_segments(void *parm)
 {
-        u16 areas = (unsigned long) parm;
+        struct slb_flush_info *fi = parm;
        unsigned long i, j;
-        asm volatile("isync" : : : "memory");
-        BUILD_BUG_ON((sizeof(areas)*8) != NUM_HIGH_AREAS);
+        BUILD_BUG_ON((sizeof(fi->newareas)*8) != NUM_HIGH_AREAS);
+        if (current->active_mm != fi->mm)
+                return;
+        /* Only need to do anything if this CPU is working in the same
+         * mm as the one which has changed */
+        /* update the paca copy of the context struct */
+        get_paca()->context = current->active_mm->context;
+        asm volatile("isync" : : : "memory");
        for (i = 0; i < NUM_HIGH_AREAS; i++) {
-                if (! (areas & (1U << i)))
+                if (! (fi->newareas & (1U << i)))
                        continue;
                for (j = 0; j < (1UL << (HTLB_AREA_SHIFT-SID_SHIFT)); j++)
                        asm volatile("slbie %0"
                                     :: "r" (((i << HTLB_AREA_SHIFT)
-                                             + (j << SID_SHIFT)) | SLBIE_C));
+                                              + (j << SID_SHIFT)) | SLBIE_C));
        }
        asm volatile("isync" : : : "memory");
 }
@@ -229,6 +249,7 @@ static int prepare_high_area_for_htlb(struct mm_struct *mm, unsigned long area)
 static int open_low_hpage_areas(struct mm_struct *mm, u16 newareas)
 {
        unsigned long i;
+        struct slb_flush_info fi;
        BUILD_BUG_ON((sizeof(newareas)*8) != NUM_LOW_AREAS);
        BUILD_BUG_ON((sizeof(mm->context.low_htlb_areas)*8) != NUM_LOW_AREAS);
@@ -244,19 +265,20 @@ static int open_low_hpage_areas(struct mm_struct *mm, u16 newareas)
        mm->context.low_htlb_areas |= newareas;
-        /* update the paca copy of the context struct */
-        get_paca()->context = mm->context;
        /* the context change must make it to memory before the flush,
         * so that further SLB misses do the right thing. */
        mb();
-        on_each_cpu(flush_low_segments, (void *)(unsigned long)newareas, 0, 1);
+        fi.mm = mm;
+        fi.newareas = newareas;
+        on_each_cpu(flush_low_segments, &fi, 0, 1);
        return 0;
 }
 static int open_high_hpage_areas(struct mm_struct *mm, u16 newareas)
 {
+        struct slb_flush_info fi;
        unsigned long i;
        BUILD_BUG_ON((sizeof(newareas)*8) != NUM_HIGH_AREAS);
@@ -280,7 +302,10 @@ static int open_high_hpage_areas(struct mm_struct *mm, u16 newareas)
        /* the context change must make it to memory before the flush,
         * so that further SLB misses do the right thing. */
        mb();
-        on_each_cpu(flush_high_segments, (void *)(unsigned long)newareas, 0, 1);
+        fi.mm = mm;
+        fi.newareas = newareas;
+        on_each_cpu(flush_high_segments, &fi, 0, 1);
        return 0;
 }
@@ -639,8 +664,36 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
        return -ENOMEM;
 }
+/*
+ * Called by asm hashtable.S for doing lazy icache flush
+ */
+static unsigned int hash_huge_page_do_lazy_icache(unsigned long rflags,
+                                                  pte_t pte, int trap)
+{
+        struct page *page;
+        int i;
+        if (!pfn_valid(pte_pfn(pte)))
+                return rflags;
+        page = pte_page(pte);
+        /* page is dirty */
+        if (!test_bit(PG_arch_1, &page->flags) && !PageReserved(page)) {
+                if (trap == 0x400) {
+                        for (i = 0; i < (HPAGE_SIZE / PAGE_SIZE); i++)
+                                __flush_dcache_icache(page_address(page+i));
+                        set_bit(PG_arch_1, &page->flags);
+                } else {
+                        rflags |= HPTE_R_N;
+                }
+        }
+        return rflags;
+}
 int hash_huge_page(struct mm_struct *mm, unsigned long access,
-                   unsigned long ea, unsigned long vsid, int local)
+                   unsigned long ea, unsigned long vsid, int local,
+                   unsigned long trap)
 {
        pte_t *ptep;
        unsigned long old_pte, new_pte;
@@ -691,6 +744,11 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access,
        rflags = 0x2 | (!(new_pte & _PAGE_RW));
        /* _PAGE_EXEC -> HW_NO_EXEC since it's inverted */
        rflags |= ((new_pte & _PAGE_EXEC) ? 0 : HPTE_R_N);
+        if (!cpu_has_feature(CPU_FTR_COHERENT_ICACHE))
+                /* No CPU has hugepages but lacks no execute, so we
+                 * don't need to worry about that case */
+                rflags = hash_huge_page_do_lazy_icache(rflags, __pte(old_pte),
+                                                       trap);
        /* Check if pte already has an hpte (case 2) */
        if (unlikely(old_pte & _PAGE_HASHPTE)) {
@@ -703,7 +761,8 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access,
                slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
                slot += (old_pte & _PAGE_F_GIX) >> 12;
-                if (ppc_md.hpte_updatepp(slot, rflags, va, 1, local) == -1)
+                if (ppc_md.hpte_updatepp(slot, rflags, va, mmu_huge_psize,
+                                         local) == -1)
                        old_pte &= ~_PAGE_HPTEFLAGS;
        }
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index f72cf87364cb..ba7a3055a9fc 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -125,7 +125,7 @@ void __init get_region(unsigned int nid, unsigned long *start_pfn,
        /* We didnt find a matching region, return start/end as 0 */
        if (*start_pfn == -1UL)
-                start_pfn = 0;
+                *start_pfn = 0;
 }
 static inline void map_cpu_to_node(int cpu, int node)
diff --git a/arch/powerpc/mm/stab.c b/arch/powerpc/mm/stab.c
index cfbb4e1f966b..51e7951414e5 100644
--- a/arch/powerpc/mm/stab.c
+++ b/arch/powerpc/mm/stab.c
@@ -288,11 +288,6 @@ void stab_initialize(unsigned long stab)
                return;
        }
 #endif /* CONFIG_PPC_ISERIES */
-#ifdef CONFIG_PPC_PSERIES
-        if (platform_is_lpar()) {
-                plpar_hcall_norets(H_SET_ASR, stabreal);
-                return;
-        }
-#endif
        mtspr(SPRN_ASR, stabreal);
 }
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 0d7fa00fcb00..f6e22da2a5da 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -1650,11 +1650,19 @@ void pmac_tweak_clock_spreading(int enable)
         */
        if (macio->type == macio_intrepid) {
-                if (enable)
+                struct device_node *clock =
-                        UN_OUT(UNI_N_CLOCK_SPREADING, 2);
+                        of_find_node_by_path("/uni-n@f8000000/hw-clock");
-                else
+                if (clock && get_property(clock, "platform-do-clockspreading",
-                        UN_OUT(UNI_N_CLOCK_SPREADING, 0);
+                                          NULL)) {
-                mdelay(40);
+                        printk(KERN_INFO "%sabling clock spreading on Intrepid"
+                               " ASIC\n", enable ? "En" : "Dis");
+                        if (enable)
+                                UN_OUT(UNI_N_CLOCK_SPREADING, 2);
+                        else
+                                UN_OUT(UNI_N_CLOCK_SPREADING, 0);
+                        mdelay(40);
+                }
+                of_node_put(clock);
        }
        while (machine_is_compatible("PowerBook5,2") ||
@@ -1724,6 +1732,9 @@ void pmac_tweak_clock_spreading(int enable)
                        pmac_low_i2c_close(ui2c);
                        break;
                }
+                printk(KERN_INFO "%sabling clock spreading on i2c clock chip\n",
+                       enable ? "En" : "Dis");
                pmac_low_i2c_setmode(ui2c, pmac_low_i2c_mode_stdsub);
                rc = pmac_low_i2c_xfer(ui2c, 0xd2 | pmac_low_i2c_write, 0x80, buffer, 9);
                DBG("write result: %d,", rc);
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index c78f2b290a73..2043659ea7b1 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -109,6 +109,9 @@ static void tce_build_pSeriesLP(struct iommu_table *tbl, long tcenum,
        u64 rc;
        union tce_entry tce;
+        tcenum <<= TCE_PAGE_FACTOR;
+        npages <<= TCE_PAGE_FACTOR;
        tce.te_word = 0;
        tce.te_rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT;
        tce.te_rdwr = 1;
@@ -143,10 +146,7 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
        union tce_entry tce, *tcep;
        long l, limit;
-        tcenum <<= TCE_PAGE_FACTOR;
+        if (TCE_PAGE_FACTOR == 0 && npages == 1)
-        npages <<= TCE_PAGE_FACTOR;
-        if (npages == 1)
                return tce_build_pSeriesLP(tbl, tcenum, npages, uaddr,
                                           direction);
@@ -164,6 +164,9 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
                __get_cpu_var(tce_page) = tcep;
        }
+        tcenum <<= TCE_PAGE_FACTOR;
+        npages <<= TCE_PAGE_FACTOR;
        tce.te_word = 0;
        tce.te_rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT;
        tce.te_rdwr = 1;
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index a50e5f3f396d..cf1bc11b3346 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -298,18 +298,6 @@ long pSeries_lpar_hpte_insert(unsigned long hpte_group,
        if (!(vflags & HPTE_V_BOLTED))
                DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
-#if 1
-        {
-                int i;
-                for (i=0;i<8;i++) {
-                        unsigned long w0, w1;
-                        plpar_pte_read(0, hpte_group, &w0, &w1);
-                        BUG_ON (HPTE_V_COMPARE(hpte_v, w0)
-                                && (w0 & HPTE_V_VALID));
-                }
-        }
-#endif
        /* Now fill in the actual HPTE */
        /* Set CEC cookie to 0         */
        /* Zero page = 0               */
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index 72ac18067ece..0377decc0719 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -48,11 +48,6 @@ static struct hw_interrupt_type xics_pic = {
        .set_affinity = xics_set_affinity
 };
-static struct hw_interrupt_type xics_8259_pic = {
-        .typename = " XICS/8259",
-        .ack = xics_mask_and_ack_irq,
-};
 /* This is used to map real irq numbers to virtual */
 static struct radix_tree_root irq_map = RADIX_TREE_INIT(GFP_ATOMIC);
@@ -367,12 +362,7 @@ int xics_get_irq(struct pt_regs *regs)
        /* for sanity, this had better be < NR_IRQS - 16 */
        if (vec == xics_irq_8259_cascade_real) {
                irq = i8259_irq(regs);
-                if (irq == -1) {
+                xics_end_irq(irq_offset_up(xics_irq_8259_cascade));
-                        /* Spurious cascaded interrupt.  Still must ack xics */
-                        xics_end_irq(irq_offset_up(xics_irq_8259_cascade));
-                        irq = -1;
-                }
        } else if (vec == XICS_IRQ_SPURIOUS) {
                irq = -1;
        } else {
@@ -542,6 +532,7 @@ nextnode:
                xics_irq_8259_cascade_real = *ireg;
                xics_irq_8259_cascade
                        = virt_irq_create_mapping(xics_irq_8259_cascade_real);
+                i8259_init(0, 0);
                of_node_put(np);
        }
@@ -565,12 +556,7 @@ nextnode:
 #endif /* CONFIG_SMP */
        }
-        xics_8259_pic.enable = i8259_pic.enable;
+        for (i = irq_offset_value(); i < NR_IRQS; ++i)
-        xics_8259_pic.disable = i8259_pic.disable;
-        xics_8259_pic.end = i8259_pic.end;
-        for (i = 0; i < 16; ++i)
-                get_irq_desc(i)->handler = &xics_8259_pic;
-        for (; i < NR_IRQS; ++i)
                get_irq_desc(i)->handler = &xics_pic;
        xics_setup_cpu();
@@ -590,7 +576,6 @@ static int __init xics_setup_i8259(void)
                                no_action, 0, "8259 cascade", NULL))
                        printk(KERN_ERR "xics_setup_i8259: couldn't get 8259 "
                                        "cascade\n");
-                i8259_init(0, 0);
        }
        return 0;
 }
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 8fa51b0a32d2..cc3f64c084c5 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -767,14 +767,14 @@ config CPM2
          on it (826x, 827x, 8560).
 config PPC_CHRP
-        bool "  Common Hardware Reference Platform (CHRP) based machines"
+        bool
        depends on PPC_MULTIPLATFORM
        select PPC_I8259
        select PPC_INDIRECT_PCI
        default y
 config PPC_PMAC
-        bool "  Apple PowerMac based machines"
+        bool
        depends on PPC_MULTIPLATFORM
        select PPC_INDIRECT_PCI
        default y
@@ -785,7 +785,7 @@ config PPC_PMAC64
        default y
 config PPC_PREP
-        bool "  PowerPC Reference Platform (PReP) based machines"
+        bool
        depends on PPC_MULTIPLATFORM
        select PPC_I8259
        select PPC_INDIRECT_PCI
diff --git a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c
index 43b8fc2ca591..becbfa397556 100644
--- a/arch/ppc/kernel/smp.c
+++ b/arch/ppc/kernel/smp.c
@@ -301,6 +301,10 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
        /* Probe platform for CPUs: always linear. */
        num_cpus = smp_ops->probe();
+        
+        if (num_cpus < 2)
+                smp_tb_synchronized = 1;
+        
        for (i = 0; i < num_cpus; ++i)
                cpu_set(i, cpu_possible_map);
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index d8991b88dc9c..5e8cc5ec6ab5 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -130,10 +130,11 @@ mpc85xx_cds_show_cpuinfo(struct seq_file *m)
 }
 #ifdef CONFIG_CPM2
-static void cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)
 {
        while((irq = cpm2_get_irq(regs)) >= 0)
                __do_IRQ(irq, regs);
+        return IRQ_HANDLED;
 }
 static struct irqaction cpm2_irqaction = {
diff --git a/arch/ppc/platforms/pmac_feature.c b/arch/ppc/platforms/pmac_feature.c
index 1e69b0593162..6b7b3a150631 100644
--- a/arch/ppc/platforms/pmac_feature.c
+++ b/arch/ppc/platforms/pmac_feature.c
@@ -1606,11 +1606,19 @@ void pmac_tweak_clock_spreading(int enable)
         */
        if (macio->type == macio_intrepid) {
-                if (enable)
+                struct device_node *clock =
-                        UN_OUT(UNI_N_CLOCK_SPREADING, 2);
+                        of_find_node_by_path("/uni-n@f8000000/hw-clock");
-                else
+                if (clock && get_property(clock, "platform-do-clockspreading",
-                        UN_OUT(UNI_N_CLOCK_SPREADING, 0);
+                                          NULL)) {
-                mdelay(40);
+                        printk(KERN_INFO "%sabling clock spreading on Intrepid"
+                               " ASIC\n", enable ? "En" : "Dis");
+                        if (enable)
+                                UN_OUT(UNI_N_CLOCK_SPREADING, 2);
+                        else
+                                UN_OUT(UNI_N_CLOCK_SPREADING, 0);
+                        mdelay(40);
+                }
+                of_node_put(clock);
        }
        while (machine_is_compatible("PowerBook5,2") ||
@@ -1680,6 +1688,8 @@ void pmac_tweak_clock_spreading(int enable)
                        pmac_low_i2c_close(ui2c);
                        break;
                }
+                printk(KERN_INFO "%sabling clock spreading on i2c clock chip\n",
+                       enable ? "En" : "Dis");
                pmac_low_i2c_setmode(ui2c, pmac_low_i2c_mode_stdsub);
                rc = pmac_low_i2c_xfer(ui2c, 0xd2 | pmac_low_i2c_write, 0x80, buffer, 9);
                DBG("write result: %d,", rc);
diff --git a/arch/ppc/syslib/ppc4xx_dma.c b/arch/ppc/syslib/ppc4xx_dma.c
index f15e64285f96..05ccd598dd4e 100644
--- a/arch/ppc/syslib/ppc4xx_dma.c
+++ b/arch/ppc/syslib/ppc4xx_dma.c
@@ -30,6 +30,7 @@
 #include <asm/system.h>
 #include <asm/io.h>
+#include <asm/dma.h>
 #include <asm/ppc4xx_dma.h>
 ppc_dma_ch_t dma_channels[MAX_PPC4xx_DMA_CHANNELS];
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 3cfb8be3ff6d..56c34e7fd4ee 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -55,6 +55,10 @@ config NR_CPUS
        depends on SMP
        default "32"
+config SPARC
+        bool
+        default y
 # Identify this as a Sparc32 build
 config SPARC32
        bool
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index dea48f6cff38..4cdbb2d59ed0 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -34,7 +34,7 @@ libs-y += arch/sparc/prom/ arch/sparc/lib/
 # Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-)
 INIT_Y          := $(patsubst %/, %/built-in.o, $(init-y))
 CORE_Y          := $(core-y)
-CORE_Y          += kernel/ mm/ fs/ ipc/ security/ crypto/
+CORE_Y          += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
 CORE_Y          := $(patsubst %/, %/built-in.o, $(CORE_Y))
 DRIVERS_Y       := $(patsubst %/, %/built-in.o, $(drivers-y))
 NET_Y           := $(patsubst %/, %/built-in.o, $(net-y))
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c
index 1754192c69d0..5c3529ceb5d6 100644
--- a/arch/sparc/kernel/ebus.c
+++ b/arch/sparc/kernel/ebus.c
@@ -22,7 +22,7 @@
 #include <asm/oplib.h>
 #include <asm/bpp.h>
-struct linux_ebus *ebus_chain = 0;
+struct linux_ebus *ebus_chain = NULL;
 /* We are together with pcic.c under CONFIG_PCI. */
 extern unsigned int pcic_pin_to_irq(unsigned int, char *name);
@@ -46,7 +46,7 @@ static struct ebus_device_irq je1_1[] = {
        { "SUNW,CS4231",         0 },
        { "parallel",            0 },
        { "se",                  2 },
-        { 0, 0 }
+        { NULL, 0 }
 };
 /*
@@ -55,7 +55,7 @@ static struct ebus_device_irq je1_1[] = {
 */
 static struct ebus_system_entry ebus_blacklist[] = {
        { "SUNW,JavaEngine1", je1_1 },
-        { 0, 0 }
+        { NULL, NULL }
 };
 static struct ebus_device_irq *ebus_blackp = NULL;
@@ -233,7 +233,7 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev)
                        ebus_alloc(sizeof(struct linux_ebus_child));
                child = dev->children;
-                child->next = 0;
+                child->next = NULL;
                child->parent = dev;
                child->bus = dev->bus;
                fill_ebus_child(node, &regs[0], child);
@@ -243,7 +243,7 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev)
                                ebus_alloc(sizeof(struct linux_ebus_child));
                        child = child->next;
-                        child->next = 0;
+                        child->next = NULL;
                        child->parent = dev;
                        child->bus = dev->bus;
                        fill_ebus_child(node, &regs[0], child);
@@ -275,7 +275,7 @@ void __init ebus_init(void)
                }
        }
-        pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, 0);
+        pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, NULL);
        if (!pdev) {
                return;
        }
@@ -284,7 +284,7 @@ void __init ebus_init(void)
        ebus_chain = ebus = (struct linux_ebus *)
                        ebus_alloc(sizeof(struct linux_ebus));
-        ebus->next = 0;
+        ebus->next = NULL;
        while (ebusnd) {
@@ -325,8 +325,8 @@ void __init ebus_init(void)
                                ebus_alloc(sizeof(struct linux_ebus_device));
                dev = ebus->devices;
-                dev->next = 0;
+                dev->next = NULL;
-                dev->children = 0;
+                dev->children = NULL;
                dev->bus = ebus;
                fill_ebus_device(nd, dev);
@@ -335,8 +335,8 @@ void __init ebus_init(void)
                                ebus_alloc(sizeof(struct linux_ebus_device));
                        dev = dev->next;
-                        dev->next = 0;
+                        dev->next = NULL;
-                        dev->children = 0;
+                        dev->children = NULL;
                        dev->bus = ebus;
                        fill_ebus_device(nd, dev);
                }
@@ -353,7 +353,7 @@ void __init ebus_init(void)
                ebus->next = (struct linux_ebus *)
                        ebus_alloc(sizeof(struct linux_ebus));
                ebus = ebus->next;
-                ebus->next = 0;
+                ebus->next = NULL;
                ++num_ebus;
        }
        if (pdev)
diff --git a/arch/sparc/kernel/led.c b/arch/sparc/kernel/led.c
index 2a3afca453c9..313d1620ae8e 100644
--- a/arch/sparc/kernel/led.c
+++ b/arch/sparc/kernel/led.c
@@ -55,7 +55,7 @@ static int led_read_proc(char *buf, char **start, off_t offset, int count,
        return len;
 }
-static int led_write_proc(struct file *file, const char *buffer,
+static int led_write_proc(struct file *file, const char __user *buffer,
                          unsigned long count, void *data)
 {
        char *buf = NULL;
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index cccfc12802ed..42002b742deb 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -161,7 +161,7 @@ static struct pcic_sn2list pcic_known_sysnames[] = {
 static int pcic0_up;
 static struct linux_pcic pcic0;
-void * __iomem pcic_regs;
+void __iomem *pcic_regs;
 volatile int pcic_speculative;
 volatile int pcic_trapped;
diff --git a/arch/sparc/kernel/sys_sunos.c b/arch/sparc/kernel/sys_sunos.c
index 81c894acd0db..d07ae02101ad 100644
--- a/arch/sparc/kernel/sys_sunos.c
+++ b/arch/sparc/kernel/sys_sunos.c
@@ -894,7 +894,7 @@ asmlinkage long sunos_sysconf (int name)
                ret = ARG_MAX;
                break;
        case _SC_CHILD_MAX:
-                ret = CHILD_MAX;
+                ret = -1; /* no limit */
                break;
        case _SC_CLK_TCK:
                ret = HZ;
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index 24814d58f9e1..7dadcdb4ca42 100644
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -49,7 +49,7 @@ DEFINE_SPINLOCK(rtc_lock);
 enum sparc_clock_type sp_clock_typ;
 DEFINE_SPINLOCK(mostek_lock);
 void __iomem *mstk48t02_regs = NULL;
-static struct mostek48t08 *mstk48t08_regs = NULL;
+static struct mostek48t08 __iomem *mstk48t08_regs = NULL;
 static int set_rtc_mmss(unsigned long);
 static int sbus_do_settimeofday(struct timespec *tv);
@@ -342,7 +342,7 @@ static __inline__ void clock_probe(void)
                /* XXX r/o attribute is somewhere in r.flags */
                r.flags = clk_reg[0].which_io;
                r.start = clk_reg[0].phys_addr;
-                mstk48t08_regs = (struct mostek48t08 *) sbus_ioremap(&r, 0,
+                mstk48t08_regs = sbus_ioremap(&r, 0,
                    sizeof(struct mostek48t08), "mk48t08");
                mstk48t02_regs = &mstk48t08_regs->regs;
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S
index 38938d2e63aa..346c19a949fd 100644
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@@ -85,19 +85,9 @@ SECTIONS
  }
  _end = . ;
  PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-  .debug          0 : { *(.debug) }
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  .line           0 : { *(.line) }
  /DISCARD/ : { *(.exit.text) *(.exit.data) *(.exitcall.exit) }
+  STABS_DEBUG
+  DWARF_DEBUG
 }
diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c
index cb3cf0f22822..de84f8534bac 100644
--- a/arch/sparc/lib/atomic32.c
+++ b/arch/sparc/lib/atomic32.c
@@ -66,7 +66,6 @@ int atomic_add_unless(atomic_t *v, int a, int u)
        return ret != u;
 }
-static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
 /* Atomic operations are already serializing */
 void atomic_set(atomic_t *v, int i)
 {
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index 1d560390e282..731f19603cad 100644
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@@ -497,7 +497,7 @@ static void __init sun4c_probe_mmu(void)
        patch_kernel_fault_handler();
 }
-volatile unsigned long *sun4c_memerr_reg = NULL;
+volatile unsigned long __iomem *sun4c_memerr_reg = NULL;
 void __init sun4c_probe_memerr_reg(void)
 {
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 3fded69b1922..c4b7ad70cd7c 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -5,6 +5,10 @@
 mainmenu "Linux/UltraSPARC Kernel Configuration"
+config SPARC
+        bool
+        default y
 config SPARC64
        bool
        default y
diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile
index 43fe382da078..cad10c5b83d3 100644
--- a/arch/sparc64/Makefile
+++ b/arch/sparc64/Makefile
@@ -17,7 +17,6 @@ CC		:= $(shell if $(CC) -m64 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then
 NEW_GCC := $(call cc-option-yn, -m64 -mcmodel=medlow)
 NEW_GAS := $(shell if $(LD) -V 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi)
 UNDECLARED_REGS := $(shell if $(CC) -c -x assembler /dev/null -Wa,--help | grep undeclared-regs > /dev/null; then echo y; else echo n; fi; )
-INLINE_LIMIT := $(call cc-option-yn, -m64 -finline-limit=100000)
 export NEW_GCC
@@ -49,10 +48,6 @@ else
  AFLAGS += -m64 -mcpu=ultrasparc $(CC_UNDECL)
 endif
-ifeq ($(INLINE_LIMIT),y)
-  CFLAGS := $(CFLAGS) -finline-limit=100000
-endif
 ifeq ($(CONFIG_MCOUNT),y)
  CFLAGS := $(CFLAGS) -pg
 endif
diff --git a/arch/sparc64/kernel/kprobes.c b/arch/sparc64/kernel/kprobes.c
index 96bd09b098f4..a97b0f0727ab 100644
--- a/arch/sparc64/kernel/kprobes.c
+++ b/arch/sparc64/kernel/kprobes.c
@@ -138,7 +138,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
                         */
                        save_previous_kprobe(kcb);
                        set_current_kprobe(p, regs, kcb);
-                        p->nmissed++;
+                        kprobes_inc_nmissed_count(p);
                        kcb->kprobe_status = KPROBE_REENTER;
                        prepare_singlestep(p, regs, kcb);
                        return 1;
diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c
index d0592ed54ea5..bfa4aa68312d 100644
--- a/arch/sparc64/kernel/sys_sunos32.c
+++ b/arch/sparc64/kernel/sys_sunos32.c
@@ -854,7 +854,7 @@ asmlinkage s32 sunos_sysconf (int name)
                ret = ARG_MAX;
                break;
        case _SC_CHILD_MAX:
-                ret = CHILD_MAX;
+                ret = -1; /* no limit */
                break;
        case _SC_CLK_TCK:
                ret = HZ;
diff --git a/arch/sparc64/kernel/vmlinux.lds.S b/arch/sparc64/kernel/vmlinux.lds.S
index 2af0cf0a8640..467d13a0d5c1 100644
--- a/arch/sparc64/kernel/vmlinux.lds.S
+++ b/arch/sparc64/kernel/vmlinux.lds.S
@@ -90,19 +90,9 @@ SECTIONS
  }
  _end = . ;
  PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-  .debug          0 : { *(.debug) }
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  .line           0 : { *(.line) }
  /DISCARD/ : { *(.exit.text) *(.exit.data) *(.exitcall.exit) }
+  STABS_DEBUG
+  DWARF_DEBUG
 }
diff --git a/arch/sparc64/solaris/misc.c b/arch/sparc64/solaris/misc.c
index 302efbcba70e..3ab4677395f2 100644
--- a/arch/sparc64/solaris/misc.c
+++ b/arch/sparc64/solaris/misc.c
@@ -353,7 +353,7 @@ asmlinkage int solaris_sysconf(int id)
 {
        switch (id) {
        case SOLARIS_CONFIG_NGROUPS:    return NGROUPS_MAX;
-        case SOLARIS_CONFIG_CHILD_MAX:  return CHILD_MAX;
+        case SOLARIS_CONFIG_CHILD_MAX:  return -1; /* no limit */
        case SOLARIS_CONFIG_OPEN_FILES: return OPEN_MAX;
        case SOLARIS_CONFIG_POSIX_VER:  return 199309;
        case SOLARIS_CONFIG_PAGESIZE:   return PAGE_SIZE;
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 563301fe5df8..1eb21de9d1b5 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -289,6 +289,8 @@ source "arch/um/Kconfig.net"
 source "drivers/net/Kconfig"
+source "drivers/connector/Kconfig"
 source "fs/Kconfig"
 source "security/Kconfig"
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64
index 4f118d5cc2ee..38df311e75dc 100644
--- a/arch/um/Makefile-x86_64
+++ b/arch/um/Makefile-x86_64
@@ -12,3 +12,7 @@ CHECKFLAGS  += -m64
 ELF_ARCH := i386:x86-64
 ELF_FORMAT := elf64-x86-64
+# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.
+LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64
diff --git a/arch/um/include/sysdep-i386/stub.h b/arch/um/include/sysdep-i386/stub.h
index 6ba8cbbe0d36..b492b12b4a10 100644
--- a/arch/um/include/sysdep-i386/stub.h
+++ b/arch/um/include/sysdep-i386/stub.h
@@ -6,8 +6,12 @@
 #ifndef __SYSDEP_STUB_H
 #define __SYSDEP_STUB_H
+#include <sys/mman.h>
 #include <asm/ptrace.h>
 #include <asm/unistd.h>
+#include "stub-data.h"
+#include "kern_constants.h"
+#include "uml-config.h"
 extern void stub_segv_handler(int sig);
 extern void stub_clone_handler(void);
@@ -76,23 +80,22 @@ static inline long stub_syscall5(long syscall, long arg1, long arg2, long arg3,
        return ret;
 }
-static inline long stub_syscall6(long syscall, long arg1, long arg2, long arg3,
+static inline void trap_myself(void)
-                                 long arg4, long arg5, long arg6)
 {
-        long ret;
+        __asm("int3");
-        __asm__ volatile ("push %%ebp ; movl %%eax,%%ebp ; movl %1,%%eax ; "
-                        "int $0x80 ; pop %%ebp"
-                        : "=a" (ret)
-                        : "g" (syscall), "b" (arg1), "c" (arg2), "d" (arg3),
-                          "S" (arg4), "D" (arg5), "0" (arg6));
-        return ret;
 }
-static inline void trap_myself(void)
+static inline void remap_stack(int fd, unsigned long offset)
 {
-        __asm("int3");
+        __asm__ volatile ("movl %%eax,%%ebp ; movl %0,%%eax ; int $0x80 ;"
+                          "movl %7, %%ebx ; movl %%eax, (%%ebx)"
+                          : : "g" (STUB_MMAP_NR), "b" (UML_CONFIG_STUB_DATA), 
+                            "c" (UM_KERN_PAGE_SIZE), 
+                            "d" (PROT_READ | PROT_WRITE),
+                            "S" (MAP_FIXED | MAP_SHARED), "D" (fd), 
+                            "a" (offset), 
+                            "i" (&((struct stub_data *) UML_CONFIG_STUB_DATA)->err) 
+                          : "memory");
 }
 #endif
diff --git a/arch/um/include/sysdep-x86_64/stub.h b/arch/um/include/sysdep-x86_64/stub.h
index c41689c13dc9..92e989f81761 100644
--- a/arch/um/include/sysdep-x86_64/stub.h
+++ b/arch/um/include/sysdep-x86_64/stub.h
@@ -6,8 +6,12 @@
 #ifndef __SYSDEP_STUB_H
 #define __SYSDEP_STUB_H
+#include <sys/mman.h>
 #include <asm/unistd.h>
 #include <sysdep/ptrace_user.h>
+#include "stub-data.h"
+#include "kern_constants.h"
+#include "uml-config.h"
 extern void stub_segv_handler(int sig);
 extern void stub_clone_handler(void);
@@ -81,23 +85,23 @@ static inline long stub_syscall5(long syscall, long arg1, long arg2, long arg3,
        return ret;
 }
-static inline long stub_syscall6(long syscall, long arg1, long arg2, long arg3,
+static inline void trap_myself(void)
-                                 long arg4, long arg5, long arg6)
 {
-        long ret;
+        __asm("int3");
-        __asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; "
-                "movq %7, %%r9; " __syscall : "=a" (ret)
-                : "0" (syscall), "D" (arg1), "S" (arg2), "d" (arg3),
-                  "g" (arg4), "g" (arg5), "g" (arg6)
-                : __syscall_clobber, "r10", "r8", "r9" );
-        return ret;
 }
-static inline void trap_myself(void)
+static inline void remap_stack(long fd, unsigned long offset)
 {
-        __asm("int3");
+        __asm__ volatile ("movq %4,%%r10 ; movq %5,%%r8 ; "
+                          "movq %6, %%r9; " __syscall "; movq %7, %%rbx ; "
+                          "movq %%rax, (%%rbx)": 
+                          : "a" (STUB_MMAP_NR), "D" (UML_CONFIG_STUB_DATA), 
+                            "S" (UM_KERN_PAGE_SIZE), 
+                            "d" (PROT_READ | PROT_WRITE), 
+                            "g" (MAP_FIXED | MAP_SHARED), "g" (fd), 
+                            "g" (offset),
+                            "i" (&((struct stub_data *) UML_CONFIG_STUB_DATA)->err)
+                          : __syscall_clobber, "r10", "r8", "r9" );
 }
 #endif
diff --git a/arch/um/include/um_uaccess.h b/arch/um/include/um_uaccess.h
index f8760a3f43b0..4567f1eeb4a7 100644
--- a/arch/um/include/um_uaccess.h
+++ b/arch/um/include/um_uaccess.h
@@ -17,6 +17,8 @@
 #include "uaccess-skas.h"
 #endif
+#include "asm/fixmap.h"
 #define __under_task_size(addr, size) \
        (((unsigned long) (addr) < TASK_SIZE) && \
         (((unsigned long) (addr) + (size)) < TASK_SIZE))
diff --git a/arch/um/kernel/skas/clone.c b/arch/um/kernel/skas/clone.c
index cb37ce9124a6..47b812b3bca8 100644
--- a/arch/um/kernel/skas/clone.c
+++ b/arch/um/kernel/skas/clone.c
@@ -18,11 +18,10 @@
 * on some systems.
 */
-#define STUB_DATA(field) (((struct stub_data *) UML_CONFIG_STUB_DATA)->field)
 void __attribute__ ((__section__ (".__syscall_stub")))
 stub_clone_handler(void)
 {
+        struct stub_data *data = (struct stub_data *) UML_CONFIG_STUB_DATA;
        long err;
        err = stub_syscall2(__NR_clone, CLONE_PARENT | CLONE_FILES | SIGCHLD,
@@ -35,17 +34,21 @@ stub_clone_handler(void)
        if(err)
                goto out;
-        err = stub_syscall3(__NR_setitimer, ITIMER_VIRTUAL,
+        err = stub_syscall3(__NR_setitimer, ITIMER_VIRTUAL, 
-                            (long) &STUB_DATA(timer), 0);
+                            (long) &data->timer, 0);
        if(err)
                goto out;
-        err = stub_syscall6(STUB_MMAP_NR, UML_CONFIG_STUB_DATA,
+        remap_stack(data->fd, data->offset);
-                            UM_KERN_PAGE_SIZE, PROT_READ | PROT_WRITE,
+        goto done;
-                            MAP_FIXED | MAP_SHARED, STUB_DATA(fd),
-                            STUB_DATA(offset));
 out:
-        /* save current result. Parent: pid; child: retcode of mmap */
+        /* save current result. 
-        STUB_DATA(err) = err;
+         * Parent: pid; 
+         * child: retcode of mmap already saved and it jumps around this 
+         * assignment
+         */
+        data->err = err;
+ done:
        trap_myself();
 }
diff --git a/arch/um/kernel/skas/include/uaccess-skas.h b/arch/um/kernel/skas/include/uaccess-skas.h
index f611f83ad4ff..64516c556cdf 100644
--- a/arch/um/kernel/skas/include/uaccess-skas.h
+++ b/arch/um/kernel/skas/include/uaccess-skas.h
@@ -7,7 +7,6 @@
 #define __SKAS_UACCESS_H
 #include "asm/errno.h"
-#include "asm/fixmap.h"
 /* No SKAS-specific checking. */
 #define access_ok_skas(type, addr, size) 0
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c
index 37517d49c4ae..29a9e3f43763 100644
--- a/arch/um/os-Linux/start_up.c
+++ b/arch/um/os-Linux/start_up.c
@@ -116,16 +116,16 @@ static int stop_ptraced_child(int pid, void *stack, int exitcode,
        if(!WIFEXITED(status) || (WEXITSTATUS(status) != exitcode)) {
                int exit_with = WEXITSTATUS(status);
                if (exit_with == 2)
-                        printk("check_ptrace : child exited with status 2. "
+                        printf("check_ptrace : child exited with status 2. "
                               "Serious trouble happening! Try updating your "
                               "host skas patch!\nDisabling SYSEMU support.");
-                printk("check_ptrace : child exited with exitcode %d, while "
+                printf("check_ptrace : child exited with exitcode %d, while "
                      "expecting %d; status 0x%x", exit_with,
                      exitcode, status);
                if (mustpanic)
                        panic("\n");
                else
-                        printk("\n");
+                        printf("\n");
                ret = -1;
        }
@@ -183,7 +183,7 @@ static void __init check_sysemu(void)
        void *stack;
        int pid, n, status, count=0;
-        printk("Checking syscall emulation patch for ptrace...");
+        printf("Checking syscall emulation patch for ptrace...");
        sysemu_supported = 0;
        pid = start_ptraced_child(&stack);
@@ -207,10 +207,10 @@ static void __init check_sysemu(void)
                goto fail_stopped;
        sysemu_supported = 1;
-        printk("OK\n");
+        printf("OK\n");
        set_using_sysemu(!force_sysemu_disabled);
-        printk("Checking advanced syscall emulation patch for ptrace...");
+        printf("Checking advanced syscall emulation patch for ptrace...");
        pid = start_ptraced_child(&stack);
        if(ptrace(PTRACE_OLDSETOPTIONS, pid, 0,
@@ -246,7 +246,7 @@ static void __init check_sysemu(void)
                goto fail_stopped;
        sysemu_supported = 2;
-        printk("OK\n");
+        printf("OK\n");
        if ( !force_sysemu_disabled )
                set_using_sysemu(sysemu_supported);
@@ -255,7 +255,7 @@ static void __init check_sysemu(void)
 fail:
        stop_ptraced_child(pid, stack, 1, 0);
 fail_stopped:
-        printk("missing\n");
+        printf("missing\n");
 }
 static void __init check_ptrace(void)
@@ -263,7 +263,7 @@ static void __init check_ptrace(void)
        void *stack;
        int pid, syscall, n, status;
-        printk("Checking that ptrace can change system call numbers...");
+        printf("Checking that ptrace can change system call numbers...");
        pid = start_ptraced_child(&stack);
        if(ptrace(PTRACE_OLDSETOPTIONS, pid, 0, (void *)PTRACE_O_TRACESYSGOOD) < 0)
@@ -292,7 +292,7 @@ static void __init check_ptrace(void)
                }
        }
        stop_ptraced_child(pid, stack, 0, 1);
-        printk("OK\n");
+        printf("OK\n");
        check_sysemu();
 }
@@ -472,6 +472,8 @@ int can_do_skas(void)
 int have_devanon = 0;
+/* Runs on boot kernel stack - already safe to use printk. */
 void check_devanon(void)
 {
        int fd;
diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
index 56d3f870926b..8da6ab31152a 100644
--- a/arch/um/os-Linux/user_syms.c
+++ b/arch/um/os-Linux/user_syms.c
@@ -34,6 +34,11 @@ EXPORT_SYMBOL(strstr);
       int sym(void);                  \
       EXPORT_SYMBOL(sym);
+extern void readdir64(void) __attribute__((weak));
+EXPORT_SYMBOL(readdir64);
+extern void truncate64(void) __attribute__((weak));
+EXPORT_SYMBOL(truncate64);
 #ifdef SUBARCH_i386
 EXPORT_SYMBOL(vsyscall_ehdr);
 EXPORT_SYMBOL(vsyscall_end);
diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules
index b3fbf125709b..2e41cabd3d93 100644
--- a/arch/um/scripts/Makefile.rules
+++ b/arch/um/scripts/Makefile.rules
@@ -21,11 +21,6 @@ define unprofile
 endef
-# The stubs and unmap.o can't try to call mcount or update basic block data
-define unprofile
-        $(patsubst -pg,,$(patsubst -fprofile-arcs -ftest-coverage,,$(1)))
-endef
 # cmd_make_link checks to see if the $(foo-dir) variable starts with a /.  If
 # so, it's considered to be a path relative to $(srcdir) rather than
 # $(srcdir)/arch/$(SUBARCH).  This is because x86_64 wants to get ldt.c from
diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 150059dbee12..f5fd5b0156d0 100644
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -1,6 +1,8 @@
-obj-y = bitops.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
+obj-y := bitops.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
-        ptrace_user.o semaphore.o signal.o sigcontext.o stub.o stub_segv.o \
+        ptrace_user.o semaphore.o signal.o sigcontext.o syscalls.o sysrq.o \
-        syscalls.o sysrq.o sys_call_table.o
+        sys_call_table.o
+obj-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o
 obj-$(CONFIG_HIGHMEM) += highmem.o
 obj-$(CONFIG_MODULES) += module.o
diff --git a/arch/um/sys-x86_64/Makefile b/arch/um/sys-x86_64/Makefile
index 00b2025427df..a351091fbd99 100644
--- a/arch/um/sys-x86_64/Makefile
+++ b/arch/um/sys-x86_64/Makefile
@@ -6,8 +6,9 @@
 #XXX: why into lib-y?
 lib-y = bitops.o bugs.o csum-partial.o delay.o fault.o ldt.o mem.o memcpy.o \
-        ptrace.o ptrace_user.o sigcontext.o signal.o stub.o \
+        ptrace.o ptrace_user.o sigcontext.o signal.o syscalls.o \
-        stub_segv.o syscalls.o syscall_table.o sysrq.o thunk.o
+        syscall_table.o sysrq.o thunk.o
+lib-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o
 obj-y := ksyms.o
 obj-$(CONFIG_MODULES) += module.o um_module.o
diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86_64/ia32/ia32_binfmt.c
index 830feb272eca..2b760d0d9ce2 100644
--- a/arch/x86_64/ia32/ia32_binfmt.c
+++ b/arch/x86_64/ia32/ia32_binfmt.c
@@ -217,8 +217,7 @@ elf_core_copy_task_fpregs(struct task_struct *tsk, struct pt_regs *regs, elf_fpr
        if (!tsk_used_math(tsk))
                return 0;
        if (!regs)
-                regs = (struct pt_regs *)tsk->thread.rsp0;
+                regs = ((struct pt_regs *)tsk->thread.rsp0) - 1;
-        --regs;
        if (tsk == current)
                unlazy_fpu(tsk);
        set_fs(KERNEL_DS); 
diff --git a/arch/x86_64/kernel/kprobes.c b/arch/x86_64/kernel/kprobes.c
index dddeb678b440..afe11f4fbd1d 100644
--- a/arch/x86_64/kernel/kprobes.c
+++ b/arch/x86_64/kernel/kprobes.c
@@ -329,7 +329,7 @@ int __kprobes kprobe_handler(struct pt_regs *regs)
                                 */
                                save_previous_kprobe(kcb);
                                set_current_kprobe(p, regs, kcb);
-                                p->nmissed++;
+                                kprobes_inc_nmissed_count(p);
                                prepare_singlestep(p, regs);
                                kcb->kprobe_status = KPROBE_REENTER;
                                return 1;
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
index 683c33f7b967..ecbd7b83acc1 100644
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@ -1181,7 +1181,7 @@ int __cpu_disable(void)
        if (cpu == 0)
                return -EBUSY;
-        disable_APIC_timer();
+        clear_local_APIC();
        /*
         * HACK:
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index fdaddc4e5284..74102796e5c0 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -59,7 +59,7 @@ static int notsc __initdata = 0;
 unsigned int cpu_khz;                                   /* TSC clocks / usec, not used here */
 static unsigned long hpet_period;                       /* fsecs / HPET clock */
 unsigned long hpet_tick;                                /* HPET clocks / interrupt */
-static int hpet_use_timer;
+static int hpet_use_timer;                              /* Use counter of hpet for time keeping, otherwise PIT */
 unsigned long vxtime_hz = PIT_TICK_RATE;
 int report_lost_ticks;                          /* command line option */
 unsigned long long monotonic_base;
@@ -908,12 +908,14 @@ void __init time_init(void)
        if (!hpet_init())
                vxtime_hz = (1000000000000000L + hpet_period / 2) /
                        hpet_period;
+        else
+                vxtime.hpet_address = 0;
        if (hpet_use_timer) {
                cpu_khz = hpet_calibrate_tsc();
                timename = "HPET";
 #ifdef CONFIG_X86_PM_TIMER
-        } else if (pmtmr_ioport) {
+        } else if (pmtmr_ioport && !vxtime.hpet_address) {
                vxtime_hz = PM_TIMER_FREQUENCY;
                timename = "PM";
                pit_init();
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index 286f6a624c3a..c016dfe84784 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -348,7 +348,7 @@ size_zones(unsigned long *z, unsigned long *h,
        }
        /* Compute holes */
-        w = 0;
+        w = start_pfn;
        for (i = 0; i < MAX_NR_ZONES; i++) {
                unsigned long s = w;
                w += z[i];
diff --git a/arch/x86_64/mm/ioremap.c b/arch/x86_64/mm/ioremap.c
index ecf7acb5db9b..ae207064201e 100644
--- a/arch/x86_64/mm/ioremap.c
+++ b/arch/x86_64/mm/ioremap.c
@@ -247,9 +247,15 @@ void __iomem *ioremap_nocache (unsigned long phys_addr, unsigned long size)
        return __ioremap(phys_addr, size, _PAGE_PCD);
 }
+/**
+ * iounmap - Free a IO remapping
+ * @addr: virtual address from ioremap_*
+ *
+ * Caller must ensure there is only one unmapping for the same pointer.
+ */
 void iounmap(volatile void __iomem *addr)
 {
-        struct vm_struct *p;
+        struct vm_struct *p, *o;
        if (addr <= high_memory) 
                return; 
@@ -257,12 +263,31 @@ void iounmap(volatile void __iomem *addr)
                addr < phys_to_virt(ISA_END_ADDRESS))
                return;
-        write_lock(&vmlist_lock);
+        addr = (volatile void __iomem *)(PAGE_MASK & (unsigned long __force)addr);
-        p = __remove_vm_area((void *)((unsigned long)addr & PAGE_MASK));
+        /* Use the vm area unlocked, assuming the caller
-        if (!p)
+           ensures there isn't another iounmap for the same address
+           in parallel. Reuse of the virtual address is prevented by
+           leaving it in the global lists until we're done with it.
+           cpa takes care of the direct mappings. */
+        read_lock(&vmlist_lock);
+        for (p = vmlist; p; p = p->next) {
+                if (p->addr == addr)
+                        break;
+        }
+        read_unlock(&vmlist_lock);
+        if (!p) {
                printk("iounmap: bad address %p\n", addr);
-        else if (p->flags >> 20)
+                dump_stack();
+                return;
+        }
+        /* Reset the direct mapping. Can block */
+        if (p->flags >> 20)
                ioremap_change_attr(p->phys_addr, p->size, 0);
-        write_unlock(&vmlist_lock);
+        /* Finally remove it */
+        o = remove_vm_area((void *)addr);
+        BUG_ON(p != o || o == NULL);
        kfree(p); 
 }
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c
index a828a01739cc..15b67d2760cb 100644
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86_64/mm/numa.c
@@ -53,6 +53,8 @@ static int __init populate_memnodemap(
        int res = -1;
        unsigned long addr, end;
+        if (shift >= 64)
+                return -1;
        memset(memnodemap, 0xff, sizeof(memnodemap));
        for (i = 0; i < numnodes; i++) {
                addr = nodes[i].start;
@@ -65,7 +67,7 @@ static int __init populate_memnodemap(
                        if (memnodemap[addr >> shift] != 0xff)
                                return -1;
                        memnodemap[addr >> shift] = i;
-                        addr += (1 << shift);
+                       addr += (1UL << shift);
                } while (addr < end);
                res = 1;
        } 
diff --git a/arch/x86_64/pci/Makefile b/arch/x86_64/pci/Makefile
index bb34e5ef916c..a8f75a2a0f6f 100644
--- a/arch/x86_64/pci/Makefile
+++ b/arch/x86_64/pci/Makefile
@@ -11,7 +11,7 @@ obj-y		+= fixup.o
 obj-$(CONFIG_ACPI)      += acpi.o
 obj-y                   += legacy.o irq.o common.o
 # mmconfig has a 64bit special
-obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o
+obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o direct.o
 obj-$(CONFIG_NUMA)      += k8-bus.o
diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c
index a0838c4a94e4..f16c0d57c552 100644
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86_64/pci/mmconfig.c
@@ -8,18 +8,21 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
+#include <linux/bitmap.h>
 #include "pci.h"
 #define MMCONFIG_APER_SIZE (256*1024*1024)
+static DECLARE_BITMAP(fallback_slots, 32);
 /* Static virtual mapping of the MMCONFIG aperture */
 struct mmcfg_virt {
        struct acpi_table_mcfg_config *cfg;
-        char *virt;
+        char __iomem *virt;
 };
 static struct mmcfg_virt *pci_mmcfg_virt;
-static char *get_virt(unsigned int seg, int bus)
+static char __iomem *get_virt(unsigned int seg, unsigned bus)
 {
        int cfg_num = -1;
        struct acpi_table_mcfg_config *cfg;
@@ -27,10 +30,9 @@ static char *get_virt(unsigned int seg, int bus)
        while (1) {
                ++cfg_num;
                if (cfg_num >= pci_mmcfg_config_num) {
-                        /* something bad is going on, no cfg table is found. */
+                        /* Not found - fall back to type 1. This happens
-                        /* so we fall back to the old way we used to do this */
+                           e.g. on the internal devices of a K8 northbridge. */
-                        /* and just rely on the first entry to be correct. */
+                        return NULL;
-                        return pci_mmcfg_virt[0].virt;
                }
                cfg = pci_mmcfg_virt[cfg_num].cfg;
                if (cfg->pci_segment_group_number != seg)
@@ -41,20 +43,30 @@ static char *get_virt(unsigned int seg, int bus)
        }
 }
-static inline char *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn)
+static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn)
 {
+        char __iomem *addr;
-        return get_virt(seg, bus) + ((bus << 20) | (devfn << 12));
+        if (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), &fallback_slots))
+                return NULL;
+        addr = get_virt(seg, bus);
+        if (!addr)
+                return NULL;
+        return addr + ((bus << 20) | (devfn << 12));
 }
 static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
                          unsigned int devfn, int reg, int len, u32 *value)
 {
-        char *addr = pci_dev_base(seg, bus, devfn);
+        char __iomem *addr;
+        /* Why do we have this when nobody checks it. How about a BUG()!? -AK */
        if (unlikely(!value || (bus > 255) || (devfn > 255) || (reg > 4095)))
                return -EINVAL;
+        addr = pci_dev_base(seg, bus, devfn);
+        if (!addr)
+                return pci_conf1_read(seg,bus,devfn,reg,len,value);
        switch (len) {
        case 1:
                *value = readb(addr + reg);
@@ -73,11 +85,16 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
 static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
                           unsigned int devfn, int reg, int len, u32 value)
 {
-        char *addr = pci_dev_base(seg, bus, devfn);
+        char __iomem *addr;
+        /* Why do we have this when nobody checks it. How about a BUG()!? -AK */
        if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095)))
                return -EINVAL;
+        addr = pci_dev_base(seg, bus, devfn);
+        if (!addr)
+                return pci_conf1_write(seg,bus,devfn,reg,len,value);
        switch (len) {
        case 1:
                writeb(value, addr + reg);
@@ -98,6 +115,30 @@ static struct pci_raw_ops pci_mmcfg = {
        .write =        pci_mmcfg_write,
 };
+/* K8 systems have some devices (typically in the builtin northbridge)
+   that are only accessible using type1
+   Normally this can be expressed in the MCFG by not listing them
+   and assigning suitable _SEGs, but this isn't implemented in some BIOS.
+   Instead try to discover all devices on bus 0 that are unreachable using MM
+   and fallback for them.
+   We only do this for bus 0/seg 0 */
+static __init void unreachable_devices(void)
+{
+        int i;
+        for (i = 0; i < 32; i++) {
+                u32 val1;
+                char __iomem *addr;
+                pci_conf1_read(0, 0, PCI_DEVFN(i,0), 0, 4, &val1);
+                if (val1 == 0xffffffff)
+                        continue;
+                addr = pci_dev_base(0, 0, PCI_DEVFN(i, 0));
+                if (addr == NULL|| readl(addr) != val1) {
+                        set_bit(i, &fallback_slots);
+                }
+        }
+}
 static int __init pci_mmcfg_init(void)
 {
        int i;
@@ -128,6 +169,8 @@ static int __init pci_mmcfg_init(void)
                printk(KERN_INFO "PCI: Using MMCONFIG at %x\n", pci_mmcfg_config[i].base_address);
        }
+        unreachable_devices();
        raw_pci_ops = &pci_mmcfg;
        pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 382dea7b224c..6e7db2e79f42 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -442,11 +442,37 @@ error:
        return err;
 }
+/* Send basic block requests */
+static int __blk_send_generic(request_queue_t *q, struct gendisk *bd_disk, int cmd, int data)
+{
+        struct request *rq;
+        int err;
+        rq = blk_get_request(q, WRITE, __GFP_WAIT);
+        rq->flags |= REQ_BLOCK_PC;
+        rq->data = NULL;
+        rq->data_len = 0;
+        rq->timeout = BLK_DEFAULT_TIMEOUT;
+        memset(rq->cmd, 0, sizeof(rq->cmd));
+        rq->cmd[0] = cmd;
+        rq->cmd[4] = data;
+        rq->cmd_len = 6;
+        err = blk_execute_rq(q, bd_disk, rq, 0);
+        blk_put_request(rq);
+        return err;
+}
+static inline int blk_send_start_stop(request_queue_t *q, struct gendisk *bd_disk, int data)
+{
+        return __blk_send_generic(q, bd_disk, GPCMD_START_STOP_UNIT, data);
+}
 int scsi_cmd_ioctl(struct file *file, struct gendisk *bd_disk, unsigned int cmd, void __user *arg)
 {
        request_queue_t *q;
-        struct request *rq;
+        int err;
-        int close = 0, err;
        q = bd_disk->queue;
        if (!q)
@@ -564,19 +590,10 @@ int scsi_cmd_ioctl(struct file *file, struct gendisk *bd_disk, unsigned int cmd,
                        err = sg_scsi_ioctl(file, q, bd_disk, arg);
                        break;
                case CDROMCLOSETRAY:
-                        close = 1;
+                        err = blk_send_start_stop(q, bd_disk, 0x03);
+                        break;
                case CDROMEJECT:
-                        rq = blk_get_request(q, WRITE, __GFP_WAIT);
+                        err = blk_send_start_stop(q, bd_disk, 0x02);
-                        rq->flags |= REQ_BLOCK_PC;
-                        rq->data = NULL;
-                        rq->data_len = 0;
-                        rq->timeout = BLK_DEFAULT_TIMEOUT;
-                        memset(rq->cmd, 0, sizeof(rq->cmd));
-                        rq->cmd[0] = GPCMD_START_STOP_UNIT;
-                        rq->cmd[4] = 0x02 + (close != 0);
-                        rq->cmd_len = 6;
-                        err = blk_execute_rq(q, bd_disk, rq, 0);
-                        blk_put_request(rq);
                        break;
                default:
                        err = -ENOTTY;
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 82292b77e5c6..78927c0f1551 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -316,7 +316,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
        if (!link || !irq)
                return_VALUE(-EINVAL);
-        resource = kmalloc(sizeof(*resource) + 1, GFP_KERNEL);
+        resource = kmalloc(sizeof(*resource) + 1, GFP_ATOMIC);
        if (!resource)
                return_VALUE(-ENOMEM);
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 5f51057518b0..807b0df308f1 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -274,8 +274,6 @@ static void acpi_processor_idle(void)
                }
        }
-        cx->usage++;
 #ifdef CONFIG_HOTPLUG_CPU
        /*
         * Check for P_LVL2_UP flag before entering C2 and above on
@@ -283,9 +281,12 @@ static void acpi_processor_idle(void)
         * detection phase, to work cleanly with logical CPU hotplug.
         */
        if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) && 
-            !pr->flags.has_cst && acpi_fadt.plvl2_up)
+            !pr->flags.has_cst && !acpi_fadt.plvl2_up)
-                cx->type = ACPI_STATE_C1;
+                cx = &pr->power.states[ACPI_STATE_C1];
 #endif
+        cx->usage++;
        /*
         * Sleep:
         * ------
@@ -386,6 +387,15 @@ static void acpi_processor_idle(void)
        next_state = pr->power.state;
+#ifdef CONFIG_HOTPLUG_CPU
+        /* Don't do promotion/demotion */
+        if ((cx->type == ACPI_STATE_C1) && (num_online_cpus() > 1) &&
+            !pr->flags.has_cst && !acpi_fadt.plvl2_up) {
+                next_state = cx;
+                goto end;
+        }
+#endif
        /*
         * Promotion?
         * ----------
@@ -557,7 +567,7 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
         * Check for P_LVL2_UP flag before entering C2 and above on
         * an SMP system. 
         */
-        if ((num_online_cpus() > 1) && acpi_fadt.plvl2_up)
+        if ((num_online_cpus() > 1) && !acpi_fadt.plvl2_up)
                return_VALUE(-ENODEV);
 #endif
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index f37584015324..dc9817cfb882 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -102,8 +102,8 @@ static int cpu_has_cpufreq(unsigned int cpu)
 {
        struct cpufreq_policy policy;
        if (!acpi_thermal_cpufreq_is_init || cpufreq_get_policy(&policy, cpu))
-                return -ENODEV;
+                return 0;
-        return 0;
+        return 1;
 }
 static int acpi_thermal_cpufreq_increase(unsigned int cpu)
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index 0c5abc536c7a..2ce872d75890 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -84,14 +84,14 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
        /* Find a free owner ID */
-        for (i = 0; i < 32; i++) {
+        for (i = 0; i < 64; i++) {
-                if (!(acpi_gbl_owner_id_mask & (1 << i))) {
+                if (!(acpi_gbl_owner_id_mask & (1ULL << i))) {
                        ACPI_DEBUG_PRINT((ACPI_DB_VALUES,
-                                          "Current owner_id mask: %8.8X New ID: %2.2X\n",
+                                          "Current owner_id mask: %16.16LX New ID: %2.2X\n",
                                          acpi_gbl_owner_id_mask,
                                          (unsigned int)(i + 1)));
-                        acpi_gbl_owner_id_mask |= (1 << i);
+                        acpi_gbl_owner_id_mask |= (1ULL << i);
                        *owner_id = (acpi_owner_id) (i + 1);
                        goto exit;
                }
@@ -106,7 +106,7 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
         */
        *owner_id = 0;
        status = AE_OWNER_ID_LIMIT;
-        ACPI_REPORT_ERROR(("Could not allocate new owner_id (32 max), AE_OWNER_ID_LIMIT\n"));
+        ACPI_REPORT_ERROR(("Could not allocate new owner_id (64 max), AE_OWNER_ID_LIMIT\n"));
      exit:
        (void)acpi_ut_release_mutex(ACPI_MTX_CACHES);
@@ -123,7 +123,7 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
 *              control method or unloading a table. Either way, we would
 *              ignore any error anyway.
 *
- * DESCRIPTION: Release a table or method owner ID.  Valid IDs are 1 - 32
+ * DESCRIPTION: Release a table or method owner ID.  Valid IDs are 1 - 64
 *
 ******************************************************************************/
@@ -140,7 +140,7 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)
        /* Zero is not a valid owner_iD */
-        if ((owner_id == 0) || (owner_id > 32)) {
+        if ((owner_id == 0) || (owner_id > 64)) {
                ACPI_REPORT_ERROR(("Invalid owner_id: %2.2X\n", owner_id));
                return_VOID;
        }
@@ -158,8 +158,8 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)
        /* Free the owner ID only if it is valid */
-        if (acpi_gbl_owner_id_mask & (1 << owner_id)) {
+        if (acpi_gbl_owner_id_mask & (1ULL << owner_id)) {
-                acpi_gbl_owner_id_mask ^= (1 << owner_id);
+                acpi_gbl_owner_id_mask ^= (1ULL << owner_id);
        }
        (void)acpi_ut_release_mutex(ACPI_MTX_CACHES);
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index d15c194be44a..d1387cfe2d30 100644
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
@@ -123,7 +123,7 @@ static int __init adummy_init(void)
        }
        memset(adummy_dev, 0, sizeof(struct adummy_dev));
-        atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, 0);
+        atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, NULL);
        if (!atm_dev) {
                printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n");
                err = -ENODEV;
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index b7ddd651d664..bc3ca6a656b2 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -28,7 +28,6 @@
 static struct sysdev_class memory_sysdev_class = {
        set_kset_name(MEMORY_CLASS_NAME),
 };
-EXPORT_SYMBOL(memory_sysdev_class);
 static char *memory_hotplug_name(struct kset *kset, struct kobject *kobj)
 {
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index a9e33db46e68..c3441b3f086e 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1146,7 +1146,6 @@ static int revalidate_allvol(ctlr_info_t *host)
                                del_gendisk(disk);
                        if (q)
                                blk_cleanup_queue(q);
-                        put_disk(disk);
                }
        }
@@ -1465,9 +1464,10 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,
                        request_queue_t *q = disk->queue;
                        if (disk->flags & GENHD_FL_UP)
                                del_gendisk(disk);
-                        if (q)  
+                        if (q) {
                                blk_cleanup_queue(q);
-                        put_disk(disk); 
+                                drv->queue = NULL;
+                        }
                }
        }
@@ -3243,7 +3243,6 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev)
                                del_gendisk(disk);
                        if (q)
                                blk_cleanup_queue(q);
-                        put_disk(disk);
                }
        }
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 970f70d498f4..84e68cdd451b 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -687,7 +687,7 @@ config NVRAM
 config RTC
        tristate "Enhanced Real Time Clock Support"
-        depends on !PPC32 && !PARISC && !IA64 && !M68K
+        depends on !PPC32 && !PARISC && !IA64 && !M68K && (!SPARC || PCI)
        ---help---
          If you say Y here and create a character special file /dev/rtc with
          major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -735,7 +735,7 @@ config SGI_IP27_RTC
 config GEN_RTC
        tristate "Generic /dev/rtc emulation"
-        depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC32 && !SPARC64
+        depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC
        ---help---
          If you say Y here and create a character special file /dev/rtc with
          major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -943,6 +943,15 @@ config RAW_DRIVER
          Applications should simply open the device (eg /dev/hda1)
          with the O_DIRECT flag.
+config MAX_RAW_DEVS
+        int "Maximum number of RAW devices to support (1-8192)"
+        depends on RAW_DRIVER
+        default "256"
+        help
+          The maximum number of RAW devices that are supported.
+          Default is 256. Increase this number in case you need lots of
+          raw devices.
 config HPET
        bool "HPET - High Precision Event Timer" if (X86 || IA64)
        default n
@@ -974,15 +983,6 @@ config HPET_MMAP
          exposed to the user.  If this applies to your hardware,
          say N here.
-config MAX_RAW_DEVS
-        int "Maximum number of RAW devices to support (1-8192)"
-        depends on RAW_DRIVER
-        default "256"
-        help
-          The maximum number of RAW devices that are supported.
-          Default is 256. Increase this number in case you need lots of
-          raw devices.
 config HANGCHECK_TIMER
        tristate "Hangcheck timer"
        depends on X86 || IA64 || PPC64 || ARCH_S390
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index 03839ea31092..342302d46743 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -1311,7 +1311,7 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
 static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
 {
-        drm_radeon_private_t *dev_priv = dev->dev_private;;
+        drm_radeon_private_t *dev_priv = dev->dev_private;
        DRM_DEBUG("\n");
        dev_priv->is_pci = init->is_pci;
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index 7bda7e33d2bd..d92ccee3e54c 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -379,6 +379,7 @@ extern int r300_do_cp_cmdbuf(drm_device_t * dev, DRMFILE filp,
 #       define RADEON_PLL_WR_EN                 (1 << 7)
 #define RADEON_CLOCK_CNTL_INDEX         0x0008
 #define RADEON_CONFIG_APER_SIZE         0x0108
+#define RADEON_CONFIG_MEMSIZE           0x00f8
 #define RADEON_CRTC_OFFSET              0x0224
 #define RADEON_CRTC_OFFSET_CNTL         0x0228
 #       define RADEON_CRTC_TILE_EN              (1 << 15)
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 6b302a930e5f..1f56b4cf0f58 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -2986,7 +2986,7 @@ static void send_panic_events(char *str)
        msg.cmd = 2; /* Platform event command. */
        msg.data = data;
        msg.data_len = 8;
-        data[0] = 0x21; /* Kernel generator ID, IPMI table 5-4 */
+        data[0] = 0x41; /* Kernel generator ID, IPMI table 5-4 */
        data[1] = 0x03; /* This is for IPMI 1.0. */
        data[2] = 0x20; /* OS Critical Stop, IPMI table 36-3 */
        data[4] = 0x6f; /* Sensor specific, IPMI table 36-1 */
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 01a1f6badb53..beea450ee4b2 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2399,7 +2399,8 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
                        new_smi->handlers->cleanup(new_smi->si_sm);
                kfree(new_smi->si_sm);
        }
-        new_smi->io_cleanup(new_smi);
+        if (new_smi->io_cleanup)
+                new_smi->io_cleanup(new_smi);
        return rv;
 }
@@ -2518,7 +2519,8 @@ static void __exit cleanup_one_si(struct smi_info *to_clean)
        kfree(to_clean->si_sm);
-        to_clean->io_cleanup(to_clean);
+        if (to_clean->io_cleanup)
+                to_clean->io_cleanup(to_clean);
 }
 static __exit void cleanup_ipmi_si(void)
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 449d029ad4f4..8b603b2d1c42 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -930,8 +930,8 @@ static void kbd_refresh_leds(struct input_handle *handle)
 }
 #if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\
-    defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC32) ||\
+    defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) ||\
-    defined(CONFIG_SPARC64) || defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\
+    defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\
    (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_ARCH_RPC))
 #define HW_RAW(dev) (test_bit(EV_MSC, dev->evbit) && test_bit(MSC_RAW, dev->mscbit) &&\
@@ -958,7 +958,7 @@ static unsigned short x86_keycodes[256] =
 extern int mac_hid_mouse_emulate_buttons(int, int, int);
 #endif /* CONFIG_MAC_EMUMOUSEBTN */
-#if defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)
+#ifdef CONFIG_SPARC
 static int sparc_l1_a_state = 0;
 extern void sun_do_break(void);
 #endif
@@ -1045,7 +1045,7 @@ static void kbd_keycode(unsigned int keycode, int down,
        if (keycode == KEY_LEFTALT || keycode == KEY_RIGHTALT)
                sysrq_alt = down;
-#if defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)
+#ifdef CONFIG_SPARC
        if (keycode == KEY_STOP)
                sparc_l1_a_state = down;
 #endif
@@ -1072,7 +1072,7 @@ static void kbd_keycode(unsigned int keycode, int down,
                return;
        }
 #endif
-#if defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)
+#ifdef CONFIG_SPARC
        if (keycode == KEY_A && sparc_l1_a_state) {
                sparc_l1_a_state = 0;
                sun_do_break();
diff --git a/drivers/char/mwave/mwavepub.h b/drivers/char/mwave/mwavepub.h
index f1f9da7a65c1..60c961ae23b4 100644
--- a/drivers/char/mwave/mwavepub.h
+++ b/drivers/char/mwave/mwavepub.h
@@ -69,7 +69,7 @@ typedef struct _MW_ABILITIES {
 typedef struct _MW_READWRITE {
        unsigned short usDspAddress;    /* The dsp address */
        unsigned long ulDataLength;     /* The size in bytes of the data or user buffer */
-        void *pBuf;             /* Input:variable sized buffer */
+        void __user *pBuf;              /* Input:variable sized buffer */
 } MW_READWRITE, *pMW_READWRITE;
 #define IOCTL_MW_RESET           _IO(MWAVE_MINOR,1)
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index ef011ef5dc46..61681c9f3f72 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1444,6 +1444,7 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
        dev_link_t *link;
        int size;
        int rc;
+        void __user *argp = (void __user *)arg;
 #ifdef PCMCIA_DEBUG
        char *ioctl_names[CM_IOC_MAXNR + 1] = {
                [_IOC_NR(CM_IOCGSTATUS)] "CM_IOCGSTATUS",
@@ -1481,11 +1482,11 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
              _IOC_DIR(cmd), _IOC_READ, _IOC_WRITE, size, cmd);
        if (_IOC_DIR(cmd) & _IOC_READ) {
-                if (!access_ok(VERIFY_WRITE, (void *)arg, size))
+                if (!access_ok(VERIFY_WRITE, argp, size))
                        return -EFAULT;
        }
        if (_IOC_DIR(cmd) & _IOC_WRITE) {
-                if (!access_ok(VERIFY_READ, (void *)arg, size))
+                if (!access_ok(VERIFY_READ, argp, size))
                        return -EFAULT;
        }
@@ -1506,14 +1507,14 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                                status |= CM_NO_READER;
                        if (test_bit(IS_BAD_CARD, &dev->flags))
                                status |= CM_BAD_CARD;
-                        if (copy_to_user((int *)arg, &status, sizeof(int)))
+                        if (copy_to_user(argp, &status, sizeof(int)))
                                return -EFAULT;
                }
                return 0;
        case CM_IOCGATR:
                DEBUGP(4, dev, "... in CM_IOCGATR\n");
                {
-                        struct atreq *atreq = (struct atreq *) arg;
+                        struct atreq __user *atreq = argp;
                        int tmp;
                        /* allow nonblocking io and being interrupted */
                        if (wait_event_interruptible
@@ -1597,7 +1598,7 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                {
                        struct ptsreq krnptsreq;
-                        if (copy_from_user(&krnptsreq, (struct ptsreq *) arg,
+                        if (copy_from_user(&krnptsreq, argp,
                                           sizeof(struct ptsreq)))
                                return -EFAULT;
@@ -1641,7 +1642,7 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                        int old_pc_debug = 0;
                        old_pc_debug = pc_debug;
-                        if (copy_from_user(&pc_debug, (int *)arg, sizeof(int)))
+                        if (copy_from_user(&pc_debug, argp, sizeof(int)))
                                return -EFAULT;
                        if (old_pc_debug != pc_debug)
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
index f66c7ad6fd38..3c1dafaa3441 100644
--- a/drivers/char/vc_screen.c
+++ b/drivers/char/vc_screen.c
@@ -419,7 +419,7 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
                        while (this_round > 1) {
                                unsigned short w;
-                                w = get_unaligned(((const unsigned short *)con_buf0));
+                                w = get_unaligned(((unsigned short *)con_buf0));
                                vcs_scr_writew(vc, w, org++);
                                con_buf0 += 2;
                                this_round -= 2;
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c
index 65830ec71042..b6640606b44d 100644
--- a/drivers/char/watchdog/booke_wdt.c
+++ b/drivers/char/watchdog/booke_wdt.c
@@ -72,7 +72,7 @@ static __inline__ void booke_wdt_ping(void)
 /*
 * booke_wdt_write:
 */
-static ssize_t booke_wdt_write (struct file *file, const char *buf,
+static ssize_t booke_wdt_write (struct file *file, const char __user *buf,
                                size_t count, loff_t *ppos)
 {
        booke_wdt_ping();
@@ -92,14 +92,15 @@ static int booke_wdt_ioctl (struct inode *inode, struct file *file,
                            unsigned int cmd, unsigned long arg)
 {
        u32 tmp = 0;
+        u32 __user *p = (u32 __user *)arg;
        switch (cmd) {
        case WDIOC_GETSUPPORT:
-                if (copy_to_user ((struct watchdog_info *) arg, &ident,
+                if (copy_to_user ((struct watchdog_info __user *) arg, &ident,
                                sizeof(struct watchdog_info)))
                        return -EFAULT;
        case WDIOC_GETSTATUS:
-                return put_user(ident.options, (u32 *) arg);
+                return put_user(ident.options, p);
        case WDIOC_GETBOOTSTATUS:
                /* XXX: something is clearing TSR */
                tmp = mfspr(SPRN_TSR) & TSR_WRS(3);
@@ -109,14 +110,14 @@ static int booke_wdt_ioctl (struct inode *inode, struct file *file,
                booke_wdt_ping();
                return 0;
        case WDIOC_SETTIMEOUT:
-                if (get_user(booke_wdt_period, (u32 *) arg))
+                if (get_user(booke_wdt_period, p))
                        return -EFAULT;
                mtspr(SPRN_TCR, (mfspr(SPRN_TCR)&~WDTP(0))|WDTP(booke_wdt_period));
                return 0;
        case WDIOC_GETTIMEOUT:
-                return put_user(booke_wdt_period, (u32 *) arg);
+                return put_user(booke_wdt_period, p);
        case WDIOC_SETOPTIONS:
-                if (get_user(tmp, (u32 *) arg))
+                if (get_user(tmp, p))
                        return -EINVAL;
                if (tmp == WDIOS_ENABLECARD) {
                        booke_wdt_ping();
@@ -172,7 +173,7 @@ static int __init booke_wdt_init(void)
        int ret = 0;
        printk (KERN_INFO "PowerPC Book-E Watchdog Timer Loaded\n");
-        ident.firmware_version = cpu_specs[0].pvr_value;
+        ident.firmware_version = cur_cpu_spec->pvr_value;
        ret = misc_register(&booke_wdt_miscdev);
        if (ret) {
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c
index 9defcf861b67..b4d843489881 100644
--- a/drivers/char/watchdog/mpcore_wdt.c
+++ b/drivers/char/watchdog/mpcore_wdt.c
@@ -180,10 +180,6 @@ static ssize_t mpcore_wdt_write(struct file *file, const char *data, size_t len,
 {
        struct mpcore_wdt *wdt = file->private_data;
-        /*  Can't seek (pwrite) on this device  */
-        if (ppos != &file->f_pos)
-                return -ESPIPE;
        /*
         *      Refresh the timer.
         */
diff --git a/drivers/char/watchdog/wdrtas.c b/drivers/char/watchdog/wdrtas.c
index 619e2ffca33f..dacfe31caccf 100644
--- a/drivers/char/watchdog/wdrtas.c
+++ b/drivers/char/watchdog/wdrtas.c
@@ -320,7 +320,7 @@ static int
 wdrtas_ioctl(struct inode *inode, struct file *file,
             unsigned int cmd, unsigned long arg)
 {
-        int __user *argp = (void *)arg;
+        int __user *argp = (void __user *)arg;
        int i;
        static struct watchdog_info wdinfo = {
                .options = WDRTAS_SUPPORTED_MASK,
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index fcdf0fff13a6..969d2b4aaec0 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -56,6 +56,7 @@ void proc_fork_connector(struct task_struct *task)
        msg = (struct cn_msg*)buffer;
        ev = (struct proc_event*)msg->data;
        get_seq(&msg->seq, &ev->cpu);
+        getnstimestamp(&ev->timestamp);
        ev->what = PROC_EVENT_FORK;
        ev->event_data.fork.parent_pid = task->real_parent->pid;
        ev->event_data.fork.parent_tgid = task->real_parent->tgid;
@@ -81,6 +82,7 @@ void proc_exec_connector(struct task_struct *task)
        msg = (struct cn_msg*)buffer;
        ev = (struct proc_event*)msg->data;
        get_seq(&msg->seq, &ev->cpu);
+        getnstimestamp(&ev->timestamp);
        ev->what = PROC_EVENT_EXEC;
        ev->event_data.exec.process_pid = task->pid;
        ev->event_data.exec.process_tgid = task->tgid;
@@ -114,6 +116,7 @@ void proc_id_connector(struct task_struct *task, int which_id)
        } else
                return;
        get_seq(&msg->seq, &ev->cpu);
+        getnstimestamp(&ev->timestamp);
        memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
        msg->ack = 0; /* not used */
@@ -133,6 +136,7 @@ void proc_exit_connector(struct task_struct *task)
        msg = (struct cn_msg*)buffer;
        ev = (struct proc_event*)msg->data;
        get_seq(&msg->seq, &ev->cpu);
+        getnstimestamp(&ev->timestamp);
        ev->what = PROC_EVENT_EXIT;
        ev->event_data.exit.process_pid = task->pid;
        ev->event_data.exit.process_tgid = task->tgid;
@@ -165,6 +169,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
        msg = (struct cn_msg*)buffer;
        ev = (struct proc_event*)msg->data;
        msg->seq = rcvd_seq;
+        getnstimestamp(&ev->timestamp);
        ev->cpu = -1;
        ev->what = PROC_EVENT_NONE;
        ev->event_data.ack.err = err;
diff --git a/drivers/fc4/Kconfig b/drivers/fc4/Kconfig
index f00c02a13ed6..345dbe6f10df 100644
--- a/drivers/fc4/Kconfig
+++ b/drivers/fc4/Kconfig
@@ -26,7 +26,7 @@ comment "FC4 drivers"
 config FC4_SOC
        tristate "Sun SOC/Sbus"
-        depends on FC4!=n && (SPARC32 || SPARC64)
+        depends on FC4!=n && SPARC
        help
          Serial Optical Channel is an interface card with one or two Fibre
          Optic ports, each of which can be connected to a disk array. Note
@@ -38,7 +38,7 @@ config FC4_SOC
 config FC4_SOCAL
        tristate "Sun SOC+ (aka SOCAL)"
-        depends on FC4!=n && (SPARC32 || SPARC64)
+        depends on FC4!=n && SPARC
        ---help---
          Serial Optical Channel Plus is an interface card with up to two
          Fibre Optic ports. This card supports FC Arbitrated Loop (usually
@@ -62,7 +62,7 @@ config SCSI_PLUTO
          be called pluto.
 config SCSI_FCAL
-        tristate "Sun Enterprise Network Array (A5000 and EX500)" if SPARC32 || SPARC64
+        tristate "Sun Enterprise Network Array (A5000 and EX500)" if SPARC
        depends on FC4!=n && SCSI
        help
          This driver drives FC-AL disks connected through a Fibre Channel
@@ -75,7 +75,7 @@ config SCSI_FCAL
 config SCSI_FCAL
        prompt "Generic FC-AL disk driver"
-        depends on FC4!=n && SCSI && !SPARC32 && !SPARC64
+        depends on FC4!=n && SCSI && !SPARC
 endmenu
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c
index 6d83299e7c9b..dfedb777d8c9 100644
--- a/drivers/firmware/dell_rbu.c
+++ b/drivers/firmware/dell_rbu.c
@@ -105,8 +105,8 @@ static int create_packet(void *data, size_t length)
        int ordernum = 0;
        int retval = 0;
        unsigned int packet_array_size = 0;
-        void **invalid_addr_packet_array = 0;
+        void **invalid_addr_packet_array = NULL;
-        void *packet_data_temp_buf = 0;
+        void *packet_data_temp_buf = NULL;
        unsigned int idx = 0;
        pr_debug("create_packet: entry \n");
@@ -178,7 +178,7 @@ static int create_packet(void *data, size_t length)
                                                packet_data_temp_buf),
                                        allocation_floor);
                        invalid_addr_packet_array[idx++] = packet_data_temp_buf;
-                        packet_data_temp_buf = 0;
+                        packet_data_temp_buf = NULL;
                }
        }
        spin_lock(&rbu_data.lock);
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index afd7634e5cc9..81031eb51056 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -529,14 +529,15 @@ mv64xxx_i2c_probe(struct platform_device *pd)
        i2c_set_adapdata(&drv_data->adapter, drv_data);
        if (request_irq(drv_data->irq, mv64xxx_i2c_intr, 0,
-                MV64XXX_I2C_CTLR_NAME, drv_data)) {
+                        MV64XXX_I2C_CTLR_NAME, drv_data)) {
+                dev_err(&drv_data->adapter.dev,
-                dev_err(dev, "mv64xxx: Can't register intr handler "
+                        "mv64xxx: Can't register intr handler irq: %d\n",
-                        "irq: %d\n", drv_data->irq);
+                        drv_data->irq);
                rc = -EINVAL;
                goto exit_unmap_regs;
        } else if ((rc = i2c_add_adapter(&drv_data->adapter)) != 0) {
-                dev_err(dev, "mv64xxx: Can't add i2c adapter, rc: %d\n", -rc);
+                dev_err(&drv_data->adapter.dev,
+                        "mv64xxx: Can't add i2c adapter, rc: %d\n", -rc);
                goto exit_free_irq;
        }
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 31e649a9ff71..1c81174595b3 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -807,14 +807,6 @@ config BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
       depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX
 endchoice
-config BLK_DEV_IDE_AU1XXX_BURSTABLE_ON
-        bool "Enable burstable Mode on DbDMA"
-        default false
-        depends BLK_DEV_IDE_AU1XXX
-        help
-          This option enable the burstable Flag on DbDMA controller
-          (cf. "AMD Alchemy 'Au1200' Processor Data Book - PRELIMINARY").
 config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
       int "Maximum transfer size (KB) per request (up to 128)"
       default "128"
@@ -940,7 +932,7 @@ config BLK_DEV_Q40IDE
 config BLK_DEV_MPC8xx_IDE
        bool "MPC8xx IDE support"
-        depends on 8xx
+        depends on 8xx && IDE=y && BLK_DEV_IDE=y
        help
          This option provides support for IDE on Motorola MPC8xx Systems.
          Please see 'Type of MPC8xx IDE interface' for details.
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 9455e42abb23..b4d7a3efb90f 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1292,7 +1292,6 @@ static ide_startstop_t cdrom_start_seek (ide_drive_t *drive, unsigned int block)
        struct cdrom_info *info = drive->driver_data;
        info->dma = 0;
-        info->cmd = 0;
        info->start_seek = jiffies;
        return cdrom_start_packet_command(drive, 0, cdrom_start_seek_continuation);
 }
@@ -1344,8 +1343,6 @@ static ide_startstop_t cdrom_start_read (ide_drive_t *drive, unsigned int block)
            (rq->nr_sectors & (sectors_per_frame - 1)))
                info->dma = 0;
-        info->cmd = READ;
        /* Start sending the read request to the drive. */
        return cdrom_start_packet_command(drive, 32768, cdrom_start_read_continuation);
 }
@@ -1484,7 +1481,6 @@ static ide_startstop_t cdrom_do_packet_command (ide_drive_t *drive)
        struct cdrom_info *info = drive->driver_data;
        info->dma = 0;
-        info->cmd = 0;
        rq->flags &= ~REQ_FAILED;
        len = rq->data_len;
@@ -1891,7 +1887,6 @@ static ide_startstop_t cdrom_start_write(ide_drive_t *drive, struct request *rq)
        /* use dma, if possible. we don't need to check more, since we
         * know that the transfer is always (at least!) frame aligned */
        info->dma = drive->using_dma ? 1 : 0;
-        info->cmd = WRITE;
        info->devinfo.media_written = 1;
@@ -1916,7 +1911,6 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
        rq->flags |= REQ_QUIET;
        info->dma = 0;
-        info->cmd = 0;
        /*
         * sg request
@@ -1925,7 +1919,6 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
                int mask = drive->queue->dma_alignment;
                unsigned long addr = (unsigned long) page_address(bio_page(rq->bio));
-                info->cmd = rq_data_dir(rq);
                info->dma = drive->using_dma;
                /*
diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h
index 7ca3e5afc665..ad1f2ed14a37 100644
--- a/drivers/ide/ide-cd.h
+++ b/drivers/ide/ide-cd.h
@@ -480,7 +480,6 @@ struct cdrom_info {
        struct request request_sense_request;
        int dma;
-        int cmd;
        unsigned long last_block;
        unsigned long start_seek;
        /* Buffer to hold mechanism status and changer slot table. */
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index f4e3d3527b0e..449522f0540c 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -1034,12 +1034,12 @@ static int ide_disk_remove(struct device *dev)
        struct ide_disk_obj *idkp = drive->driver_data;
        struct gendisk *g = idkp->disk;
-        ide_cacheflush_p(drive);
        ide_unregister_subdriver(drive, idkp->driver);
        del_gendisk(g);
+        ide_cacheflush_p(drive);
        ide_disk_put(idkp);
        return 0;
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 1e1531334c25..0523da77425a 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -90,11 +90,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
-struct drive_list_entry {
-        const char *id_model;
-        const char *id_firmware;
-};
 static const struct drive_list_entry drive_whitelist [] = {
        { "Micropolis 2112A"    ,       "ALL"           },
@@ -139,7 +134,7 @@ static const struct drive_list_entry drive_blacklist [] = {
 };
 /**
- *      in_drive_list   -       look for drive in black/white list
+ *      ide_in_drive_list       -       look for drive in black/white list
 *      @id: drive identifier
 *      @drive_table: list to inspect
 *
@@ -147,7 +142,7 @@ static const struct drive_list_entry drive_blacklist [] = {
 *      Returns 1 if the drive is found in the table.
 */
-static int in_drive_list(struct hd_driveid *id, const struct drive_list_entry *drive_table)
+int ide_in_drive_list(struct hd_driveid *id, const struct drive_list_entry *drive_table)
 {
        for ( ; drive_table->id_model ; drive_table++)
                if ((!strcmp(drive_table->id_model, id->model)) &&
@@ -157,6 +152,8 @@ static int in_drive_list(struct hd_driveid *id, const struct drive_list_entry *d
        return 0;
 }
+EXPORT_SYMBOL_GPL(ide_in_drive_list);
 /**
 *      ide_dma_intr    -       IDE DMA interrupt handler
 *      @drive: the drive the interrupt is for
@@ -663,7 +660,7 @@ int __ide_dma_bad_drive (ide_drive_t *drive)
 {
        struct hd_driveid *id = drive->id;
-        int blacklist = in_drive_list(id, drive_blacklist);
+        int blacklist = ide_in_drive_list(id, drive_blacklist);
        if (blacklist) {
                printk(KERN_WARNING "%s: Disabling (U)DMA for %s (blacklisted)\n",
                                    drive->name, id->model);
@@ -677,7 +674,7 @@ EXPORT_SYMBOL(__ide_dma_bad_drive);
 int __ide_dma_good_drive (ide_drive_t *drive)
 {
        struct hd_driveid *id = drive->id;
-        return in_drive_list(id, drive_whitelist);
+        return ide_in_drive_list(id, drive_whitelist);
 }
 EXPORT_SYMBOL(__ide_dma_good_drive);
diff --git a/drivers/ide/mips/Makefile b/drivers/ide/mips/Makefile
index 578e52a59588..677c7b2bac92 100644
--- a/drivers/ide/mips/Makefile
+++ b/drivers/ide/mips/Makefile
@@ -1 +1,4 @@
 obj-$(CONFIG_BLK_DEV_IDE_SWARM)         += swarm.o
+obj-$(CONFIG_BLK_DEV_IDE_AU1XXX)        += au1xxx-ide.o
+EXTRA_CFLAGS    := -Idrivers/ide
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 2b6327c576b9..32431dcf5d8e 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -31,865 +31,638 @@
 */
 #undef REALLY_SLOW_IO           /* most systems can safely undef this */
-#include <linux/config.h>       /* for CONFIG_BLK_DEV_IDEPCI */
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/timer.h>
+#include <linux/platform_device.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/hdreg.h>
 #include <linux/init.h>
 #include <linux/ide.h>
 #include <linux/sysdev.h>
 #include <linux/dma-mapping.h>
+#include "ide-timing.h"
 #include <asm/io.h>
 #include <asm/mach-au1x00/au1xxx.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
-#if CONFIG_PM
-#include <asm/mach-au1x00/au1xxx_pm.h>
-#endif
 #include <asm/mach-au1x00/au1xxx_ide.h>
 #define DRV_NAME        "au1200-ide"
 #define DRV_VERSION     "1.0"
-#define DRV_AUTHOR      "AMD PCS / Pete Popov <ppopov@embeddedalley.com>"
+#define DRV_AUTHOR      "Enrico Walther <enrico.walther@amd.com> / Pete Popov <ppopov@embeddedalley.com>"
-#define DRV_DESC        "Au1200 IDE"
-static _auide_hwif auide_hwif;
-static spinlock_t ide_tune_drive_spin_lock = SPIN_LOCK_UNLOCKED;
-static spinlock_t ide_tune_chipset_spin_lock = SPIN_LOCK_UNLOCKED;
-static int dbdma_init_done = 0;
-/*
- * local I/O functions
- */
-u8 auide_inb(unsigned long port)
-{
-        return (au_readb(port));
-}
-u16 auide_inw(unsigned long port)
+/* enable the burstmode in the dbdma */
-{
+#define IDE_AU1XXX_BURSTMODE    1
-        return (au_readw(port));
-}
-u32 auide_inl(unsigned long port)
+static _auide_hwif auide_hwif;
-{
+static int dbdma_init_done;
-        return (au_readl(port));
-}
-void auide_insw(unsigned long port, void *addr, u32 count)
-{
 #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA)
-        _auide_hwif *ahwif = &auide_hwif;
+void auide_insw(unsigned long port, void *addr, u32 count)
-        chan_tab_t *ctp;
-        au1x_ddma_desc_t *dp;
-        if(!put_dest_flags(ahwif->rx_chan, (void*)addr, count << 1,
-                                DDMA_FLAGS_NOIE)) {
-                printk(KERN_ERR "%s failed %d\n", __FUNCTION__, __LINE__);
-                return;
-        }
-        ctp = *((chan_tab_t **)ahwif->rx_chan);
-        dp = ctp->cur_ptr;
-        while (dp->dscr_cmd0 & DSCR_CMD0_V)
-                ;
-        ctp->cur_ptr = au1xxx_ddma_get_nextptr_virt(dp);
-#else
-        while (count--)
-        {
-                *(u16 *)addr = au_readw(port);
-                addr +=2 ;
-        }
-#endif
-}
-void auide_insl(unsigned long port, void *addr, u32 count)
-{
-        while (count--)
-        {
-                *(u32 *)addr = au_readl(port);
-                /* NOTE: For IDE interfaces over PCMCIA,
-                 * 32-bit access does not work
-                 */
-                addr += 4;
-        }
-}
-void auide_outb(u8 addr, unsigned long port)
 {
-        return (au_writeb(addr, port));
+        _auide_hwif *ahwif = &auide_hwif;
-}
+        chan_tab_t *ctp;
+        au1x_ddma_desc_t *dp;
-void auide_outbsync(ide_drive_t *drive, u8 addr, unsigned long port)
+        if(!put_dest_flags(ahwif->rx_chan, (void*)addr, count << 1, 
-{
+                           DDMA_FLAGS_NOIE)) {
-        return (au_writeb(addr, port));
+                printk(KERN_ERR "%s failed %d\n", __FUNCTION__, __LINE__);
+                return;
+        }
+        ctp = *((chan_tab_t **)ahwif->rx_chan);
+        dp = ctp->cur_ptr;
+        while (dp->dscr_cmd0 & DSCR_CMD0_V)
+                ;
+        ctp->cur_ptr = au1xxx_ddma_get_nextptr_virt(dp);
 }
-void auide_outw(u16 addr, unsigned long port)
+void auide_outsw(unsigned long port, void *addr, u32 count)
 {
-        return (au_writew(addr, port));
+        _auide_hwif *ahwif = &auide_hwif;
-}
+        chan_tab_t *ctp;
+        au1x_ddma_desc_t *dp;
-void auide_outl(u32 addr, unsigned long port)
+        if(!put_source_flags(ahwif->tx_chan, (void*)addr,
-{
+                             count << 1, DDMA_FLAGS_NOIE)) {
-        return (au_writel(addr, port));
+                printk(KERN_ERR "%s failed %d\n", __FUNCTION__, __LINE__);
+                return;
+        }
+        ctp = *((chan_tab_t **)ahwif->tx_chan);
+        dp = ctp->cur_ptr;
+        while (dp->dscr_cmd0 & DSCR_CMD0_V)
+                ;
+        ctp->cur_ptr = au1xxx_ddma_get_nextptr_virt(dp);
 }
-void auide_outsw(unsigned long port, void *addr, u32 count)
-{
-#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA)
-        _auide_hwif *ahwif = &auide_hwif;
-        chan_tab_t *ctp;
-        au1x_ddma_desc_t *dp;
-        if(!put_source_flags(ahwif->tx_chan, (void*)addr,
-                                          count << 1, DDMA_FLAGS_NOIE)) {
-                printk(KERN_ERR "%s failed %d\n", __FUNCTION__, __LINE__);
-                return;
-        }
-        ctp = *((chan_tab_t **)ahwif->tx_chan);
-        dp = ctp->cur_ptr;
-        while (dp->dscr_cmd0 & DSCR_CMD0_V)
-                ;
-        ctp->cur_ptr = au1xxx_ddma_get_nextptr_virt(dp);
-#else
-        while (count--)
-        {
-                au_writew(*(u16 *)addr, port);
-                addr += 2;
-        }
 #endif
-}
-void auide_outsl(unsigned long port, void *addr, u32 count)
-{
-        while (count--)
-        {
-                au_writel(*(u32 *)addr, port);
-                /* NOTE: For IDE interfaces over PCMCIA,
-                 * 32-bit access does not work
-                 */
-                addr += 4;
-        }
-}
 static void auide_tune_drive(ide_drive_t *drive, byte pio)
 {
-        int mem_sttime;
+        int mem_sttime;
-        int mem_stcfg;
+        int mem_stcfg;
-        unsigned long flags;
+        u8 speed;
-        u8 speed;
+        /* get the best pio mode for the drive */
-        /* get the best pio mode for the drive */
+        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        printk(KERN_INFO "%s: setting Au1XXX IDE to PIO mode%d\n",
-        printk("%s: setting Au1XXX IDE to PIO mode%d\n",
+               drive->name, pio);
-                drive->name, pio);
+        mem_sttime = 0;
-        spin_lock_irqsave(&ide_tune_drive_spin_lock, flags);
+        mem_stcfg  = au_readl(MEM_STCFG2);
-        mem_sttime = 0;
+        /* set pio mode! */
-        mem_stcfg  = au_readl(MEM_STCFG2);
+        switch(pio) {
+        case 0:
-        /* set pio mode! */
+                mem_sttime = SBC_IDE_TIMING(PIO0);
-        switch(pio) {
-                case 0:
+                /* set configuration for RCS2# */
-                        /* set timing parameters for RCS2# */
+                mem_stcfg |= TS_MASK;
-                        mem_sttime =   SBC_IDE_PIO0_TWCS
+                mem_stcfg &= ~TCSOE_MASK;
-                                     | SBC_IDE_PIO0_TCSH
+                mem_stcfg &= ~TOECS_MASK;
-                                     | SBC_IDE_PIO0_TCSOFF
+                mem_stcfg |= SBC_IDE_PIO0_TCSOE | SBC_IDE_PIO0_TOECS;
-                                     | SBC_IDE_PIO0_TWP
+                break;
-                                     | SBC_IDE_PIO0_TCSW
-                                     | SBC_IDE_PIO0_TPM
+        case 1:
-                                     | SBC_IDE_PIO0_TA;
+                mem_sttime = SBC_IDE_TIMING(PIO1);
-                        /* set configuration for RCS2# */
-                        mem_stcfg |= TS_MASK;
+                /* set configuration for RCS2# */
-                        mem_stcfg &= ~TCSOE_MASK;
+                mem_stcfg |= TS_MASK;
-                        mem_stcfg &= ~TOECS_MASK;
+                mem_stcfg &= ~TCSOE_MASK;
-                        mem_stcfg |= SBC_IDE_PIO0_TCSOE | SBC_IDE_PIO0_TOECS;
+                mem_stcfg &= ~TOECS_MASK;
+                mem_stcfg |= SBC_IDE_PIO1_TCSOE | SBC_IDE_PIO1_TOECS;
-                        au_writel(mem_sttime,MEM_STTIME2);
+                break;
-                        au_writel(mem_stcfg,MEM_STCFG2);
-                        break;
+        case 2:
+                mem_sttime = SBC_IDE_TIMING(PIO2);
-                case 1:
-                        /* set timing parameters for RCS2# */
+                /* set configuration for RCS2# */
-                        mem_sttime =   SBC_IDE_PIO1_TWCS
+                mem_stcfg &= ~TS_MASK;
-                                     | SBC_IDE_PIO1_TCSH
+                mem_stcfg &= ~TCSOE_MASK;
-                                     | SBC_IDE_PIO1_TCSOFF
+                mem_stcfg &= ~TOECS_MASK;
-                                     | SBC_IDE_PIO1_TWP
+                mem_stcfg |= SBC_IDE_PIO2_TCSOE | SBC_IDE_PIO2_TOECS;
-                                     | SBC_IDE_PIO1_TCSW
+                break;
-                                     | SBC_IDE_PIO1_TPM
-                                     | SBC_IDE_PIO1_TA;
+        case 3:
-                        /* set configuration for RCS2# */
+                mem_sttime = SBC_IDE_TIMING(PIO3);
-                        mem_stcfg |= TS_MASK;
-                        mem_stcfg &= ~TCSOE_MASK;
+                /* set configuration for RCS2# */
-                        mem_stcfg &= ~TOECS_MASK;
+                mem_stcfg &= ~TS_MASK;
-                        mem_stcfg |= SBC_IDE_PIO1_TCSOE | SBC_IDE_PIO1_TOECS;
+                mem_stcfg &= ~TCSOE_MASK;
-                        break;
+                mem_stcfg &= ~TOECS_MASK;
+                mem_stcfg |= SBC_IDE_PIO3_TCSOE | SBC_IDE_PIO3_TOECS;
-                case 2:
-                        /* set timing parameters for RCS2# */
+                break;
-                        mem_sttime =   SBC_IDE_PIO2_TWCS
-                                     | SBC_IDE_PIO2_TCSH
+        case 4:
-                                     | SBC_IDE_PIO2_TCSOFF
+                mem_sttime = SBC_IDE_TIMING(PIO4);
-                                     | SBC_IDE_PIO2_TWP
-                                     | SBC_IDE_PIO2_TCSW
+                /* set configuration for RCS2# */
-                                     | SBC_IDE_PIO2_TPM
+                mem_stcfg &= ~TS_MASK;
-                                     | SBC_IDE_PIO2_TA;
+                mem_stcfg &= ~TCSOE_MASK;
-                        /* set configuration for RCS2# */
+                mem_stcfg &= ~TOECS_MASK;
-                        mem_stcfg &= ~TS_MASK;
+                mem_stcfg |= SBC_IDE_PIO4_TCSOE | SBC_IDE_PIO4_TOECS;
-                        mem_stcfg &= ~TCSOE_MASK;
+                break;
-                        mem_stcfg &= ~TOECS_MASK;
+        }
-                        mem_stcfg |= SBC_IDE_PIO2_TCSOE | SBC_IDE_PIO2_TOECS;
-                        break;
+        au_writel(mem_sttime,MEM_STTIME2);
+        au_writel(mem_stcfg,MEM_STCFG2);
-                case 3:
-                        /* set timing parameters for RCS2# */
+        speed = pio + XFER_PIO_0;
-                        mem_sttime =   SBC_IDE_PIO3_TWCS
+        ide_config_drive_speed(drive, speed);
-                                     | SBC_IDE_PIO3_TCSH
-                                     | SBC_IDE_PIO3_TCSOFF
-                                     | SBC_IDE_PIO3_TWP
-                                     | SBC_IDE_PIO3_TCSW
-                                     | SBC_IDE_PIO3_TPM
-                                     | SBC_IDE_PIO3_TA;
-                        /* set configuration for RCS2# */
-                        mem_stcfg |= TS_MASK;
-                        mem_stcfg &= ~TS_MASK;
-                        mem_stcfg &= ~TCSOE_MASK;
-                        mem_stcfg &= ~TOECS_MASK;
-                        mem_stcfg |= SBC_IDE_PIO3_TCSOE | SBC_IDE_PIO3_TOECS;
-                        break;
-                case 4:
-                        /* set timing parameters for RCS2# */
-                        mem_sttime =   SBC_IDE_PIO4_TWCS
-                                     | SBC_IDE_PIO4_TCSH
-                                     | SBC_IDE_PIO4_TCSOFF
-                                     | SBC_IDE_PIO4_TWP
-                                     | SBC_IDE_PIO4_TCSW
-                                     | SBC_IDE_PIO4_TPM
-                                     | SBC_IDE_PIO4_TA;
-                        /* set configuration for RCS2# */
-                        mem_stcfg &= ~TS_MASK;
-                        mem_stcfg &= ~TCSOE_MASK;
-                        mem_stcfg &= ~TOECS_MASK;
-                        mem_stcfg |= SBC_IDE_PIO4_TCSOE | SBC_IDE_PIO4_TOECS;
-                        break;
-        }
-        au_writel(mem_sttime,MEM_STTIME2);
-        au_writel(mem_stcfg,MEM_STCFG2);
-        spin_unlock_irqrestore(&ide_tune_drive_spin_lock, flags);
-        speed = pio + XFER_PIO_0;
-        ide_config_drive_speed(drive, speed);
 }
 static int auide_tune_chipset (ide_drive_t *drive, u8 speed)
 {
-        u8 mode = 0;
+        int mem_sttime;
-        int mem_sttime;
+        int mem_stcfg;
-        int mem_stcfg;
+        unsigned long mode;
-        unsigned long flags;
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-        struct hd_driveid *id = drive->id;
+        if (ide_use_dma(drive))
+                mode = ide_dma_speed(drive, 0);
-        /*
-         * Now see what the current drive is capable of,
-         * selecting UDMA only if the mate said it was ok.
-         */
-        if (id && (id->capability & 1) && drive->autodma &&
-            !__ide_dma_bad_drive(drive)) {
-                if (!mode && (id->field_valid & 2) && (id->dma_mword & 7)) {
-                        if      (id->dma_mword & 4)
-                                mode = XFER_MW_DMA_2;
-                        else if (id->dma_mword & 2)
-                                mode = XFER_MW_DMA_1;
-                        else if (id->dma_mword & 1)
-                                mode = XFER_MW_DMA_0;
-                }
-        }
 #endif
-        spin_lock_irqsave(&ide_tune_chipset_spin_lock, flags);
+        mem_sttime = 0;
+        mem_stcfg  = au_readl(MEM_STCFG2);
-        mem_sttime = 0;
+        if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) {
-        mem_stcfg  = au_readl(MEM_STCFG2);
+                auide_tune_drive(drive, speed - XFER_PIO_0);
+                return 0;
-        switch(speed) {
+        }
-                case XFER_PIO_4:
+              
-                case XFER_PIO_3:
+        switch(speed) {
-                case XFER_PIO_2:
-                case XFER_PIO_1:
-                case XFER_PIO_0:
-                        auide_tune_drive(drive, (speed - XFER_PIO_0));
-                        break;
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-                case XFER_MW_DMA_2:
+        case XFER_MW_DMA_2:
-                        /* set timing parameters for RCS2# */
+                mem_sttime = SBC_IDE_TIMING(MDMA2);
-                        mem_sttime =   SBC_IDE_MDMA2_TWCS
-                                     | SBC_IDE_MDMA2_TCSH
+                /* set configuration for RCS2# */
-                                     | SBC_IDE_MDMA2_TCSOFF
+                mem_stcfg &= ~TS_MASK;
-                                     | SBC_IDE_MDMA2_TWP
+                mem_stcfg &= ~TCSOE_MASK;
-                                     | SBC_IDE_MDMA2_TCSW
+                mem_stcfg &= ~TOECS_MASK;
-                                     | SBC_IDE_MDMA2_TPM
+                mem_stcfg |= SBC_IDE_MDMA2_TCSOE | SBC_IDE_MDMA2_TOECS;
-                                     | SBC_IDE_MDMA2_TA;
-                        /* set configuration for RCS2# */
+                mode = XFER_MW_DMA_2;
-                        mem_stcfg &= ~TS_MASK;
+                break;
-                        mem_stcfg &= ~TCSOE_MASK;
+        case XFER_MW_DMA_1:
-                        mem_stcfg &= ~TOECS_MASK;
+                mem_sttime = SBC_IDE_TIMING(MDMA1);
-                        mem_stcfg |= SBC_IDE_MDMA2_TCSOE | SBC_IDE_MDMA2_TOECS;
+                /* set configuration for RCS2# */
-                        mode = XFER_MW_DMA_2;
+                mem_stcfg &= ~TS_MASK;
-                        break;
+                mem_stcfg &= ~TCSOE_MASK;
-                case XFER_MW_DMA_1:
+                mem_stcfg &= ~TOECS_MASK;
-                        /* set timing parameters for RCS2# */
+                mem_stcfg |= SBC_IDE_MDMA1_TCSOE | SBC_IDE_MDMA1_TOECS;
-                        mem_sttime =   SBC_IDE_MDMA1_TWCS
-                                     | SBC_IDE_MDMA1_TCSH
+                mode = XFER_MW_DMA_1;
-                                     | SBC_IDE_MDMA1_TCSOFF
+                break;
-                                     | SBC_IDE_MDMA1_TWP
+        case XFER_MW_DMA_0:
-                                     | SBC_IDE_MDMA1_TCSW
+                mem_sttime = SBC_IDE_TIMING(MDMA0);
-                                     | SBC_IDE_MDMA1_TPM
-                                     | SBC_IDE_MDMA1_TA;
+                /* set configuration for RCS2# */
-                        /* set configuration for RCS2# */
+                mem_stcfg |= TS_MASK;
-                        mem_stcfg &= ~TS_MASK;
+                mem_stcfg &= ~TCSOE_MASK;
-                        mem_stcfg &= ~TCSOE_MASK;
+                mem_stcfg &= ~TOECS_MASK;
-                        mem_stcfg &= ~TOECS_MASK;
+                mem_stcfg |= SBC_IDE_MDMA0_TCSOE | SBC_IDE_MDMA0_TOECS;
-                        mem_stcfg |= SBC_IDE_MDMA1_TCSOE | SBC_IDE_MDMA1_TOECS;
+                mode = XFER_MW_DMA_0;
-                        mode = XFER_MW_DMA_1;
+                break;
-                        break;
-                case XFER_MW_DMA_0:
-                        /* set timing parameters for RCS2# */
-                        mem_sttime =   SBC_IDE_MDMA0_TWCS
-                                     | SBC_IDE_MDMA0_TCSH
-                                     | SBC_IDE_MDMA0_TCSOFF
-                                     | SBC_IDE_MDMA0_TWP
-                                     | SBC_IDE_MDMA0_TCSW
-                                     | SBC_IDE_MDMA0_TPM
-                                     | SBC_IDE_MDMA0_TA;
-                        /* set configuration for RCS2# */
-                        mem_stcfg |= TS_MASK;
-                        mem_stcfg &= ~TCSOE_MASK;
-                        mem_stcfg &= ~TOECS_MASK;
-                        mem_stcfg |= SBC_IDE_MDMA0_TCSOE | SBC_IDE_MDMA0_TOECS;
-                        mode = XFER_MW_DMA_0;
-                        break;
 #endif
-                default:
+        default:
-                        return 1;
+                return 1;
-        }
+        }
+        
-        /*
+        if (ide_config_drive_speed(drive, mode))
-         * Tell the drive to switch to the new mode; abort on failure.
+                return 1;
-         */
-        if (!mode || ide_config_drive_speed(drive, mode))
-        {
-                return 1;       /* failure */
-        }
-        au_writel(mem_sttime,MEM_STTIME2);
-        au_writel(mem_stcfg,MEM_STCFG2);
-        spin_unlock_irqrestore(&ide_tune_chipset_spin_lock, flags);
+        au_writel(mem_sttime,MEM_STTIME2);
+        au_writel(mem_stcfg,MEM_STCFG2);
-        return 0;
+        return 0;
 }
 /*
 * Multi-Word DMA + DbDMA functions
 */
-#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-static int in_drive_list(struct hd_driveid *id,
+#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-                         const struct drive_list_entry *drive_table)
-{
-        for ( ; drive_table->id_model ; drive_table++){
-                if ((!strcmp(drive_table->id_model, id->model)) &&
-                        ((strstr(drive_table->id_firmware, id->fw_rev)) ||
-                        (!strcmp(drive_table->id_firmware, "ALL")))
-                )
-                        return 1;
-        }
-        return 0;
-}
 static int auide_build_sglist(ide_drive_t *drive,  struct request *rq)
 {
-        ide_hwif_t *hwif = drive->hwif;
+        ide_hwif_t *hwif = drive->hwif;
-        _auide_hwif *ahwif = (_auide_hwif*)hwif->hwif_data;
+        _auide_hwif *ahwif = (_auide_hwif*)hwif->hwif_data;
-        struct scatterlist *sg = hwif->sg_table;
+        struct scatterlist *sg = hwif->sg_table;
-        ide_map_sg(drive, rq);
+        ide_map_sg(drive, rq);
-        if (rq_data_dir(rq) == READ)
+        if (rq_data_dir(rq) == READ)
-                hwif->sg_dma_direction = DMA_FROM_DEVICE;
+                hwif->sg_dma_direction = DMA_FROM_DEVICE;
-        else
+        else
-                hwif->sg_dma_direction = DMA_TO_DEVICE;
+                hwif->sg_dma_direction = DMA_TO_DEVICE;
-        return dma_map_sg(ahwif->dev, sg, hwif->sg_nents,
+        return dma_map_sg(ahwif->dev, sg, hwif->sg_nents,
-                          hwif->sg_dma_direction);
+                          hwif->sg_dma_direction);
 }
 static int auide_build_dmatable(ide_drive_t *drive)
 {
-        int i, iswrite, count = 0;
+        int i, iswrite, count = 0;
-        ide_hwif_t *hwif = HWIF(drive);
+        ide_hwif_t *hwif = HWIF(drive);
-        struct request *rq = HWGROUP(drive)->rq;
+        struct request *rq = HWGROUP(drive)->rq;
-        _auide_hwif *ahwif = (_auide_hwif*)hwif->hwif_data;
+        _auide_hwif *ahwif = (_auide_hwif*)hwif->hwif_data;
-        struct scatterlist *sg;
+        struct scatterlist *sg;
-        iswrite = (rq_data_dir(rq) == WRITE);
+        iswrite = (rq_data_dir(rq) == WRITE);
-        /* Save for interrupt context */
+        /* Save for interrupt context */
-        ahwif->drive = drive;
+        ahwif->drive = drive;
-        /* Build sglist */
+        /* Build sglist */
-        hwif->sg_nents = i = auide_build_sglist(drive, rq);
+        hwif->sg_nents = i = auide_build_sglist(drive, rq);
-        if (!i)
+        if (!i)
-                return 0;
+                return 0;
-        /* fill the descriptors */
+        /* fill the descriptors */
-        sg = hwif->sg_table;
+        sg = hwif->sg_table;
-        while (i && sg_dma_len(sg)) {
+        while (i && sg_dma_len(sg)) {
-                u32 cur_addr;
+                u32 cur_addr;
-                u32 cur_len;
+                u32 cur_len;
-                cur_addr = sg_dma_address(sg);
+                cur_addr = sg_dma_address(sg);
-                cur_len = sg_dma_len(sg);
+                cur_len = sg_dma_len(sg);
-                while (cur_len) {
+                while (cur_len) {
-                        u32 flags = DDMA_FLAGS_NOIE;
+                        u32 flags = DDMA_FLAGS_NOIE;
-                        unsigned int tc = (cur_len < 0xfe00)? cur_len: 0xfe00;
+                        unsigned int tc = (cur_len < 0xfe00)? cur_len: 0xfe00;
-                        if (++count >= PRD_ENTRIES) {
+                        if (++count >= PRD_ENTRIES) {
-                                printk(KERN_WARNING "%s: DMA table too small\n",
+                                printk(KERN_WARNING "%s: DMA table too small\n",
-                                drive->name);
+                                       drive->name);
-                                goto use_pio_instead;
+                                goto use_pio_instead;
-                        }
+                        }
-                        /* Lets enable intr for the last descriptor only */
+                        /* Lets enable intr for the last descriptor only */
-                        if (1==i)
+                        if (1==i)
-                                flags = DDMA_FLAGS_IE;
+                                flags = DDMA_FLAGS_IE;
-                        else
+                        else
-                                flags = DDMA_FLAGS_NOIE;
+                                flags = DDMA_FLAGS_NOIE;
-                        if (iswrite) {
+                        if (iswrite) {
-                                if(!put_source_flags(ahwif->tx_chan,
+                                if(!put_source_flags(ahwif->tx_chan, 
-                                                (void*)(page_address(sg->page)
+                                                     (void*)(page_address(sg->page) 
-                                                        + sg->offset),
+                                                             + sg->offset), 
-                                                tc, flags)) {
+                                                     tc, flags)) { 
-                                        printk(KERN_ERR "%s failed %d\n",
+                                        printk(KERN_ERR "%s failed %d\n", 
-                                                        __FUNCTION__, __LINE__);
+                                               __FUNCTION__, __LINE__);
                                }
-                        } else
+                        } else 
                        {
-                                if(!put_dest_flags(ahwif->rx_chan,
+                                if(!put_dest_flags(ahwif->rx_chan, 
-                                                (void*)(page_address(sg->page)
+                                                   (void*)(page_address(sg->page) 
-                                                        + sg->offset),
+                                                           + sg->offset), 
-                                                tc, flags)) {
+                                                   tc, flags)) { 
-                                        printk(KERN_ERR "%s failed %d\n",
+                                        printk(KERN_ERR "%s failed %d\n", 
-                                                        __FUNCTION__, __LINE__);
+                                               __FUNCTION__, __LINE__);
                                }
-                        }
+                        }
-                        cur_addr += tc;
+                        cur_addr += tc;
-                        cur_len -= tc;
+                        cur_len -= tc;
-                }
+                }
-                sg++;
+                sg++;
-                i--;
+                i--;
-        }
+        }
-        if (count)
+        if (count)
-                return 1;
+                return 1;
-use_pio_instead:
+ use_pio_instead:
-        dma_unmap_sg(ahwif->dev,
+        dma_unmap_sg(ahwif->dev,
-                     hwif->sg_table,
+                     hwif->sg_table,
-                     hwif->sg_nents,
+                     hwif->sg_nents,
-                     hwif->sg_dma_direction);
+                     hwif->sg_dma_direction);
-        return 0; /* revert to PIO for this request */
+        return 0; /* revert to PIO for this request */
 }
 static int auide_dma_end(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif = HWIF(drive);
+        ide_hwif_t *hwif = HWIF(drive);
-        _auide_hwif *ahwif = (_auide_hwif*)hwif->hwif_data;
+        _auide_hwif *ahwif = (_auide_hwif*)hwif->hwif_data;
-        if (hwif->sg_nents) {
+        if (hwif->sg_nents) {
-                dma_unmap_sg(ahwif->dev, hwif->sg_table, hwif->sg_nents,
+                dma_unmap_sg(ahwif->dev, hwif->sg_table, hwif->sg_nents,
-                             hwif->sg_dma_direction);
+                             hwif->sg_dma_direction);
-                hwif->sg_nents = 0;
+                hwif->sg_nents = 0;
-        }
+        }
-        return 0;
+        return 0;
 }
 static void auide_dma_start(ide_drive_t *drive )
 {
-//      printk("%s\n", __FUNCTION__);
 }
-ide_startstop_t auide_dma_intr(ide_drive_t *drive)
-{
-        //printk("%s\n", __FUNCTION__);
-        u8 stat = 0, dma_stat = 0;
-        dma_stat = HWIF(drive)->ide_dma_end(drive);
-        stat = HWIF(drive)->INB(IDE_STATUS_REG);        /* get drive status */
-        if (OK_STAT(stat,DRIVE_READY,drive->bad_wstat|DRQ_STAT)) {
-                if (!dma_stat) {
-                        struct request *rq = HWGROUP(drive)->rq;
-                        ide_end_request(drive, 1, rq->nr_sectors);
-                        return ide_stopped;
-                }
-                printk(KERN_ERR "%s: dma_intr: bad DMA status (dma_stat=%x)\n",
-                                 drive->name, dma_stat);
-        }
-        return ide_error(drive, "dma_intr", stat);
-}
 static void auide_dma_exec_cmd(ide_drive_t *drive, u8 command)
 {
-        //printk("%s\n", __FUNCTION__);
+        /* issue cmd to drive */
+        ide_execute_command(drive, command, &ide_dma_intr,
-        /* issue cmd to drive */
+                            (2*WAIT_CMD), NULL);
-        ide_execute_command(drive, command, &auide_dma_intr,
-                            (2*WAIT_CMD), NULL);
 }
 static int auide_dma_setup(ide_drive_t *drive)
-{
+{               
-//      printk("%s\n", __FUNCTION__);
+        struct request *rq = HWGROUP(drive)->rq;
-        if (drive->media != ide_disk)
-                return 1;
-        if (!auide_build_dmatable(drive))
-                        /* try PIO instead of DMA */
-                        return 1;
-        drive->waiting_for_dma = 1;
+        if (!auide_build_dmatable(drive)) {
+                ide_map_sg(drive, rq);
+                return 1;
+        }
-        return 0;
+        drive->waiting_for_dma = 1;
+        return 0;
 }
 static int auide_dma_check(ide_drive_t *drive)
 {
-//      printk("%s\n", __FUNCTION__);
+        u8 speed;
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-        if( !dbdma_init_done ){
-                auide_hwif.white_list = in_drive_list(drive->id,
+        if( dbdma_init_done == 0 ){
-                                                      dma_white_list);
+                auide_hwif.white_list = ide_in_drive_list(drive->id,
-                auide_hwif.black_list = in_drive_list(drive->id,
+                                                          dma_white_list);
-                                                      dma_black_list);
+                auide_hwif.black_list = ide_in_drive_list(drive->id,
-                auide_hwif.drive = drive;
+                                                          dma_black_list);
-                auide_ddma_init(&auide_hwif);
+                auide_hwif.drive = drive;
-                dbdma_init_done = 1;
+                auide_ddma_init(&auide_hwif);
-        }
+                dbdma_init_done = 1;
+        }
 #endif
-        /* Is the drive in our DMA black list? */
+        /* Is the drive in our DMA black list? */
-        if ( auide_hwif.black_list ) {
-                drive->using_dma = 0;
+        if ( auide_hwif.black_list ) {
-                printk("%s found in dma_blacklist[]! Disabling DMA.\n",
+                drive->using_dma = 0;
-                drive->id->model);
-        }
+                /* Borrowed the warning message from ide-dma.c */
-        else
-                drive->using_dma = 1;
-        return HWIF(drive)->ide_dma_host_on(drive);
+                printk(KERN_WARNING "%s: Disabling DMA for %s (blacklisted)\n",
+                       drive->name, drive->id->model);         
+        }
+        else
+                drive->using_dma = 1;
+        speed = ide_find_best_mode(drive, XFER_PIO | XFER_MWDMA);
+        
+        if (drive->autodma && (speed & XFER_MODE) != XFER_PIO)
+                return HWIF(drive)->ide_dma_on(drive);
+        return HWIF(drive)->ide_dma_off_quietly(drive);
 }
 static int auide_dma_test_irq(ide_drive_t *drive)
-{
+{       
-//      printk("%s\n", __FUNCTION__);
+        if (drive->waiting_for_dma == 0)
+                printk(KERN_WARNING "%s: ide_dma_test_irq \
-        if (!drive->waiting_for_dma)
-                printk(KERN_WARNING "%s: ide_dma_test_irq \
                                     called while not waiting\n", drive->name);
-        /* If dbdma didn't execute the STOP command yet, the
+        /* If dbdma didn't execute the STOP command yet, the
-         * active bit is still set
+         * active bit is still set
         */
-        drive->waiting_for_dma++;
+        drive->waiting_for_dma++;
-        if (drive->waiting_for_dma >= DMA_WAIT_TIMEOUT) {
+        if (drive->waiting_for_dma >= DMA_WAIT_TIMEOUT) {
-                printk(KERN_WARNING "%s: timeout waiting for ddma to \
+                printk(KERN_WARNING "%s: timeout waiting for ddma to \
                                     complete\n", drive->name);
-                return 1;
+                return 1;
-        }
+        }
-        udelay(10);
+        udelay(10);
-        return 0;
+        return 0;
 }
 static int auide_dma_host_on(ide_drive_t *drive)
 {
-//      printk("%s\n", __FUNCTION__);
+        return 0;
-        return 0;
 }
 static int auide_dma_on(ide_drive_t *drive)
 {
-//      printk("%s\n", __FUNCTION__);
+        drive->using_dma = 1;
-        drive->using_dma = 1;
+        return auide_dma_host_on(drive);
-        return auide_dma_host_on(drive);
 }
 static int auide_dma_host_off(ide_drive_t *drive)
 {
-//      printk("%s\n", __FUNCTION__);
+        return 0;
-        return 0;
 }
 static int auide_dma_off_quietly(ide_drive_t *drive)
 {
-//      printk("%s\n", __FUNCTION__);
+        drive->using_dma = 0;
-        drive->using_dma = 0;
+        return auide_dma_host_off(drive);
-        return auide_dma_host_off(drive);
 }
 static int auide_dma_lostirq(ide_drive_t *drive)
 {
-//      printk("%s\n", __FUNCTION__);
+        printk(KERN_ERR "%s: IRQ lost\n", drive->name);
+        return 0;
-        printk(KERN_ERR "%s: IRQ lost\n", drive->name);
-        return 0;
 }
 static void auide_ddma_tx_callback(int irq, void *param, struct pt_regs *regs)
 {
-//      printk("%s\n", __FUNCTION__);
+        _auide_hwif *ahwif = (_auide_hwif*)param;
+        ahwif->drive->waiting_for_dma = 0;
-        _auide_hwif *ahwif = (_auide_hwif*)param;
-        ahwif->drive->waiting_for_dma = 0;
-        return;
 }
 static void auide_ddma_rx_callback(int irq, void *param, struct pt_regs *regs)
 {
-//      printk("%s\n", __FUNCTION__);
+        _auide_hwif *ahwif = (_auide_hwif*)param;
+        ahwif->drive->waiting_for_dma = 0;
+}
+#endif /* end CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */
-        _auide_hwif *ahwif = (_auide_hwif*)param;
+static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize, u32 devwidth, u32 flags)
-        ahwif->drive->waiting_for_dma = 0;
+{
-        return;
+        dev->dev_id          = dev_id;
+        dev->dev_physaddr    = (u32)AU1XXX_ATA_PHYS_ADDR;
+        dev->dev_intlevel    = 0;
+        dev->dev_intpolarity = 0;
+        dev->dev_tsize       = tsize;
+        dev->dev_devwidth    = devwidth;
+        dev->dev_flags       = flags;
 }
+  
+#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
 static int auide_dma_timeout(ide_drive_t *drive)
 {
 //      printk("%s\n", __FUNCTION__);
-        printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name);
+        printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name);
-        if (HWIF(drive)->ide_dma_test_irq(drive))
+        if (HWIF(drive)->ide_dma_test_irq(drive))
-                return 0;
+                return 0;
-        return HWIF(drive)->ide_dma_end(drive);
+        return HWIF(drive)->ide_dma_end(drive);
 }
-#endif /* end CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */
+                                        
+static int auide_ddma_init(_auide_hwif *auide) {
+        
+        dbdev_tab_t source_dev_tab, target_dev_tab;
+        u32 dev_id, tsize, devwidth, flags;
+        ide_hwif_t *hwif = auide->hwif;
-static int auide_ddma_init( _auide_hwif *auide )
+        dev_id   = AU1XXX_ATA_DDMA_REQ;
-{
-//      printk("%s\n", __FUNCTION__);
-        dbdev_tab_t source_dev_tab;
+        if (auide->white_list || auide->black_list) {
-#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
+                tsize    = 8;
-        dbdev_tab_t target_dev_tab;
+                devwidth = 32;
-        ide_hwif_t *hwif = auide->hwif;
+        }
-        char warning_output [2][80];
+        else { 
-        int i;
+                tsize    = 1;
-#endif
+                devwidth = 16;
+                
+                printk(KERN_ERR "au1xxx-ide: %s is not on ide driver whitelist.\n",auide_hwif.drive->id->model);
+                printk(KERN_ERR "            please read 'Documentation/mips/AU1xxx_IDE.README'");
+        }
-        /* Add our custom device to DDMA device table */
+#ifdef IDE_AU1XXX_BURSTMODE 
-        /* Create our new device entries in the table */
+        flags = DEV_FLAGS_SYNC | DEV_FLAGS_BURSTABLE;
-#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
-        source_dev_tab.dev_id = AU1XXX_ATA_DDMA_REQ;
-        if( auide->white_list || auide->black_list ){
-                source_dev_tab.dev_tsize       = 8;
-                source_dev_tab.dev_devwidth    = 32;
-                source_dev_tab.dev_physaddr    = (u32)AU1XXX_ATA_PHYS_ADDR;
-                source_dev_tab.dev_intlevel    = 0;
-                source_dev_tab.dev_intpolarity = 0;
-                /* init device table for target - static bus controller - */
-                target_dev_tab.dev_id          = DSCR_CMD0_ALWAYS;
-                target_dev_tab.dev_tsize       = 8;
-                target_dev_tab.dev_devwidth    = 32;
-                target_dev_tab.dev_physaddr    = (u32)AU1XXX_ATA_PHYS_ADDR;
-                target_dev_tab.dev_intlevel    = 0;
-                target_dev_tab.dev_intpolarity = 0;
-                target_dev_tab.dev_flags       = DEV_FLAGS_ANYUSE;
-        }
-        else{
-                source_dev_tab.dev_tsize       = 1;
-                source_dev_tab.dev_devwidth    = 16;
-                source_dev_tab.dev_physaddr    = (u32)AU1XXX_ATA_PHYS_ADDR;
-                source_dev_tab.dev_intlevel    = 0;
-                source_dev_tab.dev_intpolarity = 0;
-                /* init device table for target - static bus controller - */
-                target_dev_tab.dev_id          = DSCR_CMD0_ALWAYS;
-                target_dev_tab.dev_tsize       = 1;
-                target_dev_tab.dev_devwidth    = 16;
-                target_dev_tab.dev_physaddr    = (u32)AU1XXX_ATA_PHYS_ADDR;
-                target_dev_tab.dev_intlevel    = 0;
-                target_dev_tab.dev_intpolarity = 0;
-                target_dev_tab.dev_flags       = DEV_FLAGS_ANYUSE;
-                sprintf(&warning_output[0][0],
-                        "%s is not on ide driver white list.",
-                        auide_hwif.drive->id->model);
-                for ( i=strlen(&warning_output[0][0]) ; i<76; i++ ){
-                        sprintf(&warning_output[0][i]," ");
-                }
-                sprintf(&warning_output[1][0],
-                "To add %s please read 'Documentation/mips/AU1xxx_IDE.README'.",
-                        auide_hwif.drive->id->model);
-                for ( i=strlen(&warning_output[1][0]) ; i<76; i++ ){
-                        sprintf(&warning_output[1][i]," ");
-                }
-                printk("\n****************************************");
-                printk("****************************************\n");
-                printk("* %s *\n",&warning_output[0][0]);
-                printk("* Switch to safe MWDMA Mode!            ");
-                printk("                                       *\n");
-                printk("* %s *\n",&warning_output[1][0]);
-                printk("****************************************");
-                printk("****************************************\n\n");
-        }
 #else
-        source_dev_tab.dev_id = DSCR_CMD0_ALWAYS;
+        flags = DEV_FLAGS_SYNC;
-        source_dev_tab.dev_tsize       = 8;
-        source_dev_tab.dev_devwidth    = 32;
-        source_dev_tab.dev_physaddr    = (u32)AU1XXX_ATA_PHYS_ADDR;
-        source_dev_tab.dev_intlevel    = 0;
-        source_dev_tab.dev_intpolarity = 0;
 #endif
-#if CONFIG_BLK_DEV_IDE_AU1XXX_BURSTABLE_ON
+        /* setup dev_tab for tx channel */
-        /* set flags for tx channel */
+        auide_init_dbdma_dev( &source_dev_tab,
-        source_dev_tab.dev_flags =  DEV_FLAGS_OUT
+                              dev_id,
-                                  | DEV_FLAGS_SYNC
+                              tsize, devwidth, DEV_FLAGS_OUT | flags);
-                                  | DEV_FLAGS_BURSTABLE;
+        auide->tx_dev_id = au1xxx_ddma_add_device( &source_dev_tab );
-        auide->tx_dev_id = au1xxx_ddma_add_device( &source_dev_tab );
-        /* set flags for rx channel */
+        auide_init_dbdma_dev( &source_dev_tab,
-        source_dev_tab.dev_flags =  DEV_FLAGS_IN
+                              dev_id,
-                                  | DEV_FLAGS_SYNC
+                              tsize, devwidth, DEV_FLAGS_IN | flags);
-                                  | DEV_FLAGS_BURSTABLE;
+        auide->rx_dev_id = au1xxx_ddma_add_device( &source_dev_tab );
-        auide->rx_dev_id = au1xxx_ddma_add_device( &source_dev_tab );
+        
+        /* We also need to add a target device for the DMA */
+        auide_init_dbdma_dev( &target_dev_tab,
+                              (u32)DSCR_CMD0_ALWAYS,
+                              tsize, devwidth, DEV_FLAGS_ANYUSE);
+        auide->target_dev_id = au1xxx_ddma_add_device(&target_dev_tab); 
+ 
+        /* Get a channel for TX */
+        auide->tx_chan = au1xxx_dbdma_chan_alloc(auide->target_dev_id,
+                                                 auide->tx_dev_id,
+                                                 auide_ddma_tx_callback,
+                                                 (void*)auide);
+ 
+        /* Get a channel for RX */
+        auide->rx_chan = au1xxx_dbdma_chan_alloc(auide->rx_dev_id,
+                                                 auide->target_dev_id,
+                                                 auide_ddma_rx_callback,
+                                                 (void*)auide);
+        auide->tx_desc_head = (void*)au1xxx_dbdma_ring_alloc(auide->tx_chan,
+                                                             NUM_DESCRIPTORS);
+        auide->rx_desc_head = (void*)au1xxx_dbdma_ring_alloc(auide->rx_chan,
+                                                             NUM_DESCRIPTORS);
+ 
+        hwif->dmatable_cpu = dma_alloc_coherent(auide->dev,
+                                                PRD_ENTRIES * PRD_BYTES,        /* 1 Page */
+                                                &hwif->dmatable_dma, GFP_KERNEL);
+        
+        au1xxx_dbdma_start( auide->tx_chan );
+        au1xxx_dbdma_start( auide->rx_chan );
+ 
+        return 0;
+} 
 #else
-        /* set flags for tx channel */
+ 
-        source_dev_tab.dev_flags = DEV_FLAGS_OUT | DEV_FLAGS_SYNC;
+static int auide_ddma_init( _auide_hwif *auide )
-        auide->tx_dev_id         = au1xxx_ddma_add_device( &source_dev_tab );
+{
-        /* set flags for rx channel */
+        dbdev_tab_t source_dev_tab;
-        source_dev_tab.dev_flags = DEV_FLAGS_IN | DEV_FLAGS_SYNC;
+        int flags;
-        auide->rx_dev_id         = au1xxx_ddma_add_device( &source_dev_tab );
-#endif
-#if  defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
+#ifdef IDE_AU1XXX_BURSTMODE 
+        flags = DEV_FLAGS_SYNC | DEV_FLAGS_BURSTABLE;
-        auide->target_dev_id           = au1xxx_ddma_add_device(&target_dev_tab);
+#else
+        flags = DEV_FLAGS_SYNC;
-        /* Get a channel for TX */
-        auide->tx_chan = au1xxx_dbdma_chan_alloc(auide->target_dev_id,
-                                                 auide->tx_dev_id,
-                                                 auide_ddma_tx_callback,
-                                                 (void*)auide);
-        /* Get a channel for RX */
-        auide->rx_chan = au1xxx_dbdma_chan_alloc(auide->rx_dev_id,
-                                                 auide->target_dev_id,
-                                                 auide_ddma_rx_callback,
-                                                 (void*)auide);
-#else   /* CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA */
-        /*
-         * Note: if call back is not enabled, update ctp->cur_ptr manually
-         */
-        auide->tx_chan = au1xxx_dbdma_chan_alloc(DSCR_CMD0_ALWAYS,
-                                                 auide->tx_dev_id,
-                                                 NULL,
-                                                 (void*)auide);
-        auide->rx_chan = au1xxx_dbdma_chan_alloc(auide->rx_dev_id,
-                                                 DSCR_CMD0_ALWAYS,
-                                                 NULL,
-                                                 (void*)auide);
 #endif
-        auide->tx_desc_head = (void*)au1xxx_dbdma_ring_alloc(auide->tx_chan,
-                                                             NUM_DESCRIPTORS);
-        auide->rx_desc_head = (void*)au1xxx_dbdma_ring_alloc(auide->rx_chan,
-                                                             NUM_DESCRIPTORS);
-#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
+        /* setup dev_tab for tx channel */
-        hwif->dmatable_cpu = dma_alloc_coherent(auide->dev,
+        auide_init_dbdma_dev( &source_dev_tab,
-                                                PRD_ENTRIES * PRD_BYTES,        /* 1 Page */
+                              (u32)DSCR_CMD0_ALWAYS,
-                                                &hwif->dmatable_dma, GFP_KERNEL);
+                              8, 32, DEV_FLAGS_OUT | flags);
+        auide->tx_dev_id = au1xxx_ddma_add_device( &source_dev_tab );
-        auide->sg_table = kmalloc(sizeof(struct scatterlist) * PRD_ENTRIES,
-                                GFP_KERNEL|GFP_DMA);
+        auide_init_dbdma_dev( &source_dev_tab,
-        if (auide->sg_table == NULL) {
+                              (u32)DSCR_CMD0_ALWAYS,
-                return -ENOMEM;
+                              8, 32, DEV_FLAGS_IN | flags);
-        }
+        auide->rx_dev_id = au1xxx_ddma_add_device( &source_dev_tab );
-#endif
+        
-        au1xxx_dbdma_start( auide->tx_chan );
+        /* Get a channel for TX */
-        au1xxx_dbdma_start( auide->rx_chan );
+        auide->tx_chan = au1xxx_dbdma_chan_alloc(DSCR_CMD0_ALWAYS,
-        return 0;
+                                                 auide->tx_dev_id,
+                                                 NULL,
+                                                 (void*)auide);
+ 
+        /* Get a channel for RX */
+        auide->rx_chan = au1xxx_dbdma_chan_alloc(auide->rx_dev_id,
+                                                 DSCR_CMD0_ALWAYS,
+                                                 NULL,
+                                                 (void*)auide);
+ 
+        auide->tx_desc_head = (void*)au1xxx_dbdma_ring_alloc(auide->tx_chan,
+                                                             NUM_DESCRIPTORS);
+        auide->rx_desc_head = (void*)au1xxx_dbdma_ring_alloc(auide->rx_chan,
+                                                             NUM_DESCRIPTORS);
+ 
+        au1xxx_dbdma_start( auide->tx_chan );
+        au1xxx_dbdma_start( auide->rx_chan );
+        
+        return 0;
 }
+#endif
 static void auide_setup_ports(hw_regs_t *hw, _auide_hwif *ahwif)
 {
-        int i;
+        int i;
-#define ide_ioreg_t unsigned long
+        unsigned long *ata_regs = hw->io_ports;
-        ide_ioreg_t *ata_regs = hw->io_ports;
+        /* FIXME? */
-        /* fixme */
+        for (i = 0; i < IDE_CONTROL_OFFSET; i++) {
-        for (i = 0; i < IDE_CONTROL_OFFSET; i++) {
+                *ata_regs++ = ahwif->regbase + (i << AU1XXX_ATA_REG_OFFSET);
-                *ata_regs++ = (ide_ioreg_t) ahwif->regbase
+        }
-                            + (ide_ioreg_t)(i << AU1XXX_ATA_REG_OFFSET);
-        }
+        /* set the Alternative Status register */
+        *ata_regs = ahwif->regbase + (14 << AU1XXX_ATA_REG_OFFSET);
-        /* set the Alternative Status register */
-        *ata_regs = (ide_ioreg_t) ahwif->regbase
-                  + (ide_ioreg_t)(14 << AU1XXX_ATA_REG_OFFSET);
 }
 static int au_ide_probe(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
-        _auide_hwif *ahwif = &auide_hwif;
+        _auide_hwif *ahwif = &auide_hwif;
-        ide_hwif_t *hwif;
+        ide_hwif_t *hwif;
        struct resource *res;
        int ret = 0;
 #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
-        char *mode = "MWDMA2";
+        char *mode = "MWDMA2";
 #elif defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA)
-        char *mode = "PIO+DDMA(offload)";
+        char *mode = "PIO+DDMA(offload)";
 #endif
-        memset(&auide_hwif, 0, sizeof(_auide_hwif));
+        memset(&auide_hwif, 0, sizeof(_auide_hwif));
-        auide_hwif.dev                  = 0;
+        auide_hwif.dev                  = 0;
        ahwif->dev = dev;
        ahwif->irq = platform_get_irq(pdev, 0);
@@ -902,11 +675,11 @@ static int au_ide_probe(struct device *dev)
                goto out;
        }
-        if (!request_mem_region (res->start, res->end-res->start, pdev->name)) {
+        if (!request_mem_region (res->start, res->end-res->start, pdev->name)) {
                pr_debug("%s: request_mem_region failed\n", DRV_NAME);
-                ret =  -EBUSY;
+                ret =  -EBUSY;
                goto out;
-        }
+        }
        ahwif->regbase = (u32)ioremap(res->start, res->end-res->start);
        if (ahwif->regbase == 0) {
@@ -914,130 +687,92 @@ static int au_ide_probe(struct device *dev)
                goto out;
        }
-        hwif                            = &ide_hwifs[pdev->id];
+        /* FIXME:  This might possibly break PCMCIA IDE devices */
+        hwif                            = &ide_hwifs[pdev->id];
        hw_regs_t *hw                   = &hwif->hw;
-        hwif->irq = hw->irq             = ahwif->irq;
+        hwif->irq = hw->irq             = ahwif->irq;
-        hwif->chipset                   = ide_au1xxx;
+        hwif->chipset                   = ide_au1xxx;
-        auide_setup_ports(hw, ahwif);
+        auide_setup_ports(hw, ahwif);
        memcpy(hwif->io_ports, hw->io_ports, sizeof(hwif->io_ports));
-#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
+        hwif->ultra_mask                = 0x0;  /* Disable Ultra DMA */
-        hwif->rqsize = CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ;
-        hwif->rqsize                    = ((hwif->rqsize > AU1XXX_ATA_RQSIZE)
-                                        || (hwif->rqsize < 32)) ? AU1XXX_ATA_RQSIZE : hwif->rqsize;
-#else /* if kernel config is not set */
-        hwif->rqsize                    = AU1XXX_ATA_RQSIZE;
-#endif
-        hwif->ultra_mask                = 0x0;  /* Disable Ultra DMA */
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-        hwif->mwdma_mask                = 0x07; /* Multimode-2 DMA  */
+        hwif->mwdma_mask                = 0x07; /* Multimode-2 DMA  */
-        hwif->swdma_mask                = 0x07;
+        hwif->swdma_mask                = 0x00;
 #else
-        hwif->mwdma_mask                = 0x0;
+        hwif->mwdma_mask                = 0x0;
-        hwif->swdma_mask                = 0x0;
+        hwif->swdma_mask                = 0x0;
+#endif
+        hwif->noprobe = 0;
+        hwif->drives[0].unmask          = 1;
+        hwif->drives[1].unmask          = 1;
+        /* hold should be on in all cases */
+        hwif->hold                      = 1;
+        hwif->mmio                      = 2;
+        /* If the user has selected DDMA assisted copies,
+           then set up a few local I/O function entry points 
+        */
+#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA      
+        hwif->INSW                      = auide_insw;
+        hwif->OUTSW                     = auide_outsw;
 #endif
-        //hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
-        hwif->noprobe = 0;
+        hwif->tuneproc                  = &auide_tune_drive;
-        hwif->drives[0].unmask          = 1;
+        hwif->speedproc                 = &auide_tune_chipset;
-        hwif->drives[1].unmask          = 1;
-        /* hold should be on in all cases */
-        hwif->hold                      = 1;
-        hwif->mmio                      = 2;
-        /* set up local I/O function entry points */
-        hwif->INB                       = auide_inb;
-        hwif->INW                       = auide_inw;
-        hwif->INL                       = auide_inl;
-        hwif->INSW                      = auide_insw;
-        hwif->INSL                      = auide_insl;
-        hwif->OUTB                      = auide_outb;
-        hwif->OUTBSYNC                  = auide_outbsync;
-        hwif->OUTW                      = auide_outw;
-        hwif->OUTL                      = auide_outl;
-        hwif->OUTSW                     = auide_outsw;
-        hwif->OUTSL                     = auide_outsl;
-        hwif->tuneproc                  = &auide_tune_drive;
-        hwif->speedproc                 = &auide_tune_chipset;
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-        hwif->ide_dma_off_quietly       = &auide_dma_off_quietly;
+        hwif->ide_dma_off_quietly       = &auide_dma_off_quietly;
-        hwif->ide_dma_timeout           = &auide_dma_timeout;
+        hwif->ide_dma_timeout           = &auide_dma_timeout;
-        hwif->ide_dma_check             = &auide_dma_check;
+        hwif->ide_dma_check             = &auide_dma_check;
-        hwif->dma_exec_cmd              = &auide_dma_exec_cmd;
+        hwif->dma_exec_cmd              = &auide_dma_exec_cmd;
-        hwif->dma_start                 = &auide_dma_start;
+        hwif->dma_start                 = &auide_dma_start;
-        hwif->ide_dma_end               = &auide_dma_end;
+        hwif->ide_dma_end               = &auide_dma_end;
-        hwif->dma_setup                 = &auide_dma_setup;
+        hwif->dma_setup                 = &auide_dma_setup;
-        hwif->ide_dma_test_irq          = &auide_dma_test_irq;
+        hwif->ide_dma_test_irq          = &auide_dma_test_irq;
-        hwif->ide_dma_host_off          = &auide_dma_host_off;
+        hwif->ide_dma_host_off          = &auide_dma_host_off;
-        hwif->ide_dma_host_on           = &auide_dma_host_on;
+        hwif->ide_dma_host_on           = &auide_dma_host_on;
-        hwif->ide_dma_lostirq           = &auide_dma_lostirq;
+        hwif->ide_dma_lostirq           = &auide_dma_lostirq;
-        hwif->ide_dma_on                = &auide_dma_on;
+        hwif->ide_dma_on                = &auide_dma_on;
-        hwif->autodma                   = 1;
+        hwif->autodma                   = 1;
-        hwif->drives[0].autodma         = hwif->autodma;
+        hwif->drives[0].autodma         = hwif->autodma;
-        hwif->drives[1].autodma         = hwif->autodma;
+        hwif->drives[1].autodma         = hwif->autodma;
-        hwif->atapi_dma                 = 1;
+        hwif->atapi_dma                 = 1;
-        hwif->drives[0].using_dma       = 1;
-        hwif->drives[1].using_dma       = 1;
 #else /* !CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */
-        hwif->autodma                   = 0;
+        hwif->autodma                   = 0;
-        hwif->channel                   = 0;
+        hwif->channel                   = 0;
-        hwif->hold                      = 1;
+        hwif->hold                      = 1;
-        hwif->select_data               = 0;    /* no chipset-specific code */
+        hwif->select_data               = 0;    /* no chipset-specific code */
-        hwif->config_data               = 0;    /* no chipset-specific code */
+        hwif->config_data               = 0;    /* no chipset-specific code */
-        hwif->drives[0].autodma         = 0;
+        hwif->drives[0].autodma         = 0;
-        hwif->drives[0].drive_data      = 0;    /* no drive data */
+        hwif->drives[0].autotune        = 1;    /* 1=autotune, 2=noautotune, 0=default */
-        hwif->drives[0].using_dma       = 0;
-        hwif->drives[0].waiting_for_dma = 0;
-        hwif->drives[0].autotune        = 1;    /* 1=autotune, 2=noautotune, 0=default */
-        /* secondary hdd not supported */
-        hwif->drives[1].autodma         = 0;
-        hwif->drives[1].drive_data      = 0;
-        hwif->drives[1].using_dma       = 0;
-        hwif->drives[1].waiting_for_dma = 0;
-        hwif->drives[1].autotune        = 2;   /* 1=autotune, 2=noautotune, 0=default */
-#endif
-        hwif->drives[0].io_32bit        = 0;   /* 0=16-bit, 1=32-bit, 2/3=32bit+sync */
-        hwif->drives[1].io_32bit        = 0;   /* 0=16-bit, 1=32-bit, 2/3=32bit+sync */
-        /*Register Driver with PM Framework*/
-#ifdef CONFIG_PM
-        auide_hwif.pm.lock    = SPIN_LOCK_UNLOCKED;
-        auide_hwif.pm.stopped = 0;
-        auide_hwif.pm.dev = new_au1xxx_power_device( "ide",
-                                                &au1200ide_pm_callback,
-                                                NULL);
-        if ( auide_hwif.pm.dev == NULL )
-                printk(KERN_INFO "Unable to create a power management \
-                                device entry for the au1200-IDE.\n");
-        else
-                printk(KERN_INFO "Power management device entry for the \
-                                au1200-IDE loaded.\n");
 #endif
+        hwif->drives[0].no_io_32bit     = 1;   
-        auide_hwif.hwif                 = hwif;
+        auide_hwif.hwif                 = hwif;
-        hwif->hwif_data                 = &auide_hwif;
+        hwif->hwif_data                 = &auide_hwif;
-#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA
+#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA           
-        auide_ddma_init(&auide_hwif);
+        auide_ddma_init(&auide_hwif);
-        dbdma_init_done = 1;
+        dbdma_init_done = 1;
 #endif
        probe_hwif_init(hwif);
        dev_set_drvdata(dev, hwif);
-        printk(KERN_INFO "Au1xxx IDE(builtin) configured for %s\n", mode );
+        printk(KERN_INFO "Au1xxx IDE(builtin) configured for %s\n", mode );
-out:
+ out:
-        return ret;
+        return ret;
 }
 static int au_ide_remove(struct device *dev)
@@ -1045,7 +780,7 @@ static int au_ide_remove(struct device *dev)
        struct platform_device *pdev = to_platform_device(dev);
        struct resource *res;
        ide_hwif_t *hwif = dev_get_drvdata(dev);
-        _auide_hwif *ahwif = &auide_hwif;
+        _auide_hwif *ahwif = &auide_hwif;
        ide_unregister(hwif - ide_hwifs);
@@ -1069,180 +804,11 @@ static int __init au_ide_init(void)
        return driver_register(&au1200_ide_driver);
 }
-static void __init au_ide_exit(void)
+static void __exit au_ide_exit(void)
 {
        driver_unregister(&au1200_ide_driver);
 }
-#ifdef CONFIG_PM
-int au1200ide_pm_callback( au1xxx_power_dev_t *dev,\
-                        au1xxx_request_t request, void *data) {
-        unsigned int d, err = 0;
-        unsigned long flags;
-        spin_lock_irqsave(auide_hwif.pm.lock, flags);
-        switch (request){
-                case AU1XXX_PM_SLEEP:
-                        err = au1xxxide_pm_sleep(dev);
-                        break;
-                case AU1XXX_PM_WAKEUP:
-                        d = *((unsigned int*)data);
-                        if ( d > 0 && d <= 99) {
-                                err = au1xxxide_pm_standby(dev);
-                        }
-                        else {
-                                err = au1xxxide_pm_resume(dev);
-                        }
-                        break;
-                case AU1XXX_PM_GETSTATUS:
-                        err = au1xxxide_pm_getstatus(dev);
-                        break;
-                case AU1XXX_PM_ACCESS:
-                        err = au1xxxide_pm_access(dev);
-                        break;
-                case AU1XXX_PM_IDLE:
-                        err = au1xxxide_pm_idle(dev);
-                        break;
-                case AU1XXX_PM_CLEANUP:
-                        err = au1xxxide_pm_cleanup(dev);
-                        break;
-                default:
-                        err = -1;
-                        break;
-        }
-        spin_unlock_irqrestore(auide_hwif.pm.lock, flags);
-        return err;
-}
-static int au1xxxide_pm_standby( au1xxx_power_dev_t *dev ) {
-        return 0;
-}
-static int au1xxxide_pm_sleep( au1xxx_power_dev_t *dev ) {
-        int retval;
-        ide_hwif_t *hwif = auide_hwif.hwif;
-        struct request rq;
-        struct request_pm_state rqpm;
-        ide_task_t args;
-        if(auide_hwif.pm.stopped)
-                return -1;
-        /*
-         * wait until hard disc is ready
-         */
-        if ( wait_for_ready(&hwif->drives[0], 35000) ) {
-                printk("Wait for drive sleep timeout!\n");
-                retval = -1;
-        }
-        /*
-         * sequenz to tell the high level ide driver that pm is resuming
-         */
-        memset(&rq, 0, sizeof(rq));
-        memset(&rqpm, 0, sizeof(rqpm));
-        memset(&args, 0, sizeof(args));
-        rq.flags = REQ_PM_SUSPEND;
-        rq.special = &args;
-        rq.pm = &rqpm;
-        rqpm.pm_step = ide_pm_state_start_suspend;
-        rqpm.pm_state = PMSG_SUSPEND;
-        retval = ide_do_drive_cmd(&hwif->drives[0], &rq, ide_wait);
-        if (wait_for_ready (&hwif->drives[0], 35000)) {
-                printk("Wait for drive sleep timeout!\n");
-                retval = -1;
-        }
-        /*
-         * stop dbdma channels
-         */
-        au1xxx_dbdma_reset(auide_hwif.tx_chan);
-        au1xxx_dbdma_reset(auide_hwif.rx_chan);
-        auide_hwif.pm.stopped = 1;
-        return retval;
-}
-static int au1xxxide_pm_resume( au1xxx_power_dev_t *dev ) {
-        int retval;
-        ide_hwif_t *hwif = auide_hwif.hwif;
-        struct request rq;
-        struct request_pm_state rqpm;
-        ide_task_t args;
-        if(!auide_hwif.pm.stopped)
-                return -1;
-        /*
-         * start dbdma channels
-         */
-        au1xxx_dbdma_start(auide_hwif.tx_chan);
-        au1xxx_dbdma_start(auide_hwif.rx_chan);
-        /*
-         * wait until hard disc is ready
-         */
-        if (wait_for_ready ( &hwif->drives[0], 35000)) {
-                printk("Wait for drive wake up timeout!\n");
-                retval = -1;
-        }
-        /*
-         * sequenz to tell the high level ide driver that pm is resuming
-         */
-        memset(&rq, 0, sizeof(rq));
-        memset(&rqpm, 0, sizeof(rqpm));
-        memset(&args, 0, sizeof(args));
-        rq.flags = REQ_PM_RESUME;
-        rq.special = &args;
-        rq.pm = &rqpm;
-        rqpm.pm_step = ide_pm_state_start_resume;
-        rqpm.pm_state = PMSG_ON;
-        retval = ide_do_drive_cmd(&hwif->drives[0], &rq, ide_head_wait);
-        /*
-        * wait for hard disc
-        */
-        if ( wait_for_ready(&hwif->drives[0], 35000) ) {
-                printk("Wait for drive wake up timeout!\n");
-                retval = -1;
-        }
-        auide_hwif.pm.stopped = 0;
-        return retval;
-}
-static int au1xxxide_pm_getstatus( au1xxx_power_dev_t *dev ) {
-        return dev->cur_state;
-}
-static int au1xxxide_pm_access( au1xxx_power_dev_t *dev ) {
-        if (dev->cur_state != AWAKE_STATE)
-                return 0;
-        else
-                return -1;
-}
-static int au1xxxide_pm_idle( au1xxx_power_dev_t *dev ) {
-        return 0;
-}
-static int au1xxxide_pm_cleanup( au1xxx_power_dev_t *dev ) {
-        return 0;
-}
-#endif /* CONFIG_PM */
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("AU1200 IDE driver");
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index af526b671c4e..4ee597d08797 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -622,12 +622,18 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t * d)
        ide_hwif_t *hwif;
        int h;
+        /*
+         * Find an empty HWIF; if none available, return -ENOMEM.
+         */
        for (h = 0; h < MAX_HWIFS; ++h) {
                hwif = &ide_hwifs[h];
-                /* Find an empty HWIF */
                if (hwif->chipset == ide_unknown)
                        break;
        }
+        if (h == MAX_HWIFS) {
+                printk(KERN_ERR "%s: too many IDE interfaces, no room in table\n", d->name);
+                return -ENOMEM;
+        }
        /*  Get the CmdBlk and CtrlBlk Base Registers */
        base = pci_resource_start(dev, 0) + IOC4_CMD_OFFSET;
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 7161ce0ef5aa..86fb1e0286d3 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -80,6 +80,7 @@ static struct via_isa_bridge {
        u16 flags;
 } via_isa_bridges[] = {
        { "vt6410",     PCI_DEVICE_ID_VIA_6410,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
+        { "vt8251",     PCI_DEVICE_ID_VIA_8251,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
        { "vt8237",     PCI_DEVICE_ID_VIA_8237,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
        { "vt8235",     PCI_DEVICE_ID_VIA_8235,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
        { "vt8233a",    PCI_DEVICE_ID_VIA_8233A,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h
index 38f42112dff0..ae9b02cc013f 100644
--- a/drivers/ieee1394/hosts.h
+++ b/drivers/ieee1394/hosts.h
@@ -41,6 +41,7 @@ struct hpsb_host {
        /* this nodes state */
        unsigned in_bus_reset:1;
        unsigned is_shutdown:1;
+        unsigned resume_packet_sent:1;
        /* this nodes' duties on the bus */
        unsigned is_root:1;
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 7fff5a1d2ea4..0ea37b1bccb2 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -1349,6 +1349,33 @@ static void nodemgr_update_pdrv(struct node_entry *ne)
 }
+/* Write the BROADCAST_CHANNEL as per IEEE1394a 8.3.2.3.11 and 8.4.2.3.  This
+ * seems like an optional service but in the end it is practically mandatory
+ * as a consequence of these clauses.
+ *
+ * Note that we cannot do a broadcast write to all nodes at once because some
+ * pre-1394a devices would hang. */
+static void nodemgr_irm_write_bc(struct node_entry *ne, int generation)
+{
+        const u64 bc_addr = (CSR_REGISTER_BASE | CSR_BROADCAST_CHANNEL);
+        quadlet_t bc_remote, bc_local;
+        int ret;
+        if (!ne->host->is_irm || ne->generation != generation ||
+            ne->nodeid == ne->host->node_id)
+                return;
+        bc_local = cpu_to_be32(ne->host->csr.broadcast_channel);
+        /* Check if the register is implemented and 1394a compliant. */
+        ret = hpsb_read(ne->host, ne->nodeid, generation, bc_addr, &bc_remote,
+                        sizeof(bc_remote));
+        if (!ret && bc_remote & cpu_to_be32(0x80000000) &&
+            bc_remote != bc_local)
+                hpsb_node_write(ne, bc_addr, &bc_local, sizeof(bc_local));
+}
 static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int generation)
 {
        struct device *dev;
@@ -1360,6 +1387,8 @@ static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int ge
        if (!dev)
                return;
+        nodemgr_irm_write_bc(ne, generation);
        /* If "needs_probe", then this is either a new or changed node we
         * rescan totally. If the generation matches for an existing node
         * (one that existed prior to the bus reset) we send update calls
@@ -1413,9 +1442,25 @@ static void nodemgr_node_probe(struct host_info *hi, int generation)
        return;
 }
-/* Because we are a 1394a-2000 compliant IRM, we need to inform all the other
+static int nodemgr_send_resume_packet(struct hpsb_host *host)
- * nodes of the broadcast channel.  (Really we're only setting the validity
+{
- * bit). Other IRM responsibilities go in here as well. */
+        struct hpsb_packet *packet;
+        int ret = 1;
+        packet = hpsb_make_phypacket(host,
+                        0x003c0000 | NODEID_TO_NODE(host->node_id) << 24);
+        if (packet) {
+                packet->no_waiter = 1;
+                packet->generation = get_hpsb_generation(host);
+                ret = hpsb_send_packet(packet);
+        }
+        if (ret)
+                HPSB_WARN("fw-host%d: Failed to broadcast resume packet",
+                          host->id);
+        return ret;
+}
+/* Perform a few high-level IRM responsibilities. */
 static int nodemgr_do_irm_duties(struct hpsb_host *host, int cycles)
 {
        quadlet_t bc;
@@ -1424,13 +1469,8 @@ static int nodemgr_do_irm_duties(struct hpsb_host *host, int cycles)
        if (!host->is_irm || host->irm_id == (nodeid_t)-1)
                return 1;
-        host->csr.broadcast_channel |= 0x40000000;  /* set validity bit */
+        /* We are a 1394a-2000 compliant IRM. Set the validity bit. */
+        host->csr.broadcast_channel |= 0x40000000;
-        bc = cpu_to_be32(host->csr.broadcast_channel);
-        hpsb_write(host, LOCAL_BUS | ALL_NODES, get_hpsb_generation(host),
-                   (CSR_REGISTER_BASE | CSR_BROADCAST_CHANNEL),
-                   &bc, sizeof(quadlet_t));
        /* If there is no bus manager then we should set the root node's
         * force_root bit to promote bus stability per the 1394
@@ -1463,6 +1503,13 @@ static int nodemgr_do_irm_duties(struct hpsb_host *host, int cycles)
                }
        }
+        /* Some devices suspend their ports while being connected to an inactive
+         * host adapter, i.e. if connected before the low-level driver is
+         * loaded.  They become visible either when physically unplugged and
+         * replugged, or when receiving a resume packet.  Send one once. */
+        if (!host->resume_packet_sent && !nodemgr_send_resume_packet(host))
+                host->resume_packet_sent = 1;
        return 1;
 }
diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c
index 99a642d2a1fe..1849b176cf18 100644
--- a/drivers/input/joystick/warrior.c
+++ b/drivers/input/joystick/warrior.c
@@ -172,7 +172,7 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv)
        input_set_abs_params(input_dev, ABS_Y, -64, 64, 0, 8);
        input_set_abs_params(input_dev, ABS_THROTTLE, -112, 112, 0, 0);
        input_set_abs_params(input_dev, ABS_HAT0X, -1, 1, 0, 0);
-        input_set_abs_params(input_dev, ABS_HAT0X, -1, 1, 0, 0);
+        input_set_abs_params(input_dev, ABS_HAT0Y, -1, 1, 0, 0);
        serio_set_drvdata(serio, warrior);
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 07813fc0523f..e08dbe08f46d 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -26,7 +26,7 @@ config INPUT_PCSPKR
 config INPUT_SPARCSPKR
        tristate "SPARC Speaker support"
-        depends on PCI && (SPARC32 || SPARC64)
+        depends on PCI && SPARC
        help
          Say Y here if you want the standard Speaker on Sparc PCI systems
          to be used for bells and whistles.
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index 49d0416a2a9a..bac3085185fe 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -320,7 +320,7 @@ static struct dmi_system_id dmi_ids[] = {
                },
                .driver_data = keymap_acer_aspire_1500
        },
-        { 0, }
+        { NULL, }
 };
 static int __init select_keymap(void)
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 4acc7fd4cd0f..4f41ec3e4332 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -42,7 +42,7 @@ static struct alps_model_info alps_model_data[] = {
        { { 0x53, 0x02, 0x14 }, 0xf8, 0xf8, 0 },
        { { 0x63, 0x02, 0x0a }, 0xf8, 0xf8, 0 },
        { { 0x63, 0x02, 0x14 }, 0xf8, 0xf8, 0 },
-        { { 0x63, 0x02, 0x28 }, 0xf8, 0xf8, 0 },
+        { { 0x63, 0x02, 0x28 }, 0xf8, 0xf8, ALPS_FW_BK_2 },             /* Fujitsu Siemens S6010 */
        { { 0x63, 0x02, 0x3c }, 0x8f, 0x8f, ALPS_WHEEL },               /* Toshiba Satellite S2400-103 */
        { { 0x63, 0x02, 0x50 }, 0xef, 0xef, ALPS_FW_BK_1 },             /* NEC Versa L320 */
        { { 0x63, 0x02, 0x64 }, 0xf8, 0xf8, 0 },
diff --git a/drivers/input/mouse/sermouse.c b/drivers/input/mouse/sermouse.c
index 4bf584364d28..2f9a04ae725f 100644
--- a/drivers/input/mouse/sermouse.c
+++ b/drivers/input/mouse/sermouse.c
@@ -95,7 +95,7 @@ static void sermouse_process_msc(struct sermouse *sermouse, signed char data, st
        input_sync(dev);
-        if (++sermouse->count == (5 - ((sermouse->type == SERIO_SUN) << 1)))
+        if (++sermouse->count == 5)
                sermouse->count = 0;
 }
diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
index 13835039a2a7..cbbf3842da5b 100644
--- a/drivers/input/serio/i8042.h
+++ b/drivers/input/serio/i8042.h
@@ -21,7 +21,7 @@
 #include "i8042-ip22io.h"
 #elif defined(CONFIG_PPC)
 #include "i8042-ppcio.h"
-#elif defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)
+#elif defined(CONFIG_SPARC)
 #include "i8042-sparcio.h"
 #elif defined(CONFIG_X86) || defined(CONFIG_IA64)
 #include "i8042-x86ia64io.h"
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 3fc8cdd94c3d..190878eef990 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -923,7 +923,7 @@ static void do_monitor_cpu_combined(void)
        if (temp_combi >= ((state0->mpu.tmax + 8) << 16)) {
                printk(KERN_WARNING "Warning ! Temperature way above maximum (%d) !\n",
                       temp_combi >> 16);
-                state0->overtemp = CPU_MAX_OVERTEMP;
+                state0->overtemp += CPU_MAX_OVERTEMP / 4;
        } else if (temp_combi > (state0->mpu.tmax << 16))
                state0->overtemp++;
        else
@@ -933,7 +933,7 @@ static void do_monitor_cpu_combined(void)
        if (state0->overtemp > 0) {
                state0->rpm = state0->mpu.rmaxn_exhaust_fan;
                state0->intake_rpm = intake = state0->mpu.rmaxn_intake_fan;
-                pump = state0->pump_min;
+                pump = state0->pump_max;
                goto do_set_fans;
        }
@@ -998,7 +998,7 @@ static void do_monitor_cpu_split(struct cpu_pid_state *state)
                printk(KERN_WARNING "Warning ! CPU %d temperature way above maximum"
                       " (%d) !\n",
                       state->index, temp >> 16);
-                state->overtemp = CPU_MAX_OVERTEMP;
+                state->overtemp += CPU_MAX_OVERTEMP / 4;
        } else if (temp > (state->mpu.tmax << 16))
                state->overtemp++;
        else
@@ -1060,7 +1060,7 @@ static void do_monitor_cpu_rack(struct cpu_pid_state *state)
                printk(KERN_WARNING "Warning ! CPU %d temperature way above maximum"
                       " (%d) !\n",
                       state->index, temp >> 16);
-                state->overtemp = CPU_MAX_OVERTEMP;
+                state->overtemp = CPU_MAX_OVERTEMP / 4;
        } else if (temp > (state->mpu.tmax << 16))
                state->overtemp++;
        else
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c
index 322c74b2687f..80ddf9776bde 100644
--- a/drivers/macintosh/windfarm_pm81.c
+++ b/drivers/macintosh/windfarm_pm81.c
@@ -207,7 +207,7 @@ static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = {
        },
        /* Model ID 3 */
        {
-                .model_id       = 2,
+                .model_id       = 3,
                .itarget        = 0x350000,
                .gd             = 0x08e00000,
                .gp             = 0x00566666,
@@ -219,7 +219,7 @@ static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = {
        },
        /* Model ID 5 */
        {
-                .model_id       = 2,
+                .model_id       = 5,
                .itarget        = 0x3a0000,
                .gd             = 0x15400000,
                .gp             = 0x00233333,
diff --git a/drivers/md/md.c b/drivers/md/md.c
index cd12fca73b0d..8175a2a222da 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1729,7 +1729,7 @@ level_show(mddev_t *mddev, char *page)
        if (p == NULL && mddev->raid_disks == 0)
                return 0;
        if (mddev->level >= 0)
-                return sprintf(page, "RAID-%d\n", mddev->level);
+                return sprintf(page, "raid%d\n", mddev->level);
        else
                return sprintf(page, "%s\n", p->name);
 }
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 3066c587b539..229d7b204297 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -320,7 +320,6 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int
                 * this branch is our 'one mirror IO has finished' event handler:
                 */
                r1_bio->bios[mirror] = NULL;
-                bio_put(bio);
                if (!uptodate) {
                        md_error(r1_bio->mddev, conf->mirrors[mirror].rdev);
                        /* an I/O failed, we can't clear the bitmap */
@@ -377,7 +376,6 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int
                }
                if (test_bit(R1BIO_BehindIO, &r1_bio->state)) {
                        /* free extra copy of the data pages */
-/* FIXME bio has been freed!!! */
                        int i = bio->bi_vcnt;
                        while (i--)
                                __free_page(bio->bi_io_vec[i].bv_page);
@@ -391,6 +389,9 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int
                raid_end_bio_io(r1_bio);
        }
+        if (r1_bio->bios[mirror]==NULL)
+                bio_put(bio);
        rdev_dec_pending(conf->mirrors[mirror].rdev, conf->mddev);
        return 0;
 }
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 36d5f8ac8265..fafc4bc045f7 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -98,7 +98,7 @@ static inline void __release_stripe(raid5_conf_t *conf, struct stripe_head *sh)
                        list_add_tail(&sh->lru, &conf->inactive_list);
                        atomic_dec(&conf->active_stripes);
                        if (!conf->inactive_blocked ||
-                            atomic_read(&conf->active_stripes) < (NR_STRIPES*3/4))
+                            atomic_read(&conf->active_stripes) < (conf->max_nr_stripes*3/4))
                                wake_up(&conf->wait_for_stripe);
                }
        }
@@ -264,7 +264,8 @@ static struct stripe_head *get_active_stripe(raid5_conf_t *conf, sector_t sector
                                conf->inactive_blocked = 1;
                                wait_event_lock_irq(conf->wait_for_stripe,
                                                    !list_empty(&conf->inactive_list) &&
-                                                    (atomic_read(&conf->active_stripes) < (NR_STRIPES *3/4)
+                                                    (atomic_read(&conf->active_stripes)
+                                                     < (conf->max_nr_stripes *3/4)
                                                     || !conf->inactive_blocked),
                                                    conf->device_lock,
                                                    unplug_slaves(conf->mddev);
@@ -1917,7 +1918,7 @@ static int run(mddev_t *mddev)
                        goto abort;
                }
        }
-memory = conf->max_nr_stripes * (sizeof(struct stripe_head) +
+        memory = conf->max_nr_stripes * (sizeof(struct stripe_head) +
                 conf->raid_disks * ((sizeof(struct bio) + PAGE_SIZE))) / 1024;
        if (grow_stripes(conf, conf->max_nr_stripes)) {
                printk(KERN_ERR 
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index caebd0a1c021..6a901a0268e1 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -1,12 +1,12 @@
 config VIDEO_SAA7146
-        tristate
+        tristate
        select I2C
 config VIDEO_SAA7146_VV
-        tristate
+        tristate
        select VIDEO_BUF
        select VIDEO_VIDEOBUF
        select VIDEO_SAA7146
 config VIDEO_VIDEOBUF
-        tristate
+        tristate
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index 97b4341255ea..bd458cb9b4ea 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,5 +1,5 @@
-saa7146-objs    := saa7146_i2c.o saa7146_core.o 
+saa7146-objs    := saa7146_i2c.o saa7146_core.o
-saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o  
+saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
 obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
 obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
diff --git a/drivers/media/common/ir-common.c b/drivers/media/common/ir-common.c
index 7972c73bc14e..97fa3fc571c4 100644
--- a/drivers/media/common/ir-common.c
+++ b/drivers/media/common/ir-common.c
@@ -313,6 +313,7 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
        if (ir_codes)
                memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes));
        dev->keycode     = ir->ir_codes;
        dev->keycodesize = sizeof(IR_KEYTAB_TYPE);
        dev->keycodemax  = IR_KEYTAB_SIZE;
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 206cc2f61f26..2899d34e5f7e 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -174,8 +174,8 @@ void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt)
 int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt)
 {
-        u32          *cpu;
+        u32          *cpu;
-        dma_addr_t   dma_addr;
+        dma_addr_t   dma_addr;
        cpu = pci_alloc_consistent(pci, PAGE_SIZE, &dma_addr);
        if (NULL == cpu) {
@@ -405,7 +405,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
        pci_set_drvdata(pci, dev);
-        init_MUTEX(&dev->lock);
+        init_MUTEX(&dev->lock);
        spin_lock_init(&dev->int_slock);
        spin_lock_init(&dev->slock);
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 37888989ea2e..09ec964dec5c 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -1,6 +1,6 @@
 #include <media/saa7146_vv.h>
-#define BOARD_CAN_DO_VBI(dev)   (dev->revision != 0 && dev->vv_data->vbi_minor != -1) 
+#define BOARD_CAN_DO_VBI(dev)   (dev->revision != 0 && dev->vv_data->vbi_minor != -1)
 /****************************************************************************/
 /* resource management functions, shamelessly stolen from saa7134 driver */
@@ -102,9 +102,9 @@ void saa7146_buffer_finish(struct saa7146_dev *dev,
        /* finish current buffer */
        if (NULL == q->curr) {
                DEB_D(("aiii. no current buffer\n"));
-                return; 
+                return;
        }
-                        
        q->curr->vb.state = state;
        do_gettimeofday(&q->curr->vb.ts);
        wake_up(&q->curr->vb.done);
@@ -143,13 +143,13 @@ void saa7146_buffer_next(struct saa7146_dev *dev,
                        // fixme: fix this for vflip != 0
                        saa7146_write(dev, PROT_ADDR1, 0);
-                        saa7146_write(dev, MC2, (MASK_02|MASK_18));             
+                        saa7146_write(dev, MC2, (MASK_02|MASK_18));
                        /* write the address of the rps-program */
                        saa7146_write(dev, RPS_ADDR0, dev->d_rps0.dma_handle);
                        /* turn on rps */
                        saa7146_write(dev, MC1, (MASK_12 | MASK_28));
-                                
 /*
                        printk("vdma%d.base_even:     0x%08x\n", 1,saa7146_read(dev,BASE_EVEN1));
                        printk("vdma%d.base_odd:      0x%08x\n", 1,saa7146_read(dev,BASE_ODD1));
@@ -246,7 +246,7 @@ static int fops_open(struct inode *inode, struct file *file)
                goto out;
        }
        memset(fh,0,sizeof(*fh));
-        
        file->private_data = fh;
        fh->dev = dev;
        fh->type = type;
@@ -275,7 +275,7 @@ out:
                file->private_data = NULL;
        }
        up(&saa7146_devices_lock);
-        return result;
+        return result;
 }
 static int fops_release(struct inode *inode, struct file *file)
@@ -405,7 +405,7 @@ static struct file_operations video_fops =
 static void vv_callback(struct saa7146_dev *dev, unsigned long status)
 {
        u32 isr = status;
-        
        DEB_INT(("dev:%p, isr:0x%08x\n",dev,(u32)status));
        if (0 != (isr & (MASK_27))) {
@@ -454,11 +454,11 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
           handle different devices that might need different
           configuration data) */
        dev->ext_vv_data = ext_vv;
-        
        vv->video_minor = -1;
        vv->vbi_minor = -1;
-        vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);     
+        vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);
        if( NULL == vv->d_clipping.cpu_addr ) {
                ERR(("out of memory. aborting.\n"));
                kfree(vv);
@@ -468,7 +468,7 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
        saa7146_video_uops.init(dev,vv);
        saa7146_vbi_uops.init(dev,vv);
-        
        dev->vv_data = vv;
        dev->vv_callback = &vv_callback;
@@ -480,12 +480,12 @@ int saa7146_vv_release(struct saa7146_dev* dev)
        struct saa7146_vv *vv = dev->vv_data;
        DEB_EE(("dev:%p\n",dev));
- 
        pci_free_consistent(dev->pci, SAA7146_RPS_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle);
-        kfree(vv);
+        kfree(vv);
        dev->vv_data = NULL;
        dev->vv_callback = NULL;
-        
        return 0;
 }
@@ -498,7 +498,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
        DEB_EE(("dev:%p, name:'%s', type:%d\n",dev,name,type));
        // released by vfd->release
-        vfd = video_device_alloc();
+        vfd = video_device_alloc();
        if (vfd == NULL)
                return -ENOMEM;
@@ -530,7 +530,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
 int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev)
 {
        struct saa7146_vv *vv = dev->vv_data;
-        
        DEB_EE(("dev:%p\n",dev));
        if( VFL_TYPE_GRABBER == (*vid)->type ) {
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index fec6beab8c28..8aabdd8fb3c5 100644
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
@@ -276,8 +276,8 @@ int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, in
        int i = 0, count = 0;
        u32* buffer = dev->d_i2c.cpu_addr;
        int err = 0;
-        int address_err = 0;
+        int address_err = 0;
-        int short_delay = 0;
+        int short_delay = 0;
        if (down_interruptible (&dev->i2c_lock))
                return -ERESTARTSYS;
@@ -325,7 +325,7 @@ int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, in
                                        if( 0 != (SAA7146_USE_I2C_IRQ & dev->ext->flags)) {
                                                goto out;
                                        }
-                                        address_err++;
+                                        address_err++;
                                }
                                DEB_I2C(("error while sending message(s). starting again.\n"));
                                break;
@@ -336,14 +336,14 @@ int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, in
                        break;
                }
-                /* delay a bit before retrying */
+                /* delay a bit before retrying */
-                msleep(10);
+                msleep(10);
        } while (err != num && retries--);
-        /* if every retry had an address error, exit right away */
+        /* if every retry had an address error, exit right away */
-        if (address_err == retries) {
+        if (address_err == retries) {
-                goto out;
+                goto out;
        }
        /* if any things had to be read, get the results */
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c
index cb86a97fda1f..063986ec16b5 100644
--- a/drivers/media/common/saa7146_vbi.c
+++ b/drivers/media/common/saa7146_vbi.c
@@ -6,8 +6,8 @@ static int vbi_workaround(struct saa7146_dev *dev)
 {
        struct saa7146_vv *vv = dev->vv_data;
-        u32          *cpu;
+        u32          *cpu;
-        dma_addr_t   dma_addr;
+        dma_addr_t   dma_addr;
        int count = 0;
        int i;
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index 8dd4d15ca36d..1d961023b837 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -150,23 +150,23 @@ static int try_win(struct saa7146_dev *dev, struct v4l2_window *win)
        maxh  = vv->standard->v_max_out;
        if (V4L2_FIELD_ANY == field) {
-                field = (win->w.height > maxh/2)
+                field = (win->w.height > maxh/2)
-                        ? V4L2_FIELD_INTERLACED
+                        ? V4L2_FIELD_INTERLACED
-                        : V4L2_FIELD_TOP;
+                        : V4L2_FIELD_TOP;
-                }
+                }
-        switch (field) {
+        switch (field) {
-        case V4L2_FIELD_TOP:
+        case V4L2_FIELD_TOP:
-        case V4L2_FIELD_BOTTOM:
+        case V4L2_FIELD_BOTTOM:
-        case V4L2_FIELD_ALTERNATE:
+        case V4L2_FIELD_ALTERNATE:
-                maxh = maxh / 2;
+                maxh = maxh / 2;
-                break;
+                break;
-        case V4L2_FIELD_INTERLACED:
+        case V4L2_FIELD_INTERLACED:
-                break;
+                break;
-        default: {
+        default: {
                DEB_D(("no known field mode '%d'.\n",field));
-                return -EINVAL;
+                return -EINVAL;
+        }
        }
-        }
        win->field = field;
        if (win->w.width > maxw)
@@ -887,7 +887,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
                DEB_EE(("VIDIOC_QUERYCAP\n"));
-                strcpy(cap->driver, "saa7146 v4l2");
+                strcpy(cap->driver, "saa7146 v4l2");
                strlcpy(cap->card, dev->ext->name, sizeof(cap->card));
                sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci));
                cap->version = SAA7146_VERSION_CODE;
@@ -1011,19 +1011,19 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
                err = set_control(fh,arg);
                return err;
        }
-        case VIDIOC_G_PARM:
+        case VIDIOC_G_PARM:
-        {
+        {
-                struct v4l2_streamparm *parm = arg;
+                struct v4l2_streamparm *parm = arg;
                if( parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ) {
                        return -EINVAL;
                }
-                memset(&parm->parm.capture,0,sizeof(struct v4l2_captureparm));
+                memset(&parm->parm.capture,0,sizeof(struct v4l2_captureparm));
                parm->parm.capture.readbuffers = 1;
                // fixme: only for PAL!
                parm->parm.capture.timeperframe.numerator = 1;
                parm->parm.capture.timeperframe.denominator = 25;
-                return 0;
+                return 0;
-        }
+        }
        case VIDIOC_G_FMT:
        {
                struct v4l2_format *f = arg;
@@ -1383,7 +1383,7 @@ static struct videobuf_queue_ops video_qops = {
 static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
 {
-        INIT_LIST_HEAD(&vv->video_q.queue);
+        INIT_LIST_HEAD(&vv->video_q.queue);
        init_timer(&vv->video_q.timeout);
        vv->video_q.timeout.function = saa7146_buffer_timeout;
diff --git a/drivers/media/dvb/b2c2/flexcop-common.h b/drivers/media/dvb/b2c2/flexcop-common.h
index a94912ac1872..344a3c898460 100644
--- a/drivers/media/dvb/b2c2/flexcop-common.h
+++ b/drivers/media/dvb/b2c2/flexcop-common.h
@@ -132,7 +132,7 @@ int flexcop_eeprom_check_mac_addr(struct flexcop_device *fc, int extended);
 * I2C-channel of the flexcop.
 */
 int flexcop_i2c_request(struct flexcop_device*, flexcop_access_op_t,
-                        flexcop_i2c_port_t, u8 chipaddr, u8 addr, u8 *buf, u16 len);
+                        flexcop_i2c_port_t, u8 chipaddr, u8 addr, u8 *buf, u16 len);
 /* from flexcop-sram.c */
 int flexcop_sram_set_dest(struct flexcop_device *fc, flexcop_sram_dest_t dest, flexcop_sram_dest_target_t target);
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index a35330315f65..21a9045b3ef6 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -298,7 +298,7 @@ static int flexcop_fe_request_firmware(struct dvb_frontend* fe, const struct fir
 }
 static int lgdt3303_pll_set(struct dvb_frontend* fe,
-                            struct dvb_frontend_parameters* params)
+                            struct dvb_frontend_parameters* params)
 {
        struct flexcop_device *fc = fe->dvb->priv;
        u8 buf[4];
@@ -332,7 +332,7 @@ static int lgdt3303_pll_set(struct dvb_frontend* fe,
                        return -EREMOTEIO;
        }
-        return 0;
+        return 0;
 }
 static struct lgdt330x_config air2pc_atsc_hd5000_config = {
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index e6541aff3996..2239651969c8 100644
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -406,7 +406,7 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message,
        }
        dprintk(verbose, DST_CA_DEBUG, 1, " ");
-        if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg))) {
+        if (copy_from_user(p_ca_message, arg, sizeof (struct ca_msg))) {
                result = -EFAULT;
                goto free_mem_and_exit;
        }
@@ -579,7 +579,7 @@ static int dst_ca_release(struct inode *inode, struct file *file)
        return 0;
 }
-static int dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)
+static ssize_t dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)
 {
        int bytes_read = 0;
@@ -588,7 +588,7 @@ static int dst_ca_read(struct file *file, char __user *buffer, size_t length, lo
        return bytes_read;
 }
-static int dst_ca_write(struct file *file, const char __user *buffer, size_t length, loff_t *offset)
+static ssize_t dst_ca_write(struct file *file, const char __user *buffer, size_t length, loff_t *offset)
 {
        dprintk(verbose, DST_CA_DEBUG, 1, " Device write.");
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 2e398090cf63..77977e9c013e 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -556,9 +556,9 @@ static int tdvs_tua6034_pll_set(struct dvb_frontend* fe, struct dvb_frontend_par
        dprintk("%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",
                __FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);
        if ((err = i2c_transfer(card->i2c_adapter, &msg, 1)) != 1) {
-                printk(KERN_WARNING "dvb-bt8xx: %s error "
+                printk(KERN_WARNING "dvb-bt8xx: %s error "
-                        "(addr %02x <- %02x, err = %i)\n",
+                        "(addr %02x <- %02x, err = %i)\n",
-                        __FUNCTION__, buf[0], buf[1], err);
+                        __FUNCTION__, buf[0], buf[1], err);
                if (err < 0)
                        return err;
                else
diff --git a/drivers/media/dvb/dvb-core/demux.h b/drivers/media/dvb/dvb-core/demux.h
index 7d7b0067f228..9f025825b2d2 100644
--- a/drivers/media/dvb/dvb-core/demux.h
+++ b/drivers/media/dvb/dvb-core/demux.h
@@ -86,25 +86,25 @@ enum dmx_success {
 enum dmx_ts_pes
 {  /* also send packets to decoder (if it exists) */
-        DMX_TS_PES_AUDIO0,
+        DMX_TS_PES_AUDIO0,
        DMX_TS_PES_VIDEO0,
        DMX_TS_PES_TELETEXT0,
        DMX_TS_PES_SUBTITLE0,
        DMX_TS_PES_PCR0,
-        DMX_TS_PES_AUDIO1,
+        DMX_TS_PES_AUDIO1,
        DMX_TS_PES_VIDEO1,
        DMX_TS_PES_TELETEXT1,
        DMX_TS_PES_SUBTITLE1,
        DMX_TS_PES_PCR1,
-        DMX_TS_PES_AUDIO2,
+        DMX_TS_PES_AUDIO2,
        DMX_TS_PES_VIDEO2,
        DMX_TS_PES_TELETEXT2,
        DMX_TS_PES_SUBTITLE2,
        DMX_TS_PES_PCR2,
-        DMX_TS_PES_AUDIO3,
+        DMX_TS_PES_AUDIO3,
        DMX_TS_PES_VIDEO3,
        DMX_TS_PES_TELETEXT3,
        DMX_TS_PES_SUBTITLE3,
@@ -121,17 +121,17 @@ enum dmx_ts_pes
 struct dmx_ts_feed {
-        int is_filtering; /* Set to non-zero when filtering in progress */
+        int is_filtering; /* Set to non-zero when filtering in progress */
-        struct dmx_demux *parent; /* Back-pointer */
+        struct dmx_demux *parent; /* Back-pointer */
-        void *priv; /* Pointer to private data of the API client */
+        void *priv; /* Pointer to private data of the API client */
-        int (*set) (struct dmx_ts_feed *feed,
+        int (*set) (struct dmx_ts_feed *feed,
                    u16 pid,
                    int type,
                    enum dmx_ts_pes pes_type,
                    size_t circular_buffer_size,
                    struct timespec timeout);
-        int (*start_filtering) (struct dmx_ts_feed* feed);
+        int (*start_filtering) (struct dmx_ts_feed* feed);
-        int (*stop_filtering) (struct dmx_ts_feed* feed);
+        int (*stop_filtering) (struct dmx_ts_feed* feed);
 };
 /*--------------------------------------------------------------------------*/
@@ -139,35 +139,35 @@ struct dmx_ts_feed {
 /*--------------------------------------------------------------------------*/
 struct dmx_section_filter {
-        u8 filter_value [DMX_MAX_FILTER_SIZE];
+        u8 filter_value [DMX_MAX_FILTER_SIZE];
-        u8 filter_mask [DMX_MAX_FILTER_SIZE];
+        u8 filter_mask [DMX_MAX_FILTER_SIZE];
-        u8 filter_mode [DMX_MAX_FILTER_SIZE];
+        u8 filter_mode [DMX_MAX_FILTER_SIZE];
-        struct dmx_section_feed* parent; /* Back-pointer */
+        struct dmx_section_feed* parent; /* Back-pointer */
-        void* priv; /* Pointer to private data of the API client */
+        void* priv; /* Pointer to private data of the API client */
 };
 struct dmx_section_feed {
-        int is_filtering; /* Set to non-zero when filtering in progress */
+        int is_filtering; /* Set to non-zero when filtering in progress */
-        struct dmx_demux* parent; /* Back-pointer */
+        struct dmx_demux* parent; /* Back-pointer */
-        void* priv; /* Pointer to private data of the API client */
+        void* priv; /* Pointer to private data of the API client */
-        int check_crc;
+        int check_crc;
        u32 crc_val;
-        u8 *secbuf;
+        u8 *secbuf;
-        u8 secbuf_base[DMX_MAX_SECFEED_SIZE];
+        u8 secbuf_base[DMX_MAX_SECFEED_SIZE];
-        u16 secbufp, seclen, tsfeedp;
+        u16 secbufp, seclen, tsfeedp;
-        int (*set) (struct dmx_section_feed* feed,
+        int (*set) (struct dmx_section_feed* feed,
                    u16 pid,
                    size_t circular_buffer_size,
                    int check_crc);
-        int (*allocate_filter) (struct dmx_section_feed* feed,
+        int (*allocate_filter) (struct dmx_section_feed* feed,
                                struct dmx_section_filter** filter);
-        int (*release_filter) (struct dmx_section_feed* feed,
+        int (*release_filter) (struct dmx_section_feed* feed,
                               struct dmx_section_filter* filter);
-        int (*start_filtering) (struct dmx_section_feed* feed);
+        int (*start_filtering) (struct dmx_section_feed* feed);
-        int (*stop_filtering) (struct dmx_section_feed* feed);
+        int (*stop_filtering) (struct dmx_section_feed* feed);
 };
 /*--------------------------------------------------------------------------*/
@@ -205,10 +205,10 @@ enum dmx_frontend_source {
 };
 struct dmx_frontend {
-        struct list_head connectivity_list; /* List of front-ends that can
+        struct list_head connectivity_list; /* List of front-ends that can
                                               be connected to a particular
                                               demux */
-        enum dmx_frontend_source source;
+        enum dmx_frontend_source source;
 };
 /*--------------------------------------------------------------------------*/
@@ -240,38 +240,38 @@ struct dmx_frontend {
 #define DMX_FE_ENTRY(list) list_entry(list, struct dmx_frontend, connectivity_list)
 struct dmx_demux {
-        u32 capabilities;            /* Bitfield of capability flags */
+        u32 capabilities;            /* Bitfield of capability flags */
-        struct dmx_frontend* frontend;    /* Front-end connected to the demux */
+        struct dmx_frontend* frontend;    /* Front-end connected to the demux */
-        void* priv;                  /* Pointer to private data of the API client */
+        void* priv;                  /* Pointer to private data of the API client */
-        int (*open) (struct dmx_demux* demux);
+        int (*open) (struct dmx_demux* demux);
-        int (*close) (struct dmx_demux* demux);
+        int (*close) (struct dmx_demux* demux);
-        int (*write) (struct dmx_demux* demux, const char* buf, size_t count);
+        int (*write) (struct dmx_demux* demux, const char* buf, size_t count);
-        int (*allocate_ts_feed) (struct dmx_demux* demux,
+        int (*allocate_ts_feed) (struct dmx_demux* demux,
                                 struct dmx_ts_feed** feed,
                                 dmx_ts_cb callback);
-        int (*release_ts_feed) (struct dmx_demux* demux,
+        int (*release_ts_feed) (struct dmx_demux* demux,
                                struct dmx_ts_feed* feed);
-        int (*allocate_section_feed) (struct dmx_demux* demux,
+        int (*allocate_section_feed) (struct dmx_demux* demux,
                                      struct dmx_section_feed** feed,
                                      dmx_section_cb callback);
-        int (*release_section_feed) (struct dmx_demux* demux,
+        int (*release_section_feed) (struct dmx_demux* demux,
                                     struct dmx_section_feed* feed);
-        int (*add_frontend) (struct dmx_demux* demux,
+        int (*add_frontend) (struct dmx_demux* demux,
                             struct dmx_frontend* frontend);
-        int (*remove_frontend) (struct dmx_demux* demux,
+        int (*remove_frontend) (struct dmx_demux* demux,
                                struct dmx_frontend* frontend);
-        struct list_head* (*get_frontends) (struct dmx_demux* demux);
+        struct list_head* (*get_frontends) (struct dmx_demux* demux);
-        int (*connect_frontend) (struct dmx_demux* demux,
+        int (*connect_frontend) (struct dmx_demux* demux,
                                 struct dmx_frontend* frontend);
-        int (*disconnect_frontend) (struct dmx_demux* demux);
+        int (*disconnect_frontend) (struct dmx_demux* demux);
-        int (*get_pes_pids) (struct dmx_demux* demux, u16 *pids);
+        int (*get_pes_pids) (struct dmx_demux* demux, u16 *pids);
        int (*get_caps) (struct dmx_demux* demux, struct dmx_caps *caps);
        int (*set_source) (struct dmx_demux* demux, const dmx_source_t *src);
-        int (*get_stc) (struct dmx_demux* demux, unsigned int num,
+        int (*get_stc) (struct dmx_demux* demux, unsigned int num,
                        u64 *stc, unsigned int *base);
 };
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index 8028c3a5e287..7b8373ad121b 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -947,7 +947,7 @@ static int dvb_demux_do_ioctl(struct inode *inode, struct file *file,
        case DMX_GET_STC:
                if (!dmxdev->demux->get_stc) {
-                        ret=-EINVAL;
+                        ret=-EINVAL;
                        break;
                }
                ret = dmxdev->demux->get_stc(dmxdev->demux,
diff --git a/drivers/media/dvb/dvb-core/dmxdev.h b/drivers/media/dvb/dvb-core/dmxdev.h
index 395a9cd75012..fd72920c2199 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.h
+++ b/drivers/media/dvb/dvb-core/dmxdev.h
@@ -53,51 +53,51 @@ enum dmxdev_state {
 };
 struct dmxdev_buffer {
-        u8 *data;
+        u8 *data;
-        int size;
+        int size;
-        int pread;
+        int pread;
-        int pwrite;
+        int pwrite;
        wait_queue_head_t queue;
-        int error;
+        int error;
 };
 struct dmxdev_filter {
        struct dvb_device *dvbdev;
-        union {
+        union {
-                struct dmx_section_filter *sec;
+                struct dmx_section_filter *sec;
        } filter;
-        union {
+        union {
-                struct dmx_ts_feed *ts;
+                struct dmx_ts_feed *ts;
-                struct dmx_section_feed *sec;
+                struct dmx_section_feed *sec;
        } feed;
-        union {
+        union {
-                struct dmx_sct_filter_params sec;
+                struct dmx_sct_filter_params sec;
-                struct dmx_pes_filter_params pes;
+                struct dmx_pes_filter_params pes;
        } params;
-        int type;
+        int type;
-        enum dmxdev_state state;
+        enum dmxdev_state state;
-        struct dmxdev *dev;
+        struct dmxdev *dev;
-        struct dmxdev_buffer buffer;
+        struct dmxdev_buffer buffer;
        struct semaphore mutex;
-        /* only for sections */
+        /* only for sections */
-        struct timer_list timer;
+        struct timer_list timer;
-        int todo;
+        int todo;
-        u8 secheader[3];
+        u8 secheader[3];
-        u16 pid;
+        u16 pid;
 };
 struct dmxdev_dvr {
-        int state;
+        int state;
-        struct dmxdev *dev;
+        struct dmxdev *dev;
-        struct dmxdev_buffer buffer;
+        struct dmxdev_buffer buffer;
 };
@@ -105,16 +105,16 @@ struct dmxdev {
        struct dvb_device *dvbdev;
        struct dvb_device *dvr_dvbdev;
-        struct dmxdev_filter *filter;
+        struct dmxdev_filter *filter;
-        struct dmxdev_dvr *dvr;
+        struct dmxdev_dvr *dvr;
-        struct dmx_demux *demux;
+        struct dmx_demux *demux;
-        int filternum;
+        int filternum;
-        int capabilities;
+        int capabilities;
 #define DMXDEV_CAP_DUPLEX 1
-        struct dmx_frontend *dvr_orig_fe;
+        struct dmx_frontend *dvr_orig_fe;
-        struct dmxdev_buffer dvr_buffer;
+        struct dmxdev_buffer dvr_buffer;
 #define DVR_BUFFER_SIZE (10*188*1024)
        struct semaphore mutex;
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index cb2e7d6ba283..5956c35d34ac 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -498,7 +498,7 @@ static int dvb_ca_en50221_parse_attributes(struct dvb_ca_private *ca, int slot)
        /* process the CFTABLE_ENTRY tuples, and any after those */
        while ((!end_chain) && (address < 0x1000)) {
                if ((status = dvb_ca_en50221_read_tuple(ca, slot, &address, &tupleType,
-                                                        &tupleLength, tuple)) < 0)
+                                                        &tupleLength, tuple)) < 0)
                        return status;
                switch (tupleType) {
                case 0x1B:      // CISTPL_CFTABLE_ENTRY
diff --git a/drivers/media/dvb/dvb-core/dvb_filter.c b/drivers/media/dvb/dvb-core/dvb_filter.c
index bd5143906084..c49fd0bd7181 100644
--- a/drivers/media/dvb/dvb-core/dvb_filter.c
+++ b/drivers/media/dvb/dvb-core/dvb_filter.c
@@ -72,12 +72,12 @@ static int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, in
        u8 pct;
        if (pr) printk( "Pic header: ");
-        pic->temporal_reference[field] = (( headr[0] << 2 ) |
+        pic->temporal_reference[field] = (( headr[0] << 2 ) |
                                          (headr[1] & 0x03) )& 0x03ff;
        if (pr) printk( " temp ref: 0x%04x", pic->temporal_reference[field]);
        pct = ( headr[1] >> 2 ) & 0x07;
-        pic->picture_coding_type[field] = pct;
+        pic->picture_coding_type[field] = pct;
        if (pr) {
                switch(pct){
                        case I_FRAME:
@@ -93,17 +93,17 @@ static int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, in
        }
-        pic->vinfo.vbv_delay  = (( headr[1] >> 5 ) | ( headr[2] << 3) |
+        pic->vinfo.vbv_delay  = (( headr[1] >> 5 ) | ( headr[2] << 3) |
                                 ( (headr[3] & 0x1F) << 11) ) & 0xffff;
        if (pr) printk( " vbv delay: 0x%04x", pic->vinfo.vbv_delay);
-        pic->picture_header_parameter = ( headr[3] & 0xe0 ) |
+        pic->picture_header_parameter = ( headr[3] & 0xe0 ) |
                ((headr[4] & 0x80) >> 3);
-        if ( pct == B_FRAME ){
+        if ( pct == B_FRAME ){
-                pic->picture_header_parameter |= ( headr[4] >> 3 ) & 0x0f;
+                pic->picture_header_parameter |= ( headr[4] >> 3 ) & 0x0f;
-        }
+        }
        if (pr) printk( " pic head param: 0x%x",
                        pic->picture_header_parameter);
@@ -124,18 +124,18 @@ static int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
                       ((headr[0]<<4)& 0x30)| ((headr[1]>>4)& 0x0F),
                       ((headr[1]<<3)& 0x38)| ((headr[2]>>5)& 0x0F));
-        if ( ( headr[3] & 0x40 ) != 0 ){
+        if ( ( headr[3] & 0x40 ) != 0 ){
-                pic->closed_gop = 1;
+                pic->closed_gop = 1;
-        } else {
+        } else {
-                pic->closed_gop = 0;
+                pic->closed_gop = 0;
-        }
+        }
        if (pr) printk("closed: %d", pic->closed_gop);
-        if ( ( headr[3] & 0x20 ) != 0 ){
+        if ( ( headr[3] & 0x20 ) != 0 ){
-                pic->broken_link = 1;
+                pic->broken_link = 1;
-        } else {
+        } else {
-                pic->broken_link = 0;
+                pic->broken_link = 0;
-        }
+        }
        if (pr) printk(" broken: %d\n", pic->broken_link);
        return 0;
@@ -146,7 +146,7 @@ static int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
 /* needs 8 byte input */
 static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
 {
-        int sw;
+        int sw;
        int form = -1;
        if (pr) printk("Reading sequence header\n");
@@ -154,9 +154,9 @@ static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
        vi->horizontal_size     = ((headr[1] &0xF0) >> 4) | (headr[0] << 4);
        vi->vertical_size       = ((headr[1] &0x0F) << 8) | (headr[2]);
-        sw = (int)((headr[3]&0xF0) >> 4) ;
+        sw = (int)((headr[3]&0xF0) >> 4) ;
-        switch( sw ){
+        switch( sw ){
        case 1:
                if (pr)
                        printk("Videostream: ASPECT: 1:1");
@@ -165,84 +165,84 @@ static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
        case 2:
                if (pr)
                        printk("Videostream: ASPECT: 4:3");
-                vi->aspect_ratio = 133;
+                vi->aspect_ratio = 133;
                break;
        case 3:
                if (pr)
                        printk("Videostream: ASPECT: 16:9");
-                vi->aspect_ratio = 177;
+                vi->aspect_ratio = 177;
                break;
        case 4:
                if (pr)
                        printk("Videostream: ASPECT: 2.21:1");
-                vi->aspect_ratio = 221;
+                vi->aspect_ratio = 221;
                break;
-        case 5 ... 15:
+        case 5 ... 15:
                if (pr)
                        printk("Videostream: ASPECT: reserved");
-                vi->aspect_ratio = 0;
+                vi->aspect_ratio = 0;
                break;
-        default:
+        default:
-                vi->aspect_ratio = 0;
+                vi->aspect_ratio = 0;
-                return -1;
+                return -1;
        }
        if (pr)
                printk("  Size = %dx%d",vi->horizontal_size,vi->vertical_size);
-        sw = (int)(headr[3]&0x0F);
+        sw = (int)(headr[3]&0x0F);
-        switch ( sw ) {
+        switch ( sw ) {
        case 1:
                if (pr)
                        printk("  FRate: 23.976 fps");
-                vi->framerate = 23976;
+                vi->framerate = 23976;
                form = -1;
                break;
        case 2:
                if (pr)
                        printk("  FRate: 24 fps");
-                vi->framerate = 24000;
+                vi->framerate = 24000;
                form = -1;
                break;
        case 3:
                if (pr)
                        printk("  FRate: 25 fps");
-                vi->framerate = 25000;
+                vi->framerate = 25000;
                form = VIDEO_MODE_PAL;
                break;
        case 4:
                if (pr)
                        printk("  FRate: 29.97 fps");
-                vi->framerate = 29970;
+                vi->framerate = 29970;
                form = VIDEO_MODE_NTSC;
                break;
        case 5:
                if (pr)
                        printk("  FRate: 30 fps");
-                vi->framerate = 30000;
+                vi->framerate = 30000;
                form = VIDEO_MODE_NTSC;
                break;
        case 6:
                if (pr)
                        printk("  FRate: 50 fps");
-                vi->framerate = 50000;
+                vi->framerate = 50000;
                form = VIDEO_MODE_PAL;
                break;
        case 7:
                if (pr)
                        printk("  FRate: 60 fps");
-                vi->framerate = 60000;
+                vi->framerate = 60000;
                form = VIDEO_MODE_NTSC;
                break;
        }
        vi->bit_rate = (headr[4] << 10) | (headr[5] << 2) | (headr[6] & 0x03);
-        vi->vbv_buffer_size
+        vi->vbv_buffer_size
-                = (( headr[6] & 0xF8) >> 3 ) | (( headr[7] & 0x1F )<< 5);
+                = (( headr[6] & 0xF8) >> 3 ) | (( headr[7] & 0x1F )<< 5);
        if (pr){
                printk("  BRate: %d Mbit/s",4*(vi->bit_rate)/10000);
@@ -250,7 +250,7 @@ static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
                printk("\n");
        }
-        vi->video_format = form;
+        vi->video_format = form;
        return 0;
 }
@@ -308,7 +308,7 @@ static int get_ainfo(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr)
        if (!found) return -1;
        if (c+3 >= count) return -1;
-        headr = mbuf+c;
+        headr = mbuf+c;
        ai->layer = (headr[1] & 0x06) >> 1;
@@ -368,7 +368,7 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p
        if (c+5 >= count) return -1;
        ai->layer = 0;  // 0 for AC3
-        headr = mbuf+c+2;
+        headr = mbuf+c+2;
        frame = (headr[2]&0x3f);
        ai->bit_rate = ac3_bitrates[frame >> 1]*1000;
@@ -396,159 +396,159 @@ EXPORT_SYMBOL(dvb_filter_get_ac3info);
 #if 0
 static u8 *skip_pes_header(u8 **bufp)
 {
-        u8 *inbuf = *bufp;
+        u8 *inbuf = *bufp;
-        u8 *buf = inbuf;
+        u8 *buf = inbuf;
-        u8 *pts = NULL;
+        u8 *pts = NULL;
-        int skip = 0;
+        int skip = 0;
        static const int mpeg1_skip_table[16] = {
                1, 0xffff,      5,     10, 0xffff, 0xffff, 0xffff, 0xffff,
-                0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
+                0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
        };
-        if ((inbuf[6] & 0xc0) == 0x80){ /* mpeg2 */
+        if ((inbuf[6] & 0xc0) == 0x80){ /* mpeg2 */
-                if (buf[7] & PTS_ONLY)
+                if (buf[7] & PTS_ONLY)
-                        pts = buf+9;
+                        pts = buf+9;
-                else pts = NULL;
+                else pts = NULL;
-                buf = inbuf + 9 + inbuf[8];
+                buf = inbuf + 9 + inbuf[8];
-        } else {        /* mpeg1 */
+        } else {        /* mpeg1 */
-                for (buf = inbuf + 6; *buf == 0xff; buf++)
+                for (buf = inbuf + 6; *buf == 0xff; buf++)
-                        if (buf == inbuf + 6 + 16) {
+                        if (buf == inbuf + 6 + 16) {
-                                break;
+                                break;
-                        }
+                        }
-                if ((*buf & 0xc0) == 0x40)
+                if ((*buf & 0xc0) == 0x40)
-                        buf += 2;
+                        buf += 2;
-                skip = mpeg1_skip_table [*buf >> 4];
+                skip = mpeg1_skip_table [*buf >> 4];
-                if (skip == 5 || skip == 10) pts = buf;
+                if (skip == 5 || skip == 10) pts = buf;
-                else pts = NULL;
+                else pts = NULL;
-                buf += mpeg1_skip_table [*buf >> 4];
+                buf += mpeg1_skip_table [*buf >> 4];
-        }
+        }
-        *bufp = buf;
+        *bufp = buf;
-        return pts;
+        return pts;
 }
 #endif
 #if 0
 static void initialize_quant_matrix( u32 *matrix )
 {
-        int i;
+        int i;
-        matrix[0]  = 0x08101013;
+        matrix[0]  = 0x08101013;
-        matrix[1]  = 0x10131616;
+        matrix[1]  = 0x10131616;
-        matrix[2]  = 0x16161616;
+        matrix[2]  = 0x16161616;
-        matrix[3]  = 0x1a181a1b;
+        matrix[3]  = 0x1a181a1b;
-        matrix[4]  = 0x1b1b1a1a;
+        matrix[4]  = 0x1b1b1a1a;
-        matrix[5]  = 0x1a1a1b1b;
+        matrix[5]  = 0x1a1a1b1b;
-        matrix[6]  = 0x1b1d1d1d;
+        matrix[6]  = 0x1b1d1d1d;
-        matrix[7]  = 0x2222221d;
+        matrix[7]  = 0x2222221d;
-        matrix[8]  = 0x1d1d1b1b;
+        matrix[8]  = 0x1d1d1b1b;
-        matrix[9]  = 0x1d1d2020;
+        matrix[9]  = 0x1d1d2020;
-        matrix[10] = 0x22222526;
+        matrix[10] = 0x22222526;
-        matrix[11] = 0x25232322;
+        matrix[11] = 0x25232322;
-        matrix[12] = 0x23262628;
+        matrix[12] = 0x23262628;
-        matrix[13] = 0x28283030;
+        matrix[13] = 0x28283030;
-        matrix[14] = 0x2e2e3838;
+        matrix[14] = 0x2e2e3838;
-        matrix[15] = 0x3a454553;
+        matrix[15] = 0x3a454553;
-        for ( i = 16 ; i < 32 ; i++ )
+        for ( i = 16 ; i < 32 ; i++ )
-                matrix[i] = 0x10101010;
+                matrix[i] = 0x10101010;
 }
 #endif
 #if 0
 static void initialize_mpg_picture(struct mpg_picture *pic)
 {
-        int i;
+        int i;
-        /* set MPEG1 */
+        /* set MPEG1 */
-        pic->mpeg1_flag = 1;
+        pic->mpeg1_flag = 1;
-        pic->profile_and_level = 0x4A ;        /* MP@LL */
+        pic->profile_and_level = 0x4A ;        /* MP@LL */
-        pic->progressive_sequence = 1;
+        pic->progressive_sequence = 1;
-        pic->low_delay = 0;
+        pic->low_delay = 0;
-        pic->sequence_display_extension_flag = 0;
+        pic->sequence_display_extension_flag = 0;
-        for ( i = 0 ; i < 4 ; i++ ){
+        for ( i = 0 ; i < 4 ; i++ ){
-                pic->frame_centre_horizontal_offset[i] = 0;
+                pic->frame_centre_horizontal_offset[i] = 0;
-                pic->frame_centre_vertical_offset[i] = 0;
+                pic->frame_centre_vertical_offset[i] = 0;
-        }
+        }
-        pic->last_frame_centre_horizontal_offset = 0;
+        pic->last_frame_centre_horizontal_offset = 0;
-        pic->last_frame_centre_vertical_offset = 0;
+        pic->last_frame_centre_vertical_offset = 0;
-        pic->picture_display_extension_flag[0] = 0;
+        pic->picture_display_extension_flag[0] = 0;
-        pic->picture_display_extension_flag[1] = 0;
+        pic->picture_display_extension_flag[1] = 0;
-        pic->sequence_header_flag = 0;
+        pic->sequence_header_flag = 0;
        pic->gop_flag = 0;
-        pic->sequence_end_flag = 0;
+        pic->sequence_end_flag = 0;
 }
 #endif
 #if 0
 static void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *pic )
 {
-        int16_t last_h_offset;
+        int16_t last_h_offset;
-        int16_t last_v_offset;
+        int16_t last_v_offset;
-        int16_t *p_h_offset;
+        int16_t *p_h_offset;
-        int16_t *p_v_offset;
+        int16_t *p_v_offset;
-        if ( pic->mpeg1_flag ){
+        if ( pic->mpeg1_flag ){
-                pic->picture_structure[field_type] = VIDEO_FRAME_PICTURE;
+                pic->picture_structure[field_type] = VIDEO_FRAME_PICTURE;
-                pic->top_field_first = 0;
+                pic->top_field_first = 0;
-                pic->repeat_first_field = 0;
+                pic->repeat_first_field = 0;
-                pic->progressive_frame = 1;
+                pic->progressive_frame = 1;
-                pic->picture_coding_parameter = 0x000010;
+                pic->picture_coding_parameter = 0x000010;
-        }
+        }
-        /* Reset flag */
+        /* Reset flag */
-        pic->picture_display_extension_flag[field_type] = 0;
+        pic->picture_display_extension_flag[field_type] = 0;
-        last_h_offset = pic->last_frame_centre_horizontal_offset;
+        last_h_offset = pic->last_frame_centre_horizontal_offset;
-        last_v_offset = pic->last_frame_centre_vertical_offset;
+        last_v_offset = pic->last_frame_centre_vertical_offset;
-        if ( field_type == FIRST_FIELD ){
+        if ( field_type == FIRST_FIELD ){
-                p_h_offset = pic->frame_centre_horizontal_offset;
+                p_h_offset = pic->frame_centre_horizontal_offset;
-                p_v_offset = pic->frame_centre_vertical_offset;
+                p_v_offset = pic->frame_centre_vertical_offset;
-                *p_h_offset = last_h_offset;
+                *p_h_offset = last_h_offset;
-                *(p_h_offset + 1) = last_h_offset;
+                *(p_h_offset + 1) = last_h_offset;
-                *(p_h_offset + 2) = last_h_offset;
+                *(p_h_offset + 2) = last_h_offset;
-                *p_v_offset = last_v_offset;
+                *p_v_offset = last_v_offset;
-                *(p_v_offset + 1) = last_v_offset;
+                *(p_v_offset + 1) = last_v_offset;
-                *(p_v_offset + 2) = last_v_offset;
+                *(p_v_offset + 2) = last_v_offset;
-        } else {
+        } else {
-                pic->frame_centre_horizontal_offset[3] = last_h_offset;
+                pic->frame_centre_horizontal_offset[3] = last_h_offset;
-                pic->frame_centre_vertical_offset[3] = last_v_offset;
+                pic->frame_centre_vertical_offset[3] = last_v_offset;
-        }
+        }
 }
 #endif
 #if 0
 static void init_mpg_picture( struct mpg_picture *pic, int chan, int32_t field_type)
 {
-        pic->picture_header = 0;
+        pic->picture_header = 0;
-        pic->sequence_header_data
+        pic->sequence_header_data
-                = ( INIT_HORIZONTAL_SIZE << 20 )
+                = ( INIT_HORIZONTAL_SIZE << 20 )
-                        | ( INIT_VERTICAL_SIZE << 8 )
+                        | ( INIT_VERTICAL_SIZE << 8 )
-                        | ( INIT_ASPECT_RATIO << 4 )
+                        | ( INIT_ASPECT_RATIO << 4 )
-                        | ( INIT_FRAME_RATE );
+                        | ( INIT_FRAME_RATE );
-        pic->mpeg1_flag = 0;
+        pic->mpeg1_flag = 0;
-        pic->vinfo.horizontal_size
+        pic->vinfo.horizontal_size
-                = INIT_DISP_HORIZONTAL_SIZE;
+                = INIT_DISP_HORIZONTAL_SIZE;
-        pic->vinfo.vertical_size
+        pic->vinfo.vertical_size
-                = INIT_DISP_VERTICAL_SIZE;
+                = INIT_DISP_VERTICAL_SIZE;
-        pic->picture_display_extension_flag[field_type]
+        pic->picture_display_extension_flag[field_type]
-                = 0;
+                = 0;
-        pic->pts_flag[field_type] = 0;
+        pic->pts_flag[field_type] = 0;
-        pic->sequence_gop_header = 0;
+        pic->sequence_gop_header = 0;
-        pic->picture_header = 0;
+        pic->picture_header = 0;
-        pic->sequence_header_flag = 0;
+        pic->sequence_header_flag = 0;
-        pic->gop_flag = 0;
+        pic->gop_flag = 0;
-        pic->sequence_end_flag = 0;
+        pic->sequence_end_flag = 0;
-        pic->sequence_display_extension_flag = 0;
+        pic->sequence_display_extension_flag = 0;
-        pic->last_frame_centre_horizontal_offset = 0;
+        pic->last_frame_centre_horizontal_offset = 0;
-        pic->last_frame_centre_vertical_offset = 0;
+        pic->last_frame_centre_vertical_offset = 0;
        pic->channel = chan;
 }
 #endif
@@ -588,11 +588,11 @@ int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes,
                buf[1]&=~0x40;
        }
        if (!len)
-                return 0;
+                return 0;
        buf[3]=0x30|((p2ts->cc++)&0x0f);
        rest=183-len;
        if (rest) {
-                buf[5]=0x00;
+                buf[5]=0x00;
                if (rest-1)
                        memset(buf+6, 0xff, rest-1);
        }
diff --git a/drivers/media/dvb/dvb-core/dvb_filter.h b/drivers/media/dvb/dvb-core/dvb_filter.h
index b0848f7836b7..375e3be184b1 100644
--- a/drivers/media/dvb/dvb-core/dvb_filter.h
+++ b/drivers/media/dvb/dvb-core/dvb_filter.h
@@ -29,8 +29,8 @@ typedef int (dvb_filter_pes2ts_cb_t) (void *, unsigned char *);
 struct dvb_filter_pes2ts {
        unsigned char buf[188];
-        unsigned char cc;
+        unsigned char cc;
-        dvb_filter_pes2ts_cb_t *cb;
+        dvb_filter_pes2ts_cb_t *cb;
        void *priv;
 };
@@ -162,7 +162,7 @@ struct dvb_video_info {
        u32 bit_rate;
        u32 comp_bit_rate;
        u32 vbv_buffer_size;
-        s16 vbv_delay;
+        s16 vbv_delay;
        u32 CSPF;
        u32 off;
 };
@@ -173,60 +173,60 @@ struct dvb_video_info {
 #define VIDEO_FRAME_PICTURE 0x03
 struct mpg_picture {
-        int       channel;
+        int       channel;
        struct dvb_video_info vinfo;
-        u32      *sequence_gop_header;
+        u32      *sequence_gop_header;
-        u32      *picture_header;
+        u32      *picture_header;
-        s32       time_code;
+        s32       time_code;
-        int       low_delay;
+        int       low_delay;
-        int       closed_gop;
+        int       closed_gop;
-        int       broken_link;
+        int       broken_link;
-        int       sequence_header_flag;
+        int       sequence_header_flag;
-        int       gop_flag;
+        int       gop_flag;
-        int       sequence_end_flag;
+        int       sequence_end_flag;
-        u8        profile_and_level;
+        u8        profile_and_level;
-        s32       picture_coding_parameter;
+        s32       picture_coding_parameter;
-        u32       matrix[32];
+        u32       matrix[32];
-        s8        matrix_change_flag;
+        s8        matrix_change_flag;
-        u8        picture_header_parameter;
+        u8        picture_header_parameter;
  /* bit 0 - 2: bwd f code
     bit 3    : fpb vector
     bit 4 - 6: fwd f code
     bit 7    : fpf vector */
-        int       mpeg1_flag;
+        int       mpeg1_flag;
-        int       progressive_sequence;
+        int       progressive_sequence;
-        int       sequence_display_extension_flag;
+        int       sequence_display_extension_flag;
-        u32       sequence_header_data;
+        u32       sequence_header_data;
-        s16       last_frame_centre_horizontal_offset;
+        s16       last_frame_centre_horizontal_offset;
-        s16       last_frame_centre_vertical_offset;
+        s16       last_frame_centre_vertical_offset;
-        u32       pts[2]; /* [0] 1st field, [1] 2nd field */
+        u32       pts[2]; /* [0] 1st field, [1] 2nd field */
-        int       top_field_first;
+        int       top_field_first;
-        int       repeat_first_field;
+        int       repeat_first_field;
-        int       progressive_frame;
+        int       progressive_frame;
-        int       bank;
+        int       bank;
-        int       forward_bank;
+        int       forward_bank;
-        int       backward_bank;
+        int       backward_bank;
-        int       compress;
+        int       compress;
-        s16       frame_centre_horizontal_offset[OFF_SIZE];
+        s16       frame_centre_horizontal_offset[OFF_SIZE];
-                  /* [0-2] 1st field, [3] 2nd field */
+                  /* [0-2] 1st field, [3] 2nd field */
-        s16       frame_centre_vertical_offset[OFF_SIZE];
+        s16       frame_centre_vertical_offset[OFF_SIZE];
-                  /* [0-2] 1st field, [3] 2nd field */
+                  /* [0-2] 1st field, [3] 2nd field */
-        s16       temporal_reference[2];
+        s16       temporal_reference[2];
-                  /* [0] 1st field, [1] 2nd field */
+                  /* [0] 1st field, [1] 2nd field */
-        s8        picture_coding_type[2];
+        s8        picture_coding_type[2];
-                  /* [0] 1st field, [1] 2nd field */
+                  /* [0] 1st field, [1] 2nd field */
-        s8        picture_structure[2];
+        s8        picture_structure[2];
-                  /* [0] 1st field, [1] 2nd field */
+                  /* [0] 1st field, [1] 2nd field */
-        s8        picture_display_extension_flag[2];
+        s8        picture_display_extension_flag[2];
-                  /* [0] 1st field, [1] 2nd field */
+                  /* [0] 1st field, [1] 2nd field */
-                  /* picture_display_extenion() 0:no 1:exit*/
+                  /* picture_display_extenion() 0:no 1:exit*/
-        s8        pts_flag[2];
+        s8        pts_flag[2];
-                  /* [0] 1st field, [1] 2nd field */
+                  /* [0] 1st field, [1] 2nd field */
 };
 struct dvb_audio_info {
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 6ffa6b216363..95ea5095e07e 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -372,10 +372,10 @@ static int dvb_frontend_thread(void *data)
        snprintf (name, sizeof(name), "kdvb-fe-%i", fe->dvb->num);
-        lock_kernel();
+        lock_kernel();
-        daemonize(name);
+        daemonize(name);
-        sigfillset(&current->blocked);
+        sigfillset(&current->blocked);
-        unlock_kernel();
+        unlock_kernel();
        fepriv->status = 0;
        dvb_frontend_init(fe);
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 348c9b0b988a..1e0840d02f1f 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -41,10 +41,10 @@
 #include "dvbdev.h"
 struct dvb_frontend_tune_settings {
-        int min_delay_ms;
+        int min_delay_ms;
-        int step_size;
+        int step_size;
-        int max_drift;
+        int max_drift;
-        struct dvb_frontend_parameters parameters;
+        struct dvb_frontend_parameters parameters;
 };
 struct dvb_frontend;
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c
index df536bd2e103..86bba81e851e 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb/dvb-core/dvb_net.c
@@ -713,7 +713,7 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
        if (buffer1_len > 32768)
                printk(KERN_WARNING "length > 32k: %zu.\n", buffer1_len);
        /* printk("TS callback: %u bytes, %u TS cells @ %p.\n",
-                  buffer1_len, buffer1_len / TS_SZ, buffer1); */
+                  buffer1_len, buffer1_len / TS_SZ, buffer1); */
        dvb_net_ule(dev, buffer1, buffer1_len);
        return 0;
 }
@@ -721,8 +721,8 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
 static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
 {
-        u8 *eth;
+        u8 *eth;
-        struct sk_buff *skb;
+        struct sk_buff *skb;
        struct net_device_stats *stats = &(((struct dvb_net_priv *) dev->priv)->stats);
        int snap = 0;
@@ -754,7 +754,7 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
                        return;
                }
                snap = 8;
-        }
+        }
        if (pkt[7]) {
                /* FIXME: assemble datagram from multiple sections */
                stats->rx_errors++;
@@ -778,14 +778,14 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
        memcpy(eth + 14, pkt + 12 + snap, pkt_len - 12 - 4 - snap);
        /* create ethernet header: */
-        eth[0]=pkt[0x0b];
+        eth[0]=pkt[0x0b];
-        eth[1]=pkt[0x0a];
+        eth[1]=pkt[0x0a];
-        eth[2]=pkt[0x09];
+        eth[2]=pkt[0x09];
-        eth[3]=pkt[0x08];
+        eth[3]=pkt[0x08];
-        eth[4]=pkt[0x04];
+        eth[4]=pkt[0x04];
-        eth[5]=pkt[0x03];
+        eth[5]=pkt[0x03];
-        eth[6]=eth[7]=eth[8]=eth[9]=eth[10]=eth[11]=0;
+        eth[6]=eth[7]=eth[8]=eth[9]=eth[10]=eth[11]=0;
        if (snap) {
                eth[12] = pkt[18];
@@ -807,7 +807,7 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
        stats->rx_packets++;
        stats->rx_bytes+=skb->len;
-        netif_rx(skb);
+        netif_rx(skb);
 }
 static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len,
@@ -815,7 +815,7 @@ static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len,
                 struct dmx_section_filter *filter,
                 enum dmx_success success)
 {
-        struct net_device *dev = filter->priv;
+        struct net_device *dev = filter->priv;
        /**
         * we rely on the DVB API definition where exactly one complete
@@ -885,8 +885,8 @@ static int dvb_net_feed_start(struct net_device *dev)
 {
        int ret = 0, i;
        struct dvb_net_priv *priv = dev->priv;
-        struct dmx_demux *demux = priv->demux;
+        struct dmx_demux *demux = priv->demux;
-        unsigned char *mac = (unsigned char *) dev->dev_addr;
+        unsigned char *mac = (unsigned char *) dev->dev_addr;
        dprintk("%s: rx_mode %i\n", __FUNCTION__, priv->rx_mode);
        down(&priv->mutex);
@@ -1129,12 +1129,12 @@ static int dvb_net_stop(struct net_device *dev)
        struct dvb_net_priv *priv = dev->priv;
        priv->in_use--;
-        return dvb_net_feed_stop(dev);
+        return dvb_net_feed_stop(dev);
 }
 static struct net_device_stats * dvb_net_get_stats(struct net_device *dev)
 {
-        return &((struct dvb_net_priv*) dev->priv)->stats;
+        return &((struct dvb_net_priv*) dev->priv)->stats;
 }
 static void dvb_net_setup(struct net_device *dev)
@@ -1360,10 +1360,10 @@ static struct file_operations dvb_net_fops = {
 };
 static struct dvb_device dvbdev_net = {
-        .priv = NULL,
+        .priv = NULL,
-        .users = 1,
+        .users = 1,
-        .writers = 1,
+        .writers = 1,
-        .fops = &dvb_net_fops,
+        .fops = &dvb_net_fops,
 };
diff --git a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c b/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
index fb6d94a69d71..283c6e9339a4 100644
--- a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
+++ b/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
@@ -42,216 +42,216 @@
 void dvb_ringbuffer_init(struct dvb_ringbuffer *rbuf, void *data, size_t len)
 {
-        rbuf->pread=rbuf->pwrite=0;
+        rbuf->pread=rbuf->pwrite=0;
-        rbuf->data=data;
+        rbuf->data=data;
-        rbuf->size=len;
+        rbuf->size=len;
-        init_waitqueue_head(&rbuf->queue);
+        init_waitqueue_head(&rbuf->queue);
-        spin_lock_init(&(rbuf->lock));
+        spin_lock_init(&(rbuf->lock));
 }
 int dvb_ringbuffer_empty(struct dvb_ringbuffer *rbuf)
 {
-        return (rbuf->pread==rbuf->pwrite);
+        return (rbuf->pread==rbuf->pwrite);
 }
 ssize_t dvb_ringbuffer_free(struct dvb_ringbuffer *rbuf)
 {
-        ssize_t free;
+        ssize_t free;
-        free = rbuf->pread - rbuf->pwrite;
+        free = rbuf->pread - rbuf->pwrite;
-        if (free <= 0)
+        if (free <= 0)
-                free += rbuf->size;
+                free += rbuf->size;
-        return free-1;
+        return free-1;
 }
 ssize_t dvb_ringbuffer_avail(struct dvb_ringbuffer *rbuf)
 {
-        ssize_t avail;
+        ssize_t avail;
-        avail = rbuf->pwrite - rbuf->pread;
+        avail = rbuf->pwrite - rbuf->pread;
-        if (avail < 0)
+        if (avail < 0)
-                avail += rbuf->size;
+                avail += rbuf->size;
-        return avail;
+        return avail;
 }
 void dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf)
 {
-        rbuf->pread = rbuf->pwrite;
+        rbuf->pread = rbuf->pwrite;
 }
 void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf)
 {
-        unsigned long flags;
+        unsigned long flags;
-        spin_lock_irqsave(&rbuf->lock, flags);
+        spin_lock_irqsave(&rbuf->lock, flags);
-        dvb_ringbuffer_flush(rbuf);
+        dvb_ringbuffer_flush(rbuf);
-        spin_unlock_irqrestore(&rbuf->lock, flags);
+        spin_unlock_irqrestore(&rbuf->lock, flags);
-        wake_up(&rbuf->queue);
+        wake_up(&rbuf->queue);
 }
 ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf, size_t len, int usermem)
 {
-        size_t todo = len;
+        size_t todo = len;
-        size_t split;
+        size_t split;
-        split = (rbuf->pread + len > rbuf->size) ? rbuf->size - rbuf->pread : 0;
+        split = (rbuf->pread + len > rbuf->size) ? rbuf->size - rbuf->pread : 0;
-        if (split > 0) {
+        if (split > 0) {
-                if (!usermem)
+                if (!usermem)
-                        memcpy(buf, rbuf->data+rbuf->pread, split);
+                        memcpy(buf, rbuf->data+rbuf->pread, split);
-                else
+                else
-                        if (copy_to_user(buf, rbuf->data+rbuf->pread, split))
+                        if (copy_to_user(buf, rbuf->data+rbuf->pread, split))
-                                return -EFAULT;
+                                return -EFAULT;
-                buf += split;
+                buf += split;
-                todo -= split;
+                todo -= split;
-                rbuf->pread = 0;
+                rbuf->pread = 0;
-        }
+        }
-        if (!usermem)
+        if (!usermem)
-                memcpy(buf, rbuf->data+rbuf->pread, todo);
+                memcpy(buf, rbuf->data+rbuf->pread, todo);
-        else
+        else
-                if (copy_to_user(buf, rbuf->data+rbuf->pread, todo))
+                if (copy_to_user(buf, rbuf->data+rbuf->pread, todo))
-                        return -EFAULT;
+                        return -EFAULT;
-        rbuf->pread = (rbuf->pread + todo) % rbuf->size;
+        rbuf->pread = (rbuf->pread + todo) % rbuf->size;
-        return len;
+        return len;
 }
 ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf, size_t len)
 {
-        size_t todo = len;
+        size_t todo = len;
-        size_t split;
+        size_t split;
-        split = (rbuf->pwrite + len > rbuf->size) ? rbuf->size - rbuf->pwrite : 0;
+        split = (rbuf->pwrite + len > rbuf->size) ? rbuf->size - rbuf->pwrite : 0;
-        if (split > 0) {
+        if (split > 0) {
-                memcpy(rbuf->data+rbuf->pwrite, buf, split);
+                memcpy(rbuf->data+rbuf->pwrite, buf, split);
-                buf += split;
+                buf += split;
-                todo -= split;
+                todo -= split;
-                rbuf->pwrite = 0;
+                rbuf->pwrite = 0;
-        }
+        }
-        memcpy(rbuf->data+rbuf->pwrite, buf, todo);
+        memcpy(rbuf->data+rbuf->pwrite, buf, todo);
-        rbuf->pwrite = (rbuf->pwrite + todo) % rbuf->size;
+        rbuf->pwrite = (rbuf->pwrite + todo) % rbuf->size;
-        return len;
+        return len;
 }
 ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf, size_t len)
 {
-        int status;
+        int status;
-        ssize_t oldpwrite = rbuf->pwrite;
+        ssize_t oldpwrite = rbuf->pwrite;
-        DVB_RINGBUFFER_WRITE_BYTE(rbuf, len >> 8);
+        DVB_RINGBUFFER_WRITE_BYTE(rbuf, len >> 8);
-        DVB_RINGBUFFER_WRITE_BYTE(rbuf, len & 0xff);
+        DVB_RINGBUFFER_WRITE_BYTE(rbuf, len & 0xff);
-        DVB_RINGBUFFER_WRITE_BYTE(rbuf, PKT_READY);
+        DVB_RINGBUFFER_WRITE_BYTE(rbuf, PKT_READY);
-        status = dvb_ringbuffer_write(rbuf, buf, len);
+        status = dvb_ringbuffer_write(rbuf, buf, len);
-        if (status < 0) rbuf->pwrite = oldpwrite;
+        if (status < 0) rbuf->pwrite = oldpwrite;
-        return status;
+        return status;
 }
 ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx,
-                                int offset, u8* buf, size_t len, int usermem)
+                                int offset, u8* buf, size_t len, int usermem)
 {
-        size_t todo;
+        size_t todo;
-        size_t split;
+        size_t split;
-        size_t pktlen;
+        size_t pktlen;
-        pktlen = rbuf->data[idx] << 8;
+        pktlen = rbuf->data[idx] << 8;
-        pktlen |= rbuf->data[(idx + 1) % rbuf->size];
+        pktlen |= rbuf->data[(idx + 1) % rbuf->size];
-        if (offset > pktlen) return -EINVAL;
+        if (offset > pktlen) return -EINVAL;
-        if ((offset + len) > pktlen) len = pktlen - offset;
+        if ((offset + len) > pktlen) len = pktlen - offset;
-        idx = (idx + DVB_RINGBUFFER_PKTHDRSIZE + offset) % rbuf->size;
+        idx = (idx + DVB_RINGBUFFER_PKTHDRSIZE + offset) % rbuf->size;
-        todo = len;
+        todo = len;
-        split = ((idx + len) > rbuf->size) ? rbuf->size - idx : 0;
+        split = ((idx + len) > rbuf->size) ? rbuf->size - idx : 0;
-        if (split > 0) {
+        if (split > 0) {
-                if (!usermem)
+                if (!usermem)
-                        memcpy(buf, rbuf->data+idx, split);
+                        memcpy(buf, rbuf->data+idx, split);
-                else
+                else
-                        if (copy_to_user(buf, rbuf->data+idx, split))
+                        if (copy_to_user(buf, rbuf->data+idx, split))
-                                return -EFAULT;
+                                return -EFAULT;
-                buf += split;
+                buf += split;
-                todo -= split;
+                todo -= split;
-                idx = 0;
+                idx = 0;
-        }
+        }
-        if (!usermem)
+        if (!usermem)
-                memcpy(buf, rbuf->data+idx, todo);
+                memcpy(buf, rbuf->data+idx, todo);
-        else
+        else
-                if (copy_to_user(buf, rbuf->data+idx, todo))
+                if (copy_to_user(buf, rbuf->data+idx, todo))
-                        return -EFAULT;
+                        return -EFAULT;
-        return len;
+        return len;
 }
 void dvb_ringbuffer_pkt_dispose(struct dvb_ringbuffer *rbuf, size_t idx)
 {
-        size_t pktlen;
+        size_t pktlen;
-        rbuf->data[(idx + 2) % rbuf->size] = PKT_DISPOSED;
+        rbuf->data[(idx + 2) % rbuf->size] = PKT_DISPOSED;
-        // clean up disposed packets
+        // clean up disposed packets
-        while(dvb_ringbuffer_avail(rbuf) > DVB_RINGBUFFER_PKTHDRSIZE) {
+        while(dvb_ringbuffer_avail(rbuf) > DVB_RINGBUFFER_PKTHDRSIZE) {
-                if (DVB_RINGBUFFER_PEEK(rbuf, 2) == PKT_DISPOSED) {
+                if (DVB_RINGBUFFER_PEEK(rbuf, 2) == PKT_DISPOSED) {
-                        pktlen = DVB_RINGBUFFER_PEEK(rbuf, 0) << 8;
+                        pktlen = DVB_RINGBUFFER_PEEK(rbuf, 0) << 8;
-                        pktlen |= DVB_RINGBUFFER_PEEK(rbuf, 1);
+                        pktlen |= DVB_RINGBUFFER_PEEK(rbuf, 1);
-                        DVB_RINGBUFFER_SKIP(rbuf, pktlen + DVB_RINGBUFFER_PKTHDRSIZE);
+                        DVB_RINGBUFFER_SKIP(rbuf, pktlen + DVB_RINGBUFFER_PKTHDRSIZE);
-                } else {
+                } else {
-                        // first packet is not disposed, so we stop cleaning now
+                        // first packet is not disposed, so we stop cleaning now
-                        break;
+                        break;
-                }
+                }
-        }
+        }
 }
 ssize_t dvb_ringbuffer_pkt_next(struct dvb_ringbuffer *rbuf, size_t idx, size_t* pktlen)
 {
-        int consumed;
+        int consumed;
-        int curpktlen;
+        int curpktlen;
-        int curpktstatus;
+        int curpktstatus;
-        if (idx == -1) {
+        if (idx == -1) {
               idx = rbuf->pread;
        } else {
-                curpktlen = rbuf->data[idx] << 8;
+                curpktlen = rbuf->data[idx] << 8;
-                curpktlen |= rbuf->data[(idx + 1) % rbuf->size];
+                curpktlen |= rbuf->data[(idx + 1) % rbuf->size];
-                idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size;
+                idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size;
        }
-        consumed = (idx - rbuf->pread) % rbuf->size;
+        consumed = (idx - rbuf->pread) % rbuf->size;
-        while((dvb_ringbuffer_avail(rbuf) - consumed) > DVB_RINGBUFFER_PKTHDRSIZE) {
+        while((dvb_ringbuffer_avail(rbuf) - consumed) > DVB_RINGBUFFER_PKTHDRSIZE) {
-                curpktlen = rbuf->data[idx] << 8;
+                curpktlen = rbuf->data[idx] << 8;
-                curpktlen |= rbuf->data[(idx + 1) % rbuf->size];
+                curpktlen |= rbuf->data[(idx + 1) % rbuf->size];
-                curpktstatus = rbuf->data[(idx + 2) % rbuf->size];
+                curpktstatus = rbuf->data[(idx + 2) % rbuf->size];
-                if (curpktstatus == PKT_READY) {
+                if (curpktstatus == PKT_READY) {
-                        *pktlen = curpktlen;
+                        *pktlen = curpktlen;
-                        return idx;
+                        return idx;
-                }
+                }
-                consumed += curpktlen + DVB_RINGBUFFER_PKTHDRSIZE;
+                consumed += curpktlen + DVB_RINGBUFFER_PKTHDRSIZE;
-                idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size;
+                idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size;
-        }
+        }
-        // no packets available
+        // no packets available
-        return -1;
+        return -1;
 }
diff --git a/drivers/media/dvb/dvb-core/dvb_ringbuffer.h b/drivers/media/dvb/dvb-core/dvb_ringbuffer.h
index d18e9c4ba9ea..fa476f662f82 100644
--- a/drivers/media/dvb/dvb-core/dvb_ringbuffer.h
+++ b/drivers/media/dvb/dvb-core/dvb_ringbuffer.h
@@ -31,13 +31,13 @@
 #include <linux/wait.h>
 struct dvb_ringbuffer {
-        u8               *data;
+        u8               *data;
-        ssize_t           size;
+        ssize_t           size;
-        ssize_t           pread;
+        ssize_t           pread;
-        ssize_t           pwrite;
+        ssize_t           pwrite;
-        wait_queue_head_t queue;
+        wait_queue_head_t queue;
-        spinlock_t        lock;
+        spinlock_t        lock;
 };
 #define DVB_RINGBUFFER_PKTHDRSIZE 3
@@ -106,7 +106,7 @@ extern void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf);
 ** returns number of bytes transferred or -EFAULT
 */
 extern ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf,
-                                   size_t len, int usermem);
+                                   size_t len, int usermem);
 /* write routines & macros */
@@ -121,7 +121,7 @@ extern ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf,
 ** returns number of bytes transferred or -EFAULT
 */
 extern ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf,
-                                    size_t len);
+                                    size_t len);
 /**
@@ -133,7 +133,7 @@ extern ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf,
 * returns Number of bytes written, or -EFAULT, -ENOMEM, -EVINAL.
 */
 extern ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf,
-                                        size_t len);
+                                        size_t len);
 /**
 * Read from a packet in the ringbuffer. Note: unlike dvb_ringbuffer_read(), this
@@ -149,7 +149,7 @@ extern ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf,
 * returns Number of bytes read, or -EFAULT.
 */
 extern ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx,
-                                       int offset, u8* buf, size_t len, int usermem);
+                                       int offset, u8* buf, size_t len, int usermem);
 /**
 * Dispose of a packet in the ring buffer.
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 477b4fa56430..a4aee8665854 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -47,7 +47,7 @@ static LIST_HEAD(dvb_adapter_list);
 static DECLARE_MUTEX(dvbdev_register_lock);
 static const char * const dnames[] = {
-        "video", "audio", "sec", "frontend", "demux", "dvr", "ca",
+        "video", "audio", "sec", "frontend", "demux", "dvr", "ca",
        "net", "osd"
 };
@@ -90,15 +90,15 @@ static int dvb_device_open(struct inode *inode, struct file *file)
                file->private_data = dvbdev;
                old_fops = file->f_op;
-                file->f_op = fops_get(dvbdev->fops);
+                file->f_op = fops_get(dvbdev->fops);
-                if(file->f_op->open)
+                if(file->f_op->open)
-                        err = file->f_op->open(inode,file);
+                        err = file->f_op->open(inode,file);
-                if (err) {
+                if (err) {
-                        fops_put(file->f_op);
+                        fops_put(file->f_op);
-                        file->f_op = fops_get(old_fops);
+                        file->f_op = fops_get(old_fops);
-                }
+                }
-                fops_put(old_fops);
+                fops_put(old_fops);
-                return err;
+                return err;
        }
        return -ENODEV;
 }
@@ -117,21 +117,21 @@ static struct cdev dvb_device_cdev = {
 int dvb_generic_open(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_device *dvbdev = file->private_data;
-        if (!dvbdev)
+        if (!dvbdev)
-                return -ENODEV;
+                return -ENODEV;
        if (!dvbdev->users)
-                return -EBUSY;
+                return -EBUSY;
        if ((file->f_flags & O_ACCMODE) == O_RDONLY) {
-                if (!dvbdev->readers)
+                if (!dvbdev->readers)
-                        return -EBUSY;
+                        return -EBUSY;
                dvbdev->readers--;
        } else {
-                if (!dvbdev->writers)
+                if (!dvbdev->writers)
-                        return -EBUSY;
+                        return -EBUSY;
                dvbdev->writers--;
        }
@@ -143,10 +143,10 @@ EXPORT_SYMBOL(dvb_generic_open);
 int dvb_generic_release(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_device *dvbdev = file->private_data;
        if (!dvbdev)
-                return -ENODEV;
+                return -ENODEV;
        if ((file->f_flags & O_ACCMODE) == O_RDONLY) {
                dvbdev->readers++;
@@ -163,10 +163,10 @@ EXPORT_SYMBOL(dvb_generic_release);
 int dvb_generic_ioctl(struct inode *inode, struct file *file,
                      unsigned int cmd, unsigned long arg)
 {
-        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_device *dvbdev = file->private_data;
-        if (!dvbdev)
+        if (!dvbdev)
-                return -ENODEV;
+                return -ENODEV;
        if (!dvbdev->kernel_ioctl)
                return -EINVAL;
@@ -334,63 +334,63 @@ EXPORT_SYMBOL(dvb_unregister_adapter);
   to the v4l "videodev.o" module, which is unnecessary for some
   cards (ie. the budget dvb-cards don't need the v4l module...) */
 int dvb_usercopy(struct inode *inode, struct file *file,
-                     unsigned int cmd, unsigned long arg,
+                     unsigned int cmd, unsigned long arg,
                     int (*func)(struct inode *inode, struct file *file,
                     unsigned int cmd, void *arg))
 {
-        char    sbuf[128];
+        char    sbuf[128];
-        void    *mbuf = NULL;
+        void    *mbuf = NULL;
-        void    *parg = NULL;
+        void    *parg = NULL;
-        int     err  = -EINVAL;
+        int     err  = -EINVAL;
-        /*  Copy arguments into temp kernel buffer  */
+        /*  Copy arguments into temp kernel buffer  */
-        switch (_IOC_DIR(cmd)) {
+        switch (_IOC_DIR(cmd)) {
-        case _IOC_NONE:
+        case _IOC_NONE:
                /*
                 * For this command, the pointer is actually an integer
                 * argument.
                 */
                parg = (void *) arg;
                break;
-        case _IOC_READ: /* some v4l ioctls are marked wrong ... */
+        case _IOC_READ: /* some v4l ioctls are marked wrong ... */
-        case _IOC_WRITE:
+        case _IOC_WRITE:
-        case (_IOC_WRITE | _IOC_READ):
+        case (_IOC_WRITE | _IOC_READ):
-                if (_IOC_SIZE(cmd) <= sizeof(sbuf)) {
+                if (_IOC_SIZE(cmd) <= sizeof(sbuf)) {
-                        parg = sbuf;
+                        parg = sbuf;
-                } else {
+                } else {
-                        /* too big to allocate from stack */
+                        /* too big to allocate from stack */
-                        mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL);
+                        mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL);
-                        if (NULL == mbuf)
+                        if (NULL == mbuf)
-                                return -ENOMEM;
+                                return -ENOMEM;
-                        parg = mbuf;
+                        parg = mbuf;
-                }
+                }
-                err = -EFAULT;
+                err = -EFAULT;
-                if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd)))
+                if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd)))
-                        goto out;
+                        goto out;
-                break;
+                break;
-        }
+        }
-        /* call driver */
+        /* call driver */
-        if ((err = func(inode, file, cmd, parg)) == -ENOIOCTLCMD)
+        if ((err = func(inode, file, cmd, parg)) == -ENOIOCTLCMD)
-                err = -EINVAL;
+                err = -EINVAL;
-        if (err < 0)
+        if (err < 0)
-                goto out;
+                goto out;
-        /*  Copy results into user buffer  */
+        /*  Copy results into user buffer  */
-        switch (_IOC_DIR(cmd))
+        switch (_IOC_DIR(cmd))
-        {
+        {
-        case _IOC_READ:
+        case _IOC_READ:
-        case (_IOC_WRITE | _IOC_READ):
+        case (_IOC_WRITE | _IOC_READ):
-                if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd)))
+                if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd)))
-                        err = -EFAULT;
+                        err = -EFAULT;
-                break;
+                break;
-        }
+        }
 out:
-        kfree(mbuf);
+        kfree(mbuf);
-        return err;
+        return err;
 }
 static int __init init_dvbdev(void)
@@ -427,10 +427,10 @@ error:
 static void __exit exit_dvbdev(void)
 {
-        devfs_remove("dvb");
+        devfs_remove("dvb");
        class_destroy(dvb_class);
        cdev_del(&dvb_device_cdev);
-        unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS);
+        unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS);
 }
 module_init(init_dvbdev);
diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h
index a251867f30f1..0cc6e4a0e27c 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/drivers/media/dvb/dvb-core/dvbdev.h
@@ -68,8 +68,8 @@ struct dvb_device {
        int writers;
        int users;
-        /* don't really need those !? -- FIXME: use video_usercopy  */
+        /* don't really need those !? -- FIXME: use video_usercopy  */
-        int (*kernel_ioctl)(struct inode *inode, struct file *file,
+        int (*kernel_ioctl)(struct inode *inode, struct file *file,
                            unsigned int cmd, void *arg);
        void *priv;
@@ -97,7 +97,7 @@ we simply define out own dvb_usercopy(), which will hopefully become
 generic_usercopy()  someday... */
 extern int dvb_usercopy(struct inode *inode, struct file *file,
-                            unsigned int cmd, unsigned long arg,
+                            unsigned int cmd, unsigned long arg,
                            int (*func)(struct inode *inode, struct file *file,
                            unsigned int cmd, void *arg));
diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/dvb/dvb-usb/vp702x-fe.c
index f20d8dbd0be8..104b5d016c7b 100644
--- a/drivers/media/dvb/dvb-usb/vp702x-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp702x-fe.c
@@ -190,7 +190,7 @@ static int vp702x_fe_get_frontend(struct dvb_frontend* fe,
 }
 static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe,
-                                    struct dvb_diseqc_master_cmd *m)
+                                    struct dvb_diseqc_master_cmd *m)
 {
        struct vp702x_fe_state *st = fe->demodulator_priv;
        u8 cmd[8],ibuf[10];
diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c
index 2746edfeccba..83f1de1e7e57 100644
--- a/drivers/media/dvb/dvb-usb/vp7045-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp7045-fe.c
@@ -58,7 +58,7 @@ static int vp7045_fe_read_ber(struct dvb_frontend* fe, u32 *ber)
        struct vp7045_fe_state *state = fe->demodulator_priv;
        *ber = (vp7045_read_reg(state->d, 0x0D) << 16) |
               (vp7045_read_reg(state->d, 0x0E) << 8) |
-                vp7045_read_reg(state->d, 0x0F);
+                vp7045_read_reg(state->d, 0x0F);
        return 0;
 }
diff --git a/drivers/media/dvb/frontends/at76c651.c b/drivers/media/dvb/frontends/at76c651.c
index 72a2b5455b0b..8e0f4b3a1417 100644
--- a/drivers/media/dvb/frontends/at76c651.c
+++ b/drivers/media/dvb/frontends/at76c651.c
@@ -361,9 +361,9 @@ static int at76c651_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 static int at76c651_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *fesettings)
 {
-        fesettings->min_delay_ms = 50;
+        fesettings->min_delay_ms = 50;
-        fesettings->step_size = 0;
+        fesettings->step_size = 0;
-        fesettings->max_drift = 0;
+        fesettings->max_drift = 0;
        return 0;
 }
diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c
index f6d4ee78bdd4..8ceb9a33c7af 100644
--- a/drivers/media/dvb/frontends/bcm3510.c
+++ b/drivers/media/dvb/frontends/bcm3510.c
@@ -69,7 +69,7 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=i2c (|-able)).");
 #define dbufout(b,l,m) {\
            int i; \
            for (i = 0; i < l; i++) \
-                m("%02x ",b[i]); \
+                m("%02x ",b[i]); \
 }
 #define deb_info(args...) dprintk(0x01,args)
 #define deb_i2c(args...)  dprintk(0x02,args)
@@ -827,7 +827,7 @@ static struct dvb_frontend_ops bcm3510_ops = {
                .type = FE_ATSC,
                .frequency_min =  54000000,
                .frequency_max = 803000000,
-                /* stepsize is just a guess */
+                /* stepsize is just a guess */
                .frequency_stepsize = 0,
                .caps =
                        FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c
index 0c2ed4438618..755f774f6b7d 100644
--- a/drivers/media/dvb/frontends/cx22700.c
+++ b/drivers/media/dvb/frontends/cx22700.c
@@ -355,10 +355,10 @@ static int cx22700_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 static int cx22700_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
 {
-        fesettings->min_delay_ms = 150;
+        fesettings->min_delay_ms = 150;
-        fesettings->step_size = 166667;
+        fesettings->step_size = 166667;
-        fesettings->max_drift = 166667*2;
+        fesettings->max_drift = 166667*2;
-        return 0;
+        return 0;
 }
 static void cx22700_release(struct dvb_frontend* fe)
@@ -407,7 +407,7 @@ static struct dvb_frontend_ops cx22700_ops = {
                .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
                      FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
                      FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 |
-                      FE_CAN_RECOVER
+                      FE_CAN_RECOVER
        },
        .release = cx22700_release,
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index d9a8ede14b45..5de0e6d350b1 100644
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -2,7 +2,7 @@
    Conexant 22702 DVB OFDM demodulator driver
    based on:
-        Alps TDMB7 DVB OFDM demodulator driver
+        Alps TDMB7 DVB OFDM demodulator driver
    Copyright (C) 2001-2002 Convergence Integrated Media GmbH
          Holger Waechtler <holger@convergence.de>
diff --git a/drivers/media/dvb/frontends/cx22702.h b/drivers/media/dvb/frontends/cx22702.h
index 1f250885d2ce..5633976a58f1 100644
--- a/drivers/media/dvb/frontends/cx22702.h
+++ b/drivers/media/dvb/frontends/cx22702.h
@@ -2,7 +2,7 @@
    Conexant 22702 DVB OFDM demodulator driver
    based on:
-        Alps TDMB7 DVB OFDM demodulator driver
+        Alps TDMB7 DVB OFDM demodulator driver
    Copyright (C) 2001-2002 Convergence Integrated Media GmbH
          Holger Waechtler <holger@convergence.de>
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index 654d7dc879d9..0c4db80ec332 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -55,81 +55,81 @@ static int debug;
        } while (0)
 static struct {u8 reg; u8 data;} cx24110_regdata[]=
-                      /* Comments beginning with @ denote this value should
+                      /* Comments beginning with @ denote this value should
-                         be the default */
+                         be the default */
-        {{0x09,0x01}, /* SoftResetAll */
+        {{0x09,0x01}, /* SoftResetAll */
-         {0x09,0x00}, /* release reset */
+         {0x09,0x00}, /* release reset */
-         {0x01,0xe8}, /* MSB of code rate 27.5MS/s */
+         {0x01,0xe8}, /* MSB of code rate 27.5MS/s */
-         {0x02,0x17}, /* middle byte " */
+         {0x02,0x17}, /* middle byte " */
-         {0x03,0x29}, /* LSB         " */
+         {0x03,0x29}, /* LSB         " */
-         {0x05,0x03}, /* @ DVB mode, standard code rate 3/4 */
+         {0x05,0x03}, /* @ DVB mode, standard code rate 3/4 */
-         {0x06,0xa5}, /* @ PLL 60MHz */
+         {0x06,0xa5}, /* @ PLL 60MHz */
-         {0x07,0x01}, /* @ Fclk, i.e. sampling clock, 60MHz */
+         {0x07,0x01}, /* @ Fclk, i.e. sampling clock, 60MHz */
-         {0x0a,0x00}, /* @ partial chip disables, do not set */
+         {0x0a,0x00}, /* @ partial chip disables, do not set */
-         {0x0b,0x01}, /* set output clock in gapped mode, start signal low
+         {0x0b,0x01}, /* set output clock in gapped mode, start signal low
-                         active for first byte */
+                         active for first byte */
-         {0x0c,0x11}, /* no parity bytes, large hold time, serial data out */
+         {0x0c,0x11}, /* no parity bytes, large hold time, serial data out */
-         {0x0d,0x6f}, /* @ RS Sync/Unsync thresholds */
+         {0x0d,0x6f}, /* @ RS Sync/Unsync thresholds */
-         {0x10,0x40}, /* chip doc is misleading here: write bit 6 as 1
+         {0x10,0x40}, /* chip doc is misleading here: write bit 6 as 1
-                         to avoid starting the BER counter. Reset the
+                         to avoid starting the BER counter. Reset the
-                         CRC test bit. Finite counting selected */
+                         CRC test bit. Finite counting selected */
-         {0x15,0xff}, /* @ size of the limited time window for RS BER
+         {0x15,0xff}, /* @ size of the limited time window for RS BER
-                         estimation. It is <value>*256 RS blocks, this
+                         estimation. It is <value>*256 RS blocks, this
-                         gives approx. 2.6 sec at 27.5MS/s, rate 3/4 */
+                         gives approx. 2.6 sec at 27.5MS/s, rate 3/4 */
-         {0x16,0x00}, /* @ enable all RS output ports */
+         {0x16,0x00}, /* @ enable all RS output ports */
-         {0x17,0x04}, /* @ time window allowed for the RS to sync */
+         {0x17,0x04}, /* @ time window allowed for the RS to sync */
-         {0x18,0xae}, /* @ allow all standard DVB code rates to be scanned
+         {0x18,0xae}, /* @ allow all standard DVB code rates to be scanned
-                         for automatically */
+                         for automatically */
-                      /* leave the current code rate and normalization
+                      /* leave the current code rate and normalization
-                         registers as they are after reset... */
+                         registers as they are after reset... */
-         {0x21,0x10}, /* @ during AutoAcq, search each viterbi setting
+         {0x21,0x10}, /* @ during AutoAcq, search each viterbi setting
-                         only once */
+                         only once */
-         {0x23,0x18}, /* @ size of the limited time window for Viterbi BER
+         {0x23,0x18}, /* @ size of the limited time window for Viterbi BER
-                         estimation. It is <value>*65536 channel bits, i.e.
+                         estimation. It is <value>*65536 channel bits, i.e.
-                         approx. 38ms at 27.5MS/s, rate 3/4 */
+                         approx. 38ms at 27.5MS/s, rate 3/4 */
-         {0x24,0x24}, /* do not trigger Viterbi CRC test. Finite count window */
+         {0x24,0x24}, /* do not trigger Viterbi CRC test. Finite count window */
-                      /* leave front-end AGC parameters at default values */
+                      /* leave front-end AGC parameters at default values */
-                      /* leave decimation AGC parameters at default values */
+                      /* leave decimation AGC parameters at default values */
-         {0x35,0x40}, /* disable all interrupts. They are not connected anyway */
+         {0x35,0x40}, /* disable all interrupts. They are not connected anyway */
-         {0x36,0xff}, /* clear all interrupt pending flags */
+         {0x36,0xff}, /* clear all interrupt pending flags */
-         {0x37,0x00}, /* @ fully enable AutoAcqq state machine */
+         {0x37,0x00}, /* @ fully enable AutoAcqq state machine */
-         {0x38,0x07}, /* @ enable fade recovery, but not autostart AutoAcq */
+         {0x38,0x07}, /* @ enable fade recovery, but not autostart AutoAcq */
-                      /* leave the equalizer parameters on their default values */
+                      /* leave the equalizer parameters on their default values */
-                      /* leave the final AGC parameters on their default values */
+                      /* leave the final AGC parameters on their default values */
-         {0x41,0x00}, /* @ MSB of front-end derotator frequency */
+         {0x41,0x00}, /* @ MSB of front-end derotator frequency */
-         {0x42,0x00}, /* @ middle bytes " */
+         {0x42,0x00}, /* @ middle bytes " */
-         {0x43,0x00}, /* @ LSB          " */
+         {0x43,0x00}, /* @ LSB          " */
-                      /* leave the carrier tracking loop parameters on default */
+                      /* leave the carrier tracking loop parameters on default */
-                      /* leave the bit timing loop parameters at gefault */
+                      /* leave the bit timing loop parameters at gefault */
-         {0x56,0x4d}, /* set the filtune voltage to 2.7V, as recommended by */
+         {0x56,0x4d}, /* set the filtune voltage to 2.7V, as recommended by */
-                      /* the cx24108 data sheet for symbol rates above 15MS/s */
+                      /* the cx24108 data sheet for symbol rates above 15MS/s */
-         {0x57,0x00}, /* @ Filter sigma delta enabled, positive */
+         {0x57,0x00}, /* @ Filter sigma delta enabled, positive */
-         {0x61,0x95}, /* GPIO pins 1-4 have special function */
+         {0x61,0x95}, /* GPIO pins 1-4 have special function */
-         {0x62,0x05}, /* GPIO pin 5 has special function, pin 6 is GPIO */
+         {0x62,0x05}, /* GPIO pin 5 has special function, pin 6 is GPIO */
-         {0x63,0x00}, /* All GPIO pins use CMOS output characteristics */
+         {0x63,0x00}, /* All GPIO pins use CMOS output characteristics */
-         {0x64,0x20}, /* GPIO 6 is input, all others are outputs */
+         {0x64,0x20}, /* GPIO 6 is input, all others are outputs */
-         {0x6d,0x30}, /* tuner auto mode clock freq 62kHz */
+         {0x6d,0x30}, /* tuner auto mode clock freq 62kHz */
-         {0x70,0x15}, /* use auto mode, tuner word is 21 bits long */
+         {0x70,0x15}, /* use auto mode, tuner word is 21 bits long */
-         {0x73,0x00}, /* @ disable several demod bypasses */
+         {0x73,0x00}, /* @ disable several demod bypasses */
-         {0x74,0x00}, /* @  " */
+         {0x74,0x00}, /* @  " */
-         {0x75,0x00}  /* @  " */
+         {0x75,0x00}  /* @  " */
-                      /* the remaining registers are for SEC */
+                      /* the remaining registers are for SEC */
        };
 static int cx24110_writereg (struct cx24110_state* state, int reg, int data)
 {
-        u8 buf [] = { reg, data };
+        u8 buf [] = { reg, data };
        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 };
        int err;
-        if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
+        if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
                dprintk ("%s: writereg error (err == %i, reg == 0x%02x,"
                         " data == 0x%02x)\n", __FUNCTION__, err, reg, data);
                return -EREMOTEIO;
        }
-        return 0;
+        return 0;
 }
 static int cx24110_readreg (struct cx24110_state* state, u8 reg)
@@ -153,27 +153,27 @@ static int cx24110_set_inversion (struct cx24110_state* state, fe_spectral_inver
        switch (inversion) {
        case INVERSION_OFF:
-                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1);
+                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1);
-                /* AcqSpectrInvDis on. No idea why someone should want this */
+                /* AcqSpectrInvDis on. No idea why someone should want this */
-                cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)&0xf7);
+                cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)&0xf7);
-                /* Initial value 0 at start of acq */
+                /* Initial value 0 at start of acq */
-                cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)&0xef);
+                cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)&0xef);
-                /* current value 0 */
+                /* current value 0 */
-                /* The cx24110 manual tells us this reg is read-only.
+                /* The cx24110 manual tells us this reg is read-only.
-                   But what the heck... set it ayways */
+                   But what the heck... set it ayways */
-                break;
+                break;
        case INVERSION_ON:
-                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1);
+                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1);
-                /* AcqSpectrInvDis on. No idea why someone should want this */
+                /* AcqSpectrInvDis on. No idea why someone should want this */
-                cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)|0x08);
+                cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)|0x08);
-                /* Initial value 1 at start of acq */
+                /* Initial value 1 at start of acq */
-                cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)|0x10);
+                cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)|0x10);
-                /* current value 1 */
+                /* current value 1 */
-                break;
+                break;
        case INVERSION_AUTO:
-                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)&0xfe);
+                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)&0xfe);
-                /* AcqSpectrInvDis off. Leave initial & current states as is */
+                /* AcqSpectrInvDis off. Leave initial & current states as is */
-                break;
+                break;
        default:
                return -EINVAL;
        }
@@ -185,18 +185,18 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
 {
 /* fixme (low): error handling */
-        static const int rate[]={-1,1,2,3,5,7,-1};
+        static const int rate[]={-1,1,2,3,5,7,-1};
-        static const int g1[]={-1,0x01,0x02,0x05,0x15,0x45,-1};
+        static const int g1[]={-1,0x01,0x02,0x05,0x15,0x45,-1};
-        static const int g2[]={-1,0x01,0x03,0x06,0x1a,0x7a,-1};
+        static const int g2[]={-1,0x01,0x03,0x06,0x1a,0x7a,-1};
-        /* Well, the AutoAcq engine of the cx24106 and 24110 automatically
+        /* Well, the AutoAcq engine of the cx24106 and 24110 automatically
-           searches all enabled viterbi rates, and can handle non-standard
+           searches all enabled viterbi rates, and can handle non-standard
-           rates as well. */
+           rates as well. */
-        if (fec>FEC_AUTO)
+        if (fec>FEC_AUTO)
-                fec=FEC_AUTO;
+                fec=FEC_AUTO;
-        if (fec==FEC_AUTO) { /* (re-)establish AutoAcq behaviour */
+        if (fec==FEC_AUTO) { /* (re-)establish AutoAcq behaviour */
                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)&0xdf);
                /* clear AcqVitDis bit */
                cx24110_writereg(state,0x18,0xae);
@@ -208,7 +208,7 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
                cx24110_writereg(state,0x1a,0x05); cx24110_writereg(state,0x1b,0x06);
                /* set the puncture registers for code rate 3/4 */
                return 0;
-        } else {
+        } else {
                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x20);
                /* set AcqVitDis bit */
                if(rate[fec]>0) {
@@ -219,10 +219,10 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
                        cx24110_writereg(state,0x1a,g1[fec]);
                        cx24110_writereg(state,0x1b,g2[fec]);
                        /* not sure if this is the right way: I always used AutoAcq mode */
-           } else
+           } else
                   return -EOPNOTSUPP;
 /* fixme (low): which is the correct return code? */
-        };
+        };
        return 0;
 }
@@ -245,72 +245,72 @@ static fe_code_rate_t cx24110_get_fec (struct cx24110_state* state)
 static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate)
 {
 /* fixme (low): add error handling */
-        u32 ratio;
+        u32 ratio;
-        u32 tmp, fclk, BDRI;
+        u32 tmp, fclk, BDRI;
-        static const u32 bands[]={5000000UL,15000000UL,90999000UL/2};
+        static const u32 bands[]={5000000UL,15000000UL,90999000UL/2};
-        int i;
+        int i;
 dprintk("cx24110 debug: entering %s(%d)\n",__FUNCTION__,srate);
-        if (srate>90999000UL/2)
+        if (srate>90999000UL/2)
-                srate=90999000UL/2;
+                srate=90999000UL/2;
-        if (srate<500000)
+        if (srate<500000)
-                srate=500000;
+                srate=500000;
-        for(i=0;(i<sizeof(bands)/sizeof(bands[0]))&&(srate>bands[i]);i++)
+        for(i=0;(i<sizeof(bands)/sizeof(bands[0]))&&(srate>bands[i]);i++)
                ;
-        /* first, check which sample rate is appropriate: 45, 60 80 or 90 MHz,
+        /* first, check which sample rate is appropriate: 45, 60 80 or 90 MHz,
-           and set the PLL accordingly (R07[1:0] Fclk, R06[7:4] PLLmult,
+           and set the PLL accordingly (R07[1:0] Fclk, R06[7:4] PLLmult,
-           R06[3:0] PLLphaseDetGain */
+           R06[3:0] PLLphaseDetGain */
-        tmp=cx24110_readreg(state,0x07)&0xfc;
+        tmp=cx24110_readreg(state,0x07)&0xfc;
-        if(srate<90999000UL/4) { /* sample rate 45MHz*/
+        if(srate<90999000UL/4) { /* sample rate 45MHz*/
                cx24110_writereg(state,0x07,tmp);
                cx24110_writereg(state,0x06,0x78);
                fclk=90999000UL/2;
-        } else if(srate<60666000UL/2) { /* sample rate 60MHz */
+        } else if(srate<60666000UL/2) { /* sample rate 60MHz */
                cx24110_writereg(state,0x07,tmp|0x1);
                cx24110_writereg(state,0x06,0xa5);
                fclk=60666000UL;
-        } else if(srate<80888000UL/2) { /* sample rate 80MHz */
+        } else if(srate<80888000UL/2) { /* sample rate 80MHz */
                cx24110_writereg(state,0x07,tmp|0x2);
                cx24110_writereg(state,0x06,0x87);
                fclk=80888000UL;
-        } else { /* sample rate 90MHz */
+        } else { /* sample rate 90MHz */
                cx24110_writereg(state,0x07,tmp|0x3);
                cx24110_writereg(state,0x06,0x78);
                fclk=90999000UL;
-        };
+        };
-        dprintk("cx24110 debug: fclk %d Hz\n",fclk);
+        dprintk("cx24110 debug: fclk %d Hz\n",fclk);
-        /* we need to divide two integers with approx. 27 bits in 32 bit
+        /* we need to divide two integers with approx. 27 bits in 32 bit
-           arithmetic giving a 25 bit result */
+           arithmetic giving a 25 bit result */
-        /* the maximum dividend is 90999000/2, 0x02b6446c, this number is
+        /* the maximum dividend is 90999000/2, 0x02b6446c, this number is
-           also the most complex divisor. Hence, the dividend has,
+           also the most complex divisor. Hence, the dividend has,
-           assuming 32bit unsigned arithmetic, 6 clear bits on top, the
+           assuming 32bit unsigned arithmetic, 6 clear bits on top, the
-           divisor 2 unused bits at the bottom. Also, the quotient is
+           divisor 2 unused bits at the bottom. Also, the quotient is
-           always less than 1/2. Borrowed from VES1893.c, of course */
+           always less than 1/2. Borrowed from VES1893.c, of course */
-        tmp=srate<<6;
+        tmp=srate<<6;
-        BDRI=fclk>>2;
+        BDRI=fclk>>2;
-        ratio=(tmp/BDRI);
+        ratio=(tmp/BDRI);
-        tmp=(tmp%BDRI)<<8;
+        tmp=(tmp%BDRI)<<8;
-        ratio=(ratio<<8)+(tmp/BDRI);
+        ratio=(ratio<<8)+(tmp/BDRI);
-        tmp=(tmp%BDRI)<<8;
+        tmp=(tmp%BDRI)<<8;
-        ratio=(ratio<<8)+(tmp/BDRI);
+        ratio=(ratio<<8)+(tmp/BDRI);
-        tmp=(tmp%BDRI)<<1;
+        tmp=(tmp%BDRI)<<1;
-        ratio=(ratio<<1)+(tmp/BDRI);
+        ratio=(ratio<<1)+(tmp/BDRI);
-        dprintk("srate= %d (range %d, up to %d)\n", srate,i,bands[i]);
+        dprintk("srate= %d (range %d, up to %d)\n", srate,i,bands[i]);
-        dprintk("fclk = %d\n", fclk);
+        dprintk("fclk = %d\n", fclk);
-        dprintk("ratio= %08x\n", ratio);
+        dprintk("ratio= %08x\n", ratio);
-        cx24110_writereg(state, 0x1, (ratio>>16)&0xff);
+        cx24110_writereg(state, 0x1, (ratio>>16)&0xff);
-        cx24110_writereg(state, 0x2, (ratio>>8)&0xff);
+        cx24110_writereg(state, 0x2, (ratio>>8)&0xff);
-        cx24110_writereg(state, 0x3, (ratio)&0xff);
+        cx24110_writereg(state, 0x3, (ratio)&0xff);
-        return 0;
+        return 0;
 }
@@ -324,48 +324,48 @@ int cx24110_pll_write (struct dvb_frontend* fe, u32 data)
        dprintk("cx24110 debug: cx24108_write(%8.8x)\n",data);
-        cx24110_writereg(state,0x6d,0x30); /* auto mode at 62kHz */
+        cx24110_writereg(state,0x6d,0x30); /* auto mode at 62kHz */
-        cx24110_writereg(state,0x70,0x15); /* auto mode 21 bits */
+        cx24110_writereg(state,0x70,0x15); /* auto mode 21 bits */
-        /* if the auto tuner writer is still busy, clear it out */
+        /* if the auto tuner writer is still busy, clear it out */
-        while (cx24110_readreg(state,0x6d)&0x80)
+        while (cx24110_readreg(state,0x6d)&0x80)
                cx24110_writereg(state,0x72,0);
-        /* write the topmost 8 bits */
+        /* write the topmost 8 bits */
-        cx24110_writereg(state,0x72,(data>>24)&0xff);
+        cx24110_writereg(state,0x72,(data>>24)&0xff);
-        /* wait for the send to be completed */
+        /* wait for the send to be completed */
-        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
+        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
                ;
-        /* send another 8 bytes */
+        /* send another 8 bytes */
-        cx24110_writereg(state,0x72,(data>>16)&0xff);
+        cx24110_writereg(state,0x72,(data>>16)&0xff);
-        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
+        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
                ;
-        /* and the topmost 5 bits of this byte */
+        /* and the topmost 5 bits of this byte */
-        cx24110_writereg(state,0x72,(data>>8)&0xff);
+        cx24110_writereg(state,0x72,(data>>8)&0xff);
-        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
+        while ((cx24110_readreg(state,0x6d)&0xc0)==0x80)
                ;
-        /* now strobe the enable line once */
+        /* now strobe the enable line once */
-        cx24110_writereg(state,0x6d,0x32);
+        cx24110_writereg(state,0x6d,0x32);
-        cx24110_writereg(state,0x6d,0x30);
+        cx24110_writereg(state,0x6d,0x30);
-        return 0;
+        return 0;
 }
 static int cx24110_initfe(struct dvb_frontend* fe)
 {
        struct cx24110_state *state = fe->demodulator_priv;
 /* fixme (low): error handling */
-        int i;
+        int i;
        dprintk("%s: init chip\n", __FUNCTION__);
-        for(i=0;i<sizeof(cx24110_regdata)/sizeof(cx24110_regdata[0]);i++) {
+        for(i=0;i<sizeof(cx24110_regdata)/sizeof(cx24110_regdata[0]);i++) {
                cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data);
-        };
+        };
        if (state->config->pll_init) state->config->pll_init(fe);
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c
index 19b4bf7c21a7..1c7c91224472 100644
--- a/drivers/media/dvb/frontends/l64781.c
+++ b/drivers/media/dvb/frontends/l64781.c
@@ -2,7 +2,7 @@
    driver for LSI L64781 COFDM demodulator
    Copyright (C) 2001 Holger Waechtler for Convergence Integrated Media GmbH
-                       Marko Kohtala <marko.kohtala@luukku.com>
+                       Marko Kohtala <marko.kohtala@luukku.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -433,7 +433,7 @@ static int l64781_init(struct dvb_frontend* fe)
 {
        struct l64781_state* state = fe->demodulator_priv;
-        reset_and_configure (state);
+        reset_and_configure (state);
        /* Power up */
        l64781_writereg (state, 0x3e, 0xa5);
@@ -456,9 +456,9 @@ static int l64781_init(struct dvb_frontend* fe)
        l64781_writereg (state, 0x0d, 0x8c);
        /* With ppm=8000, it seems the DTR_SENSITIVITY will result in
-           value of 2 with all possible bandwidths and guard
+           value of 2 with all possible bandwidths and guard
-           intervals, which is the initial value anyway. */
+           intervals, which is the initial value anyway. */
-        /*l64781_writereg (state, 0x19, 0x92);*/
+        /*l64781_writereg (state, 0x19, 0x92);*/
        /* Everything is two's complement, soft bit and CSI_OUT too */
        l64781_writereg (state, 0x1e, 0x09);
@@ -477,10 +477,10 @@ static int l64781_init(struct dvb_frontend* fe)
 static int l64781_get_tune_settings(struct dvb_frontend* fe,
                                    struct dvb_frontend_tune_settings* fesettings)
 {
-        fesettings->min_delay_ms = 4000;
+        fesettings->min_delay_ms = 4000;
-        fesettings->step_size = 0;
+        fesettings->step_size = 0;
-        fesettings->max_drift = 0;
+        fesettings->max_drift = 0;
-        return 0;
+        return 0;
 }
 static void l64781_release(struct dvb_frontend* fe)
@@ -522,7 +522,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
        /* The chip always responds to reads */
        if (i2c_transfer(state->i2c, msg, 2) != 2) {
-                dprintk("No response to read on I2C bus\n");
+                dprintk("No response to read on I2C bus\n");
                goto error;
        }
@@ -531,7 +531,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
        /* Reading the POWER_DOWN register always returns 0 */
        if (reg0x3e != 0) {
-                dprintk("Device doesn't look like L64781\n");
+                dprintk("Device doesn't look like L64781\n");
                goto error;
        }
@@ -540,7 +540,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
        /* Responds to all reads with 0 */
        if (l64781_readreg(state, 0x1a) != 0) {
-                dprintk("Read 1 returned unexpcted value\n");
+                dprintk("Read 1 returned unexpcted value\n");
                goto error;
        }
@@ -549,7 +549,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
        /* Responds with register default value */
        if (l64781_readreg(state, 0x1a) != 0xa1) {
-                dprintk("Read 2 returned unexpcted value\n");
+                dprintk("Read 2 returned unexpcted value\n");
                goto error;
        }
diff --git a/drivers/media/dvb/frontends/l64781.h b/drivers/media/dvb/frontends/l64781.h
index 7e30fb0fdfa7..947f65f87465 100644
--- a/drivers/media/dvb/frontends/l64781.h
+++ b/drivers/media/dvb/frontends/l64781.h
@@ -2,7 +2,7 @@
    driver for LSI L64781 COFDM demodulator
    Copyright (C) 2001 Holger Waechtler for Convergence Integrated Media GmbH
-                       Marko Kohtala <marko.kohtala@luukku.com>
+                       Marko Kohtala <marko.kohtala@luukku.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 6a33f5a19a8d..cb5301865d07 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -301,10 +301,10 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
        static u8 lgdt3303_8vsb_44_data[] = {
                0x04, 0x00,
                0x0d, 0x40,
-        0x0e, 0x87,
+        0x0e, 0x87,
-        0x0f, 0x8e,
+        0x0f, 0x8e,
-        0x10, 0x01,
+        0x10, 0x01,
-        0x47, 0x8b };
+        0x47, 0x8b };
        /*
         * Array of byte pairs <address, value>
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index 9c67f406d581..8d672283c93d 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -554,7 +554,7 @@ static int mt312_set_frontend(struct dvb_frontend* fe,
        if ((ret = mt312_write(state, SYM_RATE_H, buf, sizeof(buf))) < 0)
                return ret;
-        mt312_reset(state, 0);
+        mt312_reset(state, 0);
        return 0;
 }
@@ -695,7 +695,7 @@ static struct dvb_frontend_ops vp310_mt312_ops = {
                    FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 |
                    FE_CAN_FEC_3_4 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 |
                    FE_CAN_FEC_AUTO | FE_CAN_QPSK | FE_CAN_MUTE_TS |
-                    FE_CAN_RECOVER
+                    FE_CAN_RECOVER
        },
        .release = mt312_release,
diff --git a/drivers/media/dvb/frontends/nxt2002.c b/drivers/media/dvb/frontends/nxt2002.c
index 30786b1911bd..52c416043a62 100644
--- a/drivers/media/dvb/frontends/nxt2002.c
+++ b/drivers/media/dvb/frontends/nxt2002.c
@@ -527,7 +527,7 @@ static int nxt2002_read_snr(struct dvb_frontend* fe, u16* snr)
        else
                snrdb = 1000*0 + ( 1000*(12-0) * ( temp2 - 0 ) / ( 0x7C00 - 0 ) );
-        /* the value reported back from the frontend will be FFFF=32db 0000=0db */
+        /* the value reported back from the frontend will be FFFF=32db 0000=0db */
        *snr = snrdb * (0xFFFF/32000);
@@ -646,7 +646,7 @@ struct dvb_frontend* nxt2002_attach(const struct nxt2002_config* config,
        memcpy(&state->ops, &nxt2002_ops, sizeof(struct dvb_frontend_ops));
        state->initialised = 0;
-        /* Check the first 5 registers to ensure this a revision we can handle */
+        /* Check the first 5 registers to ensure this a revision we can handle */
        i2c_readbytes(state, 0x00, buf, 5);
        if (buf[0] != 0x04) goto error;         /* device id */
@@ -672,7 +672,7 @@ static struct dvb_frontend_ops nxt2002_ops = {
                .type = FE_ATSC,
                .frequency_min =  54000000,
                .frequency_max = 860000000,
-                /* stepsize is just a guess */
+                /* stepsize is just a guess */
                .frequency_stepsize = 166666,
                .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
                        FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index 84b62881cea7..aeafef46e3eb 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -339,7 +339,7 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data)
        switch (state->demod_chip) {
                case NXT2004:
                        if (i2c_writebytes(state, state->config->pll_address, data, 4))
-                                printk(KERN_WARNING "nxt200x: error writing to tuner\n");
+                                printk(KERN_WARNING "nxt200x: error writing to tuner\n");
                        /* wait until we have a lock */
                        while (count < 20) {
                                i2c_readbytes(state, state->config->pll_address, &buf, 1);
@@ -497,7 +497,7 @@ static int nxt2004_load_firmware (struct dvb_frontend* fe, const struct firmware
        /* calculate firmware CRC */
        for (position = 0; position < fw->size; position++) {
-                crc = nxt200x_crc(crc, fw->data[position]);
+                crc = nxt200x_crc(crc, fw->data[position]);
        }
        buf[0] = rambase >> 8;
diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c
index 88a57b791112..a458a3bfff70 100644
--- a/drivers/media/dvb/frontends/nxt6000.c
+++ b/drivers/media/dvb/frontends/nxt6000.c
@@ -574,11 +574,11 @@ static struct dvb_frontend_ops nxt6000_ops = {
                .symbol_rate_max = 9360000,     /* FIXME */
                .symbol_rate_tolerance = 4000,
                .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
-                        FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
+                        FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
-                        FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
+                        FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
-                        FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
+                        FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
-                        FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
+                        FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
-                        FE_CAN_HIERARCHY_AUTO,
+                        FE_CAN_HIERARCHY_AUTO,
        },
        .release = nxt6000_release,
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index 78bded861d02..80e0f28127b7 100644
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -503,7 +503,7 @@ static int or51132_read_signal_strength(struct dvb_frontend* fe, u16* strength)
        rcvr_stat = rec_buf[1];
        usK = (rcvr_stat & 0x10) ? 3 : 0;
-        /* The value reported back from the frontend will be FFFF=100% 0000=0% */
+        /* The value reported back from the frontend will be FFFF=100% 0000=0% */
        signal_strength = (((8952 - i20Log10(snr_equ) - usK*100)/3+5)*65535)/1000;
        if (signal_strength > 0xffff)
                *strength = 0xffff;
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c
index f265418e3261..18715091aed8 100644
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
@@ -494,7 +494,7 @@ static int s5h1420_getfreqoffset(struct s5h1420_state* state)
 }
 static void s5h1420_setfec_inversion(struct s5h1420_state* state,
-                                     struct dvb_frontend_parameters *p)
+                                     struct dvb_frontend_parameters *p)
 {
        u8 inversion = 0;
@@ -521,8 +521,8 @@ static void s5h1420_setfec_inversion(struct s5h1420_state* state,
                case FEC_3_4:
                        s5h1420_writereg(state, 0x30, 0x04);
-                        s5h1420_writereg(state, 0x31, 0x12 | inversion);
+                        s5h1420_writereg(state, 0x31, 0x12 | inversion);
-                        break;
+                        break;
                case FEC_5_6:
                        s5h1420_writereg(state, 0x30, 0x08);
diff --git a/drivers/media/dvb/frontends/s5h1420.h b/drivers/media/dvb/frontends/s5h1420.h
index 872028ddf2a2..73296f13c324 100644
--- a/drivers/media/dvb/frontends/s5h1420.h
+++ b/drivers/media/dvb/frontends/s5h1420.h
@@ -39,6 +39,6 @@ struct s5h1420_config
 };
 extern struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,
-             struct i2c_adapter* i2c);
+             struct i2c_adapter* i2c);
 #endif // S5H1420_H
diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c
index 1c6b2e9264bc..fc06cd6b46c3 100644
--- a/drivers/media/dvb/frontends/sp8870.c
+++ b/drivers/media/dvb/frontends/sp8870.c
@@ -67,16 +67,16 @@ static int debug;
 static int sp8870_writereg (struct sp8870_state* state, u16 reg, u16 data)
 {
-        u8 buf [] = { reg >> 8, reg & 0xff, data >> 8, data & 0xff };
+        u8 buf [] = { reg >> 8, reg & 0xff, data >> 8, data & 0xff };
        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 4 };
        int err;
-        if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
+        if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
                dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __FUNCTION__, err, reg, data);
                return -EREMOTEIO;
        }
-        return 0;
+        return 0;
 }
 static int sp8870_readreg (struct sp8870_state* state, u16 reg)
@@ -305,7 +305,7 @@ static int sp8870_set_frontend_parameters (struct dvb_frontend* fe,
 static int sp8870_init (struct dvb_frontend* fe)
 {
        struct sp8870_state* state = fe->demodulator_priv;
-        const struct firmware *fw = NULL;
+        const struct firmware *fw = NULL;
        sp8870_wake_up(state);
        if (state->initialised) return 0;
@@ -534,10 +534,10 @@ static int sp8870_sleep(struct dvb_frontend* fe)
 static int sp8870_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
 {
-        fesettings->min_delay_ms = 350;
+        fesettings->min_delay_ms = 350;
-        fesettings->step_size = 0;
+        fesettings->step_size = 0;
-        fesettings->max_drift = 0;
+        fesettings->max_drift = 0;
-        return 0;
+        return 0;
 }
 static void sp8870_release(struct dvb_frontend* fe)
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c
index 73384e75625e..e3b665782243 100644
--- a/drivers/media/dvb/frontends/sp887x.c
+++ b/drivers/media/dvb/frontends/sp887x.c
@@ -80,7 +80,7 @@ static int sp887x_readreg (struct sp887x_state* state, u16 reg)
        u8 b1 [2];
        int ret;
        struct i2c_msg msg[] = {{ .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 2 },
-                         { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 }};
+                         { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 }};
        if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) {
                printk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret);
@@ -498,7 +498,7 @@ static int sp887x_sleep(struct dvb_frontend* fe)
 static int sp887x_init(struct dvb_frontend* fe)
 {
        struct sp887x_state* state = fe->demodulator_priv;
-        const struct firmware *fw = NULL;
+        const struct firmware *fw = NULL;
        int ret;
        if (!state->initialised) {
@@ -528,10 +528,10 @@ static int sp887x_init(struct dvb_frontend* fe)
 static int sp887x_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
 {
-        fesettings->min_delay_ms = 350;
+        fesettings->min_delay_ms = 350;
-        fesettings->step_size = 166666*2;
+        fesettings->step_size = 166666*2;
-        fesettings->max_drift = (166666*2)+1;
+        fesettings->max_drift = (166666*2)+1;
-        return 0;
+        return 0;
 }
 static void sp887x_release(struct dvb_frontend* fe)
@@ -581,7 +581,7 @@ static struct dvb_frontend_ops sp887x_ops = {
                .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
                        FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
                        FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 |
-                        FE_CAN_RECOVER
+                        FE_CAN_RECOVER
        },
        .release = sp887x_release,
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index 29c48665e130..177d71d56b67 100644
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -95,7 +95,7 @@ static int stv0299_writeregI (struct stv0299_state* state, u8 reg, u8 data)
 int stv0299_writereg (struct dvb_frontend* fe, u8 reg, u8 data)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        return stv0299_writeregI(state, reg, data);
 }
@@ -220,7 +220,7 @@ static int stv0299_wait_diseqc_idle (struct stv0299_state* state, int timeout)
 static int stv0299_set_symbolrate (struct dvb_frontend* fe, u32 srate)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        u64 big = srate;
        u32 ratio;
@@ -271,7 +271,7 @@ static int stv0299_get_symbolrate (struct stv0299_state* state)
 static int stv0299_send_diseqc_msg (struct dvb_frontend* fe,
                                    struct dvb_diseqc_master_cmd *m)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        u8 val;
        int i;
@@ -301,7 +301,7 @@ static int stv0299_send_diseqc_msg (struct dvb_frontend* fe,
 static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        u8 val;
        dprintk ("%s\n", __FUNCTION__);
@@ -328,7 +328,7 @@ static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t
 static int stv0299_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        u8 val;
        if (stv0299_wait_diseqc_idle (state, 100) < 0)
@@ -350,7 +350,7 @@ static int stv0299_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        u8 reg0x08;
        u8 reg0x0c;
@@ -442,7 +442,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd)
 static int stv0299_init (struct dvb_frontend* fe)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        int i;
        dprintk("stv0299: init chip\n");
@@ -461,7 +461,7 @@ static int stv0299_init (struct dvb_frontend* fe)
 static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        u8 signal = 0xff - stv0299_readreg (state, 0x18);
        u8 sync = stv0299_readreg (state, 0x1b);
@@ -489,7 +489,7 @@ static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status)
 static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        if (state->errmode != STATUS_BER) return 0;
        *ber = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
@@ -499,7 +499,7 @@ static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber)
 static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        s32 signal =  0xffff - ((stv0299_readreg (state, 0x18) << 8)
                               | stv0299_readreg (state, 0x19));
@@ -516,7 +516,7 @@ static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 static int stv0299_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        s32 xsnr = 0xffff - ((stv0299_readreg (state, 0x24) << 8)
                           | stv0299_readreg (state, 0x25));
@@ -528,7 +528,7 @@ static int stv0299_read_snr(struct dvb_frontend* fe, u16* snr)
 static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        if (state->errmode != STATUS_UCBLOCKS) *ucblocks = 0;
        else *ucblocks = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
@@ -538,7 +538,7 @@ static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        int invval = 0;
        dprintk ("%s : FE_SET_FRONTEND\n", __FUNCTION__);
@@ -571,7 +571,7 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        s32 derot_freq;
        int invval;
@@ -596,7 +596,7 @@ static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 static int stv0299_sleep(struct dvb_frontend* fe)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        stv0299_writeregI(state, 0x02, 0x80);
        state->initialised = 0;
@@ -606,7 +606,7 @@ static int stv0299_sleep(struct dvb_frontend* fe)
 static int stv0299_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
 {
-        struct stv0299_state* state = fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
        fesettings->min_delay_ms = state->config->min_delay_ms;
        if (fesettings->parameters.u.qpsk.symbol_rate < 10000000) {
@@ -658,7 +658,7 @@ struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
        /* create dvb_frontend */
        state->frontend.ops = &state->ops;
-        state->frontend.demodulator_priv = state;
+        state->frontend.demodulator_priv = state;
        return &state->frontend;
 error:
@@ -714,7 +714,7 @@ MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
 MODULE_DESCRIPTION("ST STV0299 DVB Demodulator driver");
 MODULE_AUTHOR("Ralph Metzler, Holger Waechtler, Peter Schildmann, Felix Domke, "
-              "Andreas Oberritter, Andrew de Quincey, Kenneth Aafl�y");
+              "Andreas Oberritter, Andrew de Quincey, Kenneth Aafl�y");
 MODULE_LICENSE("GPL");
 EXPORT_SYMBOL(stv0299_writereg);
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c
index eaf130e666d8..425cd19136fe 100644
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
@@ -1,10 +1,10 @@
 /*
    TDA10021  - Single Chip Cable Channel Receiver driver module
-               used on the the Siemens DVB-C cards
+               used on the the Siemens DVB-C cards
    Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de>
    Copyright (C) 2004 Markus Schulz <msc@antzsystem.de>
-                   Support for TDA10021
+                   Support for TDA10021
    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
@@ -76,9 +76,9 @@ static u8 tda10021_inittab[0x40]=
 static int tda10021_writereg (struct tda10021_state* state, u8 reg, u8 data)
 {
-        u8 buf[] = { reg, data };
+        u8 buf[] = { reg, data };
        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 };
-        int ret;
+        int ret;
        ret = i2c_transfer (state->i2c, &msg, 1);
        if (ret != 1)
@@ -95,7 +95,7 @@ static u8 tda10021_readreg (struct tda10021_state* state, u8 reg)
        u8 b0 [] = { reg };
        u8 b1 [] = { 0 };
        struct i2c_msg msg [] = { { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 1 },
-                                  { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
+                                  { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
        int ret;
        ret = i2c_transfer (state->i2c, msg, 2);
diff --git a/drivers/media/dvb/frontends/tda10021.h b/drivers/media/dvb/frontends/tda10021.h
index 7d6a51ce291e..53be939e8c55 100644
--- a/drivers/media/dvb/frontends/tda10021.h
+++ b/drivers/media/dvb/frontends/tda10021.h
@@ -1,10 +1,10 @@
 /*
    TDA10021  - Single Chip Cable Channel Receiver driver module
-               used on the the Siemens DVB-C cards
+               used on the the Siemens DVB-C cards
    Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de>
    Copyright (C) 2004 Markus Schulz <msc@antzsystem.de>
-                   Support for TDA10021
+                   Support for TDA10021
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index 7968743826fc..dd02aff467fe 100644
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -475,7 +475,7 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
                ret = state->config->request_firmware(fe, &fw, TDA10046_DEFAULT_FIRMWARE);
                if (ret) {
                        printk(KERN_ERR "tda1004x: no firmware upload (timeout or file not found?)\n");
-                        return ret;
+                        return ret;
                }
                tda1004x_write_mask(state, TDA1004X_CONFC4, 8, 8); // going to boot from HOST
                ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10046H_CODE_CPT, TDA10046H_CODE_IN);
diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c
index c05cf1861051..91baa9cedd79 100644
--- a/drivers/media/dvb/frontends/tda8083.c
+++ b/drivers/media/dvb/frontends/tda8083.c
@@ -66,13 +66,13 @@ static int tda8083_writereg (struct tda8083_state* state, u8 reg, u8 data)
        u8 buf [] = { reg, data };
        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 };
-        ret = i2c_transfer(state->i2c, &msg, 1);
+        ret = i2c_transfer(state->i2c, &msg, 1);
-        if (ret != 1)
+        if (ret != 1)
-                dprintk ("%s: writereg error (reg %02x, ret == %i)\n",
+                dprintk ("%s: writereg error (reg %02x, ret == %i)\n",
                        __FUNCTION__, reg, ret);
-        return (ret != 1) ? -1 : 0;
+        return (ret != 1) ? -1 : 0;
 }
 static int tda8083_readregs (struct tda8083_state* state, u8 reg1, u8 *b, u8 len)
@@ -87,7 +87,7 @@ static int tda8083_readregs (struct tda8083_state* state, u8 reg1, u8 *b, u8 len
                dprintk ("%s: readreg error (reg %02x, ret == %i)\n",
                        __FUNCTION__, reg1, ret);
-        return ret == 2 ? 0 : -1;
+        return ret == 2 ? 0 : -1;
 }
 static inline u8 tda8083_readreg (struct tda8083_state* state, u8 reg)
@@ -132,14 +132,14 @@ static fe_code_rate_t tda8083_get_fec (struct tda8083_state* state)
 static int tda8083_set_symbolrate (struct tda8083_state* state, u32 srate)
 {
-        u32 ratio;
+        u32 ratio;
        u32 tmp;
        u8 filter;
        if (srate > 32000000)
-                srate = 32000000;
+                srate = 32000000;
-        if (srate < 500000)
+        if (srate < 500000)
-                srate = 500000;
+                srate = 500000;
        filter = 0;
        if (srate < 24000000)
@@ -174,7 +174,7 @@ static void tda8083_wait_diseqc_fifo (struct tda8083_state* state, int timeout)
        unsigned long start = jiffies;
        while (jiffies - start < timeout &&
-               !(tda8083_readreg(state, 0x02) & 0x80))
+               !(tda8083_readreg(state, 0x02) & 0x80))
        {
                msleep(50);
        };
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 87ea52757a21..7dae91e5863c 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -176,6 +176,9 @@ static void init_av7110_av(struct av7110 *av7110)
                }
        }
+        if (dev->pci->subsystem_vendor == 0x13c2 && dev->pci->subsystem_device == 0x000e)
+                av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, SpdifSwitch, 1, 0); // SPDIF on
        ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right);
        if (ret < 0)
                printk("dvb-ttpci:cannot set volume :%d\n",ret);
@@ -217,10 +220,10 @@ static int arm_thread(void *data)
        dprintk(4, "%p\n",av7110);
-        lock_kernel();
+        lock_kernel();
-        daemonize("arm_mon");
+        daemonize("arm_mon");
-        sigfillset(&current->blocked);
+        sigfillset(&current->blocked);
-        unlock_kernel();
+        unlock_kernel();
        av7110->arm_thread = current;
@@ -1535,7 +1538,7 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
        buf[2] = ((div & 0x18000) >> 10) | 0x95;
        buf[3] = (pwr << 6) | 0x30;
-        // NOTE: since we're using a prescaler of 2, we set the
+        // NOTE: since we're using a prescaler of 2, we set the
        // divisor frequency to 62.5kHz and divide by 125 above
        if (i2c_transfer (&av7110->i2c_adap, &msg, 1) != 1)
@@ -1811,7 +1814,7 @@ static struct tda8083_config grundig_29504_451_config = {
 static int philips_cd1516_pll_set(struct dvb_frontend* fe,
                                  struct dvb_frontend_parameters* params)
 {
-        struct av7110* av7110 = fe->dvb->priv;
+        struct av7110* av7110 = fe->dvb->priv;
        u32 div;
        u32 f = params->frequency;
        u8 data[4];
@@ -2202,7 +2205,7 @@ static u8 read_pwm(struct av7110* av7110)
        struct i2c_msg msg[] = { { .addr = 0x50,.flags = 0,.buf = &b,.len = 1 },
                                 { .addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1} };
-        if ((i2c_transfer(&av7110->i2c_adap, msg, 2) != 2) || (pwm == 0xff))
+        if ((i2c_transfer(&av7110->i2c_adap, msg, 2) != 2) || (pwm == 0xff))
                pwm = 0x48;
        return pwm;
@@ -2245,7 +2248,7 @@ static int frontend_init(struct av7110 *av7110)
                        }
                        // Try the grundig 29504-451
-                        av7110->fe = tda8083_attach(&grundig_29504_451_config, &av7110->i2c_adap);
+                        av7110->fe = tda8083_attach(&grundig_29504_451_config, &av7110->i2c_adap);
                        if (av7110->fe) {
                                av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
                                av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst;
@@ -2271,12 +2274,12 @@ static int frontend_init(struct av7110 *av7110)
                case 0x0001: // Hauppauge/TT Nexus-T premium rev1.X
                        // ALPS TDLB7
-                        av7110->fe = sp8870_attach(&alps_tdlb7_config, &av7110->i2c_adap);
+                        av7110->fe = sp8870_attach(&alps_tdlb7_config, &av7110->i2c_adap);
                        break;
                case 0x0002: // Hauppauge/TT DVB-C premium rev2.X
-                        av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110));
+                        av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110));
                        break;
                case 0x0006: /* Fujitsu-Siemens DVB-S rev 1.6 */
@@ -2421,9 +2424,9 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
        dprintk(4, "dev: %p\n", dev);
-        /* Set RPS_IRQ to 1 to track rps1 activity.
+        /* Set RPS_IRQ to 1 to track rps1 activity.
-         * Enabling this won't send any interrupt to PC CPU.
+         * Enabling this won't send any interrupt to PC CPU.
-         */
+         */
 #define RPS_IRQ 0
        if (budgetpatch == 1) {
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index 7442f56a72ec..87106e8bf35b 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -1203,15 +1203,15 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc)
 int av7110_osd_capability(struct av7110 *av7110, osd_cap_t *cap)
 {
-        switch (cap->cmd) {
+        switch (cap->cmd) {
-        case OSD_CAP_MEMSIZE:
+        case OSD_CAP_MEMSIZE:
-                if (FW_4M_SDRAM(av7110->arm_app))
+                if (FW_4M_SDRAM(av7110->arm_app))
-                        cap->val = 1000000;
+                        cap->val = 1000000;
-                else
+                else
-                        cap->val = 92000;
+                        cap->val = 92000;
-                return 0;
+                return 0;
-        default:
+        default:
-                return -EINVAL;
+                return -EINVAL;
-        }
+        }
 }
 #endif /* CONFIG_DVB_AV7110_OSD */
diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/dvb/ttpci/av7110_hw.h
index fedd20f9815d..2a5e87ba1052 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.h
+++ b/drivers/media/dvb/ttpci/av7110_hw.h
@@ -143,7 +143,8 @@ enum av7110_audio_command {
        MainSwitch,
        ADSwitch,
        SendDiSEqC,
-        SetRegister
+        SetRegister,
+        SpdifSwitch
 };
 enum av7110_request_command {
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index 6af74f78b3e5..b5aea4129fa7 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -120,8 +120,8 @@ static int ves1820_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data)
 static int stv0297_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data)
 {
-        u8 buf [] = { reg, data };
+        u8 buf [] = { reg, data };
-        struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 2 };
+        struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 2 };
        if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1))
                return -1;
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index 0498a055a4cd..017fcbccb8cc 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -87,7 +87,7 @@ static int start_ts_capture(struct budget *budget)
         *      Pitch: 188, NumBytes3: 188, NumLines3: 1024
         */
-        switch(budget->card->type) {
+        switch(budget->card->type) {
        case BUDGET_FS_ACTIVY:
                saa7146_write(dev, DD1_INIT, 0x04000000);
                saa7146_write(dev, MC2, (MASK_09 | MASK_25));
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index 755df81cbc49..fc416cf5253c 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -45,11 +45,11 @@ MAKE_BUDGET_INFO(ttbp, "TT-Budget/Patch DVB-S 1.x PCI", BUDGET_PATCH);
 //MAKE_BUDGET_INFO(satel,"TT-Budget/Patch SATELCO PCI", BUDGET_TT_HW_DISEQC);
 static struct pci_device_id pci_tbl[] = {
-        MAKE_EXTENSION_PCI(ttbp,0x13c2, 0x0000),
+        MAKE_EXTENSION_PCI(ttbp,0x13c2, 0x0000),
 //        MAKE_EXTENSION_PCI(satel, 0x13c2, 0x1013),
-        {
+        {
-                .vendor    = 0,
+                .vendor    = 0,
-        }
+        }
 };
 /* those lines are for budget-patch to be tried
@@ -165,57 +165,57 @@ static int budget_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t m
 static int budget_av7110_send_fw_cmd(struct budget_patch *budget, u16* buf, int length)
 {
-        int i;
+        int i;
-        dprintk(2, "budget: %p\n", budget);
+        dprintk(2, "budget: %p\n", budget);
-        for (i = 2; i < length; i++)
+        for (i = 2; i < length; i++)
-        {
+        {
-                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2*i, 2, (u32) buf[i], 0,0);
+                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2*i, 2, (u32) buf[i], 0,0);
-                  msleep(5);
+                  msleep(5);
-        }
+        }
-        if (length)
+        if (length)
-                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, (u32) buf[1], 0,0);
+                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, (u32) buf[1], 0,0);
-        else
+        else
-                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, 0, 0,0);
+                  ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, 0, 0,0);
-        msleep(5);
+        msleep(5);
-        ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND, 2, (u32) buf[0], 0,0);
+        ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND, 2, (u32) buf[0], 0,0);
-        msleep(5);
+        msleep(5);
-        return 0;
+        return 0;
 }
 static void av7110_set22k(struct budget_patch *budget, int state)
 {
-        u16 buf[2] = {( COMTYPE_AUDIODAC << 8) | (state ? ON22K : OFF22K), 0};
+        u16 buf[2] = {( COMTYPE_AUDIODAC << 8) | (state ? ON22K : OFF22K), 0};
-        dprintk(2, "budget: %p\n", budget);
+        dprintk(2, "budget: %p\n", budget);
-        budget_av7110_send_fw_cmd(budget, buf, 2);
+        budget_av7110_send_fw_cmd(budget, buf, 2);
 }
 static int av7110_send_diseqc_msg(struct budget_patch *budget, int len, u8 *msg, int burst)
 {
-        int i;
+        int i;
-        u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) | SendDiSEqC),
+        u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) | SendDiSEqC),
-                16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+                16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-        dprintk(2, "budget: %p\n", budget);
+        dprintk(2, "budget: %p\n", budget);
-        if (len>10)
+        if (len>10)
-                len=10;
+                len=10;
-        buf[1] = len+2;
+        buf[1] = len+2;
-        buf[2] = len;
+        buf[2] = len;
-        if (burst != -1)
+        if (burst != -1)
-                buf[3]=burst ? 0x01 : 0x00;
+                buf[3]=burst ? 0x01 : 0x00;
-        else
+        else
-                buf[3]=0xffff;
+                buf[3]=0xffff;
-        for (i=0; i<len; i++)
+        for (i=0; i<len; i++)
-                buf[i+4]=msg[i];
+                buf[i+4]=msg[i];
-        budget_av7110_send_fw_cmd(budget, buf, 18);
+        budget_av7110_send_fw_cmd(budget, buf, 18);
-        return 0;
+        return 0;
 }
 static int budget_patch_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
@@ -276,7 +276,7 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
        buf[2] = ((div & 0x18000) >> 10) | 0x95;
        buf[3] = (pwr << 6) | 0x30;
-        // NOTE: since we're using a prescaler of 2, we set the
+        // NOTE: since we're using a prescaler of 2, we set the
        // divisor frequency to 62.5kHz and divide by 125 above
        if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
@@ -294,7 +294,7 @@ static u8 alps_bsru6_inittab[] = {
        0x01, 0x15,
        0x02, 0x00,
        0x03, 0x00,
-        0x04, 0x7d,   /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
+        0x04, 0x7d,   /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
        0x05, 0x35,   /* I2CT = 0, SCLT = 1, SDAT = 1 */
        0x06, 0x40,   /* DAC not used, set to high impendance mode */
        0x07, 0x00,   /* DAC LSB */
@@ -413,7 +413,7 @@ static void frontend_init(struct budget_patch* budget)
 {
        switch(budget->dev->pci->subsystem_device) {
        case 0x0000: // Hauppauge/TT WinTV DVB-S rev1.X
-        case 0x1013: // SATELCO Multimedia PCI
+        case 0x1013: // SATELCO Multimedia PCI
                // try the ALPS BSRV2 first of all
                budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap);
@@ -463,8 +463,8 @@ static void frontend_init(struct budget_patch* budget)
 /* written by Emard */
 static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
 {
-        struct budget_patch *budget;
+        struct budget_patch *budget;
-        int err;
+        int err;
        int count = 0;
        int detected = 0;
@@ -472,12 +472,12 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
 #define RPS_IRQ 0
 #define HPS_SETUP 0
 #if PATCH_RESET
-        saa7146_write(dev, MC1, MASK_31);
+        saa7146_write(dev, MC1, MASK_31);
-        msleep(40);
+        msleep(40);
 #endif
 #if HPS_SETUP
-        // initialize registers. Better to have it like this
+        // initialize registers. Better to have it like this
-        // than leaving something unconfigured
+        // than leaving something unconfigured
        saa7146_write(dev, DD1_STREAM_B, 0);
        // port B VSYNC at rising edge
        saa7146_write(dev, DD1_INIT, 0x00000200);  // have this in budget-core too!
@@ -486,29 +486,29 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
        // debi config
        // saa7146_write(dev, DEBI_CONFIG, MASK_30|MASK_28|MASK_18);
-        // zero all HPS registers
+        // zero all HPS registers
-        saa7146_write(dev, HPS_H_PRESCALE, 0);                  // r68
+        saa7146_write(dev, HPS_H_PRESCALE, 0);                  // r68
-        saa7146_write(dev, HPS_H_SCALE, 0);                     // r6c
+        saa7146_write(dev, HPS_H_SCALE, 0);                     // r6c
-        saa7146_write(dev, BCS_CTRL, 0);                        // r70
+        saa7146_write(dev, BCS_CTRL, 0);                        // r70
-        saa7146_write(dev, HPS_V_SCALE, 0);                     // r60
+        saa7146_write(dev, HPS_V_SCALE, 0);                     // r60
-        saa7146_write(dev, HPS_V_GAIN, 0);                      // r64
+        saa7146_write(dev, HPS_V_GAIN, 0);                      // r64
-        saa7146_write(dev, CHROMA_KEY_RANGE, 0);                // r74
+        saa7146_write(dev, CHROMA_KEY_RANGE, 0);                // r74
-        saa7146_write(dev, CLIP_FORMAT_CTRL, 0);                // r78
+        saa7146_write(dev, CLIP_FORMAT_CTRL, 0);                // r78
-        // Set HPS prescaler for port B input
+        // Set HPS prescaler for port B input
-        saa7146_write(dev, HPS_CTRL, (1<<30) | (0<<29) | (1<<28) | (0<<12) );
+        saa7146_write(dev, HPS_CTRL, (1<<30) | (0<<29) | (1<<28) | (0<<12) );
-        saa7146_write(dev, MC2,
+        saa7146_write(dev, MC2,
-          0 * (MASK_08 | MASK_24)  |   // BRS control
+          0 * (MASK_08 | MASK_24)  |   // BRS control
-          0 * (MASK_09 | MASK_25)  |   // a
+          0 * (MASK_09 | MASK_25)  |   // a
-          0 * (MASK_10 | MASK_26)  |   // b
+          0 * (MASK_10 | MASK_26)  |   // b
-          1 * (MASK_06 | MASK_22)  |   // HPS_CTRL1
+          1 * (MASK_06 | MASK_22)  |   // HPS_CTRL1
-          1 * (MASK_05 | MASK_21)  |   // HPS_CTRL2
+          1 * (MASK_05 | MASK_21)  |   // HPS_CTRL2
-          0 * (MASK_01 | MASK_15)      // DEBI
+          0 * (MASK_01 | MASK_15)      // DEBI
-           );
+           );
 #endif
        // Disable RPS1 and RPS0
-        saa7146_write(dev, MC1, ( MASK_29 | MASK_28));
+        saa7146_write(dev, MC1, ( MASK_29 | MASK_28));
-        // RPS1 timeout disable
+        // RPS1 timeout disable
-        saa7146_write(dev, RPS_TOV1, 0);
+        saa7146_write(dev, RPS_TOV1, 0);
        // code for autodetection
        // will wait for VBI_B event (vertical blank at port B)
@@ -521,38 +521,38 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
        WRITE_RPS1(cpu_to_le32(CMD_UPLOAD |
          MASK_10 | MASK_09 | MASK_08 | MASK_06 | MASK_05 | MASK_04 | MASK_03 | MASK_02 ));
 #endif
-        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_VBI_B));
+        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_VBI_B));
-        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
+        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
-        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
+        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
-        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24));
+        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24));
 #if RPS_IRQ
-        // issue RPS1 interrupt to increment counter
+        // issue RPS1 interrupt to increment counter
-        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
+        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
-        // at least a NOP is neede between two interrupts
+        // at least a NOP is neede between two interrupts
-        WRITE_RPS1(cpu_to_le32(CMD_NOP));
+        WRITE_RPS1(cpu_to_le32(CMD_NOP));
-        // interrupt again
+        // interrupt again
-        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
+        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
 #endif
-        WRITE_RPS1(cpu_to_le32(CMD_STOP));
+        WRITE_RPS1(cpu_to_le32(CMD_STOP));
 #if RPS_IRQ
-        // set event counter 1 source as RPS1 interrupt (0x03)          (rE4 p53)
+        // set event counter 1 source as RPS1 interrupt (0x03)          (rE4 p53)
-        // use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled
+        // use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled
-        // use 0x15 to track VPE  interrupts - increase by 1 every vpeirq() is called
+        // use 0x15 to track VPE  interrupts - increase by 1 every vpeirq() is called
-        saa7146_write(dev, EC1SSR, (0x03<<2) | 3 );
+        saa7146_write(dev, EC1SSR, (0x03<<2) | 3 );
-        // set event counter 1 treshold to maximum allowed value        (rEC p55)
+        // set event counter 1 treshold to maximum allowed value        (rEC p55)
-        saa7146_write(dev, ECT1R,  0x3fff );
+        saa7146_write(dev, ECT1R,  0x3fff );
 #endif
-        // Fix VSYNC level
+        // Fix VSYNC level
-        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
+        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
-        // Set RPS1 Address register to point to RPS code               (r108 p42)
+        // Set RPS1 Address register to point to RPS code               (r108 p42)
-        saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle);
+        saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle);
-        // Enable RPS1,                                                 (rFC p33)
+        // Enable RPS1,                                                 (rFC p33)
-        saa7146_write(dev, MC1, (MASK_13 | MASK_29 ));
+        saa7146_write(dev, MC1, (MASK_13 | MASK_29 ));
-        mdelay(50);
+        mdelay(50);
-        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI);
+        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI);
        mdelay(150);
@@ -560,17 +560,17 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
                detected = 1;
 #if RPS_IRQ
-        printk("Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff );
+        printk("Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff );
 #endif
        // Disable RPS1
-        saa7146_write(dev, MC1, ( MASK_29 ));
+        saa7146_write(dev, MC1, ( MASK_29 ));
        if(detected == 0)
-                printk("budget-patch not detected or saa7146 in non-default state.\n"
+                printk("budget-patch not detected or saa7146 in non-default state.\n"
-                       "try enabling ressetting of 7146 with MASK_31 in MC1 register\n");
+                       "try enabling ressetting of 7146 with MASK_31 in MC1 register\n");
        else
-                printk("BUDGET-PATCH DETECTED.\n");
+                printk("BUDGET-PATCH DETECTED.\n");
 /*      OLD (Original design by Roberto Deza):
@@ -641,83 +641,83 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
 */
        // Setup RPS1 "program" (p35)
-        count = 0;
+        count = 0;
-        // Wait Source Line Counter Threshold                           (p36)
+        // Wait Source Line Counter Threshold                           (p36)
-        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_HS));
+        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_HS));
-        // Set GPIO3=1                                                  (p42)
+        // Set GPIO3=1                                                  (p42)
-        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
+        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
-        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
+        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
-        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTHI<<24));
+        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTHI<<24));
 #if RPS_IRQ
-        // issue RPS1 interrupt
+        // issue RPS1 interrupt
-        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
+        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
 #endif
-        // Wait reset Source Line Counter Threshold                     (p36)
+        // Wait reset Source Line Counter Threshold                     (p36)
-        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | RPS_INV | EVT_HS));
+        WRITE_RPS1(cpu_to_le32(CMD_PAUSE | RPS_INV | EVT_HS));
-        // Set GPIO3=0                                                  (p42)
+        // Set GPIO3=0                                                  (p42)
-        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
+        WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2)));
-        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
+        WRITE_RPS1(cpu_to_le32(GPIO3_MSK));
-        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24));
+        WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24));
 #if RPS_IRQ
-        // issue RPS1 interrupt
+        // issue RPS1 interrupt
-        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
+        WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT));
 #endif
-        // Jump to begin of RPS program                                 (p37)
+        // Jump to begin of RPS program                                 (p37)
-        WRITE_RPS1(cpu_to_le32(CMD_JUMP));
+        WRITE_RPS1(cpu_to_le32(CMD_JUMP));
-        WRITE_RPS1(cpu_to_le32(dev->d_rps1.dma_handle));
+        WRITE_RPS1(cpu_to_le32(dev->d_rps1.dma_handle));
-        // Fix VSYNC level
-        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
-        // Set RPS1 Address register to point to RPS code               (r108 p42)
-        saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle);
-        // Set Source Line Counter Threshold, using BRS                 (rCC p43)
-        // It generates HS event every TS_HEIGHT lines
-        // this is related to TS_WIDTH set in register
-        // NUM_LINE_BYTE3 in budget-core.c. If NUM_LINE_BYTE
-        // low 16 bits are set to TS_WIDTH bytes (TS_WIDTH=2*188
-        //,then RPS_THRESH1
-        // should be set to trigger every TS_HEIGHT (512) lines.
-        //
-        saa7146_write(dev, RPS_THRESH1, (TS_HEIGHT*1) | MASK_12 );
-        // saa7146_write(dev, RPS_THRESH0, ((TS_HEIGHT/2)<<16) |MASK_28| (TS_HEIGHT/2) |MASK_12 );
+        // Fix VSYNC level
-        // Enable RPS1                                                  (rFC p33)
+        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
-        saa7146_write(dev, MC1, (MASK_13 | MASK_29));
+        // Set RPS1 Address register to point to RPS code               (r108 p42)
+        saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle);
+        // Set Source Line Counter Threshold, using BRS                 (rCC p43)
-        if (!(budget = kmalloc (sizeof(struct budget_patch), GFP_KERNEL)))
+        // It generates HS event every TS_HEIGHT lines
-                return -ENOMEM;
+        // this is related to TS_WIDTH set in register
+        // NUM_LINE_BYTE3 in budget-core.c. If NUM_LINE_BYTE
+        // low 16 bits are set to TS_WIDTH bytes (TS_WIDTH=2*188
+        //,then RPS_THRESH1
+        // should be set to trigger every TS_HEIGHT (512) lines.
+        //
+        saa7146_write(dev, RPS_THRESH1, (TS_HEIGHT*1) | MASK_12 );
+        // saa7146_write(dev, RPS_THRESH0, ((TS_HEIGHT/2)<<16) |MASK_28| (TS_HEIGHT/2) |MASK_12 );
+        // Enable RPS1                                                  (rFC p33)
+        saa7146_write(dev, MC1, (MASK_13 | MASK_29));
+        if (!(budget = kmalloc (sizeof(struct budget_patch), GFP_KERNEL)))
+                return -ENOMEM;
-        dprintk(2, "budget: %p\n", budget);
+        dprintk(2, "budget: %p\n", budget);
-        if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) {
+        if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) {
-                kfree (budget);
+                kfree (budget);
-                return err;
+                return err;
-        }
+        }
-        dev->ext_priv = budget;
+        dev->ext_priv = budget;
        budget->dvb_adapter.priv = budget;
        frontend_init(budget);
-        return 0;
+        return 0;
 }
 static int budget_patch_detach (struct saa7146_dev* dev)
 {
-        struct budget_patch *budget = (struct budget_patch*) dev->ext_priv;
+        struct budget_patch *budget = (struct budget_patch*) dev->ext_priv;
-        int err;
+        int err;
        if (budget->dvb_frontend) dvb_unregister_frontend(budget->dvb_frontend);
-        err = ttpci_budget_deinit (budget);
+        err = ttpci_budget_deinit (budget);
-        kfree (budget);
+        kfree (budget);
-        return err;
+        return err;
 }
 static int __init budget_patch_init(void)
@@ -727,20 +727,20 @@ static int __init budget_patch_init(void)
 static void __exit budget_patch_exit(void)
 {
-        saa7146_unregister_extension(&budget_extension);
+        saa7146_unregister_extension(&budget_extension);
 }
 static struct saa7146_extension budget_extension = {
-        .name           = "budget_patch dvb\0",
+        .name           = "budget_patch dvb\0",
-        .flags          = 0,
+        .flags          = 0,
-        .module         = THIS_MODULE,
+        .module         = THIS_MODULE,
-        .pci_tbl        = pci_tbl,
+        .pci_tbl        = pci_tbl,
-        .attach         = budget_patch_attach,
+        .attach         = budget_patch_attach,
-        .detach         = budget_patch_detach,
+        .detach         = budget_patch_detach,
-        .irq_mask       = MASK_10,
+        .irq_mask       = MASK_10,
-        .irq_func       = ttpci_budget_irq10_handler,
+        .irq_func       = ttpci_budget_irq10_handler,
 };
 module_init(budget_patch_init);
@@ -749,4 +749,4 @@ module_exit(budget_patch_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Emard, Roberto Deza, Holger Waechtler, Michael Hunold, others");
 MODULE_DESCRIPTION("Driver for full TS modified DVB-S SAA7146+AV7110 "
-                   "based so-called Budget Patch cards");
+                   "based so-called Budget Patch cards");
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index bc4ce7559cbe..fafe6407b3d0 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -256,7 +256,7 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
        buf[2] = ((div & 0x18000) >> 10) | 0x95;
        buf[3] = (pwr << 6) | 0x30;
-        // NOTE: since we're using a prescaler of 2, we set the
+        // NOTE: since we're using a prescaler of 2, we set the
        // divisor frequency to 62.5kHz and divide by 125 above
        if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
@@ -565,7 +565,7 @@ static u8 read_pwm(struct budget* budget)
        struct i2c_msg msg[] = { { .addr = 0x50,.flags = 0,.buf = &b,.len = 1 },
                                 { .addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1} };
-        if ((i2c_transfer(&budget->i2c_adap, msg, 2) != 2) || (pwm == 0xff))
+        if ((i2c_transfer(&budget->i2c_adap, msg, 2) != 2) || (pwm == 0xff))
                pwm = 0x48;
        return pwm;
@@ -593,7 +593,7 @@ static void frontend_init(struct budget *budget)
                budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap);
                if (budget->dvb_frontend) {
                        budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_diseqc_send_master_cmd;
-                        budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst;
+                        budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst;
                        budget->dvb_frontend->ops->set_tone = budget_set_tone;
                        break;
                }
diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index c6ef496ba70a..fdaa3318ad3a 100644
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -19,7 +19,7 @@ extern int budget_debug;
 #endif
 #define dprintk(level,args...) \
-            do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __FUNCTION__); printk(args); } } while (0)
+            do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __FUNCTION__); printk(args); } } while (0)
 struct budget_info {
        char *name;
diff --git a/drivers/media/dvb/ttpci/fdump.c b/drivers/media/dvb/ttpci/fdump.c
index 0b478db3e744..c90001d35e7d 100644
--- a/drivers/media/dvb/ttpci/fdump.c
+++ b/drivers/media/dvb/ttpci/fdump.c
@@ -36,7 +36,7 @@ int main(int argc, char **argv)
    }
    fprintf(fd_out, "\n};\n\n");
-    
    fclose(fd_in);
    fclose(fd_out);
diff --git a/drivers/media/dvb/ttpci/ttpci-eeprom.c b/drivers/media/dvb/ttpci/ttpci-eeprom.c
index ac79ef178c05..18aa22b5478d 100644
--- a/drivers/media/dvb/ttpci/ttpci-eeprom.c
+++ b/drivers/media/dvb/ttpci/ttpci-eeprom.c
@@ -13,7 +13,7 @@
    Holger Waechtler    Convergence
    Copyright (C) 2002-2003 Ralph Metzler <rjkm@metzlerbros.de>
-                            Metzler Brothers Systementwicklung GbR
+                            Metzler Brothers Systementwicklung GbR
    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
@@ -48,41 +48,41 @@
 static int check_mac_tt(u8 *buf)
 {
-        int i;
+        int i;
-        u16 tmp = 0xffff;
+        u16 tmp = 0xffff;
-        for (i = 0; i < 8; i++) {
+        for (i = 0; i < 8; i++) {
-                tmp  = (tmp << 8) | ((tmp >> 8) ^ buf[i]);
+                tmp  = (tmp << 8) | ((tmp >> 8) ^ buf[i]);
-                tmp ^= (tmp >> 4) & 0x0f;
+                tmp ^= (tmp >> 4) & 0x0f;
-                tmp ^= (tmp << 12) ^ ((tmp & 0xff) << 5);
+                tmp ^= (tmp << 12) ^ ((tmp & 0xff) << 5);
-        }
+        }
-        tmp ^= 0xffff;
+        tmp ^= 0xffff;
-        return (((tmp >> 8) ^ buf[8]) | ((tmp & 0xff) ^ buf[9]));
+        return (((tmp >> 8) ^ buf[8]) | ((tmp & 0xff) ^ buf[9]));
 }
 static int getmac_tt(u8 * decodedMAC, u8 * encodedMAC)
 {
-        u8 xor[20] = { 0x72, 0x23, 0x68, 0x19, 0x5c, 0xa8, 0x71, 0x2c,
+        u8 xor[20] = { 0x72, 0x23, 0x68, 0x19, 0x5c, 0xa8, 0x71, 0x2c,
                       0x54, 0xd3, 0x7b, 0xf1, 0x9E, 0x23, 0x16, 0xf6,
                       0x1d, 0x36, 0x64, 0x78};
-        u8 data[20];
+        u8 data[20];
-        int i;
+        int i;
        /* In case there is a sig check failure have the orig contents available */
        memcpy(data, encodedMAC, 20);
        for (i = 0; i < 20; i++)
-                data[i] ^= xor[i];
+                data[i] ^= xor[i];
-        for (i = 0; i < 10; i++)
+        for (i = 0; i < 10; i++)
-                data[i] = ((data[2 * i + 1] << 8) | data[2 * i])
+                data[i] = ((data[2 * i + 1] << 8) | data[2 * i])
                        >> ((data[2 * i + 1] >> 6) & 3);
-        if (check_mac_tt(data))
+        if (check_mac_tt(data))
-                return -ENODEV;
+                return -ENODEV;
        decodedMAC[0] = data[2]; decodedMAC[1] = data[1]; decodedMAC[2] = data[0];
        decodedMAC[3] = data[6]; decodedMAC[4] = data[5]; decodedMAC[5] = data[4];
-        return 0;
+        return 0;
 }
 static int ttpci_eeprom_read_encodedMAC(struct i2c_adapter *adapter, u8 * encodedMAC)
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index fd53d6010502..104df610dbe1 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -225,8 +225,8 @@ static int ttusb_i2c_msg(struct ttusb *ttusb,
        err = ttusb_result(ttusb, b, 0x20);
-        /* check if the i2c transaction was successful */
+        /* check if the i2c transaction was successful */
-        if ((snd_len != b[5]) || (rcv_len != b[6])) return -EREMOTEIO;
+        if ((snd_len != b[5]) || (rcv_len != b[6])) return -EREMOTEIO;
        if (rcv_len > 0) {
@@ -489,27 +489,27 @@ static int ttusb_send_diseqc(struct dvb_frontend* fe,
 static int lnbp21_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
-        struct  ttusb* ttusb = (struct ttusb*)  fe->dvb->priv;
+        struct  ttusb* ttusb = (struct ttusb*)  fe->dvb->priv;
-        int ret;
+        int ret;
-        u8 data[1];
+        u8 data[1];
-        struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = data, .len = sizeof(data) };
+        struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = data, .len = sizeof(data) };
-        switch(voltage) {
+        switch(voltage) {
-        case SEC_VOLTAGE_OFF:
+        case SEC_VOLTAGE_OFF:
-                data[0] = 0x00;
+                data[0] = 0x00;
-                break;
+                break;
-        case SEC_VOLTAGE_13:
+        case SEC_VOLTAGE_13:
-                data[0] = 0x44;
+                data[0] = 0x44;
-                break;
+                break;
-        case SEC_VOLTAGE_18:
+        case SEC_VOLTAGE_18:
-                data[0] = 0x4c;
+                data[0] = 0x4c;
-                break;
+                break;
-        default:
+        default:
-                return -EINVAL;
+                return -EINVAL;
-        };
+        };
-        ret = i2c_transfer(&ttusb->i2c_adap, &msg, 1);
+        ret = i2c_transfer(&ttusb->i2c_adap, &msg, 1);
-        return (ret != 1) ? -EIO : 0;
+        return (ret != 1) ? -EIO : 0;
 }
 static int ttusb_update_lnb(struct ttusb *ttusb)
@@ -1184,45 +1184,45 @@ static struct tda1004x_config philips_tdm1316l_config = {
 };
 static u8 alps_bsbe1_inittab[] = {
-        0x01, 0x15,
+        0x01, 0x15,
-        0x02, 0x30,
+        0x02, 0x30,
-        0x03, 0x00,
+        0x03, 0x00,
-        0x04, 0x7d,             /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
+        0x04, 0x7d,             /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
-        0x05, 0x35,             /* I2CT = 0, SCLT = 1, SDAT = 1 */
+        0x05, 0x35,             /* I2CT = 0, SCLT = 1, SDAT = 1 */
-        0x06, 0x40,             /* DAC not used, set to high impendance mode */
+        0x06, 0x40,             /* DAC not used, set to high impendance mode */
-        0x07, 0x00,             /* DAC LSB */
+        0x07, 0x00,             /* DAC LSB */
-        0x08, 0x40,             /* DiSEqC off, LNB power on OP2/LOCK pin on */
+        0x08, 0x40,             /* DiSEqC off, LNB power on OP2/LOCK pin on */
-        0x09, 0x00,             /* FIFO */
+        0x09, 0x00,             /* FIFO */
-        0x0c, 0x51,             /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */
+        0x0c, 0x51,             /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */
-        0x0d, 0x82,             /* DC offset compensation = ON, beta_agc1 = 2 */
+        0x0d, 0x82,             /* DC offset compensation = ON, beta_agc1 = 2 */
-        0x0e, 0x23,             /* alpha_tmg = 2, beta_tmg = 3 */
+        0x0e, 0x23,             /* alpha_tmg = 2, beta_tmg = 3 */
-        0x10, 0x3f,             // AGC2  0x3d
+        0x10, 0x3f,             // AGC2  0x3d
-        0x11, 0x84,
+        0x11, 0x84,
-        0x12, 0xb9,
+        0x12, 0xb9,
-        0x15, 0xc9,             // lock detector threshold
+        0x15, 0xc9,             // lock detector threshold
-        0x16, 0x00,
+        0x16, 0x00,
-        0x17, 0x00,
+        0x17, 0x00,
-        0x18, 0x00,
+        0x18, 0x00,
-        0x19, 0x00,
+        0x19, 0x00,
-        0x1a, 0x00,
+        0x1a, 0x00,
-        0x1f, 0x50,
+        0x1f, 0x50,
-        0x20, 0x00,
+        0x20, 0x00,
-        0x21, 0x00,
+        0x21, 0x00,
-        0x22, 0x00,
+        0x22, 0x00,
-        0x23, 0x00,
+        0x23, 0x00,
-        0x28, 0x00,             // out imp: normal  out type: parallel FEC mode:0
+        0x28, 0x00,             // out imp: normal  out type: parallel FEC mode:0
-        0x29, 0x1e,             // 1/2 threshold
+        0x29, 0x1e,             // 1/2 threshold
-        0x2a, 0x14,             // 2/3 threshold
+        0x2a, 0x14,             // 2/3 threshold
-        0x2b, 0x0f,             // 3/4 threshold
+        0x2b, 0x0f,             // 3/4 threshold
-        0x2c, 0x09,             // 5/6 threshold
+        0x2c, 0x09,             // 5/6 threshold
-        0x2d, 0x05,             // 7/8 threshold
+        0x2d, 0x05,             // 7/8 threshold
-        0x2e, 0x01,
+        0x2e, 0x01,
-        0x31, 0x1f,             // test all FECs
+        0x31, 0x1f,             // test all FECs
-        0x32, 0x19,             // viterbi and synchro search
+        0x32, 0x19,             // viterbi and synchro search
-        0x33, 0xfc,             // rs control
+        0x33, 0xfc,             // rs control
-        0x34, 0x93,             // error control
+        0x34, 0x93,             // error control
-        0x0f, 0x92,
+        0x0f, 0x92,
-        0xff, 0xff
+        0xff, 0xff
 };
 static u8 alps_bsru6_inittab[] = {
@@ -1350,7 +1350,7 @@ static int ttusb_novas_grundig_29504_491_pll_set(struct dvb_frontend *fe, struct
        u32 div;
        struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };
-        div = params->frequency / 125;
+        div = params->frequency / 125;
        buf[0] = (div >> 8) & 0x7f;
        buf[1] = div & 0xff;
@@ -1487,7 +1487,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
        udev = interface_to_usbdev(intf);
-        if (intf->altsetting->desc.bInterfaceNumber != 1) return -ENODEV;
+        if (intf->altsetting->desc.bInterfaceNumber != 1) return -ENODEV;
        if (!(ttusb = kmalloc(sizeof(struct ttusb), GFP_KERNEL)))
                return -ENOMEM;
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h b/drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h
index 95ee7995455e..8c3cd545e8f4 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h
@@ -2,1643 +2,1643 @@
 #include <asm/types.h>
 static u8 dsp_bootcode [] = {
-        0x08, 0xaa, 0x00, 0x18, 0x00, 0x03, 0x08, 0x00, 
+        0x08, 0xaa, 0x00, 0x18, 0x00, 0x03, 0x08, 0x00,
-        0x00, 0x10, 0x00, 0x00, 0x01, 0x80, 0x18, 0x5f, 
+        0x00, 0x10, 0x00, 0x00, 0x01, 0x80, 0x18, 0x5f,
-        0x00, 0x00, 0x01, 0x80, 0x77, 0x18, 0x2a, 0xeb, 
+        0x00, 0x00, 0x01, 0x80, 0x77, 0x18, 0x2a, 0xeb,
-        0x6b, 0xf8, 0x00, 0x18, 0x03, 0xff, 0x68, 0xf8, 
+        0x6b, 0xf8, 0x00, 0x18, 0x03, 0xff, 0x68, 0xf8,
-        0x00, 0x18, 0xff, 0xfe, 0xf7, 0xb8, 0xf7, 0xbe, 
+        0x00, 0x18, 0xff, 0xfe, 0xf7, 0xb8, 0xf7, 0xbe,
-        0xf6, 0xb9, 0xf4, 0xa0, 0xf6, 0xb7, 0xf6, 0xb5, 
+        0xf6, 0xb9, 0xf4, 0xa0, 0xf6, 0xb7, 0xf6, 0xb5,
-        0xf6, 0xb6, 0xf0, 0x20, 0x19, 0xdf, 0xf1, 0x00, 
+        0xf6, 0xb6, 0xf0, 0x20, 0x19, 0xdf, 0xf1, 0x00,
-        0x00, 0x01, 0xf8, 0x4d, 0x01, 0xab, 0xf6, 0xb8, 
+        0x00, 0x01, 0xf8, 0x4d, 0x01, 0xab, 0xf6, 0xb8,
-        0xf0, 0x20, 0x19, 0xdf, 0xf0, 0x73, 0x01, 0xa5, 
+        0xf0, 0x20, 0x19, 0xdf, 0xf0, 0x73, 0x01, 0xa5,
-        0x7e, 0xf8, 0x00, 0x12, 0xf0, 0x00, 0x00, 0x01, 
+        0x7e, 0xf8, 0x00, 0x12, 0xf0, 0x00, 0x00, 0x01,
-        0x47, 0xf8, 0x00, 0x11, 0x7e, 0x92, 0x00, 0xf8, 
+        0x47, 0xf8, 0x00, 0x11, 0x7e, 0x92, 0x00, 0xf8,
-        0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x7e, 0xf8, 
+        0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x7e, 0xf8,
-        0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x6c, 0x89, 
+        0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x6c, 0x89,
-        0x01, 0x9a, 0xf7, 0xb8, 0xee, 0xfc, 0xf0, 0x20, 
+        0x01, 0x9a, 0xf7, 0xb8, 0xee, 0xfc, 0xf0, 0x20,
-        0xff, 0xff, 0xf1, 0x00, 0x00, 0x01, 0xf8, 0x4d, 
+        0xff, 0xff, 0xf1, 0x00, 0x00, 0x01, 0xf8, 0x4d,
-        0x01, 0xbf, 0xf2, 0x73, 0x01, 0xb9, 0x4e, 0x02, 
+        0x01, 0xbf, 0xf2, 0x73, 0x01, 0xb9, 0x4e, 0x02,
-        0xf4, 0x95, 0xf5, 0xe3, 0x56, 0x02, 0x7e, 0x00, 
+        0xf4, 0x95, 0xf5, 0xe3, 0x56, 0x02, 0x7e, 0x00,
-        0x11, 0x00, 0xfa, 0x4c, 0x01, 0xb7, 0x6b, 0x03, 
+        0x11, 0x00, 0xfa, 0x4c, 0x01, 0xb7, 0x6b, 0x03,
-        0x00, 0x01, 0xf6, 0xb8, 0xee, 0x04, 0xf0, 0x74, 
+        0x00, 0x01, 0xf6, 0xb8, 0xee, 0x04, 0xf0, 0x74,
-        0x0d, 0xa7, 0xf0, 0x74, 0x01, 0xc5, 0x4a, 0x11, 
+        0x0d, 0xa7, 0xf0, 0x74, 0x01, 0xc5, 0x4a, 0x11,
-        0x4a, 0x16, 0x72, 0x11, 0x2a, 0xe6, 0x10, 0xf8, 
+        0x4a, 0x16, 0x72, 0x11, 0x2a, 0xe6, 0x10, 0xf8,
-        0x00, 0x11, 0xfa, 0x45, 0x01, 0xdb, 0xf4, 0x95, 
+        0x00, 0x11, 0xfa, 0x45, 0x01, 0xdb, 0xf4, 0x95,
-        0xee, 0xff, 0x48, 0x11, 0xf0, 0x00, 0x2a, 0xc6, 
+        0xee, 0xff, 0x48, 0x11, 0xf0, 0x00, 0x2a, 0xc6,
-        0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0xee, 
+        0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0xee,
-        0xff, 0xff, 0xf4, 0xe3, 0x6c, 0xe9, 0xff, 0xff, 
+        0xff, 0xff, 0xf4, 0xe3, 0x6c, 0xe9, 0xff, 0xff,
-        0x01, 0xd5, 0x10, 0xf8, 0x2a, 0xe7, 0xf8, 0x45, 
+        0x01, 0xd5, 0x10, 0xf8, 0x2a, 0xe7, 0xf8, 0x45,
-        0x01, 0xe2, 0x10, 0xf8, 0x2a, 0xe7, 0xf4, 0xe3, 
+        0x01, 0xe2, 0x10, 0xf8, 0x2a, 0xe7, 0xf4, 0xe3,
-        0xf0, 0x74, 0x01, 0xff, 0xee, 0x01, 0x8a, 0x16, 
+        0xf0, 0x74, 0x01, 0xff, 0xee, 0x01, 0x8a, 0x16,
-        0x8a, 0x11, 0xfc, 0x00, 0xf7, 0xb8, 0xe9, 0x20, 
+        0x8a, 0x11, 0xfc, 0x00, 0xf7, 0xb8, 0xe9, 0x20,
-        0x4a, 0x11, 0x09, 0xf8, 0x2a, 0xe6, 0xf8, 0x4e, 
+        0x4a, 0x11, 0x09, 0xf8, 0x2a, 0xe6, 0xf8, 0x4e,
-        0x01, 0xf3, 0xf2, 0x73, 0x01, 0xfd, 0xf4, 0x95, 
+        0x01, 0xf3, 0xf2, 0x73, 0x01, 0xfd, 0xf4, 0x95,
-        0xe8, 0x01, 0x72, 0x11, 0x2a, 0xe6, 0x49, 0x11, 
+        0xe8, 0x01, 0x72, 0x11, 0x2a, 0xe6, 0x49, 0x11,
-        0x80, 0xe1, 0x2a, 0xc6, 0xf3, 0x00, 0x00, 0x01, 
+        0x80, 0xe1, 0x2a, 0xc6, 0xf3, 0x00, 0x00, 0x01,
-        0xe8, 0x00, 0x81, 0xf8, 0x2a, 0xe6, 0x8a, 0x11, 
+        0xe8, 0x00, 0x81, 0xf8, 0x2a, 0xe6, 0x8a, 0x11,
-        0xfc, 0x00, 0xf4, 0x95, 0xf0, 0x73, 0x02, 0x00, 
+        0xfc, 0x00, 0xf4, 0x95, 0xf0, 0x73, 0x02, 0x00,
-        0x10, 0xf8, 0x2a, 0x0f, 0xfc, 0x00, 0x4a, 0x11, 
+        0x10, 0xf8, 0x2a, 0x0f, 0xfc, 0x00, 0x4a, 0x11,
-        0xf0, 0x74, 0x02, 0x02, 0x80, 0xf8, 0x2a, 0x10, 
+        0xf0, 0x74, 0x02, 0x02, 0x80, 0xf8, 0x2a, 0x10,
-        0x73, 0x08, 0x00, 0x09, 0x40, 0xf8, 0x2a, 0x15, 
+        0x73, 0x08, 0x00, 0x09, 0x40, 0xf8, 0x2a, 0x15,
-        0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10, 
+        0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10,
-        0x03, 0xe8, 0xf5, 0xa9, 0xf8, 0x30, 0x02, 0x21, 
+        0x03, 0xe8, 0xf5, 0xa9, 0xf8, 0x30, 0x02, 0x21,
-        0x71, 0xf8, 0x2a, 0x10, 0x2a, 0x15, 0x56, 0xf8, 
+        0x71, 0xf8, 0x2a, 0x10, 0x2a, 0x15, 0x56, 0xf8,
-        0x2a, 0x0c, 0xf0, 0xe3, 0x4e, 0xf8, 0x2a, 0x16, 
+        0x2a, 0x0c, 0xf0, 0xe3, 0x4e, 0xf8, 0x2a, 0x16,
-        0xe8, 0x00, 0x4e, 0xf8, 0x2a, 0x0c, 0x8a, 0x11, 
+        0xe8, 0x00, 0x4e, 0xf8, 0x2a, 0x0c, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d, 
+        0xfc, 0x00, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d,
-        0x68, 0xf8, 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 
+        0x68, 0xf8, 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8,
-        0x00, 0x07, 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 
+        0x00, 0x07, 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d,
-        0xff, 0xfc, 0x6b, 0xf8, 0x2a, 0x0f, 0x00, 0x01, 
+        0xff, 0xfc, 0x6b, 0xf8, 0x2a, 0x0f, 0x00, 0x01,
-        0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x06, 0xf4, 0xeb, 
+        0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x06, 0xf4, 0xeb,
-        0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x0f, 0x00, 0x00, 
+        0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x0f, 0x00, 0x00,
-        0x76, 0x00, 0x00, 0x00, 0xfb, 0x80, 0x19, 0x4c, 
+        0x76, 0x00, 0x00, 0x00, 0xfb, 0x80, 0x19, 0x4c,
-        0xf4, 0x95, 0xe8, 0x00, 0x80, 0xf8, 0x2a, 0x11, 
+        0xf4, 0x95, 0xe8, 0x00, 0x80, 0xf8, 0x2a, 0x11,
-        0xf9, 0x80, 0x19, 0x07, 0x80, 0xf8, 0x2a, 0x0e, 
+        0xf9, 0x80, 0x19, 0x07, 0x80, 0xf8, 0x2a, 0x0e,
-        0xf9, 0x80, 0x16, 0x66, 0x76, 0x00, 0x2a, 0x12, 
+        0xf9, 0x80, 0x16, 0x66, 0x76, 0x00, 0x2a, 0x12,
-        0x10, 0xf8, 0x2a, 0x11, 0xf9, 0x80, 0x18, 0xe3, 
+        0x10, 0xf8, 0x2a, 0x11, 0xf9, 0x80, 0x18, 0xe3,
-        0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x66, 
+        0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x66,
-        0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x87, 
+        0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x87,
-        0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf6, 0xb8, 
+        0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf6, 0xb8,
-        0xf4, 0x95, 0xf0, 0x20, 0x80, 0x00, 0x11, 0xf8, 
+        0xf4, 0x95, 0xf0, 0x20, 0x80, 0x00, 0x11, 0xf8,
-        0x2a, 0x5a, 0xf8, 0x4d, 0x02, 0x93, 0x11, 0xf8, 
+        0x2a, 0x5a, 0xf8, 0x4d, 0x02, 0x93, 0x11, 0xf8,
-        0x2a, 0x9f, 0xf8, 0x4c, 0x02, 0x7c, 0x77, 0x12, 
+        0x2a, 0x9f, 0xf8, 0x4c, 0x02, 0x7c, 0x77, 0x12,
-        0x2a, 0x39, 0x49, 0x12, 0x01, 0xf8, 0x2a, 0x9f, 
+        0x2a, 0x39, 0x49, 0x12, 0x01, 0xf8, 0x2a, 0x9f,
-        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81, 
+        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81,
-        0x00, 0x11, 0x6c, 0xe1, 0xff, 0xab, 0x02, 0x93, 
+        0x00, 0x11, 0x6c, 0xe1, 0xff, 0xab, 0x02, 0x93,
-        0x6b, 0xf8, 0x2a, 0x9f, 0x00, 0x01, 0xe9, 0x05, 
+        0x6b, 0xf8, 0x2a, 0x9f, 0x00, 0x01, 0xe9, 0x05,
-        0x01, 0xe2, 0x00, 0x03, 0x81, 0xf8, 0x2a, 0xa0, 
+        0x01, 0xe2, 0x00, 0x03, 0x81, 0xf8, 0x2a, 0xa0,
-        0xf0, 0x73, 0x02, 0x95, 0x72, 0x11, 0x2a, 0x9f, 
+        0xf0, 0x73, 0x02, 0x95, 0x72, 0x11, 0x2a, 0x9f,
-        0xf4, 0x95, 0x10, 0xe1, 0x2a, 0x39, 0x6b, 0xf8, 
+        0xf4, 0x95, 0x10, 0xe1, 0x2a, 0x39, 0x6b, 0xf8,
-        0x2a, 0x9f, 0x00, 0x01, 0x11, 0xf8, 0x2a, 0x9f, 
+        0x2a, 0x9f, 0x00, 0x01, 0x11, 0xf8, 0x2a, 0x9f,
-        0x09, 0xf8, 0x2a, 0xa0, 0xf8, 0x4c, 0x02, 0x93, 
+        0x09, 0xf8, 0x2a, 0xa0, 0xf8, 0x4c, 0x02, 0x93,
-        0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00, 0x76, 0xf8, 
+        0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00, 0x76, 0xf8,
-        0x2a, 0x9f, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa0, 
+        0x2a, 0x9f, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa0,
-        0x00, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x48, 0x11, 
+        0x00, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x48, 0x11,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
-        0x10, 0xf8, 0x2a, 0x5a, 0xf8, 0x44, 0x02, 0xb2, 
+        0x10, 0xf8, 0x2a, 0x5a, 0xf8, 0x44, 0x02, 0xb2,
-        0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x01, 0xf0, 0x74, 
+        0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x01, 0xf0, 0x74,
-        0x02, 0x58, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, 
+        0x02, 0x58, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10,
-        0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30, 0x02, 0xb2, 
+        0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30, 0x02, 0xb2,
-        0x48, 0x11, 0xf0, 0x30, 0x00, 0xff, 0x80, 0x00, 
+        0x48, 0x11, 0xf0, 0x30, 0x00, 0xff, 0x80, 0x00,
-        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0xd6, 
+        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0xd6,
-        0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95, 
+        0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95,
-        0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b, 
+        0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b,
-        0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11, 
+        0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11,
-        0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15, 
+        0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15,
-        0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19, 
+        0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19,
-        0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a, 
+        0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a,
-        0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8, 
+        0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8,
-        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
+        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
-        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
+        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
-        0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe, 
+        0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe,
-        0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xfd, 
+        0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xfd,
-        0xf0, 0x74, 0x02, 0x58, 0x88, 0x11, 0xf4, 0x95, 
+        0xf0, 0x74, 0x02, 0x58, 0x88, 0x11, 0xf4, 0x95,
-        0x77, 0x10, 0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30, 
+        0x77, 0x10, 0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30,
-        0x02, 0xef, 0x48, 0x11, 0xf0, 0x30, 0x00, 0xff, 
+        0x02, 0xef, 0x48, 0x11, 0xf0, 0x30, 0x00, 0xff,
-        0x80, 0x00, 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 
+        0x80, 0x00, 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80,
-        0x18, 0xd6, 0xee, 0x03, 0x8a, 0x18, 0xf4, 0x95, 
+        0x18, 0xd6, 0xee, 0x03, 0x8a, 0x18, 0xf4, 0x95,
-        0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d, 0x8a, 0x1a, 
+        0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d, 0x8a, 0x1a,
-        0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e, 0x8a, 0x19, 
+        0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e, 0x8a, 0x19,
-        0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x15, 
+        0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x15,
-        0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12, 0x8a, 0x11, 
+        0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12, 0x8a, 0x11,
-        0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b, 
+        0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b,
-        0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08, 0xf4, 0xeb, 
+        0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08, 0xf4, 0xeb,
-        0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 
+        0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81,
-        0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 
+        0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2,
-        0x00, 0x01, 0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2, 
+        0x00, 0x01, 0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2,
-        0x00, 0x02, 0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1, 
+        0x00, 0x02, 0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1,
-        0x00, 0x03, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 
+        0x00, 0x03, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x04,
-        0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, 
+        0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95, 
+        0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95,
-        0xf4, 0x95, 0x10, 0x81, 0x6f, 0xf8, 0x2a, 0x9e, 
+        0xf4, 0x95, 0x10, 0x81, 0x6f, 0xf8, 0x2a, 0x9e,
-        0x0c, 0x88, 0xe8, 0xff, 0x18, 0xe1, 0x00, 0x01, 
+        0x0c, 0x88, 0xe8, 0xff, 0x18, 0xe1, 0x00, 0x01,
-        0x1a, 0xf8, 0x2a, 0x9e, 0xf0, 0x30, 0x1f, 0xff, 
+        0x1a, 0xf8, 0x2a, 0x9e, 0xf0, 0x30, 0x1f, 0xff,
-        0x80, 0xf8, 0x2a, 0x9e, 0x8a, 0x11, 0xfc, 0x00, 
+        0x80, 0xf8, 0x2a, 0x9e, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 
+        0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81,
-        0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x11, 0xe2, 
+        0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x11, 0xe2,
-        0x00, 0x01, 0x81, 0xe1, 0x00, 0x01, 0x11, 0xe2, 
+        0x00, 0x01, 0x81, 0xe1, 0x00, 0x01, 0x11, 0xe2,
-        0x00, 0x02, 0x81, 0xe1, 0x00, 0x02, 0x76, 0xe1, 
+        0x00, 0x02, 0x81, 0xe1, 0x00, 0x02, 0x76, 0xe1,
-        0x00, 0x03, 0x00, 0x02, 0x48, 0x08, 0x6f, 0xe1, 
+        0x00, 0x03, 0x00, 0x02, 0x48, 0x08, 0x6f, 0xe1,
-        0x00, 0x04, 0x0c, 0x98, 0xf0, 0x30, 0x00, 0xff, 
+        0x00, 0x04, 0x0c, 0x98, 0xf0, 0x30, 0x00, 0xff,
-        0x80, 0xe1, 0x00, 0x05, 0x76, 0xe1, 0x00, 0x06, 
+        0x80, 0xe1, 0x00, 0x05, 0x76, 0xe1, 0x00, 0x06,
-        0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, 
+        0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 
+        0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39,
-        0x76, 0x81, 0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 
+        0x76, 0x81, 0x00, 0x55, 0x77, 0x12, 0x2a, 0x18,
-        0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, 0x00, 0x01, 
+        0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, 0x00, 0x01,
-        0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, 0x00, 0x02, 
+        0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, 0x00, 0x02,
-        0x76, 0xe1, 0x00, 0x03, 0x00, 0x04, 0x48, 0x11, 
+        0x76, 0xe1, 0x00, 0x03, 0x00, 0x04, 0x48, 0x11,
-        0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, 0xf4, 0x95, 
+        0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, 0xf4, 0x95,
-        0x77, 0x13, 0x2a, 0x76, 0xe9, 0x00, 0xe5, 0x98, 
+        0x77, 0x13, 0x2a, 0x76, 0xe9, 0x00, 0xe5, 0x98,
-        0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, 0x48, 0x0b, 
+        0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, 0x48, 0x0b,
-        0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x03, 0x71, 
+        0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x03, 0x71,
-        0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 
+        0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xf0, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xf0,
-        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81, 
+        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81,
-        0x00, 0x14, 0x71, 0xe1, 0x00, 0x01, 0x00, 0x15, 
+        0x00, 0x14, 0x71, 0xe1, 0x00, 0x01, 0x00, 0x15,
-        0x49, 0x11, 0xf3, 0x00, 0x00, 0x02, 0x89, 0x11, 
+        0x49, 0x11, 0xf3, 0x00, 0x00, 0x02, 0x89, 0x11,
-        0xe7, 0x82, 0x6d, 0xea, 0x00, 0x04, 0xe7, 0x83, 
+        0xe7, 0x82, 0x6d, 0xea, 0x00, 0x04, 0xe7, 0x83,
-        0x6d, 0xeb, 0x00, 0x0a, 0x77, 0x1a, 0x00, 0x05, 
+        0x6d, 0xeb, 0x00, 0x0a, 0x77, 0x1a, 0x00, 0x05,
-        0xf0, 0x72, 0x03, 0xaa, 0x11, 0x81, 0xf2, 0xe8, 
+        0xf0, 0x72, 0x03, 0xaa, 0x11, 0x81, 0xf2, 0xe8,
-        0x80, 0x82, 0xe9, 0xff, 0x19, 0xe1, 0x00, 0x01, 
+        0x80, 0x82, 0xe9, 0xff, 0x19, 0xe1, 0x00, 0x01,
-        0xf1, 0xa0, 0x81, 0x92, 0x11, 0xe1, 0x00, 0x0c, 
+        0xf1, 0xa0, 0x81, 0x92, 0x11, 0xe1, 0x00, 0x0c,
-        0xf2, 0xe8, 0x80, 0x83, 0xe9, 0xff, 0x19, 0xe1, 
+        0xf2, 0xe8, 0x80, 0x83, 0xe9, 0xff, 0x19, 0xe1,
-        0x00, 0x0d, 0xf1, 0xa0, 0x81, 0x93, 0x6d, 0xe9, 
+        0x00, 0x0d, 0xf1, 0xa0, 0x81, 0x93, 0x6d, 0xe9,
-        0x00, 0x02, 0x48, 0x18, 0x49, 0x18, 0x70, 0x00, 
+        0x00, 0x02, 0x48, 0x18, 0x49, 0x18, 0x70, 0x00,
-        0x00, 0x15, 0xf0, 0x00, 0x00, 0x04, 0xf3, 0x00, 
+        0x00, 0x15, 0xf0, 0x00, 0x00, 0x04, 0xf3, 0x00,
-        0x00, 0x0a, 0x80, 0x01, 0x81, 0x02, 0xf2, 0x74, 
+        0x00, 0x0a, 0x80, 0x01, 0x81, 0x02, 0xf2, 0x74,
-        0x0e, 0x54, 0xf4, 0x95, 0x48, 0x14, 0xee, 0x10, 
+        0x0e, 0x54, 0xf4, 0x95, 0x48, 0x14, 0xee, 0x10,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf0, 0x74, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf0, 0x74,
-        0x0c, 0x5e, 0x80, 0xf8, 0x2a, 0x5c, 0x77, 0x12, 
+        0x0c, 0x5e, 0x80, 0xf8, 0x2a, 0x5c, 0x77, 0x12,
-        0x2a, 0x39, 0x76, 0x82, 0x00, 0x55, 0x77, 0x11, 
+        0x2a, 0x39, 0x76, 0x82, 0x00, 0x55, 0x77, 0x11,
-        0x2a, 0x18, 0x10, 0xe1, 0x00, 0x01, 0x80, 0xe2, 
+        0x2a, 0x18, 0x10, 0xe1, 0x00, 0x01, 0x80, 0xe2,
-        0x00, 0x01, 0x10, 0xe1, 0x00, 0x02, 0x80, 0xe2, 
+        0x00, 0x01, 0x10, 0xe1, 0x00, 0x02, 0x80, 0xe2,
-        0x00, 0x02, 0x76, 0xe2, 0x00, 0x03, 0x00, 0x1c, 
+        0x00, 0x02, 0x76, 0xe2, 0x00, 0x03, 0x00, 0x1c,
-        0xf6, 0xb8, 0x56, 0xf8, 0x2a, 0x16, 0xf0, 0xf0, 
+        0xf6, 0xb8, 0x56, 0xf8, 0x2a, 0x16, 0xf0, 0xf0,
-        0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x07, 0x56, 0xf8, 
+        0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x07, 0x56, 0xf8,
-        0x2a, 0x16, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80, 
+        0x2a, 0x16, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80,
-        0x80, 0xe2, 0x00, 0x06, 0x56, 0xf8, 0x2a, 0x16, 
+        0x80, 0xe2, 0x00, 0x06, 0x56, 0xf8, 0x2a, 0x16,
-        0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, 
+        0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2,
-        0x00, 0x05, 0x57, 0xf8, 0x2a, 0x16, 0xe8, 0xff, 
+        0x00, 0x05, 0x57, 0xf8, 0x2a, 0x16, 0xe8, 0xff,
-        0xf2, 0x80, 0x80, 0xe2, 0x00, 0x04, 0x56, 0xf8, 
+        0xf2, 0x80, 0x80, 0xe2, 0x00, 0x04, 0x56, 0xf8,
-        0x27, 0x6c, 0xf0, 0xf0, 0xf0, 0xf8, 0x80, 0xe2, 
+        0x27, 0x6c, 0xf0, 0xf0, 0xf0, 0xf8, 0x80, 0xe2,
-        0x00, 0x0b, 0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf0, 
+        0x00, 0x0b, 0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf0,
-        0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0a, 
+        0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0a,
-        0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf8, 0xe8, 0xff, 
+        0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf8, 0xe8, 0xff,
-        0xf2, 0x80, 0x80, 0xe2, 0x00, 0x09, 0xe8, 0xff, 
+        0xf2, 0x80, 0x80, 0xe2, 0x00, 0x09, 0xe8, 0xff,
-        0x57, 0xf8, 0x27, 0x6c, 0xf2, 0x80, 0x80, 0xe2, 
+        0x57, 0xf8, 0x27, 0x6c, 0xf2, 0x80, 0x80, 0xe2,
-        0x00, 0x08, 0x56, 0xf8, 0x27, 0x6a, 0xf0, 0xf0, 
+        0x00, 0x08, 0x56, 0xf8, 0x27, 0x6a, 0xf0, 0xf0,
-        0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x0f, 0x56, 0xf8, 
+        0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x0f, 0x56, 0xf8,
-        0x27, 0x6a, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80, 
+        0x27, 0x6a, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80,
-        0x80, 0xe2, 0x00, 0x0e, 0x56, 0xf8, 0x27, 0x6a, 
+        0x80, 0xe2, 0x00, 0x0e, 0x56, 0xf8, 0x27, 0x6a,
-        0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, 
+        0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2,
-        0x00, 0x0d, 0x57, 0xf8, 0x27, 0x6a, 0xe8, 0xff, 
+        0x00, 0x0d, 0x57, 0xf8, 0x27, 0x6a, 0xe8, 0xff,
-        0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0c, 0x76, 0xe2, 
+        0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0c, 0x76, 0xe2,
-        0x00, 0x13, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x12, 
+        0x00, 0x13, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x12,
-        0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x5c, 0x0c, 0x58, 
+        0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x5c, 0x0c, 0x58,
-        0x80, 0xe2, 0x00, 0x11, 0xe8, 0xff, 0x18, 0xf8, 
+        0x80, 0xe2, 0x00, 0x11, 0xe8, 0xff, 0x18, 0xf8,
-        0x2a, 0x5c, 0x80, 0xe2, 0x00, 0x10, 0x76, 0xe2, 
+        0x2a, 0x5c, 0x80, 0xe2, 0x00, 0x10, 0x76, 0xe2,
-        0x00, 0x17, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x16, 
+        0x00, 0x17, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x16,
-        0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x9e, 0x0c, 0x58, 
+        0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x9e, 0x0c, 0x58,
-        0x80, 0xe2, 0x00, 0x15, 0xe8, 0xff, 0x18, 0xf8, 
+        0x80, 0xe2, 0x00, 0x15, 0xe8, 0xff, 0x18, 0xf8,
-        0x2a, 0x9e, 0x80, 0xe2, 0x00, 0x14, 0x76, 0xe2, 
+        0x2a, 0x9e, 0x80, 0xe2, 0x00, 0x14, 0x76, 0xe2,
-        0x00, 0x1b, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1a, 
+        0x00, 0x1b, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1a,
-        0x00, 0x00, 0x76, 0xe2, 0x00, 0x19, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe2, 0x00, 0x19, 0x00, 0x00,
-        0x70, 0xe2, 0x00, 0x18, 0x27, 0x6e, 0x76, 0xe2, 
+        0x70, 0xe2, 0x00, 0x18, 0x27, 0x6e, 0x76, 0xe2,
-        0x00, 0x1f, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1e, 
+        0x00, 0x1f, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1e,
-        0x00, 0x00, 0x76, 0xe2, 0x00, 0x1d, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe2, 0x00, 0x1d, 0x00, 0x00,
-        0x76, 0xe2, 0x00, 0x1c, 0x00, 0x00, 0x76, 0xe2, 
+        0x76, 0xe2, 0x00, 0x1c, 0x00, 0x00, 0x76, 0xe2,
-        0x00, 0x20, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 
+        0x00, 0x20, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
-        0x10, 0xf8, 0x2a, 0x38, 0xf8, 0x45, 0x04, 0xed, 
+        0x10, 0xf8, 0x2a, 0x38, 0xf8, 0x45, 0x04, 0xed,
-        0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x02, 
+        0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x02,
-        0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x08, 
+        0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x08,
-        0x6d, 0xe9, 0xff, 0xdf, 0xf6, 0xa9, 0xf8, 0x20, 
+        0x6d, 0xe9, 0xff, 0xdf, 0xf6, 0xa9, 0xf8, 0x20,
-        0x04, 0x75, 0xf0, 0x73, 0x04, 0x7d, 0xf0, 0x10, 
+        0x04, 0x75, 0xf0, 0x73, 0x04, 0x7d, 0xf0, 0x10,
-        0x00, 0x21, 0xf0, 0x00, 0x1a, 0x83, 0x48, 0x08, 
+        0x00, 0x21, 0xf0, 0x00, 0x1a, 0x83, 0x48, 0x08,
-        0x7e, 0xf8, 0x00, 0x08, 0xf4, 0xe2, 0xf0, 0x74, 
+        0x7e, 0xf8, 0x00, 0x08, 0xf4, 0xe2, 0xf0, 0x74,
-        0x03, 0x0a, 0xf0, 0x73, 0x04, 0xea, 0x48, 0x12, 
+        0x03, 0x0a, 0xf0, 0x73, 0x04, 0xea, 0x48, 0x12,
-        0xf2, 0x74, 0x03, 0x23, 0xf0, 0x00, 0x00, 0x04, 
+        0xf2, 0x74, 0x03, 0x23, 0xf0, 0x00, 0x00, 0x04,
-        0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, 
+        0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00,
-        0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, 
+        0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18,
-        0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48, 
+        0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48,
-        0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x69, 
+        0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x69,
-        0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36, 
+        0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36,
-        0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, 
+        0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18,
-        0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48, 
+        0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48,
-        0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x41, 
+        0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x41,
-        0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36, 
+        0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36,
-        0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0x57, 
+        0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0x57,
-        0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8, 0x2a, 0x1c, 
+        0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8, 0x2a, 0x1c,
-        0xf0, 0x74, 0x12, 0xa4, 0xf2, 0x74, 0x03, 0x36, 
+        0xf0, 0x74, 0x12, 0xa4, 0xf2, 0x74, 0x03, 0x36,
-        0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea, 
+        0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea,
-        0x48, 0x12, 0xf2, 0x74, 0x03, 0x80, 0xf0, 0x00, 
+        0x48, 0x12, 0xf2, 0x74, 0x03, 0x80, 0xf0, 0x00,
-        0x00, 0x04, 0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 
+        0x00, 0x04, 0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95,
-        0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8, 
+        0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8,
-        0x2a, 0x1c, 0xf0, 0x74, 0x12, 0xc5, 0xf2, 0x74, 
+        0x2a, 0x1c, 0xf0, 0x74, 0x12, 0xc5, 0xf2, 0x74,
-        0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73, 
+        0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73,
-        0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, 0xe8, 0xff, 
+        0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, 0xe8, 0xff,
-        0x6f, 0xe1, 0x00, 0x06, 0x0d, 0x48, 0x18, 0xe1, 
+        0x6f, 0xe1, 0x00, 0x06, 0x0d, 0x48, 0x18, 0xe1,
-        0x00, 0x07, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x00, 0x07, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0xf2, 0xa0, 0x70, 0x00, 0x00, 0x12, 0x80, 0x01, 
+        0xf2, 0xa0, 0x70, 0x00, 0x00, 0x12, 0x80, 0x01,
-        0x10, 0xe1, 0x00, 0x04, 0xf0, 0x74, 0x0e, 0x7a, 
+        0x10, 0xe1, 0x00, 0x04, 0xf0, 0x74, 0x0e, 0x7a,
-        0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, 
+        0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00,
-        0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0xbc, 
+        0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0xbc,
-        0x76, 0xf8, 0x2a, 0x38, 0x00, 0x00, 0xee, 0x02, 
+        0x76, 0xf8, 0x2a, 0x38, 0x00, 0x00, 0xee, 0x02,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11,
-        0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12, 
+        0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12,
-        0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, 
+        0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1,
-        0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, 
+        0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1,
-        0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x09, 
+        0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x09,
-        0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, 
+        0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12,
-        0xf4, 0x95, 0x77, 0x13, 0x2a, 0x86, 0xe9, 0x00, 
+        0xf4, 0x95, 0x77, 0x13, 0x2a, 0x86, 0xe9, 0x00,
-        0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, 
+        0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8,
-        0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 
+        0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43,
-        0x05, 0x0a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, 
+        0x05, 0x0a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74,
-        0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 
+        0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55,
-        0x77, 0x13, 0x2a, 0x18, 0x10, 0xe3, 0x00, 0x01, 
+        0x77, 0x13, 0x2a, 0x18, 0x10, 0xe3, 0x00, 0x01,
-        0x80, 0xe1, 0x00, 0x01, 0x10, 0xe3, 0x00, 0x02, 
+        0x80, 0xe1, 0x00, 0x01, 0x10, 0xe3, 0x00, 0x02,
-        0x80, 0xe1, 0x00, 0x02, 0x13, 0xe3, 0x00, 0x03, 
+        0x80, 0xe1, 0x00, 0x02, 0x13, 0xe3, 0x00, 0x03,
-        0x81, 0xe1, 0x00, 0x03, 0x48, 0x11, 0x77, 0x11, 
+        0x81, 0xe1, 0x00, 0x03, 0x48, 0x11, 0x77, 0x11,
-        0x00, 0x00, 0xf8, 0x4d, 0x05, 0x44, 0xf0, 0x00, 
+        0x00, 0x00, 0xf8, 0x4d, 0x05, 0x44, 0xf0, 0x00,
-        0x00, 0x04, 0x88, 0x12, 0x48, 0x13, 0xf0, 0x00, 
+        0x00, 0x04, 0x88, 0x12, 0x48, 0x13, 0xf0, 0x00,
-        0x00, 0x04, 0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95, 
+        0x00, 0x04, 0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95,
-        0xe5, 0x98, 0x6d, 0x91, 0xf6, 0xb8, 0x48, 0x11, 
+        0xe5, 0x98, 0x6d, 0x91, 0xf6, 0xb8, 0x48, 0x11,
-        0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x05, 0x3a, 
+        0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x05, 0x3a,
-        0xf0, 0x20, 0x2a, 0x39, 0x49, 0x11, 0xf5, 0x00, 
+        0xf0, 0x20, 0x2a, 0x39, 0x49, 0x11, 0xf5, 0x00,
-        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x76, 0xe1, 
+        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x76, 0xe1,
-        0x00, 0x04, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 
+        0x00, 0x04, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11,
-        0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12, 
+        0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12,
-        0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, 
+        0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1,
-        0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, 
+        0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1,
-        0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x0c, 
+        0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x0c,
-        0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, 
+        0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12,
-        0xf4, 0x95, 0x77, 0x13, 0x2a, 0x7a, 0xe9, 0x00, 
+        0xf4, 0x95, 0x77, 0x13, 0x2a, 0x7a, 0xe9, 0x00,
-        0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, 
+        0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8,
-        0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 
+        0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43,
-        0x05, 0x6a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, 
+        0x05, 0x6a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74,
-        0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 
+        0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55,
-        0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 
+        0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01,
-        0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 
+        0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2, 0x00, 0x02,
-        0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 
+        0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1, 0x00, 0x03,
-        0x00, 0x19, 0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 
+        0x00, 0x19, 0x48, 0x11, 0xf0, 0x00, 0x00, 0x04,
-        0x88, 0x12, 0xf4, 0x95, 0x77, 0x13, 0x2a, 0x5d, 
+        0x88, 0x12, 0xf4, 0x95, 0x77, 0x13, 0x2a, 0x5d,
-        0xe9, 0x00, 0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 
+        0xe9, 0x00, 0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01,
-        0xf6, 0xb8, 0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 
+        0xf6, 0xb8, 0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c,
-        0xf8, 0x43, 0x05, 0x93, 0x76, 0x82, 0x00, 0xaa, 
+        0xf8, 0x43, 0x05, 0x93, 0x76, 0x82, 0x00, 0xaa,
-        0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 
+        0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0x88, 0x11, 0x10, 0xf8, 0x2a, 0x38, 
+        0x4a, 0x11, 0x88, 0x11, 0x10, 0xf8, 0x2a, 0x38,
-        0xf8, 0x44, 0x05, 0xe3, 0x10, 0xf8, 0x2a, 0xa1, 
+        0xf8, 0x44, 0x05, 0xe3, 0x10, 0xf8, 0x2a, 0xa1,
-        0xf8, 0x44, 0x05, 0xba, 0x6c, 0xe1, 0xff, 0x56, 
+        0xf8, 0x44, 0x05, 0xba, 0x6c, 0xe1, 0xff, 0x56,
-        0x05, 0xe3, 0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95, 
+        0x05, 0xe3, 0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95,
-        0x70, 0xe2, 0x2a, 0x18, 0x00, 0x11, 0x6b, 0xf8, 
+        0x70, 0xe2, 0x2a, 0x18, 0x00, 0x11, 0x6b, 0xf8,
-        0x2a, 0xa1, 0x00, 0x01, 0xf0, 0x73, 0x05, 0xe3, 
+        0x2a, 0xa1, 0x00, 0x01, 0xf0, 0x73, 0x05, 0xe3,
-        0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95, 0x70, 0xe2, 
+        0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95, 0x70, 0xe2,
-        0x2a, 0x18, 0x00, 0x11, 0x10, 0xf8, 0x2a, 0xa1, 
+        0x2a, 0x18, 0x00, 0x11, 0x10, 0xf8, 0x2a, 0xa1,
-        0xf0, 0x00, 0x00, 0x01, 0x88, 0x12, 0xf4, 0x95, 
+        0xf0, 0x00, 0x00, 0x01, 0x88, 0x12, 0xf4, 0x95,
-        0xf4, 0x95, 0x6e, 0xe2, 0xff, 0xfc, 0x05, 0xd1, 
+        0xf4, 0x95, 0x6e, 0xe2, 0xff, 0xfc, 0x05, 0xd1,
-        0x73, 0x12, 0x2a, 0xa1, 0x48, 0x11, 0xf0, 0x00, 
+        0x73, 0x12, 0x2a, 0xa1, 0x48, 0x11, 0xf0, 0x00,
-        0x00, 0x05, 0x80, 0xf8, 0x2a, 0xa2, 0x10, 0xf8, 
+        0x00, 0x05, 0x80, 0xf8, 0x2a, 0xa2, 0x10, 0xf8,
-        0x2a, 0xa1, 0x08, 0xf8, 0x2a, 0xa2, 0xf8, 0x44, 
+        0x2a, 0xa1, 0x08, 0xf8, 0x2a, 0xa2, 0xf8, 0x44,
-        0x05, 0xe3, 0x6c, 0xe1, 0xff, 0xab, 0x05, 0xdd, 
+        0x05, 0xe3, 0x6c, 0xe1, 0xff, 0xab, 0x05, 0xdd,
-        0x76, 0xf8, 0x2a, 0x38, 0x00, 0x01, 0x76, 0xf8, 
+        0x76, 0xf8, 0x2a, 0x38, 0x00, 0x01, 0x76, 0xf8,
-        0x2a, 0xa1, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa2, 
+        0x2a, 0xa1, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa2,
-        0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95, 
+        0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95,
-        0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b, 
+        0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b,
-        0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11, 
+        0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11,
-        0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15, 
+        0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15,
-        0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19, 
+        0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19,
-        0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a, 
+        0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a,
-        0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8, 
+        0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8,
-        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
+        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
-        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
+        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
-        0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe, 
+        0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe,
-        0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xff, 
+        0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xff,
-        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0x04, 
+        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0x04,
-        0xf0, 0x74, 0x05, 0xa2, 0xee, 0x01, 0x8a, 0x18, 
+        0xf0, 0x74, 0x05, 0xa2, 0xee, 0x01, 0x8a, 0x18,
-        0xf4, 0x95, 0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d, 
+        0xf4, 0x95, 0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d,
-        0x8a, 0x1a, 0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e, 
+        0x8a, 0x1a, 0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e,
-        0x8a, 0x19, 0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16, 
+        0x8a, 0x19, 0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16,
-        0x8a, 0x15, 0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12, 
+        0x8a, 0x15, 0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12,
-        0x8a, 0x11, 0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c, 
+        0x8a, 0x11, 0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c,
-        0x8a, 0x0b, 0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08, 
+        0x8a, 0x0b, 0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08,
-        0xf4, 0xeb, 0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x38, 
+        0xf4, 0xeb, 0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x38,
-        0x00, 0x00, 0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00,
-        0xe8, 0x01, 0x4e, 0x00, 0xfb, 0x80, 0x17, 0xd6, 
+        0xe8, 0x01, 0x4e, 0x00, 0xfb, 0x80, 0x17, 0xd6,
-        0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x2a, 0x5b, 
+        0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x2a, 0x5b,
-        0x76, 0x00, 0x2a, 0x8f, 0xf9, 0x80, 0x16, 0xaa, 
+        0x76, 0x00, 0x2a, 0x8f, 0xf9, 0x80, 0x16, 0xaa,
-        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x5c, 
+        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x5c,
-        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x6f, 
+        0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x6f,
-        0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1a, 
+        0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1a,
-        0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1a, 
+        0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1a,
-        0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1b, 
+        0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1b,
-        0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1b, 
+        0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1b,
-        0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 
+        0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95,
-        0x13, 0x02, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d, 
+        0x13, 0x02, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d,
-        0x06, 0x6a, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, 
+        0x06, 0x6a, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a,
-        0xf4, 0x95, 0xf0, 0x72, 0x06, 0x69, 0x1c, 0x91, 
+        0xf4, 0x95, 0xf0, 0x72, 0x06, 0x69, 0x1c, 0x91,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11,
-        0x12, 0x03, 0x11, 0x02, 0xf8, 0x45, 0x06, 0x79, 
+        0x12, 0x03, 0x11, 0x02, 0xf8, 0x45, 0x06, 0x79,
-        0xf0, 0x10, 0x00, 0x01, 0x88, 0x1a, 0xf4, 0x95, 
+        0xf0, 0x10, 0x00, 0x01, 0x88, 0x1a, 0xf4, 0x95,
-        0xf0, 0x72, 0x06, 0x78, 0x81, 0x91, 0x8a, 0x11, 
+        0xf0, 0x72, 0x06, 0x78, 0x81, 0x91, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 
+        0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02,
-        0x00, 0x11, 0x11, 0x03, 0x61, 0xf8, 0x00, 0x11, 
+        0x00, 0x11, 0x11, 0x03, 0x61, 0xf8, 0x00, 0x11,
-        0x00, 0x01, 0xf8, 0x30, 0x06, 0x91, 0xf6, 0xb8, 
+        0x00, 0x01, 0xf8, 0x30, 0x06, 0x91, 0xf6, 0xb8,
-        0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11, 
+        0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11,
-        0xf3, 0xe8, 0xe8, 0xff, 0x18, 0x81, 0xf1, 0xa0, 
+        0xf3, 0xe8, 0xe8, 0xff, 0x18, 0x81, 0xf1, 0xa0,
-        0x81, 0x81, 0xf0, 0x73, 0x06, 0x9d, 0xf6, 0xb8, 
+        0x81, 0x81, 0xf0, 0x73, 0x06, 0x9d, 0xf6, 0xb8,
-        0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11, 
+        0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11,
-        0xf3, 0x30, 0x00, 0xff, 0xf0, 0x20, 0xff, 0x00, 
+        0xf3, 0x30, 0x00, 0xff, 0xf0, 0x20, 0xff, 0x00,
-        0x18, 0x81, 0xf1, 0xa0, 0x81, 0x81, 0x8a, 0x11, 
+        0x18, 0x81, 0xf1, 0xa0, 0x81, 0x81, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x11, 0x02, 
+        0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x11, 0x02,
-        0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20, 
+        0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20,
-        0x06, 0xb1, 0x49, 0x0b, 0xf6, 0x1f, 0x88, 0x11, 
+        0x06, 0xb1, 0x49, 0x0b, 0xf6, 0x1f, 0x88, 0x11,
-        0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf2, 0x73, 
+        0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf2, 0x73,
-        0x06, 0xb8, 0xf0, 0x30, 0x00, 0xff, 0x49, 0x0b, 
+        0x06, 0xb8, 0xf0, 0x30, 0x00, 0xff, 0x49, 0x0b,
-        0xf6, 0x1f, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 
+        0xf6, 0x1f, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95,
-        0x12, 0x81, 0xf4, 0x78, 0x8a, 0x11, 0xfc, 0x00, 
+        0x12, 0x81, 0xf4, 0x78, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x12, 
+        0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x12,
-        0x13, 0x03, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d, 
+        0x13, 0x03, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d,
-        0x06, 0xcc, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, 
+        0x06, 0xcc, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a,
-        0xf4, 0x95, 0xf0, 0x72, 0x06, 0xcb, 0x11, 0x92, 
+        0xf4, 0x95, 0xf0, 0x72, 0x06, 0xcb, 0x11, 0x92,
-        0xf2, 0xc0, 0x81, 0x91, 0x8a, 0x11, 0xfc, 0x00, 
+        0xf2, 0xc0, 0x81, 0x91, 0x8a, 0x11, 0xfc, 0x00,
-        0x88, 0x12, 0x12, 0x02, 0x71, 0x01, 0x00, 0x13, 
+        0x88, 0x12, 0x12, 0x02, 0x71, 0x01, 0x00, 0x13,
-        0xf8, 0x45, 0x06, 0xdb, 0xf0, 0x10, 0x00, 0x01, 
+        0xf8, 0x45, 0x06, 0xdb, 0xf0, 0x10, 0x00, 0x01,
-        0x88, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x06, 0xda, 
+        0x88, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x06, 0xda,
-        0xe5, 0x98, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
+        0xe5, 0x98, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
-        0x88, 0x11, 0x11, 0x04, 0x10, 0x06, 0x71, 0x05, 
+        0x88, 0x11, 0x11, 0x04, 0x10, 0x06, 0x71, 0x05,
-        0x00, 0x12, 0x61, 0xf8, 0x00, 0x12, 0x00, 0x01, 
+        0x00, 0x12, 0x61, 0xf8, 0x00, 0x12, 0x00, 0x01,
-        0xf8, 0x20, 0x06, 0xea, 0xf0, 0x00, 0x00, 0x01, 
+        0xf8, 0x20, 0x06, 0xea, 0xf0, 0x00, 0x00, 0x01,
-        0xf6, 0xb8, 0xf0, 0x00, 0x00, 0x01, 0x6f, 0xf8, 
+        0xf6, 0xb8, 0xf0, 0x00, 0x00, 0x01, 0x6f, 0xf8,
-        0x00, 0x12, 0x0f, 0x1f, 0x48, 0x08, 0x81, 0x00, 
+        0x00, 0x12, 0x0f, 0x1f, 0x48, 0x08, 0x81, 0x00,
-        0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xba, 
+        0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xba,
-        0xf4, 0x95, 0x48, 0x11, 0xee, 0x02, 0x8a, 0x11, 
+        0xf4, 0x95, 0x48, 0x11, 0xee, 0x02, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x88, 0x12, 
+        0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x88, 0x12,
-        0x11, 0x04, 0x10, 0x06, 0x71, 0x05, 0x00, 0x13, 
+        0x11, 0x04, 0x10, 0x06, 0x71, 0x05, 0x00, 0x13,
-        0x61, 0xf8, 0x00, 0x13, 0x00, 0x01, 0xf8, 0x20, 
+        0x61, 0xf8, 0x00, 0x13, 0x00, 0x01, 0xf8, 0x20,
-        0x07, 0x09, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00, 
+        0x07, 0x09, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00,
-        0x00, 0x01, 0x88, 0x11, 0xf6, 0xb8, 0x6f, 0xf8, 
+        0x00, 0x01, 0x88, 0x11, 0xf6, 0xb8, 0x6f, 0xf8,
-        0x00, 0x13, 0x0f, 0x1f, 0x81, 0x00, 0x48, 0x11, 
+        0x00, 0x13, 0x0f, 0x1f, 0x81, 0x00, 0x48, 0x11,
-        0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xce, 
+        0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xce,
-        0xf4, 0x95, 0x48, 0x12, 0x48, 0x11, 0xf0, 0x30, 
+        0xf4, 0x95, 0x48, 0x12, 0x48, 0x11, 0xf0, 0x30,
-        0xff, 0xfe, 0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 
+        0xff, 0xfe, 0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xfc, 
+        0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xfc,
-        0xf4, 0x95, 0x80, 0x02, 0x71, 0x08, 0x00, 0x16, 
+        0xf4, 0x95, 0x80, 0x02, 0x71, 0x08, 0x00, 0x16,
-        0x10, 0x09, 0x71, 0x0b, 0x00, 0x17, 0x80, 0x03, 
+        0x10, 0x09, 0x71, 0x0b, 0x00, 0x17, 0x80, 0x03,
-        0x71, 0x0a, 0x00, 0x11, 0x48, 0x17, 0xf8, 0x45, 
+        0x71, 0x0a, 0x00, 0x11, 0x48, 0x17, 0xf8, 0x45,
-        0x07, 0x3f, 0x70, 0x00, 0x00, 0x11, 0x10, 0x03, 
+        0x07, 0x3f, 0x70, 0x00, 0x00, 0x11, 0x10, 0x03,
-        0xf0, 0x74, 0x06, 0x9f, 0x80, 0x01, 0x70, 0x00, 
+        0xf0, 0x74, 0x06, 0x9f, 0x80, 0x01, 0x70, 0x00,
-        0x00, 0x16, 0x10, 0x02, 0xf0, 0x74, 0x06, 0x7b, 
+        0x00, 0x16, 0x10, 0x02, 0xf0, 0x74, 0x06, 0x7b,
-        0x6d, 0x91, 0x6d, 0x96, 0x6c, 0xef, 0xff, 0xff, 
+        0x6d, 0x91, 0x6d, 0x96, 0x6c, 0xef, 0xff, 0xff,
-        0x07, 0x2f, 0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16, 
+        0x07, 0x2f, 0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
-        0x10, 0xf8, 0x2a, 0xe8, 0x08, 0xf8, 0x2a, 0xe9, 
+        0x10, 0xf8, 0x2a, 0xe8, 0x08, 0xf8, 0x2a, 0xe9,
-        0xf8, 0x45, 0x07, 0x64, 0x76, 0x00, 0x00, 0x01, 
+        0xf8, 0x45, 0x07, 0x64, 0x76, 0x00, 0x00, 0x01,
-        0x62, 0xf8, 0x2a, 0xe9, 0x00, 0x5e, 0xf2, 0x74, 
+        0x62, 0xf8, 0x2a, 0xe9, 0x00, 0x5e, 0xf2, 0x74,
-        0x12, 0x0b, 0xf0, 0x00, 0x30, 0x40, 0x72, 0x11, 
+        0x12, 0x0b, 0xf0, 0x00, 0x30, 0x40, 0x72, 0x11,
-        0x2a, 0xe9, 0x77, 0x10, 0x00, 0x0f, 0xf5, 0xa9, 
+        0x2a, 0xe9, 0x77, 0x10, 0x00, 0x0f, 0xf5, 0xa9,
-        0xf8, 0x20, 0x07, 0x61, 0x6b, 0xf8, 0x2a, 0xe9, 
+        0xf8, 0x20, 0x07, 0x61, 0x6b, 0xf8, 0x2a, 0xe9,
-        0x00, 0x01, 0xf0, 0x73, 0x07, 0x64, 0x76, 0xf8, 
+        0x00, 0x01, 0xf0, 0x73, 0x07, 0x64, 0x76, 0xf8,
-        0x2a, 0xe9, 0x00, 0x00, 0xee, 0x02, 0x8a, 0x11, 
+        0x2a, 0xe9, 0x00, 0x00, 0xee, 0x02, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xe8, 0x00, 
+        0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xe8, 0x00,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x08, 0xe8, 0x00, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x08, 0xe8, 0x00,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x09, 0xf6, 0xb8, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x09, 0xf6, 0xb8,
-        0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f, 0x75, 0xf8, 
+        0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f, 0x75, 0xf8,
-        0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20, 0x0c, 0x30, 
+        0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20, 0x0c, 0x30,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c, 0x76, 0xf8, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c, 0x76, 0xf8,
-        0x2a, 0xe8, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xe9, 
+        0x2a, 0xe8, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xe9,
-        0x00, 0x00, 0x6c, 0x81, 0x07, 0x92, 0x76, 0xf8, 
+        0x00, 0x00, 0x6c, 0x81, 0x07, 0x92, 0x76, 0xf8,
-        0x2a, 0xea, 0x00, 0x00, 0xfb, 0x80, 0x16, 0x76, 
+        0x2a, 0xea, 0x00, 0x00, 0xfb, 0x80, 0x16, 0x76,
-        0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00, 0x75, 0xf8, 
+        0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00, 0x75, 0xf8,
-        0x00, 0x08, 0x00, 0x00, 0xf0, 0x73, 0x07, 0xa8, 
+        0x00, 0x08, 0x00, 0x00, 0xf0, 0x73, 0x07, 0xa8,
-        0x76, 0xf8, 0x2a, 0xea, 0x00, 0x01, 0xfb, 0x80, 
+        0x76, 0xf8, 0x2a, 0xea, 0x00, 0x01, 0xfb, 0x80,
-        0x16, 0x66, 0xf4, 0x95, 0xe8, 0x10, 0xfb, 0x80, 
+        0x16, 0x66, 0xf4, 0x95, 0xe8, 0x10, 0xfb, 0x80,
-        0x16, 0x87, 0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00, 
+        0x16, 0x87, 0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0xf6, 0xb8, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0xf6, 0xb8,
-        0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff, 0x75, 0xf8, 
+        0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff, 0x75, 0xf8,
-        0x00, 0x08, 0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 
+        0x00, 0x08, 0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00,
-        0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 
+        0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a,
-        0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, 
+        0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8,
-        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
+        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
-        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
+        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
-        0x10, 0xf8, 0x2a, 0xea, 0xf8, 0x45, 0x07, 0xe1, 
+        0x10, 0xf8, 0x2a, 0xea, 0xf8, 0x45, 0x07, 0xe1,
-        0x10, 0xf8, 0x2a, 0xe8, 0xf0, 0x00, 0x00, 0x01, 
+        0x10, 0xf8, 0x2a, 0xe8, 0xf0, 0x00, 0x00, 0x01,
-        0xf0, 0x30, 0x00, 0x0f, 0x80, 0xf8, 0x2a, 0xe8, 
+        0xf0, 0x30, 0x00, 0x0f, 0x80, 0xf8, 0x2a, 0xe8,
-        0x10, 0xf8, 0x2a, 0xe8, 0xf8, 0x44, 0x07, 0xd6, 
+        0x10, 0xf8, 0x2a, 0xe8, 0xf8, 0x44, 0x07, 0xd6,
-        0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f, 
+        0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20,
-        0x0c, 0x30, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c, 
+        0x0c, 0x30, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c,
-        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 
+        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x00,
-        0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff, 
+        0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0x8a, 0x1d, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0x8a, 0x1d,
-        0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0a, 0x8a, 0x09, 
+        0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0a, 0x8a, 0x09,
-        0x8a, 0x08, 0xf4, 0xeb, 0xee, 0xff, 0xf2, 0x74, 
+        0x8a, 0x08, 0xf4, 0xeb, 0xee, 0xff, 0xf2, 0x74,
-        0x07, 0x67, 0xf4, 0x95, 0xe8, 0x01, 0xee, 0x01, 
+        0x07, 0x67, 0xf4, 0x95, 0xe8, 0x01, 0xee, 0x01,
-        0xfc, 0x00, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, 
+        0xfc, 0x00, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8,
-        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
+        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
-        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
+        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
-        0x8a, 0x1d, 0x8a, 0x07, 0xf4, 0xeb, 0x4a, 0x11, 
+        0x8a, 0x1d, 0x8a, 0x07, 0xf4, 0xeb, 0x4a, 0x11,
-        0x77, 0x11, 0x00, 0x28, 0x76, 0x81, 0x24, 0x00, 
+        0x77, 0x11, 0x00, 0x28, 0x76, 0x81, 0x24, 0x00,
-        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
+        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
-        0xf2, 0x74, 0x07, 0x67, 0xf4, 0x95, 0xe8, 0x00, 
+        0xf2, 0x74, 0x07, 0x67, 0xf4, 0x95, 0xe8, 0x00,
-        0x77, 0x11, 0x00, 0x1d, 0x68, 0x81, 0x00, 0x7f, 
+        0x77, 0x11, 0x00, 0x1d, 0x68, 0x81, 0x00, 0x7f,
-        0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0x80, 
+        0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0x80,
-        0x77, 0x11, 0x00, 0x1d, 0xf0, 0x30, 0x01, 0x00, 
+        0x77, 0x11, 0x00, 0x1d, 0xf0, 0x30, 0x01, 0x00,
-        0x1a, 0x81, 0x80, 0x81, 0xf0, 0x74, 0x0a, 0x33, 
+        0x1a, 0x81, 0x80, 0x81, 0xf0, 0x74, 0x0a, 0x33,
-        0xf0, 0x74, 0x11, 0xac, 0xf9, 0x80, 0x13, 0x25, 
+        0xf0, 0x74, 0x11, 0xac, 0xf9, 0x80, 0x13, 0x25,
-        0xf9, 0x80, 0x16, 0x53, 0xf9, 0x80, 0x17, 0x82, 
+        0xf9, 0x80, 0x16, 0x53, 0xf9, 0x80, 0x17, 0x82,
-        0xf0, 0x74, 0x06, 0x2f, 0xf9, 0x80, 0x14, 0xb2, 
+        0xf0, 0x74, 0x06, 0x2f, 0xf9, 0x80, 0x14, 0xb2,
-        0xf9, 0x80, 0x19, 0x10, 0xf0, 0x74, 0x0d, 0xe3, 
+        0xf9, 0x80, 0x19, 0x10, 0xf0, 0x74, 0x0d, 0xe3,
-        0xf0, 0x74, 0x07, 0xe8, 0xf0, 0x74, 0x02, 0x36, 
+        0xf0, 0x74, 0x07, 0xe8, 0xf0, 0x74, 0x02, 0x36,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x60, 0xf8, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x60, 0xf8,
-        0x27, 0x7b, 0xff, 0xff, 0xf8, 0x30, 0x08, 0x39, 
+        0x27, 0x7b, 0xff, 0xff, 0xf8, 0x30, 0x08, 0x39,
-        0x71, 0xf8, 0x27, 0x7b, 0x27, 0x79, 0x60, 0xf8, 
+        0x71, 0xf8, 0x27, 0x7b, 0x27, 0x79, 0x60, 0xf8,
-        0x27, 0x79, 0xff, 0xff, 0xf8, 0x30, 0x08, 0xb2, 
+        0x27, 0x79, 0xff, 0xff, 0xf8, 0x30, 0x08, 0xb2,
-        0x10, 0xf8, 0x29, 0x86, 0x08, 0xf8, 0x27, 0x79, 
+        0x10, 0xf8, 0x29, 0x86, 0x08, 0xf8, 0x27, 0x79,
-        0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11, 0xf4, 0x95, 
+        0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11, 0xf4, 0x95,
-        0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x30, 
+        0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x30,
-        0x08, 0x58, 0x10, 0xf8, 0x27, 0x79, 0x08, 0xf8, 
+        0x08, 0x58, 0x10, 0xf8, 0x27, 0x79, 0x08, 0xf8,
-        0x27, 0x7a, 0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11, 
+        0x27, 0x7a, 0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11,
-        0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 
+        0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9,
-        0xf8, 0x20, 0x08, 0x63, 0x76, 0xf8, 0x27, 0x79, 
+        0xf8, 0x20, 0x08, 0x63, 0x76, 0xf8, 0x27, 0x79,
-        0xff, 0xff, 0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff, 
+        0xff, 0xff, 0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff,
-        0xf7, 0xb8, 0xf2, 0x73, 0x08, 0xd9, 0xf0, 0x20, 
+        0xf7, 0xb8, 0xf2, 0x73, 0x08, 0xd9, 0xf0, 0x20,
-        0xff, 0xff, 0xf6, 0xb8, 0x56, 0xf8, 0x27, 0x74, 
+        0xff, 0xff, 0xf6, 0xb8, 0x56, 0xf8, 0x27, 0x74,
-        0xf0, 0xf9, 0x88, 0x11, 0x56, 0xf8, 0x27, 0x72, 
+        0xf0, 0xf9, 0x88, 0x11, 0x56, 0xf8, 0x27, 0x72,
-        0xf0, 0xf9, 0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 
+        0xf0, 0xf9, 0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95,
-        0xe7, 0x20, 0xf4, 0xa9, 0xf8, 0x30, 0x08, 0x8f, 
+        0xe7, 0x20, 0xf4, 0xa9, 0xf8, 0x30, 0x08, 0x8f,
-        0xf1, 0x20, 0x27, 0x7c, 0x48, 0x11, 0xf6, 0x00, 
+        0xf1, 0x20, 0x27, 0x7c, 0x48, 0x11, 0xf6, 0x00,
-        0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x83, 
+        0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x83,
-        0x08, 0xf8, 0x27, 0x79, 0xf0, 0x30, 0x7f, 0xff, 
+        0x08, 0xf8, 0x27, 0x79, 0xf0, 0x30, 0x7f, 0xff,
-        0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 
+        0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x40, 0x00,
-        0xf5, 0xab, 0xf8, 0x30, 0x08, 0x8f, 0x6d, 0x91, 
+        0xf5, 0xab, 0xf8, 0x30, 0x08, 0x8f, 0x6d, 0x91,
-        0x48, 0x11, 0xf0, 0x30, 0x01, 0xff, 0x88, 0x11, 
+        0x48, 0x11, 0xf0, 0x30, 0x01, 0xff, 0x88, 0x11,
-        0xf4, 0x95, 0xe7, 0x20, 0xf7, 0xa9, 0xf8, 0x30, 
+        0xf4, 0x95, 0xe7, 0x20, 0xf7, 0xa9, 0xf8, 0x30,
-        0x08, 0x74, 0x6d, 0x89, 0x48, 0x11, 0xf0, 0x30, 
+        0x08, 0x74, 0x6d, 0x89, 0x48, 0x11, 0xf0, 0x30,
-        0x01, 0xff, 0xf0, 0xe7, 0xf4, 0x95, 0x48, 0x08, 
+        0x01, 0xff, 0xf0, 0xe7, 0xf4, 0x95, 0x48, 0x08,
-        0x4e, 0xf8, 0x27, 0x74, 0x48, 0x08, 0xf1, 0xf9, 
+        0x4e, 0xf8, 0x27, 0x74, 0x48, 0x08, 0xf1, 0xf9,
-        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1, 
+        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1,
-        0x27, 0x7c, 0x27, 0x7a, 0x60, 0xf8, 0x27, 0x7b, 
+        0x27, 0x7c, 0x27, 0x7a, 0x60, 0xf8, 0x27, 0x7b,
-        0xff, 0xff, 0xf8, 0x30, 0x08, 0xab, 0x48, 0x08, 
+        0xff, 0xff, 0xf8, 0x30, 0x08, 0xab, 0x48, 0x08,
-        0x4e, 0xf8, 0x27, 0x72, 0x76, 0xf8, 0x27, 0x7b, 
+        0x4e, 0xf8, 0x27, 0x72, 0x76, 0xf8, 0x27, 0x7b,
-        0xff, 0xff, 0x76, 0xf8, 0x27, 0x79, 0xff, 0xff, 
+        0xff, 0xff, 0x76, 0xf8, 0x27, 0x79, 0xff, 0xff,
-        0xf2, 0x73, 0x08, 0xd9, 0xf4, 0x95, 0xe8, 0x00, 
+        0xf2, 0x73, 0x08, 0xd9, 0xf4, 0x95, 0xe8, 0x00,
-        0x44, 0xf8, 0x27, 0x73, 0x40, 0xf8, 0x27, 0x75, 
+        0x44, 0xf8, 0x27, 0x73, 0x40, 0xf8, 0x27, 0x75,
-        0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10, 
+        0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10,
-        0x80, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xd8, 
+        0x80, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xd8,
-        0xf6, 0xb8, 0x10, 0xf8, 0x27, 0x73, 0xf0, 0x00, 
+        0xf6, 0xb8, 0x10, 0xf8, 0x27, 0x73, 0xf0, 0x00,
-        0x80, 0x00, 0x48, 0x08, 0x4e, 0xf8, 0x27, 0x74, 
+        0x80, 0x00, 0x48, 0x08, 0x4e, 0xf8, 0x27, 0x74,
-        0x48, 0x08, 0xf0, 0xf9, 0x88, 0x11, 0xf4, 0x95, 
+        0x48, 0x08, 0xf0, 0xf9, 0x88, 0x11, 0xf4, 0x95,
-        0xf4, 0x95, 0x71, 0xe1, 0x27, 0x7c, 0x27, 0x7a, 
+        0xf4, 0x95, 0x71, 0xe1, 0x27, 0x7c, 0x27, 0x7a,
-        0xf7, 0xb8, 0x57, 0xf8, 0x27, 0x74, 0xf0, 0x62, 
+        0xf7, 0xb8, 0x57, 0xf8, 0x27, 0x74, 0xf0, 0x62,
-        0xff, 0xff, 0xf0, 0x40, 0xff, 0x80, 0xf2, 0x80, 
+        0xff, 0xff, 0xf0, 0x40, 0xff, 0x80, 0xf2, 0x80,
-        0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00, 0x8a, 0x11, 
+        0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfb, 
+        0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfb,
-        0x11, 0xf8, 0x27, 0x71, 0x09, 0xf8, 0x27, 0x73, 
+        0x11, 0xf8, 0x27, 0x71, 0x09, 0xf8, 0x27, 0x73,
-        0x89, 0x11, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 
+        0x89, 0x11, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95,
-        0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xed, 0xf2, 0x73, 
+        0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xed, 0xf2, 0x73,
-        0x09, 0x0e, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0x20, 
+        0x09, 0x0e, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0x20,
-        0x76, 0x00, 0x00, 0x41, 0xf0, 0x74, 0x12, 0xee, 
+        0x76, 0x00, 0x00, 0x41, 0xf0, 0x74, 0x12, 0xee,
-        0x88, 0x16, 0xf4, 0x95, 0xf7, 0xb8, 0x6d, 0x96, 
+        0x88, 0x16, 0xf4, 0x95, 0xf7, 0xb8, 0x6d, 0x96,
-        0x10, 0xf8, 0x00, 0x16, 0xf8, 0x47, 0x09, 0x0a, 
+        0x10, 0xf8, 0x00, 0x16, 0xf8, 0x47, 0x09, 0x0a,
-        0xe7, 0x61, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 
+        0xe7, 0x61, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01,
-        0x00, 0x80, 0x76, 0x02, 0x00, 0xff, 0x76, 0x03, 
+        0x00, 0x80, 0x76, 0x02, 0x00, 0xff, 0x76, 0x03,
-        0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 
+        0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95,
-        0xe8, 0x00, 0x6c, 0xe9, 0xff, 0xff, 0x08, 0xfb, 
+        0xe8, 0x00, 0x6c, 0xe9, 0xff, 0xff, 0x08, 0xfb,
-        0x73, 0x16, 0x00, 0x0e, 0xf0, 0x66, 0x00, 0x41, 
+        0x73, 0x16, 0x00, 0x0e, 0xf0, 0x66, 0x00, 0x41,
-        0xee, 0x05, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 
+        0xee, 0x05, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x13, 
+        0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x13,
-        0xf6, 0xb8, 0x77, 0x11, 0x7f, 0xff, 0x57, 0xf8, 
+        0xf6, 0xb8, 0x77, 0x11, 0x7f, 0xff, 0x57, 0xf8,
-        0x27, 0x72, 0x48, 0x11, 0xf2, 0x80, 0xf0, 0x00, 
+        0x27, 0x72, 0x48, 0x11, 0xf2, 0x80, 0xf0, 0x00,
-        0x80, 0x00, 0x88, 0x11, 0xf6, 0x40, 0xf0, 0xe0, 
+        0x80, 0x00, 0x88, 0x11, 0xf6, 0x40, 0xf0, 0xe0,
-        0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80, 0x80, 0xf8, 
+        0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80, 0x80, 0xf8,
-        0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x57, 0xf8, 
+        0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x57, 0xf8,
-        0x27, 0x72, 0x48, 0x12, 0xf2, 0x80, 0x88, 0x12, 
+        0x27, 0x72, 0x48, 0x12, 0xf2, 0x80, 0x88, 0x12,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x09, 0x38, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x09, 0x38,
-        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
+        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
-        0xf0, 0x73, 0x09, 0x3d, 0xf0, 0x20, 0x80, 0x01, 
+        0xf0, 0x73, 0x09, 0x3d, 0xf0, 0x20, 0x80, 0x01,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x70, 0x81, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x70, 0x81,
-        0x00, 0x13, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0x00, 0x13, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0xf0, 0x30, 0x7f, 0xff, 0x11, 0xf8, 0x29, 0x86, 
+        0xf0, 0x30, 0x7f, 0xff, 0x11, 0xf8, 0x29, 0x86,
-        0xf5, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11, 
+        0xf5, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11,
-        0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 
+        0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9,
-        0xf8, 0x20, 0x09, 0x54, 0xf2, 0x73, 0x09, 0x67, 
+        0xf8, 0x20, 0x09, 0x54, 0xf2, 0x73, 0x09, 0x67,
-        0xf4, 0x95, 0xe8, 0x02, 0x6f, 0xf8, 0x27, 0x7a, 
+        0xf4, 0x95, 0xe8, 0x02, 0x6f, 0xf8, 0x27, 0x7a,
-        0x0d, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11, 
+        0x0d, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11,
-        0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 
+        0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9,
-        0xf8, 0x20, 0x09, 0x64, 0xf2, 0x73, 0x09, 0x67, 
+        0xf8, 0x20, 0x09, 0x64, 0xf2, 0x73, 0x09, 0x67,
-        0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x27, 0x7b, 
+        0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x27, 0x7b,
-        0xe8, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0xe8, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0x11, 0xf8, 0x29, 0x86, 0xf5, 0x20, 0xf3, 0x30, 
+        0x11, 0xf8, 0x29, 0x86, 0xf5, 0x20, 0xf3, 0x30,
-        0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, 
+        0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10,
-        0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x7a, 
+        0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x7a,
-        0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x02, 
+        0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x02,
-        0x6f, 0xf8, 0x27, 0x7a, 0x0d, 0x20, 0xf3, 0x30, 
+        0x6f, 0xf8, 0x27, 0x7a, 0x0d, 0x20, 0xf3, 0x30,
-        0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, 
+        0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10,
-        0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x8a, 
+        0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x8a,
-        0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x01, 
+        0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x01,
-        0x80, 0xf8, 0x27, 0x79, 0xe8, 0x00, 0x8a, 0x11, 
+        0x80, 0xf8, 0x27, 0x79, 0xe8, 0x00, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 
+        0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02,
-        0x00, 0x12, 0x88, 0x11, 0xf6, 0xb8, 0x57, 0xf8, 
+        0x00, 0x12, 0x88, 0x11, 0xf6, 0xb8, 0x57, 0xf8,
-        0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80, 
+        0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80,
-        0xf0, 0x00, 0x80, 0x00, 0x80, 0x81, 0x57, 0xf8, 
+        0xf0, 0x00, 0x80, 0x00, 0x80, 0x81, 0x57, 0xf8,
-        0x27, 0x72, 0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80, 
+        0x27, 0x72, 0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80,
-        0x80, 0xf8, 0x27, 0x78, 0x77, 0x11, 0x80, 0x00, 
+        0x80, 0xf8, 0x27, 0x78, 0x77, 0x11, 0x80, 0x00,
-        0x48, 0x11, 0x57, 0xf8, 0x27, 0x72, 0xf2, 0x80, 
+        0x48, 0x11, 0x57, 0xf8, 0x27, 0x72, 0xf2, 0x80,
-        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 
+        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81,
-        0x09, 0xb5, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 
+        0x09, 0xb5, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08,
-        0x00, 0x01, 0xf0, 0x73, 0x09, 0xba, 0xf0, 0x20, 
+        0x00, 0x01, 0xf0, 0x73, 0x09, 0xba, 0xf0, 0x20,
-        0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
+        0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
-        0x45, 0xf8, 0x27, 0x71, 0x43, 0xf8, 0x27, 0x73, 
+        0x45, 0xf8, 0x27, 0x71, 0x43, 0xf8, 0x27, 0x73,
-        0x83, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0xe7, 0x20, 
+        0x83, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0xe7, 0x20,
-        0xf6, 0xa9, 0xf8, 0x30, 0x09, 0xc9, 0xf2, 0x73, 
+        0xf6, 0xa9, 0xf8, 0x30, 0x09, 0xc9, 0xf2, 0x73,
-        0x09, 0xe4, 0x77, 0x12, 0x00, 0x00, 0x57, 0xf8, 
+        0x09, 0xe4, 0x77, 0x12, 0x00, 0x00, 0x57, 0xf8,
-        0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80, 
+        0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80,
-        0x49, 0x12, 0xf5, 0x00, 0xf3, 0x00, 0x80, 0x00, 
+        0x49, 0x12, 0xf5, 0x00, 0xf3, 0x00, 0x80, 0x00,
-        0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00, 0xf8, 0x30, 
+        0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00, 0xf8, 0x30,
-        0x09, 0xdc, 0xf1, 0x20, 0x80, 0x00, 0xf5, 0x20, 
+        0x09, 0xdc, 0xf1, 0x20, 0x80, 0x00, 0xf5, 0x20,
-        0x89, 0x12, 0xf4, 0x95, 0x48, 0x12, 0x6f, 0xf8, 
+        0x89, 0x12, 0xf4, 0x95, 0x48, 0x12, 0x6f, 0xf8,
-        0x27, 0x73, 0x0d, 0x00, 0xf4, 0x95, 0x49, 0x0b, 
+        0x27, 0x73, 0x0d, 0x00, 0xf4, 0x95, 0x49, 0x0b,
-        0x4f, 0xf8, 0x27, 0x72, 0x8a, 0x11, 0xfe, 0x00, 
+        0x4f, 0xf8, 0x27, 0x72, 0x8a, 0x11, 0xfe, 0x00,
-        0x48, 0x12, 0xf4, 0x95, 0x4a, 0x11, 0x4a, 0x16, 
+        0x48, 0x12, 0xf4, 0x95, 0x4a, 0x11, 0x4a, 0x16,
-        0x4a, 0x17, 0xee, 0xfc, 0xf4, 0x95, 0x71, 0x08, 
+        0x4a, 0x17, 0xee, 0xfc, 0xf4, 0x95, 0x71, 0x08,
-        0x00, 0x16, 0x88, 0x17, 0xf0, 0x74, 0x08, 0x30, 
+        0x00, 0x16, 0x88, 0x17, 0xf0, 0x74, 0x08, 0x30,
-        0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74, 
+        0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74,
-        0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, 
+        0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0a, 0x0a, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0a, 0x0a,
-        0xf2, 0x74, 0x08, 0xdb, 0xf4, 0x95, 0x48, 0x16, 
+        0xf2, 0x74, 0x08, 0xdb, 0xf4, 0x95, 0x48, 0x16,
-        0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74, 
+        0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74,
-        0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, 
+        0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11,
-        0x10, 0x02, 0x70, 0x01, 0x00, 0x11, 0x80, 0x00, 
+        0x10, 0x02, 0x70, 0x01, 0x00, 0x11, 0x80, 0x00,
-        0xf2, 0x74, 0x06, 0xce, 0xf4, 0x95, 0x48, 0x17, 
+        0xf2, 0x74, 0x06, 0xce, 0xf4, 0x95, 0x48, 0x17,
-        0x49, 0x11, 0x48, 0x17, 0xf6, 0x00, 0x88, 0x17, 
+        0x49, 0x11, 0x48, 0x17, 0xf6, 0x00, 0x88, 0x17,
-        0xe7, 0x60, 0xf5, 0xa9, 0xf8, 0x20, 0x0a, 0x2d, 
+        0xe7, 0x60, 0xf5, 0xa9, 0xf8, 0x20, 0x0a, 0x2d,
-        0x48, 0x16, 0xf6, 0x20, 0x88, 0x11, 0x48, 0x18, 
+        0x48, 0x16, 0xf6, 0x20, 0x88, 0x11, 0x48, 0x18,
-        0x70, 0x00, 0x00, 0x11, 0xf2, 0x74, 0x09, 0x8f, 
+        0x70, 0x00, 0x00, 0x11, 0xf2, 0x74, 0x09, 0x8f,
-        0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, 0x70, 0x01, 
+        0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, 0x70, 0x01,
-        0x00, 0x11, 0x10, 0x02, 0x80, 0x00, 0xf2, 0x74, 
+        0x00, 0x11, 0x10, 0x02, 0x80, 0x00, 0xf2, 0x74,
-        0x06, 0xce, 0xf4, 0x95, 0x48, 0x17, 0xee, 0x04, 
+        0x06, 0xce, 0xf4, 0x95, 0x48, 0x17, 0xee, 0x04,
-        0x48, 0x16, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 
+        0x48, 0x16, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11,
-        0xfc, 0x00, 0xee, 0xfd, 0xe8, 0x00, 0x4e, 0xf8, 
+        0xfc, 0x00, 0xee, 0xfd, 0xe8, 0x00, 0x4e, 0xf8,
-        0x27, 0x70, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x72, 
+        0x27, 0x70, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x72,
-        0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00, 
+        0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00,
-        0x4e, 0xf8, 0x27, 0x76, 0x76, 0xf8, 0x27, 0x79, 
+        0x4e, 0xf8, 0x27, 0x76, 0x76, 0xf8, 0x27, 0x79,
-        0xff, 0xff, 0x76, 0xf8, 0x27, 0x7a, 0x00, 0x00, 
+        0xff, 0xff, 0x76, 0xf8, 0x27, 0x7a, 0x00, 0x00,
-        0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff, 0x76, 0xf8, 
+        0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff, 0x76, 0xf8,
-        0x27, 0x78, 0x00, 0x00, 0xe8, 0x00, 0x75, 0xf8, 
+        0x27, 0x78, 0x00, 0x00, 0xe8, 0x00, 0x75, 0xf8,
-        0x00, 0x08, 0x00, 0x01, 0x76, 0x00, 0x00, 0x00, 
+        0x00, 0x08, 0x00, 0x01, 0x76, 0x00, 0x00, 0x00,
-        0x76, 0x01, 0x02, 0x00, 0xf2, 0x74, 0x12, 0xdc, 
+        0x76, 0x01, 0x02, 0x00, 0xf2, 0x74, 0x12, 0xdc,
-        0xf0, 0x20, 0x27, 0x7c, 0xee, 0x03, 0xfc, 0x00, 
+        0xf0, 0x20, 0x27, 0x7c, 0xee, 0x03, 0xfc, 0x00,
-        0x4a, 0x11, 0xee, 0xfc, 0xf4, 0x95, 0x4e, 0x00, 
+        0x4a, 0x11, 0xee, 0xfc, 0xf4, 0x95, 0x4e, 0x00,
-        0x77, 0x12, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x12, 
+        0x77, 0x12, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x12,
-        0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x12, 
+        0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x12,
-        0xf0, 0xe0, 0xf1, 0xf1, 0x4f, 0x02, 0xe9, 0x01, 
+        0xf0, 0xe0, 0xf1, 0xf1, 0x4f, 0x02, 0xe9, 0x01,
-        0xf4, 0x95, 0x48, 0x0b, 0xf5, 0x40, 0x56, 0x02, 
+        0xf4, 0x95, 0x48, 0x0b, 0xf5, 0x40, 0x56, 0x02,
-        0xf1, 0x80, 0x81, 0xf8, 0x27, 0x78, 0x77, 0x11, 
+        0xf1, 0x80, 0x81, 0xf8, 0x27, 0x78, 0x77, 0x11,
-        0x80, 0x00, 0x56, 0x00, 0x49, 0x11, 0xf1, 0x80, 
+        0x80, 0x00, 0x56, 0x00, 0x49, 0x11, 0xf1, 0x80,
-        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 
+        0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81,
-        0x0a, 0x81, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 
+        0x0a, 0x81, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08,
-        0x00, 0x01, 0xf0, 0x73, 0x0a, 0x86, 0xf0, 0x20, 
+        0x00, 0x01, 0xf0, 0x73, 0x0a, 0x86, 0xf0, 0x20,
-        0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
+        0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
-        0x10, 0x82, 0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 
+        0x10, 0x82, 0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0xee, 0xfe, 0xf4, 0x95, 0x4e, 0x00, 
+        0x4a, 0x11, 0xee, 0xfe, 0xf4, 0x95, 0x4e, 0x00,
-        0x77, 0x11, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x11, 
+        0x77, 0x11, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x11,
-        0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x11, 
+        0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x11,
-        0xf0, 0xe0, 0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80, 
+        0xf0, 0xe0, 0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80,
-        0x80, 0xf8, 0x27, 0x78, 0x56, 0x00, 0xf1, 0x20, 
+        0x80, 0xf8, 0x27, 0x78, 0x56, 0x00, 0xf1, 0x20,
-        0x80, 0x00, 0xf1, 0x80, 0xf4, 0x95, 0x49, 0x0b, 
+        0x80, 0x00, 0xf1, 0x80, 0xf4, 0x95, 0x49, 0x0b,
-        0xf8, 0x4d, 0x0a, 0xab, 0xf0, 0x20, 0x80, 0x01, 
+        0xf8, 0x4d, 0x0a, 0xab, 0xf0, 0x20, 0x80, 0x01,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf0, 0x73, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf0, 0x73,
-        0x0a, 0xaf, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 
+        0x0a, 0xaf, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08,
-        0x00, 0x01, 0xee, 0x02, 0x48, 0x11, 0x8a, 0x11, 
+        0x00, 0x01, 0xee, 0x02, 0x48, 0x11, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0x88, 0x12, 0x13, 0x02, 
+        0xfc, 0x00, 0x4a, 0x11, 0x88, 0x12, 0x13, 0x02,
-        0x77, 0x11, 0x00, 0x00, 0xf8, 0x4d, 0x0a, 0xcb, 
+        0x77, 0x11, 0x00, 0x00, 0xf8, 0x4d, 0x0a, 0xcb,
-        0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, 0xf4, 0x95, 
+        0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, 0xf4, 0x95,
-        0xf0, 0x72, 0x0a, 0xca, 0x48, 0x11, 0x1c, 0xf8, 
+        0xf0, 0x72, 0x0a, 0xca, 0x48, 0x11, 0x1c, 0xf8,
-        0x29, 0x7e, 0x88, 0x11, 0x11, 0xf8, 0x29, 0x7e, 
+        0x29, 0x7e, 0x88, 0x11, 0x11, 0xf8, 0x29, 0x7e,
-        0xf2, 0x00, 0x00, 0x01, 0x80, 0xf8, 0x29, 0x7e, 
+        0xf2, 0x00, 0x00, 0x01, 0x80, 0xf8, 0x29, 0x7e,
-        0x81, 0x92, 0x48, 0x11, 0x8a, 0x11, 0xfc, 0x00, 
+        0x81, 0x92, 0x48, 0x11, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x11, 
+        0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x11,
-        0x88, 0x12, 0xf6, 0xb8, 0xf0, 0x20, 0x7f, 0xff, 
+        0x88, 0x12, 0xf6, 0xb8, 0xf0, 0x20, 0x7f, 0xff,
-        0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0xf0, 0x00, 
+        0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0xf0, 0x00,
-        0x80, 0x00, 0x80, 0x82, 0x57, 0xf8, 0x27, 0x70, 
+        0x80, 0x00, 0x80, 0x82, 0x57, 0xf8, 0x27, 0x70,
-        0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80, 0x80, 0xf8, 
+        0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80, 0x80, 0xf8,
-        0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x48, 0x12, 
+        0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x48, 0x12,
-        0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0x88, 0x12, 
+        0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0x88, 0x12,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x0a, 0xf4, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x0a, 0xf4,
-        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 
+        0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01,
-        0xf0, 0x73, 0x0a, 0xf9, 0xf0, 0x20, 0x80, 0x01, 
+        0xf0, 0x73, 0x0a, 0xf9, 0xf0, 0x20, 0x80, 0x01,
-        0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x45, 0xf8, 
+        0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x45, 0xf8,
-        0x27, 0x75, 0xe7, 0x10, 0x43, 0xf8, 0x27, 0x71, 
+        0x27, 0x75, 0xe7, 0x10, 0x43, 0xf8, 0x27, 0x71,
-        0x83, 0xf8, 0x00, 0x12, 0x6d, 0xe8, 0x00, 0x04, 
+        0x83, 0xf8, 0x00, 0x12, 0x6d, 0xe8, 0x00, 0x04,
-        0x6d, 0x8a, 0xf6, 0xaa, 0xf8, 0x30, 0x0b, 0x0a, 
+        0x6d, 0x8a, 0xf6, 0xaa, 0xf8, 0x30, 0x0b, 0x0a,
-        0xf2, 0x73, 0x0b, 0x25, 0x77, 0x11, 0x00, 0x00, 
+        0xf2, 0x73, 0x0b, 0x25, 0x77, 0x11, 0x00, 0x00,
-        0x57, 0xf8, 0x27, 0x70, 0xf0, 0x20, 0x7f, 0xff, 
+        0x57, 0xf8, 0x27, 0x70, 0xf0, 0x20, 0x7f, 0xff,
-        0xf2, 0x80, 0x49, 0x11, 0xf5, 0x00, 0xf3, 0x00, 
+        0xf2, 0x80, 0x49, 0x11, 0xf5, 0x00, 0xf3, 0x00,
-        0x80, 0x00, 0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00, 
+        0x80, 0x00, 0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00,
-        0xf8, 0x30, 0x0b, 0x1d, 0xf1, 0x20, 0x80, 0x00, 
+        0xf8, 0x30, 0x0b, 0x1d, 0xf1, 0x20, 0x80, 0x00,
-        0xf5, 0x20, 0x89, 0x11, 0xf4, 0x95, 0x48, 0x11, 
+        0xf5, 0x20, 0x89, 0x11, 0xf4, 0x95, 0x48, 0x11,
-        0x6f, 0xf8, 0x27, 0x71, 0x0d, 0x00, 0xf4, 0x95, 
+        0x6f, 0xf8, 0x27, 0x71, 0x0d, 0x00, 0xf4, 0x95,
-        0x49, 0x0b, 0x4f, 0xf8, 0x27, 0x70, 0x48, 0x11, 
+        0x49, 0x0b, 0x4f, 0xf8, 0x27, 0x70, 0x48, 0x11,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16,
-        0x4a, 0x17, 0xee, 0xf0, 0x88, 0x17, 0x10, 0x17, 
+        0x4a, 0x17, 0xee, 0xf0, 0x88, 0x17, 0x10, 0x17,
-        0x80, 0x05, 0x10, 0x16, 0x80, 0x06, 0x10, 0x15, 
+        0x80, 0x05, 0x10, 0x16, 0x80, 0x06, 0x10, 0x15,
-        0x80, 0x07, 0x71, 0x14, 0x00, 0x11, 0x10, 0x05, 
+        0x80, 0x07, 0x71, 0x14, 0x00, 0x11, 0x10, 0x05,
-        0xf0, 0x30, 0x00, 0x01, 0x88, 0x10, 0x10, 0x06, 
+        0xf0, 0x30, 0x00, 0x01, 0x88, 0x10, 0x10, 0x06,
-        0xf0, 0x30, 0x00, 0x01, 0x80, 0x08, 0x49, 0x11, 
+        0xf0, 0x30, 0x00, 0x01, 0x80, 0x08, 0x49, 0x11,
-        0x10, 0x05, 0xf6, 0x01, 0x80, 0x09, 0x10, 0x06, 
+        0x10, 0x05, 0xf6, 0x01, 0x80, 0x09, 0x10, 0x06,
-        0x61, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf8, 0x20, 
+        0x61, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf8, 0x20,
-        0x0b, 0x4b, 0x10, 0x09, 0xf0, 0x00, 0x00, 0x01, 
+        0x0b, 0x4b, 0x10, 0x09, 0xf0, 0x00, 0x00, 0x01,
-        0x80, 0x09, 0x71, 0x08, 0x00, 0x12, 0xf4, 0xaa, 
+        0x80, 0x09, 0x71, 0x08, 0x00, 0x12, 0xf4, 0xaa,
-        0xf8, 0x30, 0x0b, 0x54, 0x10, 0x09, 0xf0, 0x00, 
+        0xf8, 0x30, 0x0b, 0x54, 0x10, 0x09, 0xf0, 0x00,
-        0x00, 0x01, 0x80, 0x09, 0x12, 0x09, 0x49, 0x11, 
+        0x00, 0x01, 0x80, 0x09, 0x12, 0x09, 0x49, 0x11,
-        0xf4, 0x7f, 0x80, 0x09, 0xf6, 0x20, 0x80, 0x0a, 
+        0xf4, 0x7f, 0x80, 0x09, 0xf6, 0x20, 0x80, 0x0a,
-        0x56, 0xf8, 0x27, 0x70, 0x4e, 0x0c, 0x10, 0x09, 
+        0x56, 0xf8, 0x27, 0x70, 0x4e, 0x0c, 0x10, 0x09,
-        0x80, 0x00, 0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 
+        0x80, 0x00, 0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce,
-        0xf0, 0x00, 0x00, 0x04, 0x88, 0x16, 0xf4, 0x95, 
+        0xf0, 0x00, 0x00, 0x04, 0x88, 0x16, 0xf4, 0x95,
-        0xf4, 0x95, 0x6c, 0x86, 0x0b, 0x6d, 0xf2, 0x73, 
+        0xf4, 0x95, 0x6c, 0x86, 0x0b, 0x6d, 0xf2, 0x73,
-        0x0c, 0x59, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0xb8, 
+        0x0c, 0x59, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0xb8,
-        0xf4, 0x95, 0x56, 0x0c, 0xf0, 0xf9, 0x88, 0x12, 
+        0xf4, 0x95, 0x56, 0x0c, 0xf0, 0xf9, 0x88, 0x12,
-        0xf4, 0x95, 0xf4, 0x95, 0x70, 0xe2, 0x27, 0x7c, 
+        0xf4, 0x95, 0xf4, 0x95, 0x70, 0xe2, 0x27, 0x7c,
-        0x29, 0x86, 0xe8, 0x00, 0x80, 0x0e, 0x48, 0x11, 
+        0x29, 0x86, 0xe8, 0x00, 0x80, 0x0e, 0x48, 0x11,
-        0xf8, 0x45, 0x0b, 0xcc, 0x77, 0x10, 0x00, 0x01, 
+        0xf8, 0x45, 0x0b, 0xcc, 0x77, 0x10, 0x00, 0x01,
-        0xf4, 0xa9, 0xf8, 0x30, 0x0b, 0x89, 0x6c, 0xe1, 
+        0xf4, 0xa9, 0xf8, 0x30, 0x0b, 0x89, 0x6c, 0xe1,
-        0xff, 0xfd, 0x0b, 0x8b, 0x10, 0xe7, 0x00, 0x02, 
+        0xff, 0xfd, 0x0b, 0x8b, 0x10, 0xe7, 0x00, 0x02,
-        0x80, 0x0e, 0xf0, 0x73, 0x0b, 0x8b, 0x10, 0x87, 
+        0x80, 0x0e, 0xf0, 0x73, 0x0b, 0x8b, 0x10, 0x87,
-        0x80, 0x0e, 0xe7, 0x10, 0xf5, 0xae, 0xf8, 0x20, 
+        0x80, 0x0e, 0xe7, 0x10, 0xf5, 0xae, 0xf8, 0x20,
-        0x0b, 0xb2, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01, 
+        0x0b, 0xb2, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01,
-        0x00, 0x16, 0x10, 0x04, 0xf0, 0x74, 0x06, 0xce, 
+        0x00, 0x16, 0x10, 0x04, 0xf0, 0x74, 0x06, 0xce,
-        0x48, 0x17, 0x49, 0x16, 0xf6, 0x00, 0x88, 0x17, 
+        0x48, 0x17, 0x49, 0x16, 0xf6, 0x00, 0x88, 0x17,
-        0x48, 0x11, 0xf6, 0x20, 0x88, 0x11, 0x10, 0x09, 
+        0x48, 0x11, 0xf6, 0x20, 0x88, 0x11, 0x10, 0x09,
-        0xf6, 0x20, 0x80, 0x00, 0x48, 0x18, 0xf2, 0x74, 
+        0xf6, 0x20, 0x80, 0x00, 0x48, 0x18, 0xf2, 0x74,
-        0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x16, 
+        0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x16,
-        0x10, 0x04, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01, 
+        0x10, 0x04, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01,
-        0x00, 0x11, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11, 
+        0x00, 0x11, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11,
-        0x00, 0x04, 0x80, 0x04, 0xf0, 0x73, 0x0b, 0xbc, 
+        0x00, 0x04, 0x80, 0x04, 0xf0, 0x73, 0x0b, 0xbc,
-        0x70, 0x00, 0x00, 0x17, 0x70, 0x01, 0x00, 0x11, 
+        0x70, 0x00, 0x00, 0x17, 0x70, 0x01, 0x00, 0x11,
-        0x10, 0x04, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11, 
+        0x10, 0x04, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11,
-        0x00, 0x04, 0x80, 0x04, 0x49, 0x11, 0x48, 0x16, 
+        0x00, 0x04, 0x80, 0x04, 0x49, 0x11, 0x48, 0x16,
-        0xf6, 0x20, 0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95, 
+        0xf6, 0x20, 0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95,
-        0x6c, 0x86, 0x0b, 0xcc, 0x10, 0x0a, 0x80, 0x00, 
+        0x6c, 0x86, 0x0b, 0xcc, 0x10, 0x0a, 0x80, 0x00,
-        0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, 
+        0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00,
-        0x00, 0x04, 0x88, 0x16, 0x12, 0x0a, 0xf8, 0x45, 
+        0x00, 0x04, 0x88, 0x16, 0x12, 0x0a, 0xf8, 0x45,
-        0x0c, 0x33, 0x71, 0x0a, 0x00, 0x10, 0xf4, 0xae, 
+        0x0c, 0x33, 0x71, 0x0a, 0x00, 0x10, 0xf4, 0xae,
-        0xf8, 0x30, 0x0c, 0x1c, 0x48, 0x16, 0xf0, 0xe1, 
+        0xf8, 0x30, 0x0c, 0x1c, 0x48, 0x16, 0xf0, 0xe1,
-        0x88, 0x11, 0x12, 0x08, 0xf8, 0x45, 0x0b, 0xdb, 
+        0x88, 0x11, 0x12, 0x08, 0xf8, 0x45, 0x0b, 0xdb,
-        0x6d, 0x89, 0x12, 0x07, 0xf8, 0x45, 0x0b, 0xe9, 
+        0x6d, 0x89, 0x12, 0x07, 0xf8, 0x45, 0x0b, 0xe9,
-        0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11, 
+        0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11,
-        0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74, 
+        0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74,
-        0x06, 0xdc, 0xf0, 0x73, 0x0b, 0xef, 0x48, 0x11, 
+        0x06, 0xdc, 0xf0, 0x73, 0x0b, 0xef, 0x48, 0x11,
-        0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74, 
+        0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74,
-        0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e, 
+        0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e,
-        0x10, 0x06, 0x49, 0x11, 0xf6, 0x00, 0x80, 0x06, 
+        0x10, 0x06, 0x49, 0x11, 0xf6, 0x00, 0x80, 0x06,
-        0x10, 0x05, 0xf6, 0x20, 0x88, 0x11, 0xf0, 0x00, 
+        0x10, 0x05, 0xf6, 0x20, 0x88, 0x11, 0xf0, 0x00,
-        0x00, 0x01, 0x48, 0x08, 0x6f, 0x00, 0x0c, 0x9f, 
+        0x00, 0x01, 0x48, 0x08, 0x6f, 0x00, 0x0c, 0x9f,
-        0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, 
+        0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00,
-        0x00, 0x04, 0x12, 0x07, 0xf8, 0x45, 0x0c, 0x11, 
+        0x00, 0x04, 0x12, 0x07, 0xf8, 0x45, 0x0c, 0x11,
-        0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11, 
+        0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11,
-        0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74, 
+        0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74,
-        0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x17, 0x48, 0x11, 
+        0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x17, 0x48, 0x11,
-        0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74, 
+        0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74,
-        0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e, 
+        0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e,
-        0xf0, 0x73, 0x0c, 0x33, 0x12, 0x07, 0xf8, 0x45, 
+        0xf0, 0x73, 0x0c, 0x33, 0x12, 0x07, 0xf8, 0x45,
-        0x0c, 0x2a, 0x10, 0x07, 0x80, 0x00, 0x10, 0x06, 
+        0x0c, 0x2a, 0x10, 0x07, 0x80, 0x00, 0x10, 0x06,
-        0x80, 0x01, 0x10, 0x05, 0x80, 0x02, 0x10, 0x04, 
+        0x80, 0x01, 0x10, 0x05, 0x80, 0x02, 0x10, 0x04,
-        0xf0, 0x74, 0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x30, 
+        0xf0, 0x74, 0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x30,
-        0x12, 0x05, 0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 
+        0x12, 0x05, 0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04,
-        0xf0, 0x74, 0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 
+        0xf0, 0x74, 0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0,
-        0x81, 0x0e, 0x76, 0x00, 0x00, 0x01, 0x48, 0x18, 
+        0x81, 0x0e, 0x76, 0x00, 0x00, 0x01, 0x48, 0x18,
-        0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 
+        0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04,
-        0x71, 0x04, 0x00, 0x11, 0x70, 0x81, 0x29, 0x86, 
+        0x71, 0x04, 0x00, 0x11, 0x70, 0x81, 0x29, 0x86,
-        0x10, 0x0e, 0x1c, 0xf8, 0x29, 0x86, 0x80, 0x0e, 
+        0x10, 0x0e, 0x1c, 0xf8, 0x29, 0x86, 0x80, 0x0e,
-        0x76, 0x00, 0x00, 0x01, 0x48, 0x18, 0xf2, 0x74, 
+        0x76, 0x00, 0x00, 0x01, 0x48, 0x18, 0xf2, 0x74,
-        0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x10, 0x0e, 
+        0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x10, 0x0e,
-        0x71, 0x04, 0x00, 0x11, 0x80, 0x81, 0x10, 0xf8, 
+        0x71, 0x04, 0x00, 0x11, 0x80, 0x81, 0x10, 0xf8,
-        0x29, 0x86, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x30, 
+        0x29, 0x86, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x30,
-        0x7f, 0xff, 0x80, 0xf8, 0x29, 0x86, 0x10, 0x09, 
+        0x7f, 0xff, 0x80, 0xf8, 0x29, 0x86, 0x10, 0x09,
-        0xf0, 0x00, 0x00, 0x02, 0x80, 0x09, 0xee, 0x10, 
+        0xf0, 0x00, 0x00, 0x02, 0x80, 0x09, 0xee, 0x10,
-        0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 
+        0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00,
-        0x10, 0xf8, 0x27, 0x75, 0x08, 0xf8, 0x27, 0x71, 
+        0x10, 0xf8, 0x27, 0x75, 0x08, 0xf8, 0x27, 0x71,
-        0xf0, 0x10, 0x00, 0x01, 0x48, 0x08, 0xfc, 0x00, 
+        0xf0, 0x10, 0x00, 0x01, 0x48, 0x08, 0xfc, 0x00,
-        0x4a, 0x11, 0x4a, 0x16, 0xee, 0xff, 0xf4, 0x95, 
+        0x4a, 0x11, 0x4a, 0x16, 0xee, 0xff, 0xf4, 0x95,
-        0x71, 0x04, 0x00, 0x16, 0xf0, 0x00, 0x00, 0x01, 
+        0x71, 0x04, 0x00, 0x16, 0xf0, 0x00, 0x00, 0x01,
-        0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c, 0x6d, 0xee, 
+        0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c, 0x6d, 0xee,
-        0xff, 0xfd, 0x48, 0x16, 0xf8, 0x45, 0x0c, 0x99, 
+        0xff, 0xfd, 0x48, 0x16, 0xf8, 0x45, 0x0c, 0x99,
-        0x56, 0xf8, 0x29, 0x7c, 0xf0, 0x74, 0x0a, 0x5a, 
+        0x56, 0xf8, 0x29, 0x7c, 0xf0, 0x74, 0x0a, 0x5a,
-        0x88, 0x11, 0x10, 0xf8, 0x29, 0x7d, 0xf0, 0x00, 
+        0x88, 0x11, 0x10, 0xf8, 0x29, 0x7d, 0xf0, 0x00,
-        0x00, 0x01, 0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c, 
+        0x00, 0x01, 0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c,
-        0x10, 0xf8, 0x29, 0x82, 0xf0, 0x00, 0x00, 0x01, 
+        0x10, 0xf8, 0x29, 0x82, 0xf0, 0x00, 0x00, 0x01,
-        0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xa9, 
+        0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xa9,
-        0xfa, 0x30, 0x0c, 0x96, 0x80, 0xf8, 0x29, 0x82, 
+        0xfa, 0x30, 0x0c, 0x96, 0x80, 0xf8, 0x29, 0x82,
-        0x56, 0xf8, 0x29, 0x80, 0xf0, 0x00, 0x00, 0x01, 
+        0x56, 0xf8, 0x29, 0x80, 0xf0, 0x00, 0x00, 0x01,
-        0x4e, 0xf8, 0x29, 0x80, 0x73, 0x11, 0x29, 0x82, 
+        0x4e, 0xf8, 0x29, 0x80, 0x73, 0x11, 0x29, 0x82,
-        0x6c, 0xee, 0xff, 0xff, 0x0c, 0x76, 0xee, 0x01, 
+        0x6c, 0xee, 0xff, 0xff, 0x0c, 0x76, 0xee, 0x01,
-        0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0x76, 0xf8, 0x29, 0x84, 0x00, 0x00, 0x76, 0xf8, 
+        0x76, 0xf8, 0x29, 0x84, 0x00, 0x00, 0x76, 0xf8,
-        0x29, 0x85, 0x00, 0x01, 0xe8, 0x00, 0x4e, 0xf8, 
+        0x29, 0x85, 0x00, 0x01, 0xe8, 0x00, 0x4e, 0xf8,
-        0x2a, 0x0c, 0x76, 0xf8, 0x29, 0x86, 0x00, 0x00, 
+        0x2a, 0x0c, 0x76, 0xf8, 0x29, 0x86, 0x00, 0x00,
-        0x76, 0xf8, 0x29, 0x87, 0x00, 0x00, 0x77, 0x11, 
+        0x76, 0xf8, 0x29, 0x87, 0x00, 0x00, 0x77, 0x11,
-        0x29, 0x88, 0x76, 0x81, 0xaa, 0xaa, 0x76, 0xe1, 
+        0x29, 0x88, 0x76, 0x81, 0xaa, 0xaa, 0x76, 0xe1,
-        0x00, 0x01, 0xaa, 0xaa, 0x76, 0xe1, 0x00, 0x02, 
+        0x00, 0x01, 0xaa, 0xaa, 0x76, 0xe1, 0x00, 0x02,
-        0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0xee, 0xfc, 0xf4, 0x95, 0x71, 0x06, 0x00, 0x14, 
+        0xee, 0xfc, 0xf4, 0x95, 0x71, 0x06, 0x00, 0x14,
-        0x71, 0x07, 0x00, 0x13, 0x71, 0x08, 0x00, 0x12, 
+        0x71, 0x07, 0x00, 0x13, 0x71, 0x08, 0x00, 0x12,
-        0x71, 0x09, 0x00, 0x15, 0x77, 0x10, 0x00, 0xff, 
+        0x71, 0x09, 0x00, 0x15, 0x77, 0x10, 0x00, 0xff,
-        0xf4, 0xaa, 0xf8, 0x30, 0x0d, 0x44, 0x49, 0x13, 
+        0xf4, 0xaa, 0xf8, 0x30, 0x0d, 0x44, 0x49, 0x13,
-        0x53, 0xf8, 0x2a, 0x0c, 0x4f, 0xf8, 0x2a, 0x0c, 
+        0x53, 0xf8, 0x2a, 0x0c, 0x4f, 0xf8, 0x2a, 0x0c,
-        0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d, 
+        0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d,
-        0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x01, 
+        0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x01,
-        0x71, 0xe1, 0x24, 0x00, 0x00, 0x11, 0xf4, 0xa9, 
+        0x71, 0xe1, 0x24, 0x00, 0x00, 0x11, 0xf4, 0xa9,
-        0xf8, 0x30, 0x0d, 0x17, 0x77, 0x10, 0x00, 0x02, 
+        0xf8, 0x30, 0x0d, 0x17, 0x77, 0x10, 0x00, 0x02,
-        0xf4, 0xa9, 0xf8, 0x30, 0x0c, 0xec, 0x77, 0x11, 
+        0xf4, 0xa9, 0xf8, 0x30, 0x0c, 0xec, 0x77, 0x11,
-        0x29, 0x8a, 0x76, 0x81, 0x00, 0x00, 0xe8, 0x00, 
+        0x29, 0x8a, 0x76, 0x81, 0x00, 0x00, 0xe8, 0x00,
-        0x77, 0x14, 0x00, 0x00, 0x77, 0x13, 0x00, 0x00, 
+        0x77, 0x14, 0x00, 0x00, 0x77, 0x13, 0x00, 0x00,
-        0xf0, 0x73, 0x0d, 0x48, 0x6c, 0x83, 0x0c, 0xfa, 
+        0xf0, 0x73, 0x0d, 0x48, 0x6c, 0x83, 0x0c, 0xfa,
-        0x77, 0x11, 0x29, 0x8a, 0x48, 0x12, 0xf0, 0xe8, 
+        0x77, 0x11, 0x29, 0x8a, 0x48, 0x12, 0xf0, 0xe8,
-        0xf0, 0x40, 0x80, 0x00, 0x80, 0x81, 0xe8, 0x00, 
+        0xf0, 0x40, 0x80, 0x00, 0x80, 0x81, 0xe8, 0x00,
-        0x77, 0x14, 0x00, 0x00, 0xf0, 0x73, 0x0d, 0x48, 
+        0x77, 0x14, 0x00, 0x00, 0xf0, 0x73, 0x0d, 0x48,
-        0x49, 0x13, 0xf3, 0x40, 0x80, 0x00, 0x81, 0xf8, 
+        0x49, 0x13, 0xf3, 0x40, 0x80, 0x00, 0x81, 0xf8,
-        0x29, 0x8a, 0x61, 0xf8, 0x00, 0x15, 0x00, 0x01, 
+        0x29, 0x8a, 0x61, 0xf8, 0x00, 0x15, 0x00, 0x01,
-        0xf8, 0x20, 0x0d, 0x07, 0x69, 0xf8, 0x29, 0x8a, 
+        0xf8, 0x20, 0x0d, 0x07, 0x69, 0xf8, 0x29, 0x8a,
-        0x40, 0x00, 0x61, 0xf8, 0x00, 0x14, 0x00, 0x01, 
+        0x40, 0x00, 0x61, 0xf8, 0x00, 0x14, 0x00, 0x01,
-        0xf8, 0x20, 0x0d, 0x0f, 0x69, 0xf8, 0x29, 0x8a, 
+        0xf8, 0x20, 0x0d, 0x0f, 0x69, 0xf8, 0x29, 0x8a,
-        0x20, 0x00, 0x77, 0x11, 0x29, 0x8a, 0x49, 0x12, 
+        0x20, 0x00, 0x77, 0x11, 0x29, 0x8a, 0x49, 0x12,
-        0xf3, 0xe8, 0x1b, 0x81, 0x81, 0x81, 0xf0, 0x73, 
+        0xf3, 0xe8, 0x1b, 0x81, 0x81, 0x81, 0xf0, 0x73,
-        0x0d, 0x48, 0x11, 0xf8, 0x29, 0x84, 0xf8, 0x4c, 
+        0x0d, 0x48, 0x11, 0xf8, 0x29, 0x84, 0xf8, 0x4c,
-        0x0d, 0x37, 0x77, 0x11, 0x29, 0x88, 0x76, 0x81, 
+        0x0d, 0x37, 0x77, 0x11, 0x29, 0x88, 0x76, 0x81,
-        0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85, 0xf3, 0x10, 
+        0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85, 0xf3, 0x10,
-        0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00, 0x81, 0xe1, 
+        0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00, 0x81, 0xe1,
-        0x00, 0x01, 0x76, 0x00, 0x00, 0x02, 0x80, 0x01, 
+        0x00, 0x01, 0x76, 0x00, 0x00, 0x02, 0x80, 0x01,
-        0x70, 0x02, 0x00, 0x14, 0x70, 0x03, 0x00, 0x13, 
+        0x70, 0x02, 0x00, 0x14, 0x70, 0x03, 0x00, 0x13,
-        0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0x48, 0x11, 
+        0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0x48, 0x11,
-        0x71, 0xf8, 0x29, 0x85, 0x29, 0x84, 0xf0, 0x73, 
+        0x71, 0xf8, 0x29, 0x85, 0x29, 0x84, 0xf0, 0x73,
-        0x0d, 0x73, 0x76, 0x00, 0x00, 0x00, 0x80, 0x01, 
+        0x0d, 0x73, 0x76, 0x00, 0x00, 0x00, 0x80, 0x01,
-        0x76, 0x02, 0x00, 0x00, 0x70, 0x03, 0x00, 0x13, 
+        0x76, 0x02, 0x00, 0x00, 0x70, 0x03, 0x00, 0x13,
-        0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0xe8, 0x00, 
+        0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0xe8, 0x00,
-        0xf0, 0x73, 0x0d, 0x73, 0x77, 0x11, 0x29, 0x8a, 
+        0xf0, 0x73, 0x0d, 0x73, 0x77, 0x11, 0x29, 0x8a,
-        0x70, 0x81, 0x00, 0x13, 0x11, 0xf8, 0x29, 0x84, 
+        0x70, 0x81, 0x00, 0x13, 0x11, 0xf8, 0x29, 0x84,
-        0xf8, 0x4c, 0x0d, 0x68, 0x77, 0x11, 0x29, 0x88, 
+        0xf8, 0x4c, 0x0d, 0x68, 0x77, 0x11, 0x29, 0x88,
-        0x76, 0x81, 0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85, 
+        0x76, 0x81, 0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85,
-        0xf3, 0x10, 0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00, 
+        0xf3, 0x10, 0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00,
-        0x81, 0xe1, 0x00, 0x01, 0x76, 0x00, 0x00, 0x03, 
+        0x81, 0xe1, 0x00, 0x01, 0x76, 0x00, 0x00, 0x03,
-        0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03, 
+        0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03,
-        0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 
+        0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95,
-        0x48, 0x11, 0x71, 0xf8, 0x29, 0x85, 0x29, 0x84, 
+        0x48, 0x11, 0x71, 0xf8, 0x29, 0x85, 0x29, 0x84,
-        0xf0, 0x73, 0x0d, 0x73, 0x76, 0x00, 0x00, 0x01, 
+        0xf0, 0x73, 0x0d, 0x73, 0x76, 0x00, 0x00, 0x01,
-        0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03, 
+        0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03,
-        0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 
+        0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95,
-        0x48, 0x11, 0x6b, 0xf8, 0x29, 0x84, 0xff, 0xff, 
+        0x48, 0x11, 0x6b, 0xf8, 0x29, 0x84, 0xff, 0xff,
-        0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0xf5, 0x40, 0xf4, 0x95, 0x48, 0x0b, 0xf4, 0x78, 
+        0xf5, 0x40, 0xf4, 0x95, 0x48, 0x0b, 0xf4, 0x78,
-        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe1, 
+        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe1,
-        0xff, 0xb9, 0x0d, 0x88, 0xf2, 0x73, 0x0d, 0xa5, 
+        0xff, 0xb9, 0x0d, 0x88, 0xf2, 0x73, 0x0d, 0xa5,
-        0xf4, 0x95, 0xe8, 0x60, 0xf2, 0x00, 0x00, 0x06, 
+        0xf4, 0x95, 0xe8, 0x60, 0xf2, 0x00, 0x00, 0x06,
-        0x61, 0xf8, 0x00, 0x11, 0x00, 0x20, 0xf8, 0x30, 
+        0x61, 0xf8, 0x00, 0x11, 0x00, 0x20, 0xf8, 0x30,
-        0x0d, 0x98, 0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01, 
+        0x0d, 0x98, 0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01,
-        0xf8, 0x20, 0x0d, 0xa3, 0xf2, 0x00, 0x00, 0x07, 
+        0xf8, 0x20, 0x0d, 0xa3, 0xf2, 0x00, 0x00, 0x07,
-        0xf0, 0x73, 0x0d, 0xa3, 0x61, 0xf8, 0x00, 0x0b, 
+        0xf0, 0x73, 0x0d, 0xa3, 0x61, 0xf8, 0x00, 0x0b,
-        0x00, 0x01, 0xf8, 0x20, 0x0d, 0xa1, 0xf2, 0x73, 
+        0x00, 0x01, 0xf8, 0x20, 0x0d, 0xa1, 0xf2, 0x73,
-        0x0d, 0xa3, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00, 
+        0x0d, 0xa3, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00,
-        0x00, 0x02, 0x48, 0x08, 0xf4, 0x7f, 0x8a, 0x11, 
+        0x00, 0x02, 0x48, 0x08, 0xf4, 0x7f, 0x8a, 0x11,
-        0xfc, 0x00, 0xee, 0xff, 0xf0, 0x74, 0x07, 0xfd, 
+        0xfc, 0x00, 0xee, 0xff, 0xf0, 0x74, 0x07, 0xfd,
-        0xf0, 0x74, 0x07, 0x44, 0xf0, 0x74, 0x0d, 0xb4, 
+        0xf0, 0x74, 0x07, 0x44, 0xf0, 0x74, 0x0d, 0xb4,
-        0xf0, 0x74, 0x02, 0x05, 0xf0, 0x74, 0x04, 0x60, 
+        0xf0, 0x74, 0x02, 0x05, 0xf0, 0x74, 0x04, 0x60,
-        0xf0, 0x73, 0x0d, 0xaa, 0xee, 0xfd, 0x10, 0xf8, 
+        0xf0, 0x73, 0x0d, 0xaa, 0xee, 0xfd, 0x10, 0xf8,
-        0x2a, 0xa3, 0xf8, 0x44, 0x0d, 0xcb, 0x10, 0xf8, 
+        0x2a, 0xa3, 0xf8, 0x44, 0x0d, 0xcb, 0x10, 0xf8,
-        0x2a, 0xa4, 0xf8, 0x45, 0x0d, 0xd7, 0x76, 0x00, 
+        0x2a, 0xa4, 0xf8, 0x45, 0x0d, 0xd7, 0x76, 0x00,
-        0x02, 0x00, 0xf2, 0x74, 0x09, 0xe8, 0xf0, 0x20, 
+        0x02, 0x00, 0xf2, 0x74, 0x09, 0xe8, 0xf0, 0x20,
-        0x22, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00, 
+        0x22, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00,
-        0x76, 0xf8, 0x2a, 0xa7, 0x00, 0x00, 0xf0, 0x73, 
+        0x76, 0xf8, 0x2a, 0xa7, 0x00, 0x00, 0xf0, 0x73,
-        0x0d, 0xd7, 0x76, 0x00, 0x02, 0x00, 0xf2, 0x74, 
+        0x0d, 0xd7, 0x76, 0x00, 0x02, 0x00, 0xf2, 0x74,
-        0x09, 0xe8, 0xf0, 0x20, 0x20, 0x00, 0x76, 0xf8, 
+        0x09, 0xe8, 0xf0, 0x20, 0x20, 0x00, 0x76, 0xf8,
-        0x2a, 0xa3, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa7, 
+        0x2a, 0xa3, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa7,
-        0x00, 0x01, 0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0, 
+        0x00, 0x01, 0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0,
-        0xf0, 0x10, 0x3a, 0x98, 0xf8, 0x47, 0x0d, 0xe1, 
+        0xf0, 0x10, 0x3a, 0x98, 0xf8, 0x47, 0x0d, 0xe1,
-        0x76, 0xf8, 0x27, 0x6e, 0x00, 0x00, 0xee, 0x03, 
+        0x76, 0xf8, 0x27, 0x6e, 0x00, 0x00, 0xee, 0x03,
-        0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x77, 0x11, 
+        0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x77, 0x11,
-        0x20, 0x00, 0x76, 0x00, 0xaa, 0xaa, 0x76, 0x01, 
+        0x20, 0x00, 0x76, 0x00, 0xaa, 0xaa, 0x76, 0x01,
-        0x02, 0x00, 0xf2, 0x74, 0x06, 0x6c, 0xf4, 0x95, 
+        0x02, 0x00, 0xf2, 0x74, 0x06, 0x6c, 0xf4, 0x95,
-        0x48, 0x11, 0x76, 0x00, 0x55, 0x55, 0x76, 0x01, 
+        0x48, 0x11, 0x76, 0x00, 0x55, 0x55, 0x76, 0x01,
-        0x02, 0x00, 0x48, 0x11, 0xf2, 0x74, 0x06, 0x6c, 
+        0x02, 0x00, 0x48, 0x11, 0xf2, 0x74, 0x06, 0x6c,
-        0xf0, 0x00, 0x02, 0x00, 0x76, 0xf8, 0x2a, 0xa3, 
+        0xf0, 0x00, 0x02, 0x00, 0x76, 0xf8, 0x2a, 0xa3,
-        0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00,
-        0xe8, 0x00, 0x4e, 0x00, 0xfb, 0x80, 0x15, 0x3e, 
+        0xe8, 0x00, 0x4e, 0x00, 0xfb, 0x80, 0x15, 0x3e,
-        0xf4, 0x95, 0xe8, 0x04, 0x80, 0xf8, 0x2a, 0xa5, 
+        0xf4, 0x95, 0xe8, 0x04, 0x80, 0xf8, 0x2a, 0xa5,
-        0x76, 0x00, 0x2a, 0xa8, 0xf9, 0x80, 0x14, 0x87, 
+        0x76, 0x00, 0x2a, 0xa8, 0xf9, 0x80, 0x14, 0x87,
-        0x76, 0x00, 0x2a, 0xad, 0xfb, 0x80, 0x13, 0x62, 
+        0x76, 0x00, 0x2a, 0xad, 0xfb, 0x80, 0x13, 0x62,
-        0xf4, 0x95, 0xe8, 0x02, 0x10, 0xf8, 0x2a, 0xa5, 
+        0xf4, 0x95, 0xe8, 0x02, 0x10, 0xf8, 0x2a, 0xa5,
-        0xf9, 0x80, 0x14, 0x63, 0xfb, 0x80, 0x16, 0x66, 
+        0xf9, 0x80, 0x14, 0x63, 0xfb, 0x80, 0x16, 0x66,
-        0xf4, 0x95, 0xe8, 0x1c, 0xfb, 0x80, 0x16, 0x87, 
+        0xf4, 0x95, 0xe8, 0x1c, 0xfb, 0x80, 0x16, 0x87,
-        0xf4, 0x95, 0xe8, 0x1c, 0xe8, 0x01, 0x4e, 0x00, 
+        0xf4, 0x95, 0xe8, 0x1c, 0xe8, 0x01, 0x4e, 0x00,
-        0xfb, 0x80, 0x17, 0xd6, 0xf4, 0x95, 0xe8, 0x00, 
+        0xfb, 0x80, 0x17, 0xd6, 0xf4, 0x95, 0xe8, 0x00,
-        0x80, 0xf8, 0x2a, 0xa6, 0x76, 0x00, 0x2a, 0xb7, 
+        0x80, 0xf8, 0x2a, 0xa6, 0x76, 0x00, 0x2a, 0xb7,
-        0xf9, 0x80, 0x16, 0xaa, 0x10, 0xf8, 0x2a, 0xa6, 
+        0xf9, 0x80, 0x16, 0xaa, 0x10, 0xf8, 0x2a, 0xa6,
-        0xf9, 0x80, 0x17, 0x5c, 0x10, 0xf8, 0x2a, 0xa6, 
+        0xf9, 0x80, 0x17, 0x5c, 0x10, 0xf8, 0x2a, 0xa6,
-        0xf9, 0x80, 0x17, 0x6f, 0xee, 0x02, 0x8a, 0x11, 
+        0xf9, 0x80, 0x17, 0x6f, 0xee, 0x02, 0x8a, 0x11,
-        0xfc, 0x00, 0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09, 
+        0xfc, 0x00, 0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09,
-        0x4a, 0x0a, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, 
+        0x4a, 0x0a, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8,
-        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, 
+        0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07,
-        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, 
+        0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc,
-        0x10, 0xf8, 0x2a, 0xa7, 0xf8, 0x44, 0x0e, 0x4b, 
+        0x10, 0xf8, 0x2a, 0xa7, 0xf8, 0x44, 0x0e, 0x4b,
-        0x76, 0xf8, 0x2a, 0xa3, 0x00, 0x01, 0xf0, 0x73, 
+        0x76, 0xf8, 0x2a, 0xa3, 0x00, 0x01, 0xf0, 0x73,
-        0x0e, 0x4e, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x01, 
+        0x0e, 0x4e, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x01,
-        0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x0a, 0x8a, 0x09, 
+        0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x0a, 0x8a, 0x09,
-        0x8a, 0x08, 0xf4, 0xeb, 0x4a, 0x11, 0x4a, 0x16, 
+        0x8a, 0x08, 0xf4, 0xeb, 0x4a, 0x11, 0x4a, 0x16,
-        0x4a, 0x17, 0xee, 0xfe, 0x88, 0x0e, 0x71, 0x08, 
+        0x4a, 0x17, 0xee, 0xfe, 0x88, 0x0e, 0x71, 0x08,
-        0x00, 0x16, 0x71, 0x06, 0x00, 0x17, 0x11, 0x07, 
+        0x00, 0x16, 0x71, 0x06, 0x00, 0x17, 0x11, 0x07,
-        0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00, 0x25, 0xa0, 
+        0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00, 0x25, 0xa0,
-        0x88, 0x11, 0x76, 0x01, 0x00, 0x06, 0x81, 0x00, 
+        0x88, 0x11, 0x76, 0x01, 0x00, 0x06, 0x81, 0x00,
-        0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00, 0x00, 0x01, 
+        0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00, 0x00, 0x01,
-        0x76, 0x01, 0x00, 0x06, 0x70, 0x00, 0x00, 0x16, 
+        0x76, 0x01, 0x00, 0x06, 0x70, 0x00, 0x00, 0x16,
-        0x48, 0x11, 0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00, 
+        0x48, 0x11, 0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00,
-        0x00, 0x07, 0x70, 0x81, 0x00, 0x17, 0xee, 0x02, 
+        0x00, 0x07, 0x70, 0x81, 0x00, 0x17, 0xee, 0x02,
-        0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 
+        0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00,
-        0x4a, 0x11, 0x88, 0x0e, 0x71, 0x02, 0x00, 0x12, 
+        0x4a, 0x11, 0x88, 0x0e, 0x71, 0x02, 0x00, 0x12,
-        0x11, 0x03, 0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00, 
+        0x11, 0x03, 0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00,
-        0x24, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x70, 0x81, 
+        0x24, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x70, 0x81,
-        0x00, 0x12, 0x6e, 0xe2, 0xff, 0xfe, 0x0e, 0x8d, 
+        0x00, 0x12, 0x6e, 0xe2, 0xff, 0xfe, 0x0e, 0x8d,
-        0xf4, 0x95, 0xe8, 0x00, 0xe8, 0x01, 0x80, 0xe1, 
+        0xf4, 0x95, 0xe8, 0x00, 0xe8, 0x01, 0x80, 0xe1,
-        0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, 
+        0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff,
-        0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1,
-        0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0c, 
+        0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0c,
-        0x00, 0x00, 0x81, 0xe1, 0x00, 0x01, 0x8a, 0x11, 
+        0x00, 0x00, 0x81, 0xe1, 0x00, 0x01, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc, 0x88, 0x0e, 
+        0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc, 0x88, 0x0e,
-        0xf4, 0x95, 0xf1, 0x66, 0x00, 0x0d, 0xf3, 0x00, 
+        0xf4, 0x95, 0xf1, 0x66, 0x00, 0x0d, 0xf3, 0x00,
-        0x24, 0x00, 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 
+        0x24, 0x00, 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95,
-        0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1,
-        0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 
+        0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02,
-        0x00, 0x01, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 
+        0x00, 0x01, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01,
-        0x00, 0x00, 0x80, 0x02, 0x76, 0x03, 0x00, 0x00, 
+        0x00, 0x00, 0x80, 0x02, 0x76, 0x03, 0x00, 0x00,
-        0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0xe8, 0x00, 
+        0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0xe8, 0x00,
-        0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0x88, 0x19, 0xf4, 0x95, 0x73, 0x19, 0x00, 0x0e, 
+        0x88, 0x19, 0xf4, 0x95, 0x73, 0x19, 0x00, 0x0e,
-        0xf1, 0x66, 0x00, 0x0d, 0xf2, 0x00, 0x24, 0x00, 
+        0xf1, 0x66, 0x00, 0x0d, 0xf2, 0x00, 0x24, 0x00,
-        0x77, 0x15, 0x25, 0xa0, 0x77, 0x14, 0x00, 0x00, 
+        0x77, 0x15, 0x25, 0xa0, 0x77, 0x14, 0x00, 0x00,
-        0x77, 0x1a, 0x00, 0x1f, 0xf0, 0x72, 0x0f, 0x14, 
+        0x77, 0x1a, 0x00, 0x1f, 0xf0, 0x72, 0x0f, 0x14,
-        0xf6, 0xb8, 0x49, 0x19, 0x09, 0x85, 0xf8, 0x4c, 
+        0xf6, 0xb8, 0x49, 0x19, 0x09, 0x85, 0xf8, 0x4c,
-        0x0f, 0x13, 0xf1, 0x00, 0x00, 0x05, 0x89, 0x11, 
+        0x0f, 0x13, 0xf1, 0x00, 0x00, 0x05, 0x89, 0x11,
-        0x49, 0x15, 0xf3, 0x00, 0x00, 0x01, 0x89, 0x13, 
+        0x49, 0x15, 0xf3, 0x00, 0x00, 0x01, 0x89, 0x13,
-        0x49, 0x15, 0xf3, 0x00, 0x00, 0x07, 0x89, 0x12, 
+        0x49, 0x15, 0xf3, 0x00, 0x00, 0x07, 0x89, 0x12,
-        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
+        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
-        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
+        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
-        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
+        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
-        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
+        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
-        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, 
+        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13,
-        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x11, 
+        0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x11,
-        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0f, 0x13, 
+        0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0f, 0x13,
-        0x6d, 0x94, 0x6d, 0xed, 0x00, 0x0d, 0x48, 0x14, 
+        0x6d, 0x94, 0x6d, 0xed, 0x00, 0x0d, 0x48, 0x14,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16,
-        0x4a, 0x17, 0xee, 0xf8, 0x88, 0x17, 0x10, 0x0d, 
+        0x4a, 0x17, 0xee, 0xf8, 0x88, 0x17, 0x10, 0x0d,
-        0x80, 0x04, 0x10, 0x0c, 0x80, 0x05, 0x71, 0x0e, 
+        0x80, 0x04, 0x10, 0x0c, 0x80, 0x05, 0x71, 0x0e,
-        0x00, 0x16, 0x73, 0x17, 0x00, 0x0e, 0xf0, 0x66, 
+        0x00, 0x16, 0x73, 0x17, 0x00, 0x0e, 0xf0, 0x66,
-        0x00, 0x0d, 0xf0, 0x00, 0x24, 0x00, 0x88, 0x11, 
+        0x00, 0x0d, 0xf0, 0x00, 0x24, 0x00, 0x88, 0x11,
-        0x10, 0xf8, 0x27, 0x63, 0xf8, 0x45, 0x0f, 0x32, 
+        0x10, 0xf8, 0x27, 0x63, 0xf8, 0x45, 0x0f, 0x32,
-        0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, 
+        0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17,
-        0x10, 0xf8, 0x27, 0x60, 0xf8, 0x44, 0x0f, 0x3d, 
+        0x10, 0xf8, 0x27, 0x60, 0xf8, 0x44, 0x0f, 0x3d,
-        0x60, 0xe1, 0x00, 0x02, 0x00, 0x01, 0xf8, 0x20, 
+        0x60, 0xe1, 0x00, 0x02, 0x00, 0x01, 0xf8, 0x20,
-        0x0f, 0x6d, 0xf0, 0x73, 0x11, 0x33, 0x10, 0x04, 
+        0x0f, 0x6d, 0xf0, 0x73, 0x11, 0x33, 0x10, 0x04,
-        0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f, 
+        0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f,
-        0x11, 0x04, 0xf3, 0x00, 0x00, 0x01, 0x81, 0x04, 
+        0x11, 0x04, 0xf3, 0x00, 0x00, 0x01, 0x81, 0x04,
-        0x6d, 0x8e, 0x77, 0x10, 0x00, 0x01, 0x71, 0xe1, 
+        0x6d, 0x8e, 0x77, 0x10, 0x00, 0x01, 0x71, 0xe1,
-        0x00, 0x02, 0x00, 0x12, 0xf4, 0xaa, 0xf8, 0x30, 
+        0x00, 0x02, 0x00, 0x12, 0xf4, 0xaa, 0xf8, 0x30,
-        0x0f, 0x62, 0x77, 0x10, 0x00, 0x02, 0xf4, 0xaa, 
+        0x0f, 0x62, 0x77, 0x10, 0x00, 0x02, 0xf4, 0xaa,
-        0xf8, 0x30, 0x0f, 0x6d, 0x45, 0xe1, 0x00, 0x0b, 
+        0xf8, 0x30, 0x0f, 0x6d, 0x45, 0xe1, 0x00, 0x0b,
-        0x88, 0x10, 0x43, 0xe1, 0x00, 0x0c, 0x83, 0xf8, 
+        0x88, 0x10, 0x43, 0xe1, 0x00, 0x0c, 0x83, 0xf8,
-        0x00, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xaa, 
+        0x00, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xaa,
-        0xf8, 0x30, 0x0f, 0x6d, 0xf0, 0x73, 0x0f, 0x96, 
+        0xf8, 0x30, 0x0f, 0x6d, 0xf0, 0x73, 0x0f, 0x96,
-        0xf5, 0x00, 0x81, 0x04, 0x49, 0x16, 0xf5, 0x20, 
+        0xf5, 0x00, 0x81, 0x04, 0x49, 0x16, 0xf5, 0x20,
-        0x89, 0x16, 0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00, 
+        0x89, 0x16, 0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x48, 0x16, 
+        0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x48, 0x16,
-        0xf8, 0x45, 0x11, 0x33, 0xf7, 0xb8, 0x71, 0xe1, 
+        0xf8, 0x45, 0x11, 0x33, 0xf7, 0xb8, 0x71, 0xe1,
-        0x00, 0x02, 0x00, 0x12, 0x10, 0xf8, 0x00, 0x12, 
+        0x00, 0x02, 0x00, 0x12, 0x10, 0xf8, 0x00, 0x12,
-        0xf0, 0x10, 0x00, 0x03, 0xf8, 0x46, 0x0f, 0x8c, 
+        0xf0, 0x10, 0x00, 0x03, 0xf8, 0x46, 0x0f, 0x8c,
-        0x10, 0xf8, 0x00, 0x12, 0xf0, 0x10, 0x00, 0x03, 
+        0x10, 0xf8, 0x00, 0x12, 0xf0, 0x10, 0x00, 0x03,
-        0xf8, 0x45, 0x10, 0x16, 0x77, 0x10, 0x00, 0x01, 
+        0xf8, 0x45, 0x10, 0x16, 0x77, 0x10, 0x00, 0x01,
-        0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0x9c, 0x77, 0x10, 
+        0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0x9c, 0x77, 0x10,
-        0x00, 0x02, 0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0xa8, 
+        0x00, 0x02, 0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0xa8,
-        0xf0, 0x73, 0x0f, 0x96, 0x77, 0x10, 0x00, 0x04, 
+        0xf0, 0x73, 0x0f, 0x96, 0x77, 0x10, 0x00, 0x04,
-        0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xb7, 0x77, 0x10, 
+        0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xb7, 0x77, 0x10,
-        0x00, 0x05, 0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xbc, 
+        0x00, 0x05, 0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xbc,
-        0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, 
+        0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17,
-        0xf0, 0x73, 0x11, 0x31, 0x76, 0xe1, 0x00, 0x0c, 
+        0xf0, 0x73, 0x11, 0x31, 0x76, 0xe1, 0x00, 0x0c,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1,
-        0x00, 0x02, 0x00, 0x02, 0x11, 0xe1, 0x00, 0x0c, 
+        0x00, 0x02, 0x00, 0x02, 0x11, 0xe1, 0x00, 0x0c,
-        0xe8, 0x03, 0xf6, 0x20, 0x89, 0x12, 0xf4, 0x95, 
+        0xe8, 0x03, 0xf6, 0x20, 0x89, 0x12, 0xf4, 0x95,
-        0x77, 0x10, 0x00, 0x03, 0xf5, 0xaa, 0xf8, 0x30, 
+        0x77, 0x10, 0x00, 0x03, 0xf5, 0xaa, 0xf8, 0x30,
-        0x0f, 0xb6, 0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01, 
+        0x0f, 0xb6, 0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01,
-        0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf5, 0xae, 
+        0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf5, 0xae,
-        0xf8, 0x20, 0x0f, 0xbd, 0x48, 0x16, 0x80, 0x06, 
+        0xf8, 0x20, 0x0f, 0xbd, 0x48, 0x16, 0x80, 0x06,
-        0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x03, 
+        0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x03,
-        0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xc8, 0x6b, 0xf8, 
+        0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xc8, 0x6b, 0xf8,
-        0x27, 0x6f, 0x00, 0x01, 0x12, 0x06, 0xf8, 0x45, 
+        0x27, 0x6f, 0x00, 0x01, 0x12, 0x06, 0xf8, 0x45,
-        0x10, 0x00, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00, 
+        0x10, 0x00, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00,
-        0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02, 
+        0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02,
-        0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74, 
+        0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74,
-        0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06, 
+        0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06,
-        0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04, 
+        0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04,
-        0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, 
+        0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1,
-        0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04, 
+        0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04,
-        0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, 
+        0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20,
-        0x88, 0x16, 0x89, 0x13, 0xf4, 0x95, 0x77, 0x10, 
+        0x88, 0x16, 0x89, 0x13, 0xf4, 0x95, 0x77, 0x10,
-        0x00, 0x03, 0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xf5, 
+        0x00, 0x03, 0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xf5,
-        0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01, 0x77, 0x10, 
+        0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01, 0x77, 0x10,
-        0x00, 0x0c, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x13, 
+        0x00, 0x0c, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x13,
-        0xf6, 0xab, 0xf8, 0x20, 0x10, 0x00, 0x6b, 0xf8, 
+        0xf6, 0xab, 0xf8, 0x20, 0x10, 0x00, 0x6b, 0xf8,
-        0x27, 0x6f, 0x00, 0x01, 0x6c, 0xe2, 0xff, 0xfd, 
+        0x27, 0x6f, 0x00, 0x01, 0x6c, 0xe2, 0xff, 0xfd,
-        0x11, 0x31, 0xf6, 0xb8, 0x6f, 0xe1, 0x00, 0x05, 
+        0x11, 0x31, 0xf6, 0xb8, 0x6f, 0xe1, 0x00, 0x05,
-        0x0c, 0x48, 0x6f, 0xe1, 0x00, 0x06, 0x0c, 0x18, 
+        0x0c, 0x48, 0x6f, 0xe1, 0x00, 0x06, 0x0c, 0x18,
-        0xf0, 0x30, 0x0f, 0xff, 0xf0, 0x00, 0x00, 0x03, 
+        0xf0, 0x30, 0x0f, 0xff, 0xf0, 0x00, 0x00, 0x03,
-        0x80, 0xe1, 0x00, 0x0b, 0x76, 0xe1, 0x00, 0x02, 
+        0x80, 0xe1, 0x00, 0x0b, 0x76, 0xe1, 0x00, 0x02,
-        0x00, 0x03, 0x48, 0x16, 0xf8, 0x45, 0x11, 0x33, 
+        0x00, 0x03, 0x48, 0x16, 0xf8, 0x45, 0x11, 0x33,
-        0x71, 0xe1, 0x00, 0x0c, 0x00, 0x12, 0x10, 0xe1, 
+        0x71, 0xe1, 0x00, 0x0c, 0x00, 0x12, 0x10, 0xe1,
-        0x00, 0x0b, 0x49, 0x12, 0xf6, 0x20, 0x88, 0x13, 
+        0x00, 0x0b, 0x49, 0x12, 0xf6, 0x20, 0x88, 0x13,
-        0xe8, 0x0c, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95, 
+        0xe8, 0x0c, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95,
-        0xf4, 0x95, 0xf5, 0xab, 0xf8, 0x20, 0x10, 0x27, 
+        0xf4, 0x95, 0xf5, 0xab, 0xf8, 0x20, 0x10, 0x27,
-        0x48, 0x13, 0x80, 0x06, 0x88, 0x10, 0xf4, 0x95, 
+        0x48, 0x13, 0x80, 0x06, 0x88, 0x10, 0xf4, 0x95,
-        0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0x30, 
+        0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0x30,
-        0x70, 0x06, 0x00, 0x16, 0x12, 0x06, 0xf8, 0x45, 
+        0x70, 0x06, 0x00, 0x16, 0x12, 0x06, 0xf8, 0x45,
-        0x10, 0x5f, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00, 
+        0x10, 0x5f, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00,
-        0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02, 
+        0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02,
-        0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74, 
+        0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74,
-        0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06, 
+        0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06,
-        0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04, 
+        0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04,
-        0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, 
+        0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1,
-        0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04, 
+        0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04,
-        0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, 
+        0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20,
-        0x88, 0x16, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x0c, 
+        0x88, 0x16, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x0c,
-        0x71, 0xe1, 0x00, 0x04, 0x00, 0x13, 0xf6, 0xab, 
+        0x71, 0xe1, 0x00, 0x04, 0x00, 0x13, 0xf6, 0xab,
-        0xf8, 0x20, 0x10, 0x5f, 0x6b, 0xf8, 0x27, 0x6f, 
+        0xf8, 0x20, 0x10, 0x5f, 0x6b, 0xf8, 0x27, 0x6f,
-        0x00, 0x01, 0x77, 0x10, 0x00, 0x0c, 0xf6, 0xaa, 
+        0x00, 0x01, 0x77, 0x10, 0x00, 0x0c, 0xf6, 0xaa,
-        0xf8, 0x20, 0x10, 0x6b, 0xf2, 0x74, 0x0e, 0x9f, 
+        0xf8, 0x20, 0x10, 0x6b, 0xf2, 0x74, 0x0e, 0x9f,
-        0xf4, 0x95, 0x48, 0x17, 0x71, 0xe1, 0x00, 0x0c, 
+        0xf4, 0x95, 0x48, 0x17, 0x71, 0xe1, 0x00, 0x0c,
-        0x00, 0x12, 0x77, 0x10, 0x00, 0x0c, 0xf4, 0xaa, 
+        0x00, 0x12, 0x77, 0x10, 0x00, 0x0c, 0xf4, 0xaa,
-        0xf8, 0x30, 0x10, 0x7c, 0x77, 0x10, 0x00, 0x0c, 
+        0xf8, 0x30, 0x10, 0x7c, 0x77, 0x10, 0x00, 0x0c,
-        0x71, 0xe1, 0x00, 0x0b, 0x00, 0x13, 0xf6, 0xab, 
+        0x71, 0xe1, 0x00, 0x0b, 0x00, 0x13, 0xf6, 0xab,
-        0xf8, 0x30, 0x10, 0xb4, 0xe7, 0x30, 0xf7, 0xaa, 
+        0xf8, 0x30, 0x10, 0xb4, 0xe7, 0x30, 0xf7, 0xaa,
-        0xf8, 0x30, 0x10, 0xb4, 0xf2, 0x74, 0x0e, 0xc1, 
+        0xf8, 0x30, 0x10, 0xb4, 0xf2, 0x74, 0x0e, 0xc1,
-        0xf4, 0x95, 0x48, 0x17, 0x88, 0x12, 0xf4, 0x95, 
+        0xf4, 0x95, 0x48, 0x17, 0x88, 0x12, 0xf4, 0x95,
-        0xf4, 0x95, 0x6c, 0x82, 0x10, 0x8d, 0x76, 0xe1, 
+        0xf4, 0x95, 0x6c, 0x82, 0x10, 0x8d, 0x76, 0xe1,
-        0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 
+        0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02,
-        0x00, 0x05, 0xf0, 0x73, 0x10, 0xb4, 0x76, 0xe1, 
+        0x00, 0x05, 0xf0, 0x73, 0x10, 0xb4, 0x76, 0xe1,
-        0x00, 0x02, 0x00, 0x04, 0x77, 0x10, 0x00, 0x0c, 
+        0x00, 0x02, 0x00, 0x04, 0x77, 0x10, 0x00, 0x0c,
-        0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf5, 0xaa, 
+        0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf5, 0xaa,
-        0xf8, 0x20, 0x10, 0x9a, 0xf0, 0x73, 0x10, 0x9c, 
+        0xf8, 0x20, 0x10, 0x9a, 0xf0, 0x73, 0x10, 0x9c,
-        0x77, 0x12, 0x00, 0x0c, 0x76, 0x00, 0x00, 0x00, 
+        0x77, 0x12, 0x00, 0x0c, 0x76, 0x00, 0x00, 0x00,
-        0x70, 0x01, 0x00, 0x12, 0x70, 0x02, 0x00, 0x17, 
+        0x70, 0x01, 0x00, 0x12, 0x70, 0x02, 0x00, 0x17,
-        0x76, 0x03, 0x00, 0x01, 0x48, 0x11, 0xf2, 0x74, 
+        0x76, 0x03, 0x00, 0x01, 0x48, 0x11, 0xf2, 0x74,
-        0x0c, 0xb9, 0xf0, 0x00, 0x00, 0x05, 0x76, 0xe1, 
+        0x0c, 0xb9, 0xf0, 0x00, 0x00, 0x05, 0x76, 0xe1,
-        0x00, 0x04, 0x00, 0x00, 0x77, 0x10, 0x00, 0x0c, 
+        0x00, 0x04, 0x00, 0x00, 0x77, 0x10, 0x00, 0x0c,
-        0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf6, 0xaa, 
+        0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf6, 0xaa,
-        0xf8, 0x20, 0x11, 0x1c, 0x48, 0x16, 0xf8, 0x45, 
+        0xf8, 0x20, 0x11, 0x1c, 0x48, 0x16, 0xf8, 0x45,
-        0x11, 0x33, 0x60, 0xe1, 0x00, 0x02, 0x00, 0x05, 
+        0x11, 0x33, 0x60, 0xe1, 0x00, 0x02, 0x00, 0x05,
-        0xf8, 0x20, 0x10, 0xdf, 0x10, 0xe1, 0x00, 0x0b, 
+        0xf8, 0x20, 0x10, 0xdf, 0x10, 0xe1, 0x00, 0x0b,
-        0x08, 0xe1, 0x00, 0x0c, 0x11, 0xe1, 0x00, 0x04, 
+        0x08, 0xe1, 0x00, 0x0c, 0x11, 0xe1, 0x00, 0x04,
-        0xf8, 0x4d, 0x10, 0xc7, 0x6b, 0xf8, 0x27, 0x6f, 
+        0xf8, 0x4d, 0x10, 0xc7, 0x6b, 0xf8, 0x27, 0x6f,
-        0x00, 0x01, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 
+        0x00, 0x01, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95,
-        0xf5, 0xae, 0xf8, 0x20, 0x10, 0xcf, 0x48, 0x16, 
+        0xf5, 0xae, 0xf8, 0x20, 0x10, 0xcf, 0x48, 0x16,
-        0xf4, 0x95, 0x48, 0x08, 0xf8, 0x45, 0x11, 0x16, 
+        0xf4, 0x95, 0x48, 0x08, 0xf8, 0x45, 0x11, 0x16,
-        0x6f, 0xe1, 0x00, 0x0c, 0x0d, 0x00, 0x81, 0xe1, 
+        0x6f, 0xe1, 0x00, 0x0c, 0x0d, 0x00, 0x81, 0xe1,
-        0x00, 0x0c, 0x11, 0x04, 0xf5, 0x00, 0x81, 0x04, 
+        0x00, 0x0c, 0x11, 0x04, 0xf5, 0x00, 0x81, 0x04,
-        0x49, 0x16, 0xf5, 0x20, 0x89, 0x16, 0xf0, 0x73, 
+        0x49, 0x16, 0xf5, 0x20, 0x89, 0x16, 0xf0, 0x73,
-        0x11, 0x0e, 0x10, 0xe1, 0x00, 0x0b, 0x71, 0xe1, 
+        0x11, 0x0e, 0x10, 0xe1, 0x00, 0x0b, 0x71, 0xe1,
-        0x00, 0x0c, 0x00, 0x12, 0x88, 0x10, 0xf4, 0x95, 
+        0x00, 0x0c, 0x00, 0x12, 0x88, 0x10, 0xf4, 0x95,
-        0xf4, 0x95, 0xf6, 0xaa, 0xf8, 0x30, 0x11, 0x16, 
+        0xf4, 0x95, 0xf6, 0xaa, 0xf8, 0x30, 0x11, 0x16,
-        0x49, 0x12, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95, 
+        0x49, 0x12, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95,
-        0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0xf3, 
+        0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0xf3,
-        0x48, 0x16, 0x80, 0x06, 0x48, 0x08, 0xf8, 0x45, 
+        0x48, 0x16, 0x80, 0x06, 0x48, 0x08, 0xf8, 0x45,
-        0x11, 0x16, 0x10, 0x04, 0x70, 0x02, 0x00, 0x17, 
+        0x11, 0x16, 0x10, 0x04, 0x70, 0x02, 0x00, 0x17,
-        0x80, 0x00, 0x76, 0x03, 0x00, 0x00, 0x10, 0x06, 
+        0x80, 0x00, 0x76, 0x03, 0x00, 0x00, 0x10, 0x06,
-        0x80, 0x01, 0x10, 0x05, 0xf0, 0x74, 0x0c, 0xb9, 
+        0x80, 0x01, 0x10, 0x05, 0xf0, 0x74, 0x0c, 0xb9,
-        0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, 
+        0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1,
-        0x00, 0x0c, 0x11, 0x06, 0x10, 0x04, 0xf6, 0x00, 
+        0x00, 0x0c, 0x11, 0x06, 0x10, 0x04, 0xf6, 0x00,
-        0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, 0x88, 0x16, 
+        0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, 0x88, 0x16,
-        0x10, 0xe1, 0x00, 0x0c, 0x08, 0xe1, 0x00, 0x0b, 
+        0x10, 0xe1, 0x00, 0x0c, 0x08, 0xe1, 0x00, 0x0b,
-        0xf8, 0x45, 0x11, 0x1c, 0xf0, 0x73, 0x11, 0x31, 
+        0xf8, 0x45, 0x11, 0x1c, 0xf0, 0x73, 0x11, 0x31,
-        0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, 
+        0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17,
-        0xf0, 0x73, 0x11, 0x33, 0x76, 0xe1, 0x00, 0x0c, 
+        0xf0, 0x73, 0x11, 0x33, 0x76, 0xe1, 0x00, 0x0c,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0x02, 0x00, 0x01, 0x10, 0x04, 
+        0x76, 0xe1, 0x00, 0x02, 0x00, 0x01, 0x10, 0x04,
-        0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f, 
+        0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f,
-        0x88, 0x12, 0xf4, 0x95, 0x77, 0x10, 0x00, 0xff, 
+        0x88, 0x12, 0xf4, 0x95, 0x77, 0x10, 0x00, 0xff,
-        0xf4, 0xaa, 0xf8, 0x30, 0x11, 0x33, 0x6c, 0x86, 
+        0xf4, 0xaa, 0xf8, 0x30, 0x11, 0x33, 0x6c, 0x86,
-        0x0f, 0x70, 0xee, 0x08, 0x8a, 0x17, 0x8a, 0x16, 
+        0x0f, 0x70, 0xee, 0x08, 0x8a, 0x17, 0x8a, 0x16,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc,
-        0xf4, 0x95, 0x71, 0x06, 0x00, 0x12, 0x88, 0x11, 
+        0xf4, 0x95, 0x71, 0x06, 0x00, 0x12, 0x88, 0x11,
-        0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d, 
+        0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d,
-        0xf3, 0x00, 0x24, 0x00, 0x89, 0x14, 0x13, 0x81, 
+        0xf3, 0x00, 0x24, 0x00, 0x89, 0x14, 0x13, 0x81,
-        0xf7, 0x7a, 0xf3, 0x30, 0x00, 0x01, 0x81, 0xf8, 
+        0xf7, 0x7a, 0xf3, 0x30, 0x00, 0x01, 0x81, 0xf8,
-        0x27, 0x60, 0x13, 0xe1, 0x00, 0x01, 0xf7, 0x7c, 
+        0x27, 0x60, 0x13, 0xe1, 0x00, 0x01, 0xf7, 0x7c,
-        0xf3, 0x30, 0x00, 0x03, 0x81, 0xf8, 0x27, 0x61, 
+        0xf3, 0x30, 0x00, 0x03, 0x81, 0xf8, 0x27, 0x61,
-        0xe9, 0x0f, 0x19, 0xe1, 0x00, 0x01, 0x81, 0xf8, 
+        0xe9, 0x0f, 0x19, 0xe1, 0x00, 0x01, 0x81, 0xf8,
-        0x27, 0x62, 0x71, 0xe4, 0x00, 0x03, 0x00, 0x13, 
+        0x27, 0x62, 0x71, 0xe4, 0x00, 0x03, 0x00, 0x13,
-        0xf6, 0xb8, 0x49, 0x13, 0xf3, 0x00, 0x00, 0x01, 
+        0xf6, 0xb8, 0x49, 0x13, 0xf3, 0x00, 0x00, 0x01,
-        0xf3, 0x30, 0x00, 0x0f, 0x49, 0x0b, 0x09, 0xf8, 
+        0xf3, 0x30, 0x00, 0x0f, 0x49, 0x0b, 0x09, 0xf8,
-        0x27, 0x62, 0xf8, 0x4d, 0x11, 0x75, 0x77, 0x10, 
+        0x27, 0x62, 0xf8, 0x4d, 0x11, 0x75, 0x77, 0x10,
-        0x00, 0xff, 0xf4, 0xab, 0xf8, 0x30, 0x11, 0x75, 
+        0x00, 0xff, 0xf4, 0xab, 0xf8, 0x30, 0x11, 0x75,
-        0x57, 0xf8, 0x27, 0x6c, 0xf3, 0x00, 0x00, 0x01, 
+        0x57, 0xf8, 0x27, 0x6c, 0xf3, 0x00, 0x00, 0x01,
-        0x4f, 0xf8, 0x27, 0x6c, 0x76, 0xf8, 0x27, 0x63, 
+        0x4f, 0xf8, 0x27, 0x6c, 0x76, 0xf8, 0x27, 0x63,
-        0x00, 0x01, 0xf0, 0x73, 0x11, 0x78, 0x76, 0xf8, 
+        0x00, 0x01, 0xf0, 0x73, 0x11, 0x78, 0x76, 0xf8,
-        0x27, 0x63, 0x00, 0x00, 0x70, 0xe4, 0x00, 0x03, 
+        0x27, 0x63, 0x00, 0x00, 0x70, 0xe4, 0x00, 0x03,
-        0x27, 0x62, 0x76, 0xf8, 0x27, 0x64, 0x00, 0x00, 
+        0x27, 0x62, 0x76, 0xf8, 0x27, 0x64, 0x00, 0x00,
-        0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8, 0x00, 0x0b, 
+        0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8, 0x00, 0x0b,
-        0x00, 0x02, 0xf8, 0x20, 0x11, 0x8d, 0xe9, 0x01, 
+        0x00, 0x02, 0xf8, 0x20, 0x11, 0x8d, 0xe9, 0x01,
-        0x6f, 0xe1, 0x00, 0x02, 0x0f, 0x18, 0x81, 0xf8, 
+        0x6f, 0xe1, 0x00, 0x02, 0x0f, 0x18, 0x81, 0xf8,
-        0x27, 0x64, 0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8, 
+        0x27, 0x64, 0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8,
-        0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20, 0x11, 0xa9, 
+        0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20, 0x11, 0xa9,
-        0x10, 0xf8, 0x27, 0x64, 0xf1, 0x00, 0x00, 0x04, 
+        0x10, 0xf8, 0x27, 0x64, 0xf1, 0x00, 0x00, 0x04,
-        0x89, 0x13, 0xe9, 0xb8, 0xf5, 0x20, 0x81, 0xf8, 
+        0x89, 0x13, 0xe9, 0xb8, 0xf5, 0x20, 0x81, 0xf8,
-        0x27, 0x65, 0x60, 0x84, 0x00, 0x02, 0xf8, 0x20, 
+        0x27, 0x65, 0x60, 0x84, 0x00, 0x02, 0xf8, 0x20,
-        0x11, 0xa9, 0x70, 0x00, 0x00, 0x11, 0x70, 0x01, 
+        0x11, 0xa9, 0x70, 0x00, 0x00, 0x11, 0x70, 0x01,
-        0x00, 0x13, 0x70, 0x02, 0x27, 0x65, 0xf2, 0x74, 
+        0x00, 0x13, 0x70, 0x02, 0x27, 0x65, 0xf2, 0x74,
-        0x0f, 0x18, 0xf4, 0x95, 0x48, 0x12, 0xee, 0x04, 
+        0x0f, 0x18, 0xf4, 0x95, 0x48, 0x12, 0xee, 0x04,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16,
-        0x4a, 0x17, 0xee, 0xfc, 0xe8, 0x00, 0x4e, 0xf8, 
+        0x4a, 0x17, 0xee, 0xfc, 0xe8, 0x00, 0x4e, 0xf8,
-        0x27, 0x66, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x68, 
+        0x27, 0x66, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x68,
-        0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x6c, 0xe8, 0x00, 
+        0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x6c, 0xe8, 0x00,
-        0x4e, 0xf8, 0x27, 0x6a, 0x77, 0x12, 0x27, 0x40, 
+        0x4e, 0xf8, 0x27, 0x6a, 0x77, 0x12, 0x27, 0x40,
-        0x77, 0x11, 0x24, 0x00, 0x77, 0x1a, 0x00, 0x1f, 
+        0x77, 0x11, 0x24, 0x00, 0x77, 0x1a, 0x00, 0x1f,
-        0xf0, 0x72, 0x11, 0xdb, 0x70, 0x92, 0x00, 0x11, 
+        0xf0, 0x72, 0x11, 0xdb, 0x70, 0x92, 0x00, 0x11,
-        0x76, 0xe1, 0x00, 0x01, 0xff, 0xff, 0x76, 0x81, 
+        0x76, 0xe1, 0x00, 0x01, 0xff, 0xff, 0x76, 0x81,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, 0x76, 0xe1,
-        0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 
+        0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00,
-        0x6d, 0xe9, 0x00, 0x0d, 0xf0, 0x20, 0x25, 0xa0, 
+        0x6d, 0xe9, 0x00, 0x0d, 0xf0, 0x20, 0x25, 0xa0,
-        0xf1, 0x00, 0x00, 0x07, 0x89, 0x11, 0xf1, 0x00, 
+        0xf1, 0x00, 0x00, 0x07, 0x89, 0x11, 0xf1, 0x00,
-        0x00, 0x01, 0x81, 0x02, 0x88, 0x16, 0xf4, 0x95, 
+        0x00, 0x01, 0x81, 0x02, 0x88, 0x16, 0xf4, 0x95,
-        0x77, 0x17, 0x00, 0x20, 0x76, 0x86, 0x00, 0xff, 
+        0x77, 0x17, 0x00, 0x20, 0x76, 0x86, 0x00, 0xff,
-        0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 
+        0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0x06,
-        0x10, 0x02, 0xf0, 0x74, 0x06, 0x6c, 0x76, 0x00, 
+        0x10, 0x02, 0xf0, 0x74, 0x06, 0x6c, 0x76, 0x00,
-        0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74, 
+        0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74,
-        0x06, 0x6c, 0xf4, 0x95, 0x48, 0x11, 0x10, 0x02, 
+        0x06, 0x6c, 0xf4, 0x95, 0x48, 0x11, 0x10, 0x02,
-        0xf0, 0x00, 0x00, 0x0d, 0x80, 0x02, 0x6d, 0xe9, 
+        0xf0, 0x00, 0x00, 0x0d, 0x80, 0x02, 0x6d, 0xe9,
-        0x00, 0x0d, 0x6d, 0xee, 0x00, 0x0d, 0x6c, 0xef, 
+        0x00, 0x0d, 0x6d, 0xee, 0x00, 0x0d, 0x6c, 0xef,
-        0xff, 0xff, 0x11, 0xe8, 0xf0, 0x74, 0x0c, 0x9d, 
+        0xff, 0xff, 0x11, 0xe8, 0xf0, 0x74, 0x0c, 0x9d,
-        0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 
+        0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11,
-        0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 
+        0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17,
-        0xee, 0xfa, 0x88, 0x11, 0x10, 0x0a, 0x49, 0x11, 
+        0xee, 0xfa, 0x88, 0x11, 0x10, 0x0a, 0x49, 0x11,
-        0xf8, 0x4d, 0x12, 0x9f, 0x48, 0x08, 0xf8, 0x45, 
+        0xf8, 0x4d, 0x12, 0x9f, 0x48, 0x08, 0xf8, 0x45,
-        0x12, 0x9f, 0x80, 0x04, 0x12, 0x81, 0xf5, 0x78, 
+        0x12, 0x9f, 0x80, 0x04, 0x12, 0x81, 0xf5, 0x78,
-        0x89, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe2, 
+        0x89, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe2,
-        0xff, 0xb9, 0x12, 0x8a, 0x61, 0xf8, 0x00, 0x08, 
+        0xff, 0xb9, 0x12, 0x8a, 0x61, 0xf8, 0x00, 0x08,
-        0x00, 0x80, 0xf8, 0x30, 0x12, 0x8a, 0x13, 0xe1, 
+        0x00, 0x80, 0xf8, 0x30, 0x12, 0x8a, 0x13, 0xe1,
-        0x00, 0x01, 0xf0, 0xe8, 0xf7, 0x78, 0xf1, 0xa0, 
+        0x00, 0x01, 0xf0, 0xe8, 0xf7, 0x78, 0xf1, 0xa0,
-        0xf2, 0x30, 0x1f, 0xff, 0x88, 0x17, 0xf4, 0x95, 
+        0xf2, 0x30, 0x1f, 0xff, 0x88, 0x17, 0xf4, 0x95,
-        0x77, 0x12, 0x24, 0x00, 0x77, 0x16, 0x00, 0x00, 
+        0x77, 0x12, 0x24, 0x00, 0x77, 0x16, 0x00, 0x00,
-        0x77, 0x13, 0x00, 0x20, 0xf6, 0xb8, 0x48, 0x17, 
+        0x77, 0x13, 0x00, 0x20, 0xf6, 0xb8, 0x48, 0x17,
-        0x08, 0xe2, 0x00, 0x01, 0xf8, 0x45, 0x12, 0x42, 
+        0x08, 0xe2, 0x00, 0x01, 0xf8, 0x45, 0x12, 0x42,
-        0x6d, 0xea, 0x00, 0x0d, 0x6d, 0x96, 0x6c, 0xeb, 
+        0x6d, 0xea, 0x00, 0x0d, 0x6d, 0x96, 0x6c, 0xeb,
-        0xff, 0xff, 0x12, 0x34, 0xf0, 0x73, 0x12, 0x90, 
+        0xff, 0xff, 0x12, 0x34, 0xf0, 0x73, 0x12, 0x90,
-        0x56, 0xf8, 0x27, 0x6a, 0xf0, 0x00, 0x00, 0x01, 
+        0x56, 0xf8, 0x27, 0x6a, 0xf0, 0x00, 0x00, 0x01,
-        0x4e, 0xf8, 0x27, 0x6a, 0x60, 0x82, 0x00, 0x01, 
+        0x4e, 0xf8, 0x27, 0x6a, 0x60, 0x82, 0x00, 0x01,
-        0xf8, 0x30, 0x12, 0x54, 0x70, 0x00, 0x00, 0x16, 
+        0xf8, 0x30, 0x12, 0x54, 0x70, 0x00, 0x00, 0x16,
-        0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11, 
+        0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11,
-        0xf0, 0x73, 0x12, 0x90, 0x70, 0x00, 0x00, 0x16, 
+        0xf0, 0x73, 0x12, 0x90, 0x70, 0x00, 0x00, 0x16,
-        0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11, 
+        0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11,
-        0x72, 0x10, 0x2a, 0x9e, 0xf4, 0x95, 0xf4, 0xaf, 
+        0x72, 0x10, 0x2a, 0x9e, 0xf4, 0x95, 0xf4, 0xaf,
-        0xf8, 0x30, 0x12, 0x6e, 0x76, 0x00, 0x00, 0x00, 
+        0xf8, 0x30, 0x12, 0x6e, 0x76, 0x00, 0x00, 0x00,
-        0x76, 0x01, 0x00, 0xbc, 0x70, 0x02, 0x00, 0x16, 
+        0x76, 0x01, 0x00, 0xbc, 0x70, 0x02, 0x00, 0x16,
-        0x76, 0x03, 0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9, 
+        0x76, 0x03, 0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9,
-        0xf4, 0x95, 0x48, 0x11, 0xf0, 0x73, 0x12, 0x90, 
+        0xf4, 0x95, 0x48, 0x11, 0xf0, 0x73, 0x12, 0x90,
-        0x10, 0xf8, 0x27, 0x6e, 0xf8, 0x44, 0x12, 0x90, 
+        0x10, 0xf8, 0x27, 0x6e, 0xf8, 0x44, 0x12, 0x90,
-        0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0xbc, 
+        0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0xbc,
-        0x70, 0x02, 0x00, 0x16, 0x76, 0x03, 0x00, 0x00, 
+        0x70, 0x02, 0x00, 0x16, 0x76, 0x03, 0x00, 0x00,
-        0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0x48, 0x11, 
+        0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0x48, 0x11,
-        0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0, 0xf0, 0x10, 
+        0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0, 0xf0, 0x10,
-        0x13, 0x88, 0xf8, 0x42, 0x12, 0x90, 0x76, 0xf8, 
+        0x13, 0x88, 0xf8, 0x42, 0x12, 0x90, 0x76, 0xf8,
-        0x27, 0x6e, 0x00, 0x01, 0xf0, 0x73, 0x12, 0x90, 
+        0x27, 0x6e, 0x00, 0x01, 0xf0, 0x73, 0x12, 0x90,
-        0x56, 0xf8, 0x27, 0x66, 0xf0, 0x00, 0x00, 0x01, 
+        0x56, 0xf8, 0x27, 0x66, 0xf0, 0x00, 0x00, 0x01,
-        0x4e, 0xf8, 0x27, 0x66, 0x6d, 0xe9, 0x00, 0x5e, 
+        0x4e, 0xf8, 0x27, 0x66, 0x6d, 0xe9, 0x00, 0x5e,
-        0x56, 0xf8, 0x27, 0x68, 0xf0, 0x00, 0x00, 0x01, 
+        0x56, 0xf8, 0x27, 0x68, 0xf0, 0x00, 0x00, 0x01,
-        0x4e, 0xf8, 0x27, 0x68, 0x71, 0x04, 0x00, 0x12, 
+        0x4e, 0xf8, 0x27, 0x68, 0x71, 0x04, 0x00, 0x12,
-        0x6e, 0xea, 0xff, 0xff, 0x12, 0x18, 0x70, 0x04, 
+        0x6e, 0xea, 0xff, 0xff, 0x12, 0x18, 0x70, 0x04,
-        0x00, 0x12, 0xee, 0x06, 0x8a, 0x17, 0x8a, 0x16, 
+        0x00, 0x12, 0xee, 0x06, 0x8a, 0x17, 0x8a, 0x16,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe,
-        0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d, 
+        0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d,
-        0xf0, 0x00, 0x25, 0xa0, 0x88, 0x11, 0xf4, 0x95, 
+        0xf0, 0x00, 0x25, 0xa0, 0x88, 0x11, 0xf4, 0x95,
-        0xf4, 0x95, 0x76, 0x81, 0x00, 0xff, 0x76, 0x00, 
+        0xf4, 0x95, 0x76, 0x81, 0x00, 0xff, 0x76, 0x00,
-        0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74, 
+        0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74,
-        0x06, 0x6c, 0xf0, 0x00, 0x00, 0x01, 0x76, 0x00, 
+        0x06, 0x6c, 0xf0, 0x00, 0x00, 0x01, 0x76, 0x00,
-        0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0x48, 0x11, 
+        0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0x48, 0x11,
-        0xf2, 0x74, 0x06, 0x6c, 0xf0, 0x00, 0x00, 0x07, 
+        0xf2, 0x74, 0x06, 0x6c, 0xf0, 0x00, 0x00, 0x07,
-        0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 
+        0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11,
-        0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d, 
+        0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d,
-        0xf0, 0x00, 0x24, 0x00, 0x88, 0x11, 0xf4, 0x95, 
+        0xf0, 0x00, 0x24, 0x00, 0x88, 0x11, 0xf4, 0x95,
-        0xf4, 0x95, 0x76, 0xe1, 0x00, 0x01, 0xff, 0xff, 
+        0xf4, 0x95, 0x76, 0xe1, 0x00, 0x01, 0xff, 0xff,
-        0x76, 0x81, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 
+        0x76, 0x81, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff,
-        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 
+        0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95,
-        0x13, 0x03, 0x88, 0x11, 0xfa, 0x4d, 0x12, 0xec, 
+        0x13, 0x03, 0x88, 0x11, 0xfa, 0x4d, 0x12, 0xec,
-        0x71, 0x02, 0x00, 0x12, 0xf3, 0x10, 0x00, 0x01, 
+        0x71, 0x02, 0x00, 0x12, 0xf3, 0x10, 0x00, 0x01,
-        0x89, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x12, 0xeb, 
+        0x89, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x12, 0xeb,
-        0x70, 0x91, 0x00, 0x12, 0x8a, 0x11, 0xfc, 0x00, 
+        0x70, 0x91, 0x00, 0x12, 0x8a, 0x11, 0xfc, 0x00,
-        0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d, 
+        0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d,
-        0xf7, 0xb8, 0xee, 0xfe, 0x10, 0xf8, 0x00, 0x08, 
+        0xf7, 0xb8, 0xee, 0xfe, 0x10, 0xf8, 0x00, 0x08,
-        0x11, 0x06, 0xf1, 0xc0, 0x83, 0x00, 0xf4, 0x85, 
+        0x11, 0x06, 0xf1, 0xc0, 0x83, 0x00, 0xf4, 0x85,
-        0x11, 0x06, 0xf7, 0x85, 0x81, 0x06, 0xf6, 0xb8, 
+        0x11, 0x06, 0xf7, 0x85, 0x81, 0x06, 0xf6, 0xb8,
-        0xec, 0x0f, 0x1e, 0x06, 0x61, 0x00, 0x80, 0x00, 
+        0xec, 0x0f, 0x1e, 0x06, 0x61, 0x00, 0x80, 0x00,
-        0xf8, 0x20, 0x13, 0x05, 0xf4, 0x84, 0xee, 0x02, 
+        0xf8, 0x20, 0x13, 0x05, 0xf4, 0x84, 0xee, 0x02,
-        0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00, 
+        0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00,
-        0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d, 
+        0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d,
-        0xee, 0xfe, 0xf7, 0xb8, 0x80, 0x00, 0x10, 0xf8, 
+        0xee, 0xfe, 0xf7, 0xb8, 0x80, 0x00, 0x10, 0xf8,
-        0x00, 0x08, 0xf4, 0x85, 0x11, 0x06, 0xf7, 0x85, 
+        0x00, 0x08, 0xf4, 0x85, 0x11, 0x06, 0xf7, 0x85,
-        0x81, 0x06, 0xf6, 0xb8, 0xec, 0x0f, 0x1e, 0x06, 
+        0x81, 0x06, 0xf6, 0xb8, 0xec, 0x0f, 0x1e, 0x06,
-        0xf0, 0xf0, 0x61, 0x00, 0x80, 0x00, 0xf8, 0x20, 
+        0xf0, 0xf0, 0x61, 0x00, 0x80, 0x00, 0xf8, 0x20,
-        0x13, 0x20, 0xf4, 0x84, 0xee, 0x02, 0x8a, 0x0d, 
+        0x13, 0x20, 0xf4, 0x84, 0xee, 0x02, 0x8a, 0x0d,
-        0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00, 0x4a, 0x11, 
+        0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00, 0x4a, 0x11,
-        0x77, 0x11, 0x00, 0x7b, 0x76, 0x81, 0x2e, 0xec, 
+        0x77, 0x11, 0x00, 0x7b, 0x76, 0x81, 0x2e, 0xec,
-        0x77, 0x11, 0x00, 0x7b, 0xee, 0xff, 0x71, 0x81, 
+        0x77, 0x11, 0x00, 0x7b, 0xee, 0xff, 0x71, 0x81,
-        0x00, 0x11, 0xee, 0x01, 0x76, 0xe1, 0x00, 0x01, 
+        0x00, 0x11, 0xee, 0x01, 0x76, 0xe1, 0x00, 0x01,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1,
-        0x00, 0x62, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x76, 
+        0x00, 0x62, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x76,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x92, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x92, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0x94, 0x00, 0x00, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x94, 0x00, 0x00, 0x76, 0xe1,
-        0x00, 0xb0, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xb3, 
+        0x00, 0xb0, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xb3,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0xbe, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0xbe, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0xbf, 0x00, 0x00, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0xbf, 0x00, 0x00, 0x76, 0xe1,
-        0x00, 0xc1, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xc3, 
+        0x00, 0xc1, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xc3,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0xc5, 0x00, 0x00, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0xc5, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0xc7, 0x00, 0x00, 0x76, 0x81, 
+        0x76, 0xe1, 0x00, 0xc7, 0x00, 0x00, 0x76, 0x81,
-        0x00, 0x00, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
+        0x00, 0x00, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
-        0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xff, 
+        0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xff,
-        0xf4, 0x95, 0x71, 0x06, 0x00, 0x16, 0xfb, 0x80, 
+        0xf4, 0x95, 0x71, 0x06, 0x00, 0x16, 0xfb, 0x80,
-        0x16, 0xa2, 0x88, 0x17, 0xf4, 0x95, 0xf7, 0xb8, 
+        0x16, 0xa2, 0x88, 0x17, 0xf4, 0x95, 0xf7, 0xb8,
-        0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02, 
+        0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02,
-        0xfa, 0x46, 0x13, 0x88, 0x77, 0x11, 0x00, 0x00, 
+        0xfa, 0x46, 0x13, 0x88, 0x77, 0x11, 0x00, 0x00,
-        0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02, 
+        0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02,
-        0xf8, 0x45, 0x13, 0xf9, 0x10, 0xf8, 0x00, 0x17, 
+        0xf8, 0x45, 0x13, 0xf9, 0x10, 0xf8, 0x00, 0x17,
-        0xf8, 0x45, 0x14, 0x39, 0x10, 0xf8, 0x00, 0x17, 
+        0xf8, 0x45, 0x14, 0x39, 0x10, 0xf8, 0x00, 0x17,
-        0xf0, 0x10, 0x00, 0x01, 0xf8, 0x45, 0x14, 0x1f, 
+        0xf0, 0x10, 0x00, 0x01, 0xf8, 0x45, 0x14, 0x1f,
-        0xf0, 0x73, 0x14, 0x52, 0x10, 0xf8, 0x00, 0x17, 
+        0xf0, 0x73, 0x14, 0x52, 0x10, 0xf8, 0x00, 0x17,
-        0xf0, 0x10, 0x00, 0x03, 0xf8, 0x45, 0x13, 0xd3, 
+        0xf0, 0x10, 0x00, 0x03, 0xf8, 0x45, 0x13, 0xd3,
-        0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x06, 
+        0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x06,
-        0xf8, 0x44, 0x14, 0x52, 0x77, 0x12, 0x00, 0x7b, 
+        0xf8, 0x44, 0x14, 0x52, 0x77, 0x12, 0x00, 0x7b,
-        0x71, 0x82, 0x00, 0x14, 0x61, 0xe4, 0x00, 0x07, 
+        0x71, 0x82, 0x00, 0x14, 0x61, 0xe4, 0x00, 0x07,
-        0x00, 0x40, 0xf8, 0x30, 0x14, 0x52, 0x49, 0x14, 
+        0x00, 0x40, 0xf8, 0x30, 0x14, 0x52, 0x49, 0x14,
-        0x48, 0x17, 0xf6, 0x00, 0x88, 0x12, 0xf4, 0x95, 
+        0x48, 0x17, 0xf6, 0x00, 0x88, 0x12, 0xf4, 0x95,
-        0x77, 0x13, 0x00, 0x55, 0x77, 0x11, 0x00, 0x57, 
+        0x77, 0x13, 0x00, 0x55, 0x77, 0x11, 0x00, 0x57,
-        0x6d, 0xea, 0x00, 0x3b, 0xe5, 0x01, 0x10, 0xe6, 
+        0x6d, 0xea, 0x00, 0x3b, 0xe5, 0x01, 0x10, 0xe6,
-        0x00, 0x06, 0x80, 0x81, 0x48, 0x14, 0x00, 0xf8, 
+        0x00, 0x06, 0x80, 0x81, 0x48, 0x14, 0x00, 0xf8,
-        0x00, 0x17, 0x88, 0x12, 0xf4, 0x95, 0x77, 0x11, 
+        0x00, 0x17, 0x88, 0x12, 0xf4, 0x95, 0x77, 0x11,
-        0x00, 0x55, 0x10, 0xe2, 0x00, 0x40, 0x80, 0x81, 
+        0x00, 0x55, 0x10, 0xe2, 0x00, 0x40, 0x80, 0x81,
-        0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x07, 
+        0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x07,
-        0x80, 0x81, 0x77, 0x11, 0x00, 0x55, 0x10, 0xe2, 
+        0x80, 0x81, 0x77, 0x11, 0x00, 0x55, 0x10, 0xe2,
-        0x00, 0x45, 0x80, 0x81, 0x10, 0xe6, 0x00, 0x08, 
+        0x00, 0x45, 0x80, 0x81, 0x10, 0xe6, 0x00, 0x08,
-        0x77, 0x11, 0x00, 0x57, 0x80, 0x81, 0x77, 0x11, 
+        0x77, 0x11, 0x00, 0x57, 0x80, 0x81, 0x77, 0x11,
-        0x00, 0x55, 0x10, 0xe2, 0x00, 0x4a, 0x80, 0x81, 
+        0x00, 0x55, 0x10, 0xe2, 0x00, 0x4a, 0x80, 0x81,
-        0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x09, 
+        0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x09,
-        0x80, 0x81, 0xf2, 0x73, 0x14, 0x52, 0x77, 0x11, 
+        0x80, 0x81, 0xf2, 0x73, 0x14, 0x52, 0x77, 0x11,
-        0x03, 0xc0, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82, 
+        0x03, 0xc0, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82,
-        0xf0, 0x00, 0x00, 0x07, 0x88, 0x13, 0xf4, 0x95, 
+        0xf0, 0x00, 0x00, 0x07, 0x88, 0x13, 0xf4, 0x95,
-        0xf4, 0x95, 0x96, 0x1b, 0xf8, 0x30, 0x14, 0x52, 
+        0xf4, 0x95, 0x96, 0x1b, 0xf8, 0x30, 0x14, 0x52,
-        0x10, 0xe3, 0x00, 0x35, 0x77, 0x12, 0x00, 0x55, 
+        0x10, 0xe3, 0x00, 0x35, 0x77, 0x12, 0x00, 0x55,
-        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, 
+        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6,
-        0x00, 0x04, 0x80, 0x82, 0x77, 0x12, 0x00, 0x55, 
+        0x00, 0x04, 0x80, 0x82, 0x77, 0x12, 0x00, 0x55,
-        0x10, 0xe3, 0x00, 0x37, 0x80, 0x82, 0x77, 0x12, 
+        0x10, 0xe3, 0x00, 0x37, 0x80, 0x82, 0x77, 0x12,
-        0x00, 0x57, 0x10, 0xe6, 0x00, 0x05, 0x80, 0x82, 
+        0x00, 0x57, 0x10, 0xe6, 0x00, 0x05, 0x80, 0x82,
-        0x48, 0x11, 0xf0, 0x40, 0x00, 0x10, 0xf2, 0x73, 
+        0x48, 0x11, 0xf0, 0x40, 0x00, 0x10, 0xf2, 0x73,
-        0x14, 0x50, 0xf0, 0x40, 0x00, 0x20, 0x77, 0x12, 
+        0x14, 0x50, 0xf0, 0x40, 0x00, 0x20, 0x77, 0x12,
-        0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07, 
+        0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07,
-        0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0d, 
+        0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0d,
-        0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x34, 
+        0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x34,
-        0x77, 0x13, 0x00, 0x55, 0x80, 0x83, 0x77, 0x13, 
+        0x77, 0x13, 0x00, 0x55, 0x80, 0x83, 0x77, 0x13,
-        0x00, 0x57, 0x10, 0xe6, 0x00, 0x02, 0x80, 0x83, 
+        0x00, 0x57, 0x10, 0xe6, 0x00, 0x02, 0x80, 0x83,
-        0x10, 0xe2, 0x00, 0x36, 0x77, 0x12, 0x00, 0x55, 
+        0x10, 0xe2, 0x00, 0x36, 0x77, 0x12, 0x00, 0x55,
-        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, 
+        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6,
-        0x00, 0x03, 0x80, 0x82, 0x48, 0x11, 0xf0, 0x40, 
+        0x00, 0x03, 0x80, 0x82, 0x48, 0x11, 0xf0, 0x40,
-        0x00, 0x04, 0xf2, 0x73, 0x14, 0x50, 0xf0, 0x40, 
+        0x00, 0x04, 0xf2, 0x73, 0x14, 0x50, 0xf0, 0x40,
-        0x00, 0x08, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82, 
+        0x00, 0x08, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82,
-        0xf0, 0x00, 0x00, 0x07, 0x88, 0x12, 0xf4, 0x95, 
+        0xf0, 0x00, 0x00, 0x07, 0x88, 0x12, 0xf4, 0x95,
-        0xf4, 0x95, 0x96, 0x0e, 0xf8, 0x30, 0x14, 0x52, 
+        0xf4, 0x95, 0x96, 0x0e, 0xf8, 0x30, 0x14, 0x52,
-        0x10, 0xe2, 0x00, 0x33, 0x77, 0x12, 0x00, 0x55, 
+        0x10, 0xe2, 0x00, 0x33, 0x77, 0x12, 0x00, 0x55,
-        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, 
+        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6,
-        0x00, 0x01, 0x80, 0x82, 0x48, 0x11, 0xf2, 0x73, 
+        0x00, 0x01, 0x80, 0x82, 0x48, 0x11, 0xf2, 0x73,
-        0x14, 0x50, 0xf0, 0x40, 0x00, 0x02, 0x77, 0x12, 
+        0x14, 0x50, 0xf0, 0x40, 0x00, 0x02, 0x77, 0x12,
-        0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07, 
+        0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07,
-        0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0f, 
+        0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0f,
-        0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x32, 
+        0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x32,
-        0x77, 0x12, 0x00, 0x55, 0x77, 0x13, 0x00, 0x57, 
+        0x77, 0x12, 0x00, 0x55, 0x77, 0x13, 0x00, 0x57,
-        0x80, 0x82, 0x48, 0x11, 0xe7, 0x62, 0xf0, 0x40, 
+        0x80, 0x82, 0x48, 0x11, 0xe7, 0x62, 0xf0, 0x40,
-        0x00, 0x01, 0xe5, 0x01, 0x88, 0x11, 0xf4, 0x95, 
+        0x00, 0x01, 0xe5, 0x01, 0x88, 0x11, 0xf4, 0x95,
-        0x77, 0x12, 0x00, 0x7b, 0x48, 0x11, 0x71, 0x82, 
+        0x77, 0x12, 0x00, 0x7b, 0x48, 0x11, 0x71, 0x82,
-        0x00, 0x12, 0x1a, 0xe2, 0x00, 0x07, 0x80, 0xe2, 
+        0x00, 0x12, 0x1a, 0xe2, 0x00, 0x07, 0x80, 0xe2,
-        0x00, 0x07, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 
+        0x00, 0x07, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01,
-        0x8a, 0x17, 0x48, 0x11, 0x8a, 0x16, 0x8a, 0x11, 
+        0x8a, 0x17, 0x48, 0x11, 0x8a, 0x16, 0x8a, 0x11,
-        0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0x77, 0x0e, 
+        0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0x77, 0x0e,
-        0x00, 0x05, 0x77, 0x12, 0x00, 0x55, 0xe8, 0x04, 
+        0x00, 0x05, 0x77, 0x12, 0x00, 0x55, 0xe8, 0x04,
-        0xf6, 0xb8, 0x28, 0xe1, 0x00, 0x02, 0xee, 0xff, 
+        0xf6, 0xb8, 0x28, 0xe1, 0x00, 0x02, 0xee, 0xff,
-        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0xf0, 0x20, 
+        0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0xf0, 0x20,
-        0x80, 0x00, 0xee, 0x01, 0x1a, 0x82, 0x77, 0x12, 
+        0x80, 0x00, 0xee, 0x01, 0x1a, 0x82, 0x77, 0x12,
-        0x00, 0x57, 0x80, 0x82, 0xe8, 0x01, 0x32, 0xe1, 
+        0x00, 0x57, 0x80, 0x82, 0xe8, 0x01, 0x32, 0xe1,
-        0x00, 0x02, 0xf5, 0x82, 0x77, 0x11, 0x00, 0x54, 
+        0x00, 0x02, 0xf5, 0x82, 0x77, 0x11, 0x00, 0x54,
-        0xf6, 0x93, 0x18, 0x81, 0x77, 0x11, 0x00, 0x54, 
+        0xf6, 0x93, 0x18, 0x81, 0x77, 0x11, 0x00, 0x54,
-        0xf2, 0xa0, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 
+        0xf2, 0xa0, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95,
-        0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, 
+        0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95,
-        0x71, 0x04, 0x00, 0x11, 0xfb, 0x80, 0x16, 0xa2, 
+        0x71, 0x04, 0x00, 0x11, 0xfb, 0x80, 0x16, 0xa2,
-        0x88, 0x16, 0xf4, 0x95, 0x77, 0x12, 0x00, 0x55, 
+        0x88, 0x16, 0xf4, 0x95, 0x77, 0x12, 0x00, 0x55,
-        0x10, 0xe6, 0x00, 0x03, 0x80, 0x82, 0x77, 0x12, 
+        0x10, 0xe6, 0x00, 0x03, 0x80, 0x82, 0x77, 0x12,
-        0x00, 0x56, 0x10, 0xe1, 0x00, 0x02, 0x77, 0x13, 
+        0x00, 0x56, 0x10, 0xe1, 0x00, 0x02, 0x77, 0x13,
-        0x00, 0x56, 0x80, 0x82, 0x77, 0x12, 0x00, 0x56, 
+        0x00, 0x56, 0x80, 0x82, 0x77, 0x12, 0x00, 0x56,
-        0x10, 0xe1, 0x00, 0x03, 0x80, 0x82, 0x10, 0xe1, 
+        0x10, 0xe1, 0x00, 0x03, 0x80, 0x82, 0x10, 0xe1,
-        0x00, 0x04, 0x77, 0x12, 0x00, 0x56, 0x80, 0x82, 
+        0x00, 0x04, 0x77, 0x12, 0x00, 0x56, 0x80, 0x82,
-        0x77, 0x12, 0x00, 0x56, 0x10, 0xe1, 0x00, 0x01, 
+        0x77, 0x12, 0x00, 0x56, 0x10, 0xe1, 0x00, 0x01,
-        0x80, 0x82, 0xe7, 0x12, 0xe5, 0x01, 0xf9, 0x80, 
+        0x80, 0x82, 0xe7, 0x12, 0xe5, 0x01, 0xf9, 0x80,
-        0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, 
+        0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4,
-        0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xf9, 
+        0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xf9,
-        0x77, 0x11, 0x00, 0x7b, 0x76, 0x00, 0x00, 0x16, 
+        0x77, 0x11, 0x00, 0x7b, 0x76, 0x00, 0x00, 0x16,
-        0x76, 0x01, 0x00, 0x17, 0x76, 0x02, 0x00, 0x1a, 
+        0x76, 0x01, 0x00, 0x17, 0x76, 0x02, 0x00, 0x1a,
-        0x76, 0x03, 0x00, 0x1b, 0x76, 0x04, 0x00, 0x1c, 
+        0x76, 0x03, 0x00, 0x1b, 0x76, 0x04, 0x00, 0x1c,
-        0x76, 0x05, 0x00, 0x1d, 0x71, 0x81, 0x00, 0x17, 
+        0x76, 0x05, 0x00, 0x1d, 0x71, 0x81, 0x00, 0x17,
-        0x71, 0xe7, 0x00, 0x06, 0x00, 0x11, 0x10, 0x81, 
+        0x71, 0xe7, 0x00, 0x06, 0x00, 0x11, 0x10, 0x81,
-        0xf8, 0x44, 0x14, 0xdf, 0xf9, 0x80, 0x16, 0x53, 
+        0xf8, 0x44, 0x14, 0xdf, 0xf9, 0x80, 0x16, 0x53,
-        0xf6, 0xb8, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x20, 
+        0xf6, 0xb8, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x20,
-        0xff, 0xff, 0xf6, 0xb8, 0xfb, 0x80, 0x16, 0x08, 
+        0xff, 0xff, 0xf6, 0xb8, 0xfb, 0x80, 0x16, 0x08,
-        0xf0, 0x20, 0xff, 0xff, 0x77, 0x11, 0x00, 0x7b, 
+        0xf0, 0x20, 0xff, 0xff, 0x77, 0x11, 0x00, 0x7b,
-        0x71, 0x81, 0x00, 0x17, 0x76, 0xe7, 0x00, 0x06, 
+        0x71, 0x81, 0x00, 0x17, 0x76, 0xe7, 0x00, 0x06,
-        0x00, 0x01, 0x48, 0x17, 0x77, 0x16, 0x00, 0x00, 
+        0x00, 0x01, 0x48, 0x17, 0x77, 0x16, 0x00, 0x00,
-        0x77, 0x10, 0x00, 0x04, 0x77, 0x15, 0x00, 0x03, 
+        0x77, 0x10, 0x00, 0x04, 0x77, 0x15, 0x00, 0x03,
-        0x77, 0x14, 0x00, 0x02, 0x77, 0x13, 0x00, 0x01, 
+        0x77, 0x14, 0x00, 0x02, 0x77, 0x13, 0x00, 0x01,
-        0xf0, 0x00, 0x00, 0x39, 0x76, 0xe7, 0x00, 0x08, 
+        0xf0, 0x00, 0x00, 0x39, 0x76, 0xe7, 0x00, 0x08,
-        0x00, 0x1f, 0x76, 0xe7, 0x00, 0x07, 0x00, 0x00, 
+        0x00, 0x1f, 0x76, 0xe7, 0x00, 0x07, 0x00, 0x00,
-        0x88, 0x0e, 0x77, 0x1a, 0x00, 0x05, 0x48, 0x17, 
+        0x88, 0x0e, 0x77, 0x1a, 0x00, 0x05, 0x48, 0x17,
-        0xf0, 0x00, 0x00, 0x09, 0x88, 0x12, 0x48, 0x18, 
+        0xf0, 0x00, 0x00, 0x09, 0x88, 0x12, 0x48, 0x18,
-        0x88, 0x19, 0xe8, 0x00, 0xf0, 0x72, 0x15, 0x2c, 
+        0x88, 0x19, 0xe8, 0x00, 0xf0, 0x72, 0x15, 0x2c,
-        0x73, 0x19, 0x00, 0x11, 0x76, 0x82, 0x00, 0x00, 
+        0x73, 0x19, 0x00, 0x11, 0x76, 0x82, 0x00, 0x00,
-        0x11, 0x91, 0x73, 0x11, 0x00, 0x19, 0x70, 0xe2, 
+        0x11, 0x91, 0x73, 0x11, 0x00, 0x19, 0x70, 0xe2,
-        0x00, 0x03, 0x00, 0x16, 0x70, 0xe2, 0x00, 0x04, 
+        0x00, 0x03, 0x00, 0x16, 0x70, 0xe2, 0x00, 0x04,
-        0x00, 0x13, 0x70, 0xe2, 0x00, 0x05, 0x00, 0x14, 
+        0x00, 0x13, 0x70, 0xe2, 0x00, 0x05, 0x00, 0x14,
-        0x81, 0xe2, 0x00, 0x01, 0x70, 0xe2, 0x00, 0x06, 
+        0x81, 0xe2, 0x00, 0x01, 0x70, 0xe2, 0x00, 0x06,
-        0x00, 0x15, 0x70, 0xe2, 0x00, 0x07, 0x00, 0x10, 
+        0x00, 0x15, 0x70, 0xe2, 0x00, 0x07, 0x00, 0x10,
-        0x80, 0xe2, 0x00, 0x02, 0x73, 0x0e, 0x00, 0x11, 
+        0x80, 0xe2, 0x00, 0x02, 0x73, 0x0e, 0x00, 0x11,
-        0xf1, 0x00, 0x00, 0x1e, 0x6d, 0xee, 0x00, 0x05, 
+        0xf1, 0x00, 0x00, 0x1e, 0x6d, 0xee, 0x00, 0x05,
-        0x6d, 0xeb, 0x00, 0x05, 0x6d, 0xec, 0x00, 0x05, 
+        0x6d, 0xeb, 0x00, 0x05, 0x6d, 0xec, 0x00, 0x05,
-        0x6d, 0xed, 0x00, 0x05, 0x6d, 0xe8, 0x00, 0x05, 
+        0x6d, 0xed, 0x00, 0x05, 0x6d, 0xe8, 0x00, 0x05,
-        0xf0, 0x00, 0x00, 0x01, 0x81, 0x91, 0x6d, 0xea, 
+        0xf0, 0x00, 0x00, 0x01, 0x81, 0x91, 0x6d, 0xea,
-        0x00, 0x08, 0x73, 0x11, 0x00, 0x0e, 0xee, 0x07, 
+        0x00, 0x08, 0x73, 0x11, 0x00, 0x0e, 0xee, 0x07,
-        0x76, 0xe7, 0x00, 0x41, 0x00, 0x24, 0x76, 0xe7, 
+        0x76, 0xe7, 0x00, 0x41, 0x00, 0x24, 0x76, 0xe7,
-        0x00, 0x46, 0x00, 0x25, 0x76, 0xe7, 0x00, 0x4b, 
+        0x00, 0x46, 0x00, 0x25, 0x76, 0xe7, 0x00, 0x4b,
-        0x00, 0x26, 0x76, 0xe7, 0x00, 0x50, 0x00, 0x27, 
+        0x00, 0x26, 0x76, 0xe7, 0x00, 0x50, 0x00, 0x27,
-        0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, 
+        0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4,
-        0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfe, 0x88, 0x11, 
+        0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfe, 0x88, 0x11,
-        0x56, 0x06, 0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2, 
+        0x56, 0x06, 0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2,
-        0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11, 0xf0, 0x10, 
+        0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11, 0xf0, 0x10,
-        0xff, 0xff, 0xfa, 0x45, 0x15, 0x60, 0x77, 0x16, 
+        0xff, 0xff, 0xfa, 0x45, 0x15, 0x60, 0x77, 0x16,
-        0xff, 0xff, 0x77, 0x12, 0x00, 0x7b, 0x49, 0x11, 
+        0xff, 0xff, 0x77, 0x12, 0x00, 0x7b, 0x49, 0x11,
-        0x10, 0x82, 0xf6, 0x03, 0xf0, 0x00, 0x00, 0x09, 
+        0x10, 0x82, 0xf6, 0x03, 0xf0, 0x00, 0x00, 0x09,
-        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 
+        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81,
-        0xf8, 0x44, 0x15, 0x71, 0xf2, 0x73, 0x15, 0x71, 
+        0xf8, 0x44, 0x15, 0x71, 0xf2, 0x73, 0x15, 0x71,
-        0xf4, 0x95, 0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b, 
+        0xf4, 0x95, 0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b,
-        0x10, 0x81, 0xf0, 0x00, 0x00, 0x09, 0x88, 0x11, 
+        0x10, 0x81, 0xf0, 0x00, 0x00, 0x09, 0x88, 0x11,
-        0xf4, 0x95, 0x77, 0x12, 0x00, 0x06, 0x10, 0x81, 
+        0xf4, 0x95, 0x77, 0x12, 0x00, 0x06, 0x10, 0x81,
-        0xf8, 0x45, 0x15, 0x5c, 0x6e, 0xea, 0xff, 0xff, 
+        0xf8, 0x45, 0x15, 0x5c, 0x6e, 0xea, 0xff, 0xff,
-        0x15, 0x69, 0x6d, 0xe9, 0x00, 0x08, 0x76, 0x86, 
+        0x15, 0x69, 0x6d, 0xe9, 0x00, 0x08, 0x76, 0x86,
-        0x00, 0x01, 0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80, 
+        0x00, 0x01, 0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80,
-        0x10, 0xf8, 0x00, 0x0b, 0xf8, 0x45, 0x15, 0x7e, 
+        0x10, 0xf8, 0x00, 0x0b, 0xf8, 0x45, 0x15, 0x7e,
-        0xfb, 0x80, 0x15, 0x85, 0xf4, 0x95, 0x48, 0x16, 
+        0xfb, 0x80, 0x15, 0x85, 0xf4, 0x95, 0x48, 0x16,
-        0xf9, 0x80, 0x16, 0x9a, 0xee, 0x02, 0x48, 0x16, 
+        0xf9, 0x80, 0x16, 0x9a, 0xee, 0x02, 0x48, 0x16,
-        0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 
+        0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11,
-        0xee, 0xff, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 
+        0xee, 0xff, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11,
-        0xf4, 0x95, 0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 
+        0xf4, 0x95, 0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9,
-        0xf8, 0x30, 0x15, 0xc4, 0x10, 0xe1, 0x00, 0x03, 
+        0xf8, 0x30, 0x15, 0xc4, 0x10, 0xe1, 0x00, 0x03,
-        0x77, 0x12, 0x00, 0x55, 0x80, 0x82, 0x77, 0x12, 
+        0x77, 0x12, 0x00, 0x55, 0x80, 0x82, 0x77, 0x12,
-        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, 
+        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12,
-        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, 
+        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12,
-        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, 
+        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12,
-        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, 
+        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12,
-        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, 
+        0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1,
-        0x00, 0x02, 0xf0, 0x00, 0x00, 0x08, 0x32, 0xf8, 
+        0x00, 0x02, 0xf0, 0x00, 0x00, 0x08, 0x32, 0xf8,
-        0x00, 0x08, 0x77, 0x12, 0x00, 0x54, 0xe8, 0x01, 
+        0x00, 0x08, 0x77, 0x12, 0x00, 0x54, 0xe8, 0x01,
-        0xf4, 0x82, 0xf4, 0x93, 0x18, 0x82, 0x77, 0x12, 
+        0xf4, 0x82, 0xf4, 0x93, 0x18, 0x82, 0x77, 0x12,
-        0x00, 0x54, 0xf0, 0x40, 0x00, 0x00, 0x80, 0x82, 
+        0x00, 0x54, 0xf0, 0x40, 0x00, 0x00, 0x80, 0x82,
-        0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x76, 
+        0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x76,
-        0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x66, 
+        0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x66,
-        0xf0, 0x73, 0x16, 0x03, 0x77, 0x11, 0x00, 0x7b, 
+        0xf0, 0x73, 0x16, 0x03, 0x77, 0x11, 0x00, 0x7b,
-        0x71, 0x81, 0x00, 0x11, 0x71, 0xe1, 0x00, 0x07, 
+        0x71, 0x81, 0x00, 0x11, 0x71, 0xe1, 0x00, 0x07,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1,
-        0x00, 0x09, 0xf9, 0x80, 0x15, 0x85, 0x77, 0x11, 
+        0x00, 0x09, 0xf9, 0x80, 0x15, 0x85, 0x77, 0x11,
-        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, 
+        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1,
-        0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, 
+        0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00,
-        0x00, 0x08, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81, 
+        0x00, 0x08, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81,
-        0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80, 
+        0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80,
-        0x15, 0x85, 0xf0, 0x00, 0x00, 0x10, 0x77, 0x11, 
+        0x15, 0x85, 0xf0, 0x00, 0x00, 0x10, 0x77, 0x11,
-        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, 
+        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1,
-        0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, 
+        0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00,
-        0x00, 0x18, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81, 
+        0x00, 0x18, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81,
-        0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80, 
+        0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80,
-        0x15, 0x85, 0xf0, 0x00, 0x00, 0x20, 0x77, 0x11, 
+        0x15, 0x85, 0xf0, 0x00, 0x00, 0x20, 0x77, 0x11,
-        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, 
+        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1,
-        0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, 
+        0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00,
-        0x00, 0x28, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 
+        0x00, 0x28, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01,
-        0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, 
+        0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff,
-        0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, 
+        0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95,
-        0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, 
+        0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30,
-        0x16, 0x41, 0x77, 0x11, 0x00, 0x55, 0x76, 0x81, 
+        0x16, 0x41, 0x77, 0x11, 0x00, 0x55, 0x76, 0x81,
-        0x00, 0x1e, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x1e, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81,
-        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0xf2, 0x73, 
+        0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0xf2, 0x73,
-        0x16, 0x4e, 0x76, 0x81, 0x00, 0x00, 0x77, 0x11, 
+        0x16, 0x4e, 0x76, 0x81, 0x00, 0x00, 0x77, 0x11,
-        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x71, 0xe1, 
+        0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x71, 0xe1,
-        0x00, 0x07, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 
+        0x00, 0x07, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00,
-        0x10, 0xe1, 0x00, 0x39, 0xf9, 0x80, 0x16, 0x08, 
+        0x10, 0xe1, 0x00, 0x39, 0xf9, 0x80, 0x16, 0x08,
-        0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, 
+        0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11,
-        0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b, 
+        0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b,
-        0x10, 0x81, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x11, 
+        0x10, 0x81, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x11,
-        0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44, 
+        0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44,
-        0x16, 0x63, 0xf4, 0x95, 0xee, 0xff, 0x76, 0x81, 
+        0x16, 0x63, 0xf4, 0x95, 0xee, 0xff, 0x76, 0x81,
-        0x00, 0x01, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4, 
+        0x00, 0x01, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4,
-        0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8, 
+        0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8,
-        0x00, 0x08, 0xee, 0xff, 0x77, 0x11, 0x00, 0x01, 
+        0x00, 0x08, 0xee, 0xff, 0x77, 0x11, 0x00, 0x01,
-        0xe8, 0x01, 0xee, 0x01, 0xf4, 0x82, 0x1a, 0x81, 
+        0xe8, 0x01, 0xee, 0x01, 0xf4, 0x82, 0x1a, 0x81,
-        0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
+        0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
-        0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8, 
+        0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8,
-        0x00, 0x08, 0xee, 0xff, 0xe8, 0x01, 0x77, 0x11, 
+        0x00, 0x08, 0xee, 0xff, 0xe8, 0x01, 0x77, 0x11,
-        0x00, 0x00, 0xf4, 0x82, 0xee, 0x01, 0xf4, 0x93, 
+        0x00, 0x00, 0xf4, 0x82, 0xee, 0x01, 0xf4, 0x93,
-        0x18, 0x81, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 
+        0x18, 0x81, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95,
-        0xf4, 0xe4, 0x4a, 0x11, 0xf0, 0x10, 0x00, 0x10, 
+        0xf4, 0xe4, 0x4a, 0x11, 0xf0, 0x10, 0x00, 0x10,
-        0x77, 0x11, 0x00, 0x00, 0x32, 0xf8, 0x00, 0x08, 
+        0x77, 0x11, 0x00, 0x00, 0x32, 0xf8, 0x00, 0x08,
-        0xee, 0xff, 0x11, 0x81, 0xe8, 0x01, 0xee, 0x01, 
+        0xee, 0xff, 0x11, 0x81, 0xe8, 0x01, 0xee, 0x01,
-        0x77, 0x11, 0x00, 0x00, 0xf4, 0x82, 0xf2, 0xa0, 
+        0x77, 0x11, 0x00, 0x00, 0xf4, 0x82, 0xf2, 0xa0,
-        0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
+        0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
-        0xf2, 0x73, 0x16, 0x9e, 0xf6, 0xbb, 0xf4, 0x95, 
+        0xf2, 0x73, 0x16, 0x9e, 0xf6, 0xbb, 0xf4, 0x95,
-        0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4, 
+        0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4,
-        0xf2, 0x73, 0x16, 0xa6, 0xf7, 0xbb, 0xf4, 0x95, 
+        0xf2, 0x73, 0x16, 0xa6, 0xf7, 0xbb, 0xf4, 0x95,
-        0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4, 
+        0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4,
-        0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, 0x71, 0x04, 
+        0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, 0x71, 0x04,
-        0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 
+        0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11,
-        0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x0e, 0x10, 0xe6, 0x00, 0x0e, 
+        0x76, 0x82, 0x00, 0x0e, 0x10, 0xe6, 0x00, 0x0e,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82,
-        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x0d, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 
+        0x00, 0x0d, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12,
-        0x10, 0xe6, 0x00, 0x0d, 0x80, 0x82, 0x71, 0xe1, 
+        0x10, 0xe6, 0x00, 0x0d, 0x80, 0x82, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0c, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0c,
-        0x10, 0xe6, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06, 
+        0x10, 0xe6, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 
+        0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x0b, 0x10, 0xe6, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x0b, 0x10, 0xe6,
-        0x00, 0x0b, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 
+        0x00, 0x0b, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12,
-        0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x10, 0xe6, 0x00, 0x0a, 0x80, 0x82, 
+        0x00, 0x12, 0x10, 0xe6, 0x00, 0x0a, 0x80, 0x82,
-        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x09, 0x10, 0xe6, 0x00, 0x09, 0x71, 0xe1, 
+        0x00, 0x09, 0x10, 0xe6, 0x00, 0x09, 0x71, 0xe1,
-        0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, 
+        0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x08, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x08,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6,
-        0x00, 0x08, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 
+        0x00, 0x08, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x07, 0x10, 0xe6, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x07, 0x10, 0xe6,
-        0x00, 0x07, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 
+        0x00, 0x07, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12,
-        0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x10, 0xe6, 0x00, 0x06, 0x80, 0x82, 
+        0x00, 0x12, 0x10, 0xe6, 0x00, 0x06, 0x80, 0x82,
-        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x05, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 
+        0x00, 0x05, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12,
-        0x10, 0xe6, 0x00, 0x05, 0x80, 0x82, 0x71, 0xe1, 
+        0x10, 0xe6, 0x00, 0x05, 0x80, 0x82, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x04, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x04,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6,
-        0x00, 0x04, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 
+        0x00, 0x04, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x03, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x03, 0x71, 0xe1,
-        0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, 0x00, 0x03, 
+        0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, 0x00, 0x03,
-        0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x02, 0x10, 0xe6, 0x00, 0x02, 
+        0x76, 0x82, 0x00, 0x02, 0x10, 0xe6, 0x00, 0x02,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82,
-        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x01, 0x10, 0xe6, 0x00, 0x01, 0x71, 0xe1, 
+        0x00, 0x01, 0x10, 0xe6, 0x00, 0x01, 0x71, 0xe1,
-        0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, 
+        0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x13, 0xe7, 0x62, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x13, 0xe7, 0x62,
-        0xe5, 0x01, 0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16, 
+        0xe5, 0x01, 0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16,
-        0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 
+        0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11,
-        0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 
+        0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05,
-        0x00, 0x12, 0xee, 0xff, 0x76, 0x82, 0x00, 0x00, 
+        0x00, 0x12, 0xee, 0xff, 0x76, 0x82, 0x00, 0x00,
-        0xee, 0x01, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x11, 
+        0xee, 0x01, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x11,
-        0x69, 0x81, 0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95, 
+        0x69, 0x81, 0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95,
-        0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95, 
+        0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95,
-        0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0xee, 0xff, 0x76, 0x82, 0x00, 0x01, 0xee, 0x01, 
+        0xee, 0xff, 0x76, 0x82, 0x00, 0x01, 0xee, 0x01,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x11, 0x69, 0x81, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x11, 0x69, 0x81,
-        0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
+        0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
-        0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 
+        0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81,
-        0xf0, 0x00, 0x00, 0x94, 0x88, 0x11, 0xf4, 0x95, 
+        0xf0, 0x00, 0x00, 0x94, 0x88, 0x11, 0xf4, 0x95,
-        0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44, 0x17, 0x9c, 
+        0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44, 0x17, 0x9c,
-        0xf4, 0x95, 0xee, 0xff, 0xf9, 0x80, 0x16, 0x53, 
+        0xf4, 0x95, 0xee, 0xff, 0xf9, 0x80, 0x16, 0x53,
-        0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00, 
+        0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00,
-        0x00, 0x94, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 
+        0x00, 0x94, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95,
-        0x76, 0x81, 0x00, 0x01, 0xee, 0x01, 0x76, 0xe1, 
+        0x76, 0x81, 0x00, 0x01, 0xee, 0x01, 0x76, 0xe1,
-        0x00, 0x01, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 
+        0x00, 0x01, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02,
-        0x00, 0x21, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x20, 
+        0x00, 0x21, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x20,
-        0x76, 0xe1, 0x00, 0x04, 0x00, 0x23, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x04, 0x00, 0x23, 0x76, 0xe1,
-        0x00, 0x05, 0x00, 0x22, 0x76, 0xe1, 0x00, 0x06, 
+        0x00, 0x05, 0x00, 0x22, 0x76, 0xe1, 0x00, 0x06,
-        0x00, 0x38, 0x76, 0xe1, 0x00, 0x07, 0x00, 0x39, 
+        0x00, 0x38, 0x76, 0xe1, 0x00, 0x07, 0x00, 0x39,
-        0x76, 0xe1, 0x00, 0x08, 0x00, 0x15, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x08, 0x00, 0x15, 0x76, 0xe1,
-        0x00, 0x09, 0x00, 0x14, 0x76, 0xe1, 0x00, 0x0a, 
+        0x00, 0x09, 0x00, 0x14, 0x76, 0xe1, 0x00, 0x0a,
-        0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x41, 
+        0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x41,
-        0x76, 0xe1, 0x00, 0x0c, 0x00, 0x40, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x0c, 0x00, 0x40, 0x76, 0xe1,
-        0x00, 0x0d, 0x00, 0x43, 0x76, 0xe1, 0x00, 0x0e, 
+        0x00, 0x0d, 0x00, 0x43, 0x76, 0xe1, 0x00, 0x0e,
-        0x00, 0x42, 0x76, 0xe1, 0x00, 0x0f, 0x00, 0x48, 
+        0x00, 0x42, 0x76, 0xe1, 0x00, 0x0f, 0x00, 0x48,
-        0x76, 0xe1, 0x00, 0x10, 0x00, 0x49, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x10, 0x00, 0x49, 0x76, 0xe1,
-        0x00, 0x11, 0x00, 0x1b, 0x76, 0xe1, 0x00, 0x12, 
+        0x00, 0x11, 0x00, 0x1b, 0x76, 0xe1, 0x00, 0x12,
-        0x00, 0x1a, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, 
+        0x00, 0x1a, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4,
-        0x4a, 0x11, 0xee, 0xfd, 0x88, 0x11, 0x56, 0x06, 
+        0x4a, 0x11, 0xee, 0xfd, 0x88, 0x11, 0x56, 0x06,
-        0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2, 0x77, 0x12, 
+        0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2, 0x77, 0x12,
-        0x00, 0x7b, 0x77, 0x0e, 0x00, 0x09, 0x10, 0x82, 
+        0x00, 0x7b, 0x77, 0x0e, 0x00, 0x09, 0x10, 0x82,
-        0x28, 0xf8, 0x00, 0x11, 0xf0, 0x00, 0x00, 0x95, 
+        0x28, 0xf8, 0x00, 0x11, 0xf0, 0x00, 0x00, 0x95,
-        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 
+        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81,
-        0xf8, 0x45, 0x17, 0xf0, 0xf2, 0x73, 0x17, 0xfd, 
+        0xf8, 0x45, 0x17, 0xf0, 0xf2, 0x73, 0x17, 0xfd,
-        0x77, 0x11, 0xff, 0xff, 0x76, 0x81, 0x00, 0x01, 
+        0x77, 0x11, 0xff, 0xff, 0x76, 0x81, 0x00, 0x01,
-        0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80, 0x10, 0xf8, 
+        0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80, 0x10, 0xf8,
-        0x00, 0x0b, 0xf8, 0x45, 0x17, 0xfd, 0xfb, 0x80, 
+        0x00, 0x0b, 0xf8, 0x45, 0x17, 0xfd, 0xfb, 0x80,
-        0x18, 0x10, 0xf4, 0x95, 0x48, 0x11, 0xf9, 0x80, 
+        0x18, 0x10, 0xf4, 0x95, 0x48, 0x11, 0xf9, 0x80,
-        0x16, 0x9a, 0xee, 0x03, 0x48, 0x11, 0x8a, 0x11, 
+        0x16, 0x9a, 0xee, 0x03, 0x48, 0x11, 0x8a, 0x11,
-        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 
+        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11,
-        0xf4, 0x95, 0xee, 0xff, 0x71, 0xe1, 0x00, 0x01, 
+        0xf4, 0x95, 0xee, 0xff, 0x71, 0xe1, 0x00, 0x01,
-        0x00, 0x11, 0xee, 0x01, 0x10, 0x81, 0x8a, 0x11, 
+        0x00, 0x11, 0xee, 0x01, 0x10, 0x81, 0x8a, 0x11,
-        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, 
+        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff,
-        0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, 
+        0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95,
-        0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, 
+        0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30,
-        0x18, 0xc3, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x18, 0xc3, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x01, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x01,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x02, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x02, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x03, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x03,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x04, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x04, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x05, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x05,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x01, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x01, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x07, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x07,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
-        0x20, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x20, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x08, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x08, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x09, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x09,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0b, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0b,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1,
-        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0d, 
+        0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0d,
-        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82,
-        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 
+        0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12,
-        0x76, 0x82, 0x00, 0x0e, 0x71, 0xe1, 0x00, 0x06, 
+        0x76, 0x82, 0x00, 0x0e, 0x71, 0xe1, 0x00, 0x06,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1,
-        0x00, 0x07, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1, 
+        0x00, 0x07, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1,
-        0x00, 0x08, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1, 
+        0x00, 0x08, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1,
-        0x00, 0x07, 0xf9, 0x80, 0x16, 0x66, 0x10, 0xe1, 
+        0x00, 0x07, 0xf9, 0x80, 0x16, 0x66, 0x10, 0xe1,
-        0x00, 0x08, 0xf9, 0x80, 0x16, 0x66, 0xf0, 0x73, 
+        0x00, 0x08, 0xf9, 0x80, 0x16, 0x66, 0xf0, 0x73,
-        0x18, 0xd1, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 
+        0x18, 0xd1, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81,
-        0xfb, 0x80, 0x18, 0x10, 0xf0, 0x00, 0x00, 0x95, 
+        0xfb, 0x80, 0x18, 0x10, 0xf0, 0x00, 0x00, 0x95,
-        0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xfb, 0x80, 
+        0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xfb, 0x80,
-        0x18, 0x10, 0xf0, 0x00, 0x00, 0x9e, 0xf9, 0x80, 
+        0x18, 0x10, 0xf0, 0x00, 0x00, 0x9e, 0xf9, 0x80,
-        0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4, 
+        0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4,
-        0x4a, 0x11, 0x88, 0x11, 0xee, 0xff, 0xf4, 0x95, 
+        0x4a, 0x11, 0x88, 0x11, 0xee, 0xff, 0xf4, 0x95,
-        0x10, 0x04, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x11, 
+        0x10, 0x04, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x11,
-        0xee, 0x01, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 
+        0xee, 0x01, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95,
-        0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, 
+        0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95,
-        0x71, 0x04, 0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2, 
+        0x71, 0x04, 0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2,
-        0x88, 0x11, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x02, 
+        0x88, 0x11, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x02,
-        0x00, 0x12, 0x76, 0x82, 0x00, 0x10, 0x10, 0xe6, 
+        0x00, 0x12, 0x76, 0x82, 0x00, 0x10, 0x10, 0xe6,
-        0x00, 0x01, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x12, 
+        0x00, 0x01, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x12,
-        0x80, 0x82, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12, 
+        0x80, 0x82, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12,
-        0x10, 0xe6, 0x00, 0x02, 0x80, 0x82, 0xe7, 0x62, 
+        0x10, 0xe6, 0x00, 0x02, 0x80, 0x82, 0xe7, 0x62,
-        0x71, 0xe1, 0x00, 0x02, 0x00, 0x13, 0xe5, 0x01, 
+        0x71, 0xe1, 0x00, 0x02, 0x00, 0x13, 0xe5, 0x01,
-        0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11, 
+        0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11,
-        0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xee, 0xff, 
+        0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xee, 0xff,
-        0xee, 0x01, 0x10, 0xe1, 0x00, 0x01, 0x8a, 0x11, 
+        0xee, 0x01, 0x10, 0xe1, 0x00, 0x01, 0x8a, 0x11,
-        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11, 
+        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11,
-        0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3, 
+        0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3,
-        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 
+        0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81,
-        0xfa, 0x44, 0x19, 0x2a, 0xf4, 0x95, 0xee, 0xff, 
+        0xfa, 0x44, 0x19, 0x2a, 0xf4, 0x95, 0xee, 0xff,
-        0xf9, 0x80, 0x16, 0x53, 0x77, 0x11, 0x00, 0x7b, 
+        0xf9, 0x80, 0x16, 0x53, 0x77, 0x11, 0x00, 0x7b,
-        0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3, 0x88, 0x11, 
+        0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3, 0x88, 0x11,
-        0xf4, 0x95, 0xf4, 0x95, 0x76, 0x81, 0x00, 0x01, 
+        0xf4, 0x95, 0xf4, 0x95, 0x76, 0x81, 0x00, 0x01,
-        0xee, 0x01, 0x76, 0xe1, 0x00, 0x01, 0x00, 0x00, 
+        0xee, 0x01, 0x76, 0xe1, 0x00, 0x01, 0x00, 0x00,
-        0x76, 0xe1, 0x00, 0x02, 0x00, 0x13, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x02, 0x00, 0x13, 0x76, 0xe1,
-        0x00, 0x03, 0x00, 0x26, 0x76, 0xe1, 0x00, 0x04, 
+        0x00, 0x03, 0x00, 0x26, 0x76, 0xe1, 0x00, 0x04,
-        0x00, 0x25, 0x76, 0xe1, 0x00, 0x05, 0x00, 0x24, 
+        0x00, 0x25, 0x76, 0xe1, 0x00, 0x05, 0x00, 0x24,
-        0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1, 
+        0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1,
-        0x00, 0x07, 0x00, 0x17, 0x76, 0xe1, 0x00, 0x08, 
+        0x00, 0x07, 0x00, 0x17, 0x76, 0xe1, 0x00, 0x08,
-        0x00, 0x32, 0x76, 0xe1, 0x00, 0x09, 0x00, 0x31, 
+        0x00, 0x32, 0x76, 0xe1, 0x00, 0x09, 0x00, 0x31,
-        0x76, 0xe1, 0x00, 0x0a, 0x00, 0x30, 0x8a, 0x11, 
+        0x76, 0xe1, 0x00, 0x0a, 0x00, 0x30, 0x8a, 0x11,
-        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 
+        0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16,
-        0x4a, 0x17, 0xee, 0xff, 0xf4, 0x95, 0x71, 0x06, 
+        0x4a, 0x17, 0xee, 0xff, 0xf4, 0x95, 0x71, 0x06,
-        0x00, 0x17, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 
+        0x00, 0x17, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11,
-        0xf4, 0x95, 0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11, 
+        0xf4, 0x95, 0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11,
-        0xf0, 0x10, 0xff, 0xff, 0xfa, 0x45, 0x19, 0x73, 
+        0xf0, 0x10, 0xff, 0xff, 0xfa, 0x45, 0x19, 0x73,
-        0x77, 0x16, 0xff, 0xff, 0x77, 0x12, 0x00, 0x7b, 
+        0x77, 0x16, 0xff, 0xff, 0x77, 0x12, 0x00, 0x7b,
-        0x77, 0x0e, 0x00, 0x05, 0x10, 0x82, 0x28, 0xf8, 
+        0x77, 0x0e, 0x00, 0x05, 0x10, 0x82, 0x28, 0xf8,
-        0x00, 0x11, 0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11, 
+        0x00, 0x11, 0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11,
-        0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf8, 0x44, 
+        0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf8, 0x44,
-        0x19, 0x84, 0xf2, 0x73, 0x19, 0x84, 0xf4, 0x95, 
+        0x19, 0x84, 0xf2, 0x73, 0x19, 0x84, 0xf4, 0x95,
-        0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 
+        0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81,
-        0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11, 0xf4, 0x95, 
+        0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11, 0xf4, 0x95,
-        0x77, 0x12, 0x00, 0x02, 0x10, 0x81, 0xf8, 0x45, 
+        0x77, 0x12, 0x00, 0x02, 0x10, 0x81, 0xf8, 0x45,
-        0x19, 0x6f, 0x6e, 0xea, 0xff, 0xff, 0x19, 0x7c, 
+        0x19, 0x6f, 0x6e, 0xea, 0xff, 0xff, 0x19, 0x7c,
-        0x6d, 0xe9, 0x00, 0x05, 0x61, 0xf8, 0x00, 0x17, 
+        0x6d, 0xe9, 0x00, 0x05, 0x61, 0xf8, 0x00, 0x17,
-        0x00, 0x01, 0xfa, 0x20, 0x19, 0x8f, 0x76, 0x86, 
+        0x00, 0x01, 0xfa, 0x20, 0x19, 0x8f, 0x76, 0x86,
-        0x00, 0x01, 0xfb, 0x80, 0x19, 0x97, 0xf4, 0x95, 
+        0x00, 0x01, 0xfb, 0x80, 0x19, 0x97, 0xf4, 0x95,
-        0x48, 0x16, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 
+        0x48, 0x16, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01,
-        0x8a, 0x17, 0x48, 0x16, 0x8a, 0x16, 0x8a, 0x11, 
+        0x8a, 0x17, 0x48, 0x16, 0x8a, 0x16, 0x8a, 0x11,
-        0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, 0xfb, 0x80, 
+        0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, 0xfb, 0x80,
-        0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, 
+        0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10,
-        0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, 0x19, 0xcc, 
+        0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, 0x19, 0xcc,
-        0x71, 0xe1, 0x00, 0x02, 0x00, 0x12, 0x69, 0x82, 
+        0x71, 0xe1, 0x00, 0x02, 0x00, 0x12, 0x69, 0x82,
-        0x00, 0x10, 0x71, 0xe1, 0x00, 0x02, 0x00, 0x12, 
+        0x00, 0x10, 0x71, 0xe1, 0x00, 0x02, 0x00, 0x12,
-        0x68, 0x82, 0xf7, 0xff, 0x71, 0xe1, 0x00, 0x02, 
+        0x68, 0x82, 0xf7, 0xff, 0x71, 0xe1, 0x00, 0x02,
-        0x00, 0x12, 0x68, 0x82, 0xfb, 0xff, 0x71, 0xe1, 
+        0x00, 0x12, 0x68, 0x82, 0xfb, 0xff, 0x71, 0xe1,
-        0x00, 0x02, 0x00, 0x12, 0x68, 0x82, 0xff, 0xf0, 
+        0x00, 0x02, 0x00, 0x12, 0x68, 0x82, 0xff, 0xf0,
-        0x71, 0xe1, 0x00, 0x03, 0x00, 0x12, 0x76, 0x82, 
+        0x71, 0xe1, 0x00, 0x03, 0x00, 0x12, 0x76, 0x82,
-        0xff, 0xff, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12, 
+        0xff, 0xff, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12,
-        0x76, 0x82, 0xff, 0xff, 0x71, 0xe1, 0x00, 0x02, 
+        0x76, 0x82, 0xff, 0xff, 0x71, 0xe1, 0x00, 0x02,
-        0x00, 0x12, 0x69, 0x82, 0x00, 0x20, 0x71, 0xe1, 
+        0x00, 0x12, 0x69, 0x82, 0x00, 0x20, 0x71, 0xe1,
-        0x00, 0x02, 0x00, 0x11, 0xf2, 0x73, 0x19, 0xda, 
+        0x00, 0x02, 0x00, 0x11, 0xf2, 0x73, 0x19, 0xda,
-        0x68, 0x81, 0xff, 0xef, 0x77, 0x11, 0x00, 0x7b, 
+        0x68, 0x81, 0xff, 0xef, 0x77, 0x11, 0x00, 0x7b,
-        0x10, 0x81, 0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00, 
+        0x10, 0x81, 0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00,
-        0x00, 0xb4, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 
+        0x00, 0xb4, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81,
-        0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00, 0x00, 0xb9, 
+        0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00, 0x00, 0xb9,
-        0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, 
+        0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11,
-        0xf4, 0xe4, 0x00, 0xa4, 0x00, 0x00, 0x19, 0xdf, 
+        0xf4, 0xe4, 0x00, 0xa4, 0x00, 0x00, 0x19, 0xdf,
-        0x00, 0x01, 0x2a, 0xe6, 0x00, 0x00, 0x00, 0x01, 
+        0x00, 0x01, 0x2a, 0xe6, 0x00, 0x00, 0x00, 0x01,
-        0x2a, 0xe7, 0x00, 0x00, 0x00, 0x03, 0x2a, 0x12, 
+        0x2a, 0xe7, 0x00, 0x00, 0x00, 0x03, 0x2a, 0x12,
-        0x0c, 0x01, 0xc3, 0x4f, 0x00, 0x00, 0x00, 0x01, 
+        0x0c, 0x01, 0xc3, 0x4f, 0x00, 0x00, 0x00, 0x01,
-        0x2a, 0x15, 0x00, 0x00, 0x00, 0x02, 0x2a, 0x16, 
+        0x2a, 0x15, 0x00, 0x00, 0x00, 0x02, 0x2a, 0x16,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x2a, 0x5d, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x2a, 0x5d,
-        0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 
+        0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79,
-        0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 
+        0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68,
-        0x00, 0x74, 0x00, 0x20, 0x00, 0x54, 0x00, 0x65, 
+        0x00, 0x74, 0x00, 0x20, 0x00, 0x54, 0x00, 0x65,
-        0x00, 0x63, 0x00, 0x68, 0x00, 0x6e, 0x00, 0x6f, 
+        0x00, 0x63, 0x00, 0x68, 0x00, 0x6e, 0x00, 0x6f,
-        0x00, 0x54, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, 
+        0x00, 0x54, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e,
-        0x00, 0x64, 0x00, 0x20, 0x00, 0x41, 0x00, 0x47, 
+        0x00, 0x64, 0x00, 0x20, 0x00, 0x41, 0x00, 0x47,
-        0x00, 0x00, 0x00, 0x04, 0x2a, 0x76, 0x00, 0x30, 
+        0x00, 0x00, 0x00, 0x04, 0x2a, 0x76, 0x00, 0x30,
-        0x00, 0x2e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x0c, 
+        0x00, 0x2e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x0c,
-        0x2a, 0x7a, 0x00, 0x46, 0x00, 0x65, 0x00, 0x62, 
+        0x2a, 0x7a, 0x00, 0x46, 0x00, 0x65, 0x00, 0x62,
-        0x00, 0x20, 0x00, 0x32, 0x00, 0x37, 0x00, 0x20, 
+        0x00, 0x20, 0x00, 0x32, 0x00, 0x37, 0x00, 0x20,
-        0x00, 0x32, 0x00, 0x30, 0x00, 0x30, 0x00, 0x31, 
+        0x00, 0x32, 0x00, 0x30, 0x00, 0x30, 0x00, 0x31,
-        0x00, 0x00, 0x00, 0x09, 0x2a, 0x86, 0x00, 0x31, 
+        0x00, 0x00, 0x00, 0x09, 0x2a, 0x86, 0x00, 0x31,
-        0x00, 0x34, 0x00, 0x3a, 0x00, 0x33, 0x00, 0x35, 
+        0x00, 0x34, 0x00, 0x3a, 0x00, 0x33, 0x00, 0x35,
-        0x00, 0x3a, 0x00, 0x33, 0x00, 0x33, 0x00, 0x00, 
+        0x00, 0x3a, 0x00, 0x33, 0x00, 0x33, 0x00, 0x00,
-        0x00, 0x0f, 0x2a, 0x8f, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x0f, 0x2a, 0x8f, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 
+        0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x01, 0x2a, 0x9e, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x01, 0x2a, 0x9e, 0x00, 0x00,
-        0x00, 0x01, 0x2a, 0x9f, 0x00, 0x00, 0x00, 0x01, 
+        0x00, 0x01, 0x2a, 0x9f, 0x00, 0x00, 0x00, 0x01,
-        0x2a, 0xa0, 0x00, 0x00, 0x00, 0x01, 0x2a, 0xa1, 
+        0x2a, 0xa0, 0x00, 0x00, 0x00, 0x01, 0x2a, 0xa1,
-        0x00, 0x00, 0x00, 0x01, 0x2a, 0xa2, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x01, 0x2a, 0xa2, 0x00, 0x00,
-        0x00, 0x01, 0x29, 0x7e, 0x00, 0x00, 0x00, 0x02, 
+        0x00, 0x01, 0x29, 0x7e, 0x00, 0x00, 0x00, 0x02,
-        0x29, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+        0x29, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-        0x29, 0x82, 0xff, 0xff, 0x00, 0x01, 0x2a, 0xa7, 
+        0x29, 0x82, 0xff, 0xff, 0x00, 0x01, 0x2a, 0xa7,
-        0x00, 0x00, 0x00, 0x05, 0x2a, 0xa8, 0x71, 0x41, 
+        0x00, 0x00, 0x00, 0x05, 0x2a, 0xa8, 0x71, 0x41,
-        0x20, 0x00, 0x20, 0x00, 0x00, 0x23, 0x04, 0x00, 
+        0x20, 0x00, 0x20, 0x00, 0x00, 0x23, 0x04, 0x00,
-        0x00, 0x0a, 0x2a, 0xad, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x0a, 0x2a, 0xad, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x0f, 0x2a, 0xb7, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x0f, 0x2a, 0xb7, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x40, 0x00, 0xa0, 0x82, 0x40, 
+        0x00, 0x00, 0x00, 0x40, 0x00, 0xa0, 0x82, 0x40,
-        0x00, 0x08, 0x30, 0x7f, 0x00, 0x80, 0x01, 0x80, 
+        0x00, 0x08, 0x30, 0x7f, 0x00, 0x80, 0x01, 0x80,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x01, 0x27, 0x6e, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x01, 0x27, 0x6e, 0x00, 0x00,
-        0x00, 0x01, 0x27, 0x6f, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x01, 0x27, 0x6f, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x09, 0x00, 0x00, 0x1a, 0x83, 0x04, 0xe8, 
+        0x00, 0x09, 0x00, 0x00, 0x1a, 0x83, 0x04, 0xe8,
-        0x04, 0xcf, 0x04, 0xc5, 0x04, 0xba, 0x04, 0xb0, 
+        0x04, 0xcf, 0x04, 0xc5, 0x04, 0xba, 0x04, 0xb0,
-        0x04, 0xac, 0x04, 0x9c, 0x04, 0x8c, 0x04, 0x81, 
+        0x04, 0xac, 0x04, 0x9c, 0x04, 0x8c, 0x04, 0x81,
-        0x00, 0x78, 0x00, 0x00, 0x01, 0x00, 0xf2, 0x73, 
+        0x00, 0x78, 0x00, 0x00, 0x01, 0x00, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xaa, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xaa, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x02, 0x23, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x02, 0x23, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x05, 0xe5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x05, 0xe5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x02, 0xb5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x02, 0xb5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x0e, 0x33, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, 
+        0x0e, 0x33, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73,
-        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0x00, 0x00, 
+        0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0x00, 0x00,
 };
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index 832d179f26fa..8abc21890129 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1203,7 +1203,7 @@ static int ttusb_init_rc(struct ttusb_dec *dec)
        input_dev->keycode = rc_keys;
        for (i = 0; i < ARRAY_SIZE(rc_keys); i++)
-                set_bit(rc_keys[i], input_dev->keybit);
+                set_bit(rc_keys[i], input_dev->keybit);
        input_register_device(input_dev);
@@ -1529,7 +1529,7 @@ static void ttusb_dec_exit_rc(struct ttusb_dec *dec)
        usb_free_urb(dec->irq_urb);
        usb_buffer_free(dec->udev,IRQ_PACKET_SIZE,
-                           dec->irq_buffer, dec->irq_dma_handle);
+                           dec->irq_buffer, dec->irq_dma_handle);
        if (dec->rc_input_dev) {
                input_unregister_device(dec->rc_input_dev);
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index cc4a723e24db..fc87efc5049c 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -188,7 +188,7 @@ config VIDEO_ZORAN
          To compile this driver as a module, choose M here: the
          module will be called zr36067.
- 
 config VIDEO_ZORAN_BUZ
        tristate "Iomega Buz support"
        depends on VIDEO_ZORAN
@@ -204,8 +204,8 @@ config VIDEO_ZORAN_DC10
 config VIDEO_ZORAN_DC30
        tristate "Pinnacle/Miro DC30(+) support"
-        depends on VIDEO_ZORAN
+        depends on VIDEO_ZORAN
-        help
+        help
          Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback
          card. This also supports really old DC10 cards based on the
          zr36050 MJPEG codec and zr36016 VFE.
@@ -260,7 +260,7 @@ config VIDEO_MXB
        ---help---
          This is a video4linux driver for the 'Multimedia eXtension Board'
          TV card by Siemens-Nixdorf.
-          
          To compile this driver as a module, choose M here: the
          module will be called mxb.
@@ -274,7 +274,7 @@ config VIDEO_DPC
          for SAA7146 bases boards, so if you have some unsupported
          saa7146 based, analog video card, chances are good that it
          will work with this skeleton driver.
-          
          To compile this driver as a module, choose M here: the
          module will be called dpc7146.
@@ -285,7 +285,7 @@ config VIDEO_HEXIUM_ORION
        ---help---
          This is a video4linux driver for the Hexium HV-PCI6 and
          Orion frame grabber cards by Hexium.
-          
          To compile this driver as a module, choose M here: the
          module will be called hexium_orion.
@@ -297,7 +297,7 @@ config VIDEO_HEXIUM_GEMINI
          This is a video4linux driver for the Hexium Gemini frame
          grabber card by Hexium. Please note that the Gemini Dual
          card is *not* fully supported.
-          
          To compile this driver as a module, choose M here: the
          module will be called hexium_gemini.
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index e4063950ae57..3ca1d768bfd3 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -231,18 +231,18 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
 static struct i2c_driver driver = {
        .owner          = THIS_MODULE,
-        .name           = "i2c bt832 driver",
+        .name           = "i2c bt832 driver",
-        .id             = -1, /* FIXME */
+        .id             = -1, /* FIXME */
-        .flags          = I2C_DF_NOTIFY,
+        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = bt832_probe,
+        .attach_adapter = bt832_probe,
-        .detach_client  = bt832_detach,
+        .detach_client  = bt832_detach,
-        .command        = bt832_command,
+        .command        = bt832_command,
 };
 static struct i2c_client client_template =
 {
        .name       = "bt832",
        .flags      = I2C_CLIENT_ALLOW_USE,
-        .driver     = &driver,
+        .driver     = &driver,
 };
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index 3c58a2a68906..1ddf9ba613ef 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -727,71 +727,71 @@ void free_btres(struct bttv *btv, struct bttv_fh *fh, int bits)
 static void set_pll_freq(struct bttv *btv, unsigned int fin, unsigned int fout)
 {
-        unsigned char fl, fh, fi;
+        unsigned char fl, fh, fi;
-        /* prevent overflows */
+        /* prevent overflows */
-        fin/=4;
+        fin/=4;
-        fout/=4;
+        fout/=4;
-        fout*=12;
+        fout*=12;
-        fi=fout/fin;
+        fi=fout/fin;
-        fout=(fout%fin)*256;
+        fout=(fout%fin)*256;
-        fh=fout/fin;
+        fh=fout/fin;
-        fout=(fout%fin)*256;
+        fout=(fout%fin)*256;
-        fl=fout/fin;
+        fl=fout/fin;
-        btwrite(fl, BT848_PLL_F_LO);
+        btwrite(fl, BT848_PLL_F_LO);
-        btwrite(fh, BT848_PLL_F_HI);
+        btwrite(fh, BT848_PLL_F_HI);
-        btwrite(fi|BT848_PLL_X, BT848_PLL_XCI);
+        btwrite(fi|BT848_PLL_X, BT848_PLL_XCI);
 }
 static void set_pll(struct bttv *btv)
 {
-        int i;
+        int i;
-        if (!btv->pll.pll_crystal)
+        if (!btv->pll.pll_crystal)
-                return;
+                return;
        if (btv->pll.pll_ofreq == btv->pll.pll_current) {
                dprintk("bttv%d: PLL: no change required\n",btv->c.nr);
-                return;
+                return;
-        }
+        }
-        if (btv->pll.pll_ifreq == btv->pll.pll_ofreq) {
+        if (btv->pll.pll_ifreq == btv->pll.pll_ofreq) {
-                /* no PLL needed */
+                /* no PLL needed */
-                if (btv->pll.pll_current == 0)
+                if (btv->pll.pll_current == 0)
-                        return;
+                        return;
                bttv_printk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n",
-                           btv->c.nr,btv->pll.pll_ifreq);
+                        btv->c.nr,btv->pll.pll_ifreq);
-                btwrite(0x00,BT848_TGCTRL);
+                btwrite(0x00,BT848_TGCTRL);
-                btwrite(0x00,BT848_PLL_XCI);
+                btwrite(0x00,BT848_PLL_XCI);
-                btv->pll.pll_current = 0;
+                btv->pll.pll_current = 0;
-                return;
+                return;
-        }
+        }
        bttv_printk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr,
-                   btv->pll.pll_ifreq, btv->pll.pll_ofreq);
+                btv->pll.pll_ifreq, btv->pll.pll_ofreq);
        set_pll_freq(btv, btv->pll.pll_ifreq, btv->pll.pll_ofreq);
-        for (i=0; i<10; i++) {
+        for (i=0; i<10; i++) {
                /*  Let other people run while the PLL stabilizes */
                bttv_printk(".");
                msleep(10);
-                if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) {
+                if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) {
                        btwrite(0,BT848_DSTATUS);
-                } else {
+                } else {
-                        btwrite(0x08,BT848_TGCTRL);
+                        btwrite(0x08,BT848_TGCTRL);
-                        btv->pll.pll_current = btv->pll.pll_ofreq;
+                        btv->pll.pll_current = btv->pll.pll_ofreq;
                        bttv_printk(" ok\n");
-                        return;
+                        return;
-                }
+                }
-        }
+        }
-        btv->pll.pll_current = -1;
+        btv->pll.pll_current = -1;
        bttv_printk("failed\n");
-        return;
+        return;
 }
 /* used to switch between the bt848's analog/digital video capture modes */
@@ -1964,7 +1964,7 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv,
        }
        down(&fh->cap.lock);
-        kfree(fh->ov.clips);
+                kfree(fh->ov.clips);
        fh->ov.clips    = clips;
        fh->ov.nclips   = n;
@@ -2758,7 +2758,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                        fh->ov.w.height = fb->fmt.height;
                        btv->init.ov.w.width  = fb->fmt.width;
                        btv->init.ov.w.height = fb->fmt.height;
-                        kfree(fh->ov.clips);
+                                kfree(fh->ov.clips);
                        fh->ov.clips = NULL;
                        fh->ov.nclips = 0;
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h
index 3aa9c6e4fc33..1e6a5632c3c7 100644
--- a/drivers/media/video/bttvp.h
+++ b/drivers/media/video/bttvp.h
@@ -45,6 +45,7 @@
 #include <media/tveeprom.h>
 #include <media/ir-common.h>
 #include "bt848.h"
 #include "bttv.h"
 #include "btcx-risc.h"
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index aea3f038cff6..5b93723a1768 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -333,24 +333,30 @@ static int set_input(struct i2c_client *client, enum cx25840_input input)
 static int set_v4lstd(struct i2c_client *client, v4l2_std_id std)
 {
-        u8 fmt;
+        u8 fmt=0;       /* zero is autodetect */
-        switch (std) {
+        /* First tests should be against specific std */
-        /* zero is autodetect */
+        if (std & V4L2_STD_NTSC_M_JP) {
-        case 0: fmt = 0x0; break;
+                fmt=0x2;
-        /* default ntsc to ntsc-m */
+        } else if (std & V4L2_STD_NTSC_443) {
-        case V4L2_STD_NTSC:
+                fmt=0x3;
-        case V4L2_STD_NTSC_M: fmt = 0x1; break;
+        } else if (std & V4L2_STD_PAL_M) {
-        case V4L2_STD_NTSC_M_JP: fmt = 0x2; break;
+                fmt=0x5;
-        case V4L2_STD_NTSC_443: fmt = 0x3; break;
+        } else if (std & V4L2_STD_PAL_N) {
-        case V4L2_STD_PAL: fmt = 0x4; break;
+                fmt=0x6;
-        case V4L2_STD_PAL_M: fmt = 0x5; break;
+        } else if (std & V4L2_STD_PAL_Nc) {
-        case V4L2_STD_PAL_N: fmt = 0x6; break;
+                fmt=0x7;
-        case V4L2_STD_PAL_Nc: fmt = 0x7; break;
+        } else if (std & V4L2_STD_PAL_60) {
-        case V4L2_STD_PAL_60: fmt = 0x8; break;
+                fmt=0x8;
-        case V4L2_STD_SECAM: fmt = 0xc; break;
+        } else {
-        default:
+                /* Then, test against generic ones */
-                return -ERANGE;
+                if (std & V4L2_STD_NTSC) {
+                        fmt=0x1;
+                } else if (std & V4L2_STD_PAL) {
+                        fmt=0x4;
+                } else if (std & V4L2_STD_SECAM) {
+                        fmt=0xc;
+                }
        }
        cx25840_and_or(client, 0x400, ~0xf, fmt);
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 4ae3f78cccf2..74e57a53116f 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -616,6 +616,8 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
        retval = request_firmware(&firmware, BLACKBIRD_FIRM_ENC_FILENAME,
                                  &dev->pci->dev);
        if (retval != 0) {
                dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n",
                        BLACKBIRD_FIRM_ENC_FILENAME);
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 38b12ebaa49e..461019dca901 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -453,7 +453,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                input_dev->id.product = pci->device;
        }
        input_dev->cdev.dev = &pci->dev;
        /* record handles to ourself */
        ir->core = core;
        core->ir = ir;
@@ -586,7 +585,6 @@ void cx88_ir_irq(struct cx88_core *core)
 MODULE_AUTHOR("Gerd Knorr, Pavel Machek, Chris Pascoe");
 MODULE_DESCRIPTION("input driver for cx88 GPIO-based IR remote controls");
 MODULE_LICENSE("GPL");
 /*
 * Local variables:
 * c-basic-offset: 8
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 27fb080fd7aa..77beafc5c327 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -411,7 +411,6 @@ struct cx8802_dev {
        struct videobuf_dvb        dvb;
        void*                      fe_handle;
        int                        (*fe_release)(void *handle);
        /* for switching modulation types */
        unsigned char              ts_gen_cntrl;
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 9f6e5e5355a1..0cfe75416ec6 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -116,47 +116,6 @@ void em28xx_print_ioctl(char *name, unsigned int cmd)
        }
 }
-static void *rvmalloc(size_t size)
-{
-        void *mem;
-        unsigned long adr;
-        size = PAGE_ALIGN(size);
-        mem = vmalloc_32((unsigned long)size);
-        if (!mem)
-                return NULL;
-        memset(mem, 0, size);
-        adr = (unsigned long)mem;
-        while (size > 0) {
-                SetPageReserved(vmalloc_to_page((void *)adr));
-                adr += PAGE_SIZE;
-                size -= PAGE_SIZE;
-        }
-        return mem;
-}
-static void rvfree(void *mem, size_t size)
-{
-        unsigned long adr;
-        if (!mem)
-                return;
-        size = PAGE_ALIGN(size);
-        adr = (unsigned long)mem;
-        while (size > 0) {
-                ClearPageReserved(vmalloc_to_page((void *)adr));
-                adr += PAGE_SIZE;
-                size -= PAGE_SIZE;
-        }
-        vfree(mem);
-}
 /*
 * em28xx_request_buffers()
@@ -167,14 +126,16 @@ u32 em28xx_request_buffers(struct em28xx *dev, u32 count)
        const size_t imagesize = PAGE_ALIGN(dev->frame_size);   /*needs to be page aligned cause the buffers can be mapped individually! */
        void *buff = NULL;
        u32 i;
-        em28xx_coredbg("requested %i buffers with size %i", count, imagesize);
+        em28xx_coredbg("requested %i buffers with size %zd", count, imagesize);
        if (count > EM28XX_NUM_FRAMES)
                count = EM28XX_NUM_FRAMES;
        dev->num_frames = count;
        while (dev->num_frames > 0) {
-                if ((buff = rvmalloc(dev->num_frames * imagesize)))
+                if ((buff = vmalloc_32(dev->num_frames * imagesize))) {
+                        memset(buff, 0, dev->num_frames * imagesize);
                        break;
+                }
                dev->num_frames--;
        }
@@ -217,8 +178,7 @@ void em28xx_queue_unusedframes(struct em28xx *dev)
 void em28xx_release_buffers(struct em28xx *dev)
 {
        if (dev->num_frames) {
-                rvfree(dev->frame[0].bufmem,
+                vfree(dev->frame[0].bufmem);
-                       dev->num_frames * PAGE_ALIGN(dev->frame[0].buf.length));
                dev->num_frames = 0;
        }
 }
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index b32d9852f34c..7f5603054f02 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -41,7 +41,7 @@ module_param(i2c_debug, int, 0644);
 MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
 #define dprintk1(lvl,fmt, args...) if (i2c_debug>=lvl) do {\
-                        printk(fmt , ##args); } while (0)
+                        printk(fmt, ##args); } while (0)
 #define dprintk2(lvl,fmt, args...) if (i2c_debug>=lvl) do{ \
                        printk(KERN_DEBUG "%s at %s: " fmt, \
                        dev->name, __FUNCTION__ , ##args); } while (0)
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index abec32c175aa..06d76879bde2 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -189,16 +189,6 @@ static DECLARE_RWSEM(em28xx_disconnect);
 /*********************  v4l2 interface  ******************************************/
-static inline unsigned long kvirt_to_pa(unsigned long adr)
-{
-        unsigned long kva, ret;
-        kva = (unsigned long)page_address(vmalloc_to_page((void *)adr));
-        kva |= adr & (PAGE_SIZE - 1);
-        ret = __pa(kva);
-        return ret;
-}
 /*
 * em28xx_config()
 * inits registers with sane defaults
@@ -616,7 +606,8 @@ static struct vm_operations_struct em28xx_vm_ops = {
 static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
 {
        unsigned long size = vma->vm_end - vma->vm_start,
-            start = vma->vm_start, pos, page;
+            start = vma->vm_start;
+        void *pos;
        u32 i;
        struct em28xx *dev = filp->private_data;
@@ -657,12 +648,10 @@ static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
        vma->vm_flags |= VM_IO;
        vma->vm_flags |= VM_RESERVED;   /* avoid to swap out this VMA */
-        pos = (unsigned long)dev->frame[i].bufmem;
+        pos = dev->frame[i].bufmem;
        while (size > 0) {      /* size is page-aligned */
-                page = vmalloc_to_pfn((void *)pos);
+                if (vm_insert_page(vma, start, vmalloc_to_page(pos))) {
-                if (remap_pfn_range(vma, start, page, PAGE_SIZE,
+                        em28xx_videodbg("mmap: vm_insert_page failed\n");
-                                    vma->vm_page_prot)) {
-                        em28xx_videodbg("mmap: rename page map failed\n");
                        up(&dev->fileop_lock);
                        return -EAGAIN;
                }
diff --git a/drivers/media/video/ir-kbd-gpio.c b/drivers/media/video/ir-kbd-gpio.c
index 6345e29e4951..de1385e5d05e 100644
--- a/drivers/media/video/ir-kbd-gpio.c
+++ b/drivers/media/video/ir-kbd-gpio.c
@@ -291,13 +291,12 @@ struct IR {
        u32                     mask_keycode;
        u32                     mask_keydown;
        u32                     mask_keyup;
-        u32                     polling;
+        u32                     polling;
        u32                     last_gpio;
        struct work_struct      work;
        struct timer_list       timer;
        /* RC5 gpio */
        u32 rc5_gpio;
        struct timer_list timer_end;    /* timer_end for code completion */
        struct timer_list timer_keyup;  /* timer_end for key release */
@@ -647,7 +646,7 @@ static int ir_probe(struct device *dev)
                driver.any_irq = ir_rc5_irq;
                driver.gpio_irq = NULL;
                ir->rc5_gpio = 1;
-                 break;
+                break;
        }
        if (NULL == ir_codes) {
                kfree(ir);
@@ -657,7 +656,7 @@ static int ir_probe(struct device *dev)
        if (ir->rc5_gpio) {
                u32 gpio;
-                /* enable remote irq */
+                /* enable remote irq */
                bttv_gpio_inout(sub->core, (1 << 4), 1 << 4);
                gpio = bttv_gpio_read(sub->core);
                bttv_gpio_write(sub->core, gpio & ~(1 << 4));
@@ -726,6 +725,7 @@ static int ir_remove(struct device *dev)
                del_timer(&ir->timer);
                flush_scheduled_work();
        }
        if (ir->rc5_gpio) {
                u32 gpio;
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 124c502ea1f3..740e543311af 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -40,6 +40,7 @@
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
 #include <asm/semaphore.h>
 #include <media/ir-common.h>
 #include <media/ir-kbd-i2c.h>
@@ -278,7 +279,7 @@ static int ir_probe(struct i2c_adapter *adap);
 static struct i2c_driver driver = {
        .name           = "ir remote kbd driver",
-        .id             = I2C_DRIVERID_I2C_IR,
+        .id             = I2C_DRIVERID_INFRARED,
        .flags          = I2C_DF_NOTIFY,
        .attach_adapter = ir_probe,
        .detach_client  = ir_detach,
@@ -296,15 +297,15 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
        IR_KEYTAB_TYPE *ir_codes = NULL;
        char *name;
        int ir_type;
-        struct IR_i2c *ir;
+        struct IR_i2c *ir;
        struct input_dev *input_dev;
-        ir = kzalloc(sizeof(struct IR_i2c), GFP_KERNEL);
+        ir = kzalloc(sizeof(struct IR_i2c),GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!ir || !input_dev) {
                kfree(ir);
                input_free_device(input_dev);
-                return -ENOMEM;
+                return -ENOMEM;
        }
        ir->c = client_template;
@@ -360,7 +361,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
        /* register i2c device
         * At device register, IR codes may be changed to be
         * board dependent.
-        */
+         */
        i2c_attach_client(&ir->c);
        /* If IR not supported or disabled, unregisters driver */
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index a23fb0338986..d86f8e92e534 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -134,7 +134,7 @@ struct msp3400c {
        int rxsubchans;
        int muted;
-        int left, right;        /* volume */
+        int left, right;        /* volume */
        int bass, treble;
        /* shadow register set */
@@ -882,6 +882,7 @@ static void watch_stereo(struct i2c_client *client)
                msp->watch_stereo = 0;
 }
 static int msp3400c_thread(void *data)
 {
        struct i2c_client *client = data;
@@ -889,6 +890,7 @@ static int msp3400c_thread(void *data)
        struct CARRIER_DETECT *cd;
        int count, max1,max2,val1,val2, val,this;
        msp3400_info("msp3400 daemon started\n");
        for (;;) {
                msp3400_dbg_mediumvol("msp3400 thread: sleep\n");
@@ -1162,6 +1164,7 @@ static int msp3410d_thread(void *data)
        int mode,val,i,std;
        msp3400_info("msp3410 daemon started\n");
        for (;;) {
                msp3400_dbg_mediumvol("msp3410 thread: sleep\n");
                msp34xx_sleep(msp,-1);
@@ -1384,6 +1387,7 @@ static int msp34xxg_thread(void *data)
        int val, std, i;
        msp3400_info("msp34xxg daemon started\n");
        msp->source = 1; /* default */
        for (;;) {
                msp3400_dbg_mediumvol("msp34xxg thread: sleep\n");
@@ -1559,11 +1563,11 @@ static void msp_wake_thread(struct i2c_client *client);
 static struct i2c_driver driver = {
        .owner          = THIS_MODULE,
        .name           = "msp3400",
-        .id             = I2C_DRIVERID_MSP3400,
+        .id             = I2C_DRIVERID_MSP3400,
-        .flags          = I2C_DF_NOTIFY,
+        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = msp_probe,
+        .attach_adapter = msp_probe,
-        .detach_client  = msp_detach,
+        .detach_client  = msp_detach,
-        .command        = msp_command,
+        .command        = msp_command,
        .driver = {
                .suspend = msp_suspend,
                .resume  = msp_resume,
@@ -1574,7 +1578,7 @@ static struct i2c_client client_template =
 {
        .name      = "(unset)",
        .flags     = I2C_CLIENT_ALLOW_USE,
-        .driver    = &driver,
+        .driver    = &driver,
 };
 static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index dca3ddfd510f..923322503e8f 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -422,7 +422,6 @@ static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
        s->timer.function = saa6588_timer;
        s->timer.data = (unsigned long)s;
        schedule_work(&s->work);
        return 0;
 }
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index 59e13fdea780..31f7b950b01c 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -59,7 +59,7 @@ MODULE_PARM_DESC(debug, " Set the default Debug level.  Default: 0 (Off) - (0-1)
 #define dprintk(num, format, args...) \
        do { \
                if (debug >= num) \
-                        printk(format , ##args); \
+                        printk(format, ##args); \
        } while (0)
 /* ----------------------------------------------------------------------- */
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index 3428e1ed0032..c36f014f1fdf 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -389,7 +389,7 @@ static int saa7127_set_vps(struct i2c_client *client, struct v4l2_sliced_vbi_dat
 static int saa7127_set_cc(struct i2c_client *client, struct v4l2_sliced_vbi_data *data)
 {
        struct saa7127_state *state = i2c_get_clientdata(client);
-        u16 cc = data->data[0] << 8 | data->data[1];
+        u16 cc = data->data[1] << 8 | data->data[0];
        int enable = (data->line != 0);
        if (enable && (data->field != 0 || data->line != 21))
@@ -397,7 +397,7 @@ static int saa7127_set_cc(struct i2c_client *client, struct v4l2_sliced_vbi_data
        if (state->cc_enable != enable) {
                saa7127_dbg("Turn CC %s\n", enable ? "on" : "off");
                saa7127_write(client, SAA7127_REG_CLOSED_CAPTION,
-                                (enable << 6) | 0x11);
+                                (state->xds_enable << 7) | (enable << 6) | 0x11);
                state->cc_enable = enable;
        }
        if (!enable)
@@ -423,7 +423,7 @@ static int saa7127_set_xds(struct i2c_client *client, struct v4l2_sliced_vbi_dat
        if (state->xds_enable != enable) {
                saa7127_dbg("Turn XDS %s\n", enable ? "on" : "off");
                saa7127_write(client, SAA7127_REG_CLOSED_CAPTION,
-                                (enable << 7) | 0x11);
+                                (enable << 7) | (state->cc_enable << 6) | 0x11);
                state->xds_enable = enable;
        }
        if (!enable)
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index c512c4411b38..8a5c3e71b37d 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -1,11 +1,10 @@
 config VIDEO_SAA7134
        tristate "Philips SAA7134 support"
-        depends on VIDEO_DEV && PCI && I2C && SOUND && SND
+        depends on VIDEO_DEV && PCI && I2C
        select VIDEO_BUF
        select VIDEO_IR
        select VIDEO_TUNER
        select CRC32
-        select SND_PCM_OSS
        ---help---
          This is a video4linux driver for Philips SAA713x based
          TV cards.
@@ -13,6 +12,29 @@ config VIDEO_SAA7134
          To compile this driver as a module, choose M here: the
          module will be called saa7134.
+config VIDEO_SAA7134_ALSA
+        tristate "Philips SAA7134 DMA audio support"
+        depends on VIDEO_SAA7134 && SND
+        select SND_PCM_OSS
+        ---help---
+          This is a video4linux driver for direct (DMA) audio in
+          Philips SAA713x based TV cards using ALSA
+          To compile this driver as a module, choose M here: the
+          module will be called saa7134-alsa.
+config VIDEO_SAA7134_OSS
+        tristate "Philips SAA7134 DMA audio support (OSS, DEPRECATED)"
+        depends on VIDEO_SAA7134 && SOUND_PRIME && !VIDEO_SAA7134_ALSA
+        ---help---
+          This is a video4linux driver for direct (DMA) audio in
+          Philips SAA713x based TV cards using OSS
+          This is deprecated in favor of the ALSA module
+          To compile this driver as a module, choose M here: the
+          module will be called saa7134-oss.
 config VIDEO_SAA7134_DVB
        tristate "DVB/ATSC Support for saa7134 based TV cards"
        depends on VIDEO_SAA7134 && DVB_CORE
diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile
index 134f83a96218..1ba998424bbd 100644
--- a/drivers/media/video/saa7134/Makefile
+++ b/drivers/media/video/saa7134/Makefile
@@ -4,8 +4,11 @@ saa7134-objs :=	saa7134-cards.o saa7134-core.o saa7134-i2c.o	\
                saa7134-video.o saa7134-input.o
 obj-$(CONFIG_VIDEO_SAA7134) +=  saa7134.o saa7134-empress.o \
-                                saa6752hs.o saa7134-alsa.o \
+                                saa6752hs.o
-                                saa7134-oss.o
+obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o
+obj-$(CONFIG_VIDEO_SAA7134_OSS) += saa7134-oss.o
 obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
 EXTRA_CFLAGS += -I$(src)/..
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index cdd1ed9c8065..a61d24f588f7 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -523,7 +523,8 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
        h->standard = 0;
        i2c_set_clientdata(&h->client, h);
-        i2c_attach_client(&h->client);
+        i2c_attach_client(&h->client);
        return 0;
 }
@@ -597,19 +598,19 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
 static struct i2c_driver driver = {
        .owner          = THIS_MODULE,
-        .name           = "i2c saa6752hs MPEG encoder",
+        .name           = "i2c saa6752hs MPEG encoder",
-        .id             = I2C_DRIVERID_SAA6752HS,
+        .id             = I2C_DRIVERID_SAA6752HS,
-        .flags          = I2C_DF_NOTIFY,
+        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = saa6752hs_probe,
+        .attach_adapter = saa6752hs_probe,
-        .detach_client  = saa6752hs_detach,
+        .detach_client  = saa6752hs_detach,
-        .command        = saa6752hs_command,
+        .command        = saa6752hs_command,
 };
 static struct i2c_client client_template =
 {
        .name       = "saa6752hs",
        .flags      = I2C_CLIENT_ALLOW_USE,
-        .driver     = &driver,
+        .driver     = &driver,
 };
 static int __init saa6752hs_init_module(void)
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 263c6e2e3e8e..ade05f75fdb0 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -51,6 +51,7 @@ MODULE_PARM_DESC(debug,"enable debug messages [alsa]");
 #define MIXER_ADDR_LINE2        2
 #define MIXER_ADDR_LAST         2
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
 static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
@@ -59,11 +60,14 @@ module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s).");
 #define dprintk(fmt, arg...)    if (debug) \
-        printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ## arg)
+        printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ##arg)
 /*
 * Main chip structure
 */
 typedef struct snd_card_saa7134 {
        snd_card_t *card;
        spinlock_t mixer_lock;
@@ -208,8 +212,8 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev,
 static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
-        struct saa7134_dmasound *dmasound = dev_id;
+        struct saa7134_dmasound *dmasound = dev_id;
-        struct saa7134_dev *dev = dmasound->priv_data;
+        struct saa7134_dev *dev = dmasound->priv_data;
        unsigned long report, status;
        int loop, handled = 0;
@@ -985,7 +989,15 @@ static int saa7134_alsa_init(void)
        struct saa7134_dev *dev = NULL;
        struct list_head *list;
-        printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n");
+        if (!dmasound_init && !dmasound_exit) {
+                dmasound_init = alsa_device_init;
+                dmasound_exit = alsa_device_exit;
+        } else {
+                printk(KERN_WARNING "saa7134 ALSA: can't load, DMA sound handler already assigned (probably to OSS)\n");
+                return -EBUSY;
+        }
+        printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n");
        list_for_each(list,&saa7134_devlist) {
                dev = list_entry(list, struct saa7134_dev, devlist);
@@ -997,13 +1009,11 @@ static int saa7134_alsa_init(void)
                }
        }
-        dmasound_init = alsa_device_init;
-        dmasound_exit = alsa_device_exit;
        if (dev == NULL)
                printk(KERN_INFO "saa7134 ALSA: no saa7134 cards found\n");
        return 0;
 }
 /*
@@ -1018,12 +1028,18 @@ static void saa7134_alsa_exit(void)
                snd_card_free(snd_saa7134_cards[idx]);
        }
+        dmasound_init = NULL;
+        dmasound_exit = NULL;
        printk(KERN_INFO "saa7134 ALSA driver for DMA sound unloaded\n");
        return;
 }
-module_init(saa7134_alsa_init);
+/* We initialize this late, to make sure the sound system is up and running */
+late_initcall(saa7134_alsa_init);
 module_exit(saa7134_alsa_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Ricardo Cerqueira");
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 75abc20b0ccd..672fb205959f 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -976,7 +976,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-                .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER,
+                .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_ACTIVE,
                .inputs         = {{
                        .name = name_tv,
                        .vmux = 3,
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 1a093bf176f3..23d8747338ed 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -71,6 +71,7 @@ static unsigned int radio_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
 static unsigned int tuner[]    = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
 static unsigned int card[]     = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
 module_param_array(video_nr, int, NULL, 0444);
 module_param_array(vbi_nr,   int, NULL, 0444);
 module_param_array(radio_nr, int, NULL, 0444);
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index e9ec69efb4c9..575f3e835f91 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -36,6 +36,7 @@ MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
 MODULE_LICENSE("GPL");
 static unsigned int empress_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
 module_param_array(empress_nr, int, NULL, 0444);
 MODULE_PARM_DESC(empress_nr,"ts device number");
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 7575043f0874..df9dd36721e0 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -333,7 +333,7 @@ static int attach_inform(struct i2c_client *client)
        struct tuner_setup tun_setup;
        d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
-                 client->driver->name, client->addr, client->name);
+                client->driver->name, client->addr, client->name);
        /* Am I an i2c remote control? */
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index 5a579194e455..8badd2a9cb2f 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -782,36 +782,36 @@ struct file_operations saa7134_mixer_fops = {
 static irqreturn_t saa7134_oss_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
-        struct saa7134_dmasound *dmasound = dev_id;
+        struct saa7134_dmasound *dmasound = dev_id;
-        struct saa7134_dev *dev = dmasound->priv_data;
+        struct saa7134_dev *dev = dmasound->priv_data;
-        unsigned long report, status;
+        unsigned long report, status;
-        int loop, handled = 0;
+        int loop, handled = 0;
-        for (loop = 0; loop < 10; loop++) {
+        for (loop = 0; loop < 10; loop++) {
-                report = saa_readl(SAA7134_IRQ_REPORT);
+                report = saa_readl(SAA7134_IRQ_REPORT);
-                status = saa_readl(SAA7134_IRQ_STATUS);
+                status = saa_readl(SAA7134_IRQ_STATUS);
-                if (report & SAA7134_IRQ_REPORT_DONE_RA3) {
+                if (report & SAA7134_IRQ_REPORT_DONE_RA3) {
-                        handled = 1;
+                        handled = 1;
-                        saa_writel(SAA7134_IRQ_REPORT,report);
+                        saa_writel(SAA7134_IRQ_REPORT,report);
-                        saa7134_irq_oss_done(dev, status);
+                        saa7134_irq_oss_done(dev, status);
-                } else {
+                } else {
-                        goto out;
+                        goto out;
-                }
+                }
-        }
+        }
-        if (loop == 10) {
+        if (loop == 10) {
-                dprintk("error! looping IRQ!");
+                dprintk("error! looping IRQ!");
-        }
+        }
 out:
-        return IRQ_RETVAL(handled);
+        return IRQ_RETVAL(handled);
 }
 int saa7134_oss_init1(struct saa7134_dev *dev)
 {
-        if ((request_irq(dev->pci->irq, saa7134_oss_irq,
+        if ((request_irq(dev->pci->irq, saa7134_oss_irq,
-                         SA_SHIRQ | SA_INTERRUPT, dev->name,
+                         SA_SHIRQ | SA_INTERRUPT, dev->name,
                        (void*) &dev->dmasound)) < 0)
                return -1;
@@ -905,25 +905,25 @@ static int saa7134_dsp_create(struct saa7134_dev *dev)
        err = dev->dmasound.minor_dsp =
                register_sound_dsp(&saa7134_dsp_fops,
-                                        dsp_nr[dev->nr]);
+                                   dsp_nr[dev->nr]);
        if (err < 0) {
                goto fail;
        }
        printk(KERN_INFO "%s: registered device dsp%d\n",
-                dev->name,dev->dmasound.minor_dsp >> 4);
+               dev->name,dev->dmasound.minor_dsp >> 4);
        err = dev->dmasound.minor_mixer =
                register_sound_mixer(&saa7134_mixer_fops,
-                                        mixer_nr[dev->nr]);
+                                     mixer_nr[dev->nr]);
        if (err < 0)
                goto fail;
        printk(KERN_INFO "%s: registered device mixer%d\n",
-                dev->name,dev->dmasound.minor_mixer >> 4);
+               dev->name,dev->dmasound.minor_mixer >> 4);
        return 0;
 fail:
-        unregister_sound_dsp(dev->dmasound.minor_dsp);
+        unregister_sound_dsp(dev->dmasound.minor_dsp);
        return 0;
@@ -956,52 +956,63 @@ static int oss_device_exit(struct saa7134_dev *dev)
 static int saa7134_oss_init(void)
 {
-        struct saa7134_dev *dev = NULL;
+        struct saa7134_dev *dev = NULL;
-        struct list_head *list;
+        struct list_head *list;
+        if (!dmasound_init && !dmasound_exit) {
+                dmasound_init = oss_device_init;
+                dmasound_exit = oss_device_exit;
+        } else {
+                printk(KERN_WARNING "saa7134 OSS: can't load, DMA sound handler already assigned (probably to ALSA)\n");
+                return -EBUSY;
+        }
-        printk(KERN_INFO "saa7134 OSS driver for DMA sound loaded\n");
+        printk(KERN_INFO "saa7134 OSS driver for DMA sound loaded\n");
-        list_for_each(list,&saa7134_devlist) {
-                dev = list_entry(list, struct saa7134_dev, devlist);
+        list_for_each(list,&saa7134_devlist) {
+                dev = list_entry(list, struct saa7134_dev, devlist);
                if (dev->dmasound.priv_data == NULL) {
                        oss_device_init(dev);
                } else {
-                        printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name);
+                        printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name);
                        return -EBUSY;
                }
-        }
+        }
-        if (dev == NULL)
-                printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n");
-        dmasound_init = oss_device_init;
+        if (dev == NULL)
-        dmasound_exit = oss_device_exit;
+                printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n");
-        return 0;
+        return 0;
 }
 static void saa7134_oss_exit(void)
 {
-        struct saa7134_dev *dev = NULL;
+        struct saa7134_dev *dev = NULL;
-        struct list_head *list;
+        struct list_head *list;
-        list_for_each(list,&saa7134_devlist) {
+        list_for_each(list,&saa7134_devlist) {
-                dev = list_entry(list, struct saa7134_dev, devlist);
+                dev = list_entry(list, struct saa7134_dev, devlist);
                /* Device isn't registered by OSS, probably ALSA's */
                if (!dev->dmasound.minor_dsp)
                        continue;
                oss_device_exit(dev);
-        }
-        printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n");
+        }
+        dmasound_init = NULL;
+        dmasound_exit = NULL;
+        printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n");
-        return;
+        return;
 }
-module_init(saa7134_oss_init);
+/* We initialize this late, to make sure the sound system is up and running */
+late_initcall(saa7134_oss_init);
 module_exit(saa7134_oss_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 4249127c0a1d..2f2414e90e8b 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -12,6 +12,7 @@
 #include <media/audiochip.h>
 #include <media/tuner.h>
 /* Chips:
   TDA9885 (PAL, NTSC)
   TDA9886 (PAL, SECAM, NTSC)
@@ -819,12 +820,12 @@ static int tda9887_resume(struct device * dev)
 static struct i2c_driver driver = {
        .owner          = THIS_MODULE,
-        .name           = "i2c tda9887 driver",
+        .name           = "i2c tda9887 driver",
-        .id             = -1, /* FIXME */
+        .id             = -1, /* FIXME */
-        .flags          = I2C_DF_NOTIFY,
+        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = tda9887_probe,
+        .attach_adapter = tda9887_probe,
-        .detach_client  = tda9887_detach,
+        .detach_client  = tda9887_detach,
-        .command        = tda9887_command,
+        .command        = tda9887_command,
        .driver = {
                .suspend = tda9887_suspend,
                .resume  = tda9887_resume,
@@ -834,7 +835,7 @@ static struct i2c_client client_template =
 {
        .name      = "tda9887",
        .flags     = I2C_CLIENT_ALLOW_USE,
-        .driver    = &driver,
+        .driver    = &driver,
 };
 static int __init tda9887_init_module(void)
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index c31bf28b73fe..5b20e8177cad 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -188,7 +188,7 @@ static int chip_write(struct CHIPSTATE *chip, int subaddr, int val)
                buffer[1] = val;
                if (2 != i2c_master_send(&chip->c,buffer,2)) {
                        tvaudio_warn("%s: I/O error (write reg%d=0x%x)\n",
-                                                chip->c.name, subaddr, val);
+                        chip->c.name, subaddr, val);
                        return -1;
                }
        }
@@ -216,7 +216,7 @@ static int chip_read(struct CHIPSTATE *chip)
                chip->c.name);
                return -1;
        }
-        tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name,buffer);
+        tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name, buffer);
        return buffer;
 }
@@ -235,7 +235,7 @@ static int chip_read2(struct CHIPSTATE *chip, int subaddr)
                return -1;
        }
        tvaudio_dbg("%s: chip_read2: reg%d=0x%x\n",
-                        chip->c.name,subaddr,read[0]);
+                chip->c.name, subaddr,read[0]);
        return read[0];
 }
@@ -248,7 +248,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
        /* update our shadow register set; print bytes if (debug > 0) */
        tvaudio_dbg("%s: chip_cmd(%s): reg=%d, data:",
-                chip->c.name,name,cmd->bytes[0]);
+                chip->c.name, name,cmd->bytes[0]);
        for (i = 1; i < cmd->count; i++) {
                if (debug)
                        printk(" 0x%x",cmd->bytes[i]);
@@ -322,7 +322,7 @@ static void generic_checkmode(struct CHIPSTATE *chip)
        int mode = desc->getmode(chip);
        if (mode == chip->prevmode)
-                return;
+        return;
        tvaudio_dbg("%s: thread checkmode\n", chip->c.name);
        chip->prevmode = mode;
@@ -1506,18 +1506,18 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                return -EIO;
        }
        tvaudio_info("%s found @ 0x%x (%s)\n", desc->name, addr<<1, adap->name);
-        if (desc->flags) {
+        if (desc->flags) {
-                tvaudio_dbg("matches:%s%s%s.\n",
+                tvaudio_dbg("matches:%s%s%s.\n",
-                        (desc->flags & CHIP_HAS_VOLUME)     ? " volume"      : "",
+                        (desc->flags & CHIP_HAS_VOLUME)     ? " volume"      : "",
-                        (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "",
+                        (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "",
-                        (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
+                        (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
-        }
+        }
        /* fill required data structures */
-        strcpy(chip->c.name,desc->name);
+        strcpy(chip->c.name, desc->name);
        chip->type = desc-chiplist;
        chip->shadow.count = desc->registers+1;
-        chip->prevmode = -1;
+        chip->prevmode = -1;
        /* register */
        i2c_attach_client(&chip->c);
@@ -1604,7 +1604,7 @@ static int chip_command(struct i2c_client *client,
        struct CHIPSTATE *chip = i2c_get_clientdata(client);
        struct CHIPDESC  *desc = chiplist + chip->type;
-        tvaudio_dbg("%s: chip_command 0x%x\n",chip->c.name,cmd);
+        tvaudio_dbg("%s: chip_command 0x%x\n", chip->c.name, cmd);
        switch (cmd) {
        case AUDC_SET_INPUT:
@@ -1624,7 +1624,7 @@ static int chip_command(struct i2c_client *client,
        /* --- v4l ioctls --- */
        /* take care: bttv does userspace copying, we'll get a
-                                        kernel pointer here... */
+        kernel pointer here... */
        case VIDIOCGAUDIO:
        {
                struct video_audio *va = arg;
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index d95aecebbda3..5ac235365dd8 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -206,7 +206,7 @@ hauppauge_tuner[] =
        { TUNER_ABSENT,        "TCL 2002MI_3H"},
        { TUNER_TCL_2002N,     "TCL 2002N 5H"},
        /* 100-109 */
-        { TUNER_ABSENT,        "Philips FMD1216ME"},
+        { TUNER_PHILIPS_FMD1216ME_MK3, "Philips FMD1216ME"},
        { TUNER_TEA5767,       "Philips TEA5768HL FM Radio"},
        { TUNER_ABSENT,        "Panasonic ENV57H12D5"},
        { TUNER_PHILIPS_FM1236_MK3, "TCL MFNM05-4"},
@@ -753,7 +753,8 @@ tveeprom_detect_client(struct i2c_adapter *adapter,
        client->driver = &i2c_driver_tveeprom;
        client->flags = I2C_CLIENT_ALLOW_USE;
        snprintf(client->name, sizeof(client->name), "tveeprom");
-        i2c_attach_client(client);
+        i2c_attach_client(client);
        return 0;
 }
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 81e6d4494e7d..97431e26d229 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -31,7 +31,7 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 #define dprintk(num, format, args...) \
        do { \
                if (debug >= num) \
-                        printk(format , ##args); \
+                        printk(format, ##args); \
        } while (0)
 /* supported controls */
@@ -770,7 +770,6 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter,
        if (debug > 1)
                dump_reg(client);
        return 0;
 }
diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c
index 55f129e964eb..0a4004a4393c 100644
--- a/drivers/media/video/video-buf-dvb.c
+++ b/drivers/media/video/video-buf-dvb.c
@@ -13,6 +13,7 @@
 * (at your option) any later version.
 */
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -247,3 +248,4 @@ EXPORT_SYMBOL(videobuf_dvb_unregister);
 * compile-command: "make DVB=1"
 * End:
 */
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 81ef306cb124..ee7075fa1ec3 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -303,6 +303,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
        struct i2o_controller *c;
        int rc;
        struct pci_dev *i960 = NULL;
+        int pci_dev_busy = 0;
        printk(KERN_INFO "i2o: Checking for PCI I2O controllers...\n");
@@ -395,6 +396,8 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
        if ((rc = i2o_pci_alloc(c))) {
                printk(KERN_ERR "%s: DMA / IO allocation for I2O controller "
                       " failed\n", c->name);
+                if (rc == -ENODEV)
+                        pci_dev_busy = 1;
                goto free_controller;
        }
@@ -425,7 +428,8 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
        i2o_iop_free(c);
      disable:
-        pci_disable_device(pdev);
+        if (!pci_dev_busy)
+                pci_disable_device(pdev);
        return rc;
 }
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c
index a984c0efabf0..551061c2eadf 100644
--- a/drivers/mfd/ucb1x00-ts.c
+++ b/drivers/mfd/ucb1x00-ts.c
@@ -59,16 +59,18 @@ static int adcsync;
 static inline void ucb1x00_ts_evt_add(struct ucb1x00_ts *ts, u16 pressure, u16 x, u16 y)
 {
-        input_report_abs(ts->idev, ABS_X, x);
+        struct input_dev *idev = ts->idev;
-        input_report_abs(ts->idev, ABS_Y, y);
+        input_report_abs(idev, ABS_X, x);
-        input_report_abs(ts->idev, ABS_PRESSURE, pressure);
+        input_report_abs(idev, ABS_Y, y);
-        input_sync(ts->idev);
+        input_report_abs(idev, ABS_PRESSURE, pressure);
+        input_sync(idev);
 }
 static inline void ucb1x00_ts_event_release(struct ucb1x00_ts *ts)
 {
-        input_report_abs(ts->idev, ABS_PRESSURE, 0);
+        struct input_dev *idev = ts->idev;
-        input_sync(ts->idev);
+        input_report_abs(idev, ABS_PRESSURE, 0);
+        input_sync(idev);
 }
 /*
@@ -297,7 +299,7 @@ static void ucb1x00_ts_irq(int idx, void *id)
 static int ucb1x00_ts_open(struct input_dev *idev)
 {
-        struct ucb1x00_ts *ts = (struct ucb1x00_ts *)idev;
+        struct ucb1x00_ts *ts = idev->private;
        int ret = 0;
        BUG_ON(ts->rtask);
@@ -334,7 +336,7 @@ static int ucb1x00_ts_open(struct input_dev *idev)
 */
 static void ucb1x00_ts_close(struct input_dev *idev)
 {
-        struct ucb1x00_ts *ts = (struct ucb1x00_ts *)idev;
+        struct ucb1x00_ts *ts = idev->private;
        if (ts->rtask)
                kthread_stop(ts->rtask);
@@ -386,6 +388,7 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev)
        ts->ucb = dev->ucb;
        ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC;
+        ts->idev->private = ts;
        ts->idev->name       = "Touchscreen panel";
        ts->idev->id.product = ts->ucb->id;
        ts->idev->open       = ucb1x00_ts_open;
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index d336a1d65dc7..eb41391e06e9 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -679,7 +679,15 @@ static void mmc_idle_cards(struct mmc_host *host)
 }
 /*
- * Apply power to the MMC stack.
+ * Apply power to the MMC stack.  This is a two-stage process.
+ * First, we enable power to the card without the clock running.
+ * We then wait a bit for the power to stabilise.  Finally,
+ * enable the bus drivers and clock to the card.
+ *
+ * We must _NOT_ enable the clock prior to power stablising.
+ *
+ * If a host does all the power sequencing itself, ignore the
+ * initial MMC_POWER_UP stage.
 */
 static void mmc_power_up(struct mmc_host *host)
 {
@@ -932,8 +940,9 @@ static void mmc_read_scrs(struct mmc_host *host)
                sg_init_one(&sg, (u8*)card->raw_scr, 8);
-                err = mmc_wait_for_req(host, &mrq);
+                mmc_wait_for_req(host, &mrq);
-                if (err != MMC_ERR_NONE) {
+                if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) {
                        mmc_card_set_dead(card);
                        continue;
                }
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index d91fcf7c3178..abcf19116d70 100644
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -359,7 +359,12 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)
                md->block_bits = card->csd.read_blkbits;
                blk_queue_hardsect_size(md->queue.queue, 1 << md->block_bits);
-                set_capacity(md->disk, card->csd.capacity);
+                /*
+                 * The CSD capacity field is in units of read_blkbits.
+                 * set_capacity takes units of 512 bytes.
+                 */
+                set_capacity(md->disk, card->csd.capacity << (card->csd.read_blkbits - 9));
        }
 out:
        return md;
@@ -373,7 +378,7 @@ mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card)
        mmc_card_claim_host(card);
        cmd.opcode = MMC_SET_BLOCKLEN;
-        cmd.arg = 1 << card->csd.read_blkbits;
+        cmd.arg = 1 << md->block_bits;
        cmd.flags = MMC_RSP_R1;
        err = mmc_wait_for_cmd(card->host, &cmd, 5);
        mmc_card_release_host(card);
@@ -412,10 +417,9 @@ static int mmc_blk_probe(struct mmc_card *card)
        if (err)
                goto out;
-        printk(KERN_INFO "%s: %s %s %dKiB %s\n",
+        printk(KERN_INFO "%s: %s %s %luKiB %s\n",
                md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),
-                (card->csd.capacity << card->csd.read_blkbits) / 1024,
+                get_capacity(md->disk) >> 1, mmc_blk_readonly(card)?"(ro)":"");
-                mmc_blk_readonly(card)?"(ro)":"");
        mmc_set_drvdata(card, md);
        add_disk(md->disk);
diff --git a/drivers/mtd/devices/blkmtd.c b/drivers/mtd/devices/blkmtd.c
index f9db52f6bf00..04f864d238db 100644
--- a/drivers/mtd/devices/blkmtd.c
+++ b/drivers/mtd/devices/blkmtd.c
@@ -113,7 +113,7 @@ static int bi_write_complete(struct bio *bio, unsigned int bytes_done, int error
                        ClearPageUptodate(page);
                        SetPageError(page);
                }
-                ClearPageDirty(page);
+                clear_page_dirty(page);
                unlock_page(page);
                page_cache_release(page);
        } while (bvec >= bio->bi_io_vec);
@@ -289,7 +289,7 @@ static int write_pages(struct blkmtd_dev *dev, const u_char *buf, loff_t to,
                        BUG();
                }
                memcpy(page_address(page)+offset, buf, start_len);
-                SetPageDirty(page);
+                set_page_dirty(page);
                SetPageUptodate(page);
                buf += start_len;
                thislen = start_len;
@@ -336,7 +336,7 @@ static int write_pages(struct blkmtd_dev *dev, const u_char *buf, loff_t to,
                        }
                        pagenr++;
                        pagecnt--;
-                        SetPageDirty(page);
+                        set_page_dirty(page);
                        SetPageUptodate(page);
                        pagesc--;
                        thislen += PAGE_SIZE;
@@ -357,7 +357,7 @@ static int write_pages(struct blkmtd_dev *dev, const u_char *buf, loff_t to,
                        BUG();
                }
                memcpy(page_address(page), buf, end_len);
-                SetPageDirty(page);
+                set_page_dirty(page);
                SetPageUptodate(page);
                DEBUG(3, "blkmtd: write: writing out partial end\n");
                thislen += end_len;
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 452ccd5037c3..b9b77cf39a18 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -62,7 +62,7 @@ config MTD_PHYSMAP_BANKWIDTH
 config MTD_SUN_UFLASH
        tristate "Sun Microsystems userflash support"
-        depends on (SPARC32 || SPARC64) && MTD_CFI
+        depends on SPARC && MTD_CFI
        help
          This provides a 'mapping' driver which supports the way in
          which user-programmable flash chips are connected on various
diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c
index 48cce431f89f..45c077d0f063 100644
--- a/drivers/mtd/onenand/generic.c
+++ b/drivers/mtd/onenand/generic.c
@@ -12,9 +12,9 @@
 *   This is a device driver for the OneNAND flash for generic boards.
 */
-#include <linux/device.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
 #include <linux/mtd/partitions.h>
@@ -39,7 +39,7 @@ static int __devinit generic_onenand_probe(struct device *dev)
 {
        struct onenand_info *info;
        struct platform_device *pdev = to_platform_device(dev);
-        struct onenand_platform_data *pdata = pdev->dev.platform_data;
+        struct flash_platform_data *pdata = pdev->dev.platform_data;
        struct resource *res = pdev->resource;
        unsigned long size = res->end - res->start + 1;
        int err;
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index f67d5d6eb9a6..a53a73fc2a5a 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -940,7 +940,7 @@ static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
        u_char *eccbuf, struct nand_oobinfo *oobsel)
 {
        struct onenand_chip *this = mtd->priv;
-        unsigned char buffer[MAX_ONENAND_PAGESIZE], *pbuf;
+        unsigned char *pbuf;
        size_t total_len, len;
        int i, written = 0;
        int ret = 0;
@@ -975,7 +975,7 @@ static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
        /* Loop until all keve's data has been written */
        len = 0;
        while (count) {
-                pbuf = buffer;
+                pbuf = this->page_buf;
                /*
                 * If the given tuple is >= pagesize then
                 * write it out from the iov
@@ -995,7 +995,7 @@ static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
                        int cnt = 0, thislen;
                        while (cnt < mtd->oobblock) {
                                thislen = min_t(int, mtd->oobblock - cnt, vecs->iov_len - len);
-                                memcpy(buffer + cnt, vecs->iov_base + len, thislen);
+                                memcpy(this->page_buf + cnt, vecs->iov_base + len, thislen);
                                cnt += thislen;
                                len += thislen;
@@ -1296,6 +1296,12 @@ static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
        /* Block lock scheme */
        for (block = start; block < end; block++) {
+                /* Set block address */
+                value = onenand_block_address(this, block);
+                this->write_word(value, this->base + ONENAND_REG_START_ADDRESS1);
+                /* Select DataRAM for DDP */
+                value = onenand_bufferram_address(this, block);
+                this->write_word(value, this->base + ONENAND_REG_START_ADDRESS2);
                /* Set start block address */
                this->write_word(block, this->base + ONENAND_REG_START_BLOCK_ADDRESS);
                /* Write unlock command */
@@ -1309,10 +1315,6 @@ static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
                    & ONENAND_CTRL_ONGO)
                        continue;
-                /* Set block address for read block status */
-                value = onenand_block_address(this, block);
-                this->write_word(value, this->base + ONENAND_REG_START_ADDRESS1);
                /* Check lock status */
                status = this->read_word(this->base + ONENAND_REG_WP_STATUS);
                if (!(status & ONENAND_WP_US))
@@ -1346,7 +1348,6 @@ static void onenand_print_device_info(int device)
 static const struct onenand_manufacturers onenand_manuf_ids[] = {
        {ONENAND_MFR_SAMSUNG, "Samsung"},
-        {ONENAND_MFR_UNKNOWN, "Unknown"}
 };
 /**
@@ -1357,17 +1358,22 @@ static const struct onenand_manufacturers onenand_manuf_ids[] = {
 */
 static int onenand_check_maf(int manuf)
 {
+        int size = ARRAY_SIZE(onenand_manuf_ids);
+        char *name;
        int i;
-        for (i = 0; onenand_manuf_ids[i].id; i++) {
+        for (i = 0; i < size; i++)
                if (manuf == onenand_manuf_ids[i].id)
                        break;
-        }
-        printk(KERN_DEBUG "OneNAND Manufacturer: %s (0x%0x)\n",
+        if (i < size)
-                onenand_manuf_ids[i].name, manuf);
+                name = onenand_manuf_ids[i].name;
+        else
+                name = "Unknown";
+        printk(KERN_DEBUG "OneNAND Manufacturer: %s (0x%0x)\n", name, manuf);
-        return (i != ONENAND_MFR_UNKNOWN);
+        return (i == size);
 }
 /**
@@ -1513,6 +1519,18 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
                this->read_bufferram = onenand_sync_read_bufferram;
        }
+        /* Allocate buffers, if necessary */
+        if (!this->page_buf) {
+                size_t len;
+                len = mtd->oobblock + mtd->oobsize;
+                this->page_buf = kmalloc(len, GFP_KERNEL);
+                if (!this->page_buf) {
+                        printk(KERN_ERR "onenand_scan(): Can't allocate page_buf\n");
+                        return -ENOMEM;
+                }
+                this->options |= ONENAND_PAGEBUF_ALLOC;
+        }
        this->state = FL_READY;
        init_waitqueue_head(&this->wq);
        spin_lock_init(&this->chip_lock);
@@ -1574,12 +1592,21 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
 */
 void onenand_release(struct mtd_info *mtd)
 {
+        struct onenand_chip *this = mtd->priv;
 #ifdef CONFIG_MTD_PARTITIONS
        /* Deregister partitions */
        del_mtd_partitions (mtd);
 #endif
        /* Deregister the device */
        del_mtd_device (mtd);
+        /* Free bad block table memory, if allocated */
+        if (this->bbm)
+                kfree(this->bbm);
+        /* Buffer allocated by onenand_scan */
+        if (this->options & ONENAND_PAGEBUF_ALLOC)
+                kfree(this->page_buf);
 }
 EXPORT_SYMBOL_GPL(onenand_scan);
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index f40190f499e1..4510d3361eaa 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -118,10 +118,10 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
 */
 static inline int onenand_memory_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)
 {
-        unsigned char data_buf[MAX_ONENAND_PAGESIZE];
+        struct onenand_chip *this = mtd->priv;
        bd->options &= ~NAND_BBT_SCANEMPTY;
-        return create_bbt(mtd, data_buf, bd, -1);
+        return create_bbt(mtd, this->page_buf, bd, -1);
 }
 /**
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 525624fc03b4..c39344adecce 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -10,7 +10,7 @@
 * trademarks of NVIDIA Corporation in the United States and other
 * countries.
 *
- * Copyright (C) 2003,4 Manfred Spraul
+ * Copyright (C) 2003,4,5 Manfred Spraul
 * Copyright (C) 2004 Andrew de Quincey (wol support)
 * Copyright (C) 2004 Carl-Daniel Hailfinger (invalid MAC handling, insane
 *              IRQ rate fixes, bigendian fixes, cleanups, verification)
@@ -100,6 +100,7 @@
 *      0.45: 18 Sep 2005: Remove nv_stop/start_rx from every link check
 *      0.46: 20 Oct 2005: Add irq optimization modes.
 *      0.47: 26 Oct 2005: Add phyaddr 0 in phy scan.
+ *      0.48: 24 Dec 2005: Disable TSO, bugfix for pci_map_single
 *
 * Known bugs:
 * We suspect that on some hardware no TX done interrupts are generated.
@@ -111,7 +112,7 @@
 * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few
 * superfluous timer interrupts from the nic.
 */
-#define FORCEDETH_VERSION               "0.47"
+#define FORCEDETH_VERSION               "0.48"
 #define DRV_NAME                        "forcedeth"
 #include <linux/module.h>
@@ -871,8 +872,8 @@ static int nv_alloc_rx(struct net_device *dev)
                } else {
                        skb = np->rx_skbuff[nr];
                }
-                np->rx_dma[nr] = pci_map_single(np->pci_dev, skb->data, skb->len,
+                np->rx_dma[nr] = pci_map_single(np->pci_dev, skb->data,
-                                                PCI_DMA_FROMDEVICE);
+                                        skb->end-skb->data, PCI_DMA_FROMDEVICE);
                if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
                        np->rx_ring.orig[nr].PacketBuffer = cpu_to_le32(np->rx_dma[nr]);
                        wmb();
@@ -999,7 +1000,7 @@ static void nv_drain_rx(struct net_device *dev)
                wmb();
                if (np->rx_skbuff[i]) {
                        pci_unmap_single(np->pci_dev, np->rx_dma[i],
-                                                np->rx_skbuff[i]->len,
+                                                np->rx_skbuff[i]->end-np->rx_skbuff[i]->data,
                                                PCI_DMA_FROMDEVICE);
                        dev_kfree_skb(np->rx_skbuff[i]);
                        np->rx_skbuff[i] = NULL;
@@ -1334,7 +1335,7 @@ static void nv_rx_process(struct net_device *dev)
                 * the performance.
                 */
                pci_unmap_single(np->pci_dev, np->rx_dma[i],
-                                np->rx_skbuff[i]->len,
+                                np->rx_skbuff[i]->end-np->rx_skbuff[i]->data,
                                PCI_DMA_FROMDEVICE);
                {
@@ -2455,7 +2456,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                np->txrxctl_bits |= NVREG_TXRXCTL_RXCHECK;
                dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG;
 #ifdef NETIF_F_TSO
-                dev->features |= NETIF_F_TSO;
+                /* disabled dev->features |= NETIF_F_TSO; */
 #endif
        }
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index be319229f543..8f6cf8c896a4 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -1251,12 +1251,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
    if (memcmp(promaddr, dev->dev_addr, 6)
        || !is_valid_ether_addr(dev->dev_addr)) {
-#ifndef __powerpc__
        if (is_valid_ether_addr(promaddr)) {
-#else
-        if (!is_valid_ether_addr(dev->dev_addr)
-            && is_valid_ether_addr(promaddr)) {
-#endif
            if (pcnet32_debug & NETIF_MSG_PROBE) {
                printk(" warning: CSR address invalid,\n");
                printk(KERN_INFO "    using instead PROM address of");
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 16bebe7a7ce1..7da0e3dd5fe3 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -38,6 +38,10 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
+MODULE_DESCRIPTION("PHY library");
+MODULE_AUTHOR("Andy Fleming");
+MODULE_LICENSE("GPL");
 static struct phy_driver genphy_driver;
 extern int mdio_bus_init(void);
 extern void mdio_bus_exit(void);
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 50430f79f8cf..1c6d328165bb 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -524,9 +524,6 @@ static int get_filter(void __user *arg, struct sock_filter **p)
        if (copy_from_user(&uprog, arg, sizeof(uprog)))
                return -EFAULT;
-        if (uprog.len > BPF_MAXINSNS)
-                return -EINVAL;
        if (!uprog.len) {
                *p = NULL;
                return 0;
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index e57df8dfe6b4..669dd52c412a 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3078,7 +3078,7 @@ int s2io_set_swapper(nic_t * sp)
 static int wait_for_msix_trans(nic_t *nic, int i)
 {
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+        XENA_dev_config_t __iomem *bar0 = nic->bar0;
        u64 val64;
        int ret = 0, cnt = 0;
@@ -3099,7 +3099,7 @@ static int wait_for_msix_trans(nic_t *nic, int i)
 void restore_xmsi_data(nic_t *nic)
 {
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+        XENA_dev_config_t __iomem *bar0 = nic->bar0;
        u64 val64;
        int i;
@@ -3117,7 +3117,7 @@ void restore_xmsi_data(nic_t *nic)
 static void store_xmsi_data(nic_t *nic)
 {
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+        XENA_dev_config_t __iomem *bar0 = nic->bar0;
        u64 val64, addr, data;
        int i;
@@ -3140,7 +3140,7 @@ static void store_xmsi_data(nic_t *nic)
 int s2io_enable_msi(nic_t *nic)
 {
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+        XENA_dev_config_t __iomem *bar0 = nic->bar0;
        u16 msi_ctrl, msg_val;
        struct config_param *config = &nic->config;
        struct net_device *dev = nic->dev;
@@ -3190,7 +3190,7 @@ int s2io_enable_msi(nic_t *nic)
 int s2io_enable_msi_x(nic_t *nic)
 {
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+        XENA_dev_config_t __iomem *bar0 = nic->bar0;
        u64 tx_mat, rx_mat;
        u16 msi_control; /* Temp variable */
        int ret, i, j, msix_indx = 1;
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index 00c5d7f04c68..ae7343934758 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -818,7 +818,7 @@ uintptr_t VNextDescr;	/* the virtual bus address of the next descriptor */
                /* set the pointers right */
                pDescr->VNextRxd = VNextDescr & 0xffffffffULL;
                pDescr->pNextRxd = pNextDescr;
-                pDescr->TcpSumStarts = 0;
+                if (!IsTx) pDescr->TcpSumStarts = ETH_HLEN << 16 | ETH_HLEN;
                /* advance one step */
                pPrevDescr = pDescr;
@@ -2169,7 +2169,7 @@ rx_start:
                } /* frame > SK_COPY_TRESHOLD */
 #ifdef USE_SK_RX_CHECKSUM
-                pMsg->csum = pRxd->TcpSums;
+                pMsg->csum = pRxd->TcpSums & 0xffff;
                pMsg->ip_summed = CHECKSUM_HW;
 #else
                pMsg->ip_summed = CHECKSUM_NONE;
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 716467879b9c..00d683063c01 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -2280,11 +2280,13 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
        }
        if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) {
-                netif_stop_queue(dev);
+                if (!netif_queue_stopped(dev)) {
-                spin_unlock_irqrestore(&skge->tx_lock, flags);
+                        netif_stop_queue(dev);
-                printk(KERN_WARNING PFX "%s: ring full when queue awake!\n",
+                        printk(KERN_WARNING PFX "%s: ring full when queue awake!\n",
-                       dev->name);
+                               dev->name);
+                }
+                spin_unlock_irqrestore(&skge->tx_lock, flags);
                return NETDEV_TX_BUSY;
        }
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 081717d01374..28ce47a02408 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2907,7 +2907,7 @@ static int __devinit gem_get_device_address(struct gem *gp)
        return 0;
 }
-static void __devexit gem_remove_one(struct pci_dev *pdev)
+static void gem_remove_one(struct pci_dev *pdev)
 {
        struct net_device *dev = pci_get_drvdata(pdev);
@@ -3181,7 +3181,7 @@ static struct pci_driver gem_driver = {
        .name           = GEM_MODULE_NAME,
        .id_table       = gem_pci_tbl,
        .probe          = gem_init_one,
-        .remove         = __devexit_p(gem_remove_one),
+        .remove         = gem_remove_one,
 #ifdef CONFIG_PM
        .suspend        = gem_suspend,
        .resume         = gem_resume,
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 1828a6bf8458..2fc9893d69e1 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -68,8 +68,8 @@
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.43"
+#define DRV_MODULE_VERSION      "3.47"
-#define DRV_MODULE_RELDATE      "Oct 24, 2005"
+#define DRV_MODULE_RELDATE      "Dec 28, 2005"
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -341,6 +341,16 @@ static struct {
        { "interrupt test (offline)" },
 };
+static void tg3_write32(struct tg3 *tp, u32 off, u32 val)
+{
+        writel(val, tp->regs + off);
+}
+static u32 tg3_read32(struct tg3 *tp, u32 off)
+{
+        return (readl(tp->regs + off)); 
+}
 static void tg3_write_indirect_reg32(struct tg3 *tp, u32 off, u32 val)
 {
        unsigned long flags;
@@ -411,13 +421,29 @@ static u32 tg3_read_indirect_mbox(struct tg3 *tp, u32 off)
        return val;
 }
-static void _tw32_flush(struct tg3 *tp, u32 off, u32 val)
+/* usec_wait specifies the wait time in usec when writing to certain registers
+ * where it is unsafe to read back the register without some delay.
+ * GRC_LOCAL_CTRL is one example if the GPIOs are toggled to switch power.
+ * TG3PCI_CLOCK_CTRL is another example if the clock frequencies are changed.
+ */
+static void _tw32_flush(struct tg3 *tp, u32 off, u32 val, u32 usec_wait)
 {
-        tp->write32(tp, off, val);
+        if ((tp->tg3_flags & TG3_FLAG_PCIX_TARGET_HWBUG) ||
-        if (!(tp->tg3_flags & TG3_FLAG_PCIX_TARGET_HWBUG) &&
+            (tp->tg3_flags2 & TG3_FLG2_ICH_WORKAROUND))
-            !(tp->tg3_flags & TG3_FLAG_5701_REG_WRITE_BUG) &&
+                /* Non-posted methods */
-            !(tp->tg3_flags2 & TG3_FLG2_ICH_WORKAROUND))
+                tp->write32(tp, off, val);
-                tp->read32(tp, off);    /* flush */
+        else {
+                /* Posted method */
+                tg3_write32(tp, off, val);
+                if (usec_wait)
+                        udelay(usec_wait);
+                tp->read32(tp, off);
+        }
+        /* Wait again after the read for the posted method to guarantee that
+         * the wait time is met.
+         */
+        if (usec_wait)
+                udelay(usec_wait);
 }
 static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val)
@@ -438,16 +464,6 @@ static void tg3_write32_tx_mbox(struct tg3 *tp, u32 off, u32 val)
                readl(mbox);
 }
-static void tg3_write32(struct tg3 *tp, u32 off, u32 val)
-{
-        writel(val, tp->regs + off);
-}
-static u32 tg3_read32(struct tg3 *tp, u32 off)
-{
-        return (readl(tp->regs + off)); 
-}
 #define tw32_mailbox(reg, val)  tp->write32_mbox(tp, reg, val)
 #define tw32_mailbox_f(reg, val)        tw32_mailbox_flush(tp, (reg), (val))
 #define tw32_rx_mbox(reg, val)  tp->write32_rx_mbox(tp, reg, val)
@@ -455,7 +471,8 @@ static u32 tg3_read32(struct tg3 *tp, u32 off)
 #define tr32_mailbox(reg)       tp->read32_mbox(tp, reg)
 #define tw32(reg,val)           tp->write32(tp, reg, val)
-#define tw32_f(reg,val)         _tw32_flush(tp,(reg),(val))
+#define tw32_f(reg,val)         _tw32_flush(tp,(reg),(val), 0)
+#define tw32_wait_f(reg,val,us) _tw32_flush(tp,(reg),(val), (us))
 #define tr32(reg)               tp->read32(tp, reg)
 static void tg3_write_mem(struct tg3 *tp, u32 off, u32 val)
@@ -595,21 +612,19 @@ static void tg3_switch_clocks(struct tg3 *tp)
        if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS) {
                if (orig_clock_ctrl & CLOCK_CTRL_625_CORE) {
-                        tw32_f(TG3PCI_CLOCK_CTRL,
+                        tw32_wait_f(TG3PCI_CLOCK_CTRL,
-                               clock_ctrl | CLOCK_CTRL_625_CORE);
+                                    clock_ctrl | CLOCK_CTRL_625_CORE, 40);
-                        udelay(40);
                }
        } else if ((orig_clock_ctrl & CLOCK_CTRL_44MHZ_CORE) != 0) {
-                tw32_f(TG3PCI_CLOCK_CTRL,
+                tw32_wait_f(TG3PCI_CLOCK_CTRL,
-                     clock_ctrl |
+                            clock_ctrl |
-                     (CLOCK_CTRL_44MHZ_CORE | CLOCK_CTRL_ALTCLK));
+                            (CLOCK_CTRL_44MHZ_CORE | CLOCK_CTRL_ALTCLK),
-                udelay(40);
+                            40);
-                tw32_f(TG3PCI_CLOCK_CTRL,
+                tw32_wait_f(TG3PCI_CLOCK_CTRL,
-                     clock_ctrl | (CLOCK_CTRL_ALTCLK));
+                            clock_ctrl | (CLOCK_CTRL_ALTCLK),
-                udelay(40);
+                            40);
        }
-        tw32_f(TG3PCI_CLOCK_CTRL, clock_ctrl);
+        tw32_wait_f(TG3PCI_CLOCK_CTRL, clock_ctrl, 40);
-        udelay(40);
 }
 #define PHY_BUSY_LOOPS  5000
@@ -1017,37 +1032,50 @@ static void tg3_frob_aux_power(struct tg3 *tp)
        if ((tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) != 0)
                return;
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {
+        if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
-                tp_peer = pci_get_drvdata(tp->pdev_peer);
+            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714)) {
-                if (!tp_peer)
+                struct net_device *dev_peer;
+                dev_peer = pci_get_drvdata(tp->pdev_peer);
+                if (!dev_peer)
                        BUG();
+                tp_peer = netdev_priv(dev_peer);
        }
        if ((tp->tg3_flags & TG3_FLAG_WOL_ENABLE) != 0 ||
-            (tp_peer->tg3_flags & TG3_FLAG_WOL_ENABLE) != 0) {
+            (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) != 0 ||
+            (tp_peer->tg3_flags & TG3_FLAG_WOL_ENABLE) != 0 ||
+            (tp_peer->tg3_flags & TG3_FLAG_ENABLE_ASF) != 0) {
                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) {
-                        tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
+                        tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-                             (GRC_LCLCTRL_GPIO_OE0 |
+                                    (GRC_LCLCTRL_GPIO_OE0 |
-                              GRC_LCLCTRL_GPIO_OE1 |
+                                     GRC_LCLCTRL_GPIO_OE1 |
-                              GRC_LCLCTRL_GPIO_OE2 |
+                                     GRC_LCLCTRL_GPIO_OE2 |
-                              GRC_LCLCTRL_GPIO_OUTPUT0 |
+                                     GRC_LCLCTRL_GPIO_OUTPUT0 |
-                              GRC_LCLCTRL_GPIO_OUTPUT1));
+                                     GRC_LCLCTRL_GPIO_OUTPUT1),
-                        udelay(100);
+                                    100);
                } else {
                        u32 no_gpio2;
-                        u32 grc_local_ctrl;
+                        u32 grc_local_ctrl = 0;
                        if (tp_peer != tp &&
                            (tp_peer->tg3_flags & TG3_FLAG_INIT_COMPLETE) != 0)
                                return;
+                        /* Workaround to prevent overdrawing Amps. */
+                        if (GET_ASIC_REV(tp->pci_chip_rev_id) ==
+                            ASIC_REV_5714) {
+                                grc_local_ctrl |= GRC_LCLCTRL_GPIO_OE3;
+                                tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
+                                            grc_local_ctrl, 100);
+                        }
                        /* On 5753 and variants, GPIO2 cannot be used. */
                        no_gpio2 = tp->nic_sram_data_cfg &
                                    NIC_SRAM_DATA_CFG_NO_GPIO2;
-                        grc_local_ctrl = GRC_LCLCTRL_GPIO_OE0 |
+                        grc_local_ctrl |= GRC_LCLCTRL_GPIO_OE0 |
                                         GRC_LCLCTRL_GPIO_OE1 |
                                         GRC_LCLCTRL_GPIO_OE2 |
                                         GRC_LCLCTRL_GPIO_OUTPUT1 |
@@ -1056,21 +1084,18 @@ static void tg3_frob_aux_power(struct tg3 *tp)
                                grc_local_ctrl &= ~(GRC_LCLCTRL_GPIO_OE2 |
                                                    GRC_LCLCTRL_GPIO_OUTPUT2);
                        }
-                        tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
+                        tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-                                                grc_local_ctrl);
+                                                    grc_local_ctrl, 100);
-                        udelay(100);
                        grc_local_ctrl |= GRC_LCLCTRL_GPIO_OUTPUT0;
-                        tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
+                        tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-                                                grc_local_ctrl);
+                                                    grc_local_ctrl, 100);
-                        udelay(100);
                        if (!no_gpio2) {
                                grc_local_ctrl &= ~GRC_LCLCTRL_GPIO_OUTPUT2;
-                                tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
+                                tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-                                       grc_local_ctrl);
+                                            grc_local_ctrl, 100);
-                                udelay(100);
                        }
                }
        } else {
@@ -1080,19 +1105,16 @@ static void tg3_frob_aux_power(struct tg3 *tp)
                            (tp_peer->tg3_flags & TG3_FLAG_INIT_COMPLETE) != 0)
                                return;
-                        tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
+                        tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-                             (GRC_LCLCTRL_GPIO_OE1 |
+                                    (GRC_LCLCTRL_GPIO_OE1 |
-                              GRC_LCLCTRL_GPIO_OUTPUT1));
+                                     GRC_LCLCTRL_GPIO_OUTPUT1), 100);
-                        udelay(100);
-                        tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
+                        tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-                             (GRC_LCLCTRL_GPIO_OE1));
+                                    GRC_LCLCTRL_GPIO_OE1, 100);
-                        udelay(100);
-                        tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
+                        tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-                             (GRC_LCLCTRL_GPIO_OE1 |
+                                    (GRC_LCLCTRL_GPIO_OE1 |
-                              GRC_LCLCTRL_GPIO_OUTPUT1));
+                                     GRC_LCLCTRL_GPIO_OUTPUT1), 100);
-                        udelay(100);
                }
        }
 }
@@ -1105,6 +1127,8 @@ static int tg3_setup_phy(struct tg3 *, int);
 static void tg3_write_sig_post_reset(struct tg3 *, int);
 static int tg3_halt_cpu(struct tg3 *, u32);
+static int tg3_nvram_lock(struct tg3 *);
+static void tg3_nvram_unlock(struct tg3 *);
 static int tg3_set_power_state(struct tg3 *tp, int state)
 {
@@ -1133,10 +1157,8 @@ static int tg3_set_power_state(struct tg3 *tp, int state)
                udelay(100);    /* Delay after power state change */
                /* Switch out of Vaux if it is not a LOM */
-                if (!(tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT)) {
+                if (!(tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT))
-                        tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl);
+                        tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl, 100);
-                        udelay(100);
-                }
                return 0;
@@ -1179,6 +1201,21 @@ static int tg3_set_power_state(struct tg3 *tp, int state)
                tg3_setup_phy(tp, 0);
        }
+        if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) {
+                int i;
+                u32 val;
+                for (i = 0; i < 200; i++) {
+                        tg3_read_mem(tp, NIC_SRAM_FW_ASF_STATUS_MBOX, &val);
+                        if (val == ~NIC_SRAM_FIRMWARE_MBOX_MAGIC1)
+                                break;
+                        msleep(1);
+                }
+        }
+        tg3_write_mem(tp, NIC_SRAM_WOL_MBOX, WOL_SIGNATURE |
+                                             WOL_DRV_STATE_SHUTDOWN |
+                                             WOL_DRV_WOL | WOL_SET_MAGIC_PKT);
        pci_read_config_word(tp->pdev, pm + PCI_PM_PMC, &power_caps);
        if (tp->tg3_flags & TG3_FLAG_WOL_ENABLE) {
@@ -1220,10 +1257,8 @@ static int tg3_set_power_state(struct tg3 *tp, int state)
                base_val |= (CLOCK_CTRL_RXCLK_DISABLE |
                             CLOCK_CTRL_TXCLK_DISABLE);
-                tw32_f(TG3PCI_CLOCK_CTRL, base_val |
+                tw32_wait_f(TG3PCI_CLOCK_CTRL, base_val | CLOCK_CTRL_ALTCLK |
-                     CLOCK_CTRL_ALTCLK |
+                            CLOCK_CTRL_PWRDOWN_PLL133, 40);
-                     CLOCK_CTRL_PWRDOWN_PLL133);
-                udelay(40);
        } else if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS) {
                /* do nothing */
        } else if (!((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) &&
@@ -1244,11 +1279,11 @@ static int tg3_set_power_state(struct tg3 *tp, int state)
                        newbits2 = newbits1 | CLOCK_CTRL_44MHZ_CORE;
                }
-                tw32_f(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl | newbits1);
+                tw32_wait_f(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl | newbits1,
-                udelay(40);
+                            40);
-                tw32_f(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl | newbits2);
+                tw32_wait_f(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl | newbits2,
-                udelay(40);
+                            40);
                if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS)) {
                        u32 newbits3;
@@ -1262,9 +1297,20 @@ static int tg3_set_power_state(struct tg3 *tp, int state)
                                newbits3 = CLOCK_CTRL_44MHZ_CORE;
                        }
-                        tw32_f(TG3PCI_CLOCK_CTRL,
+                        tw32_wait_f(TG3PCI_CLOCK_CTRL,
-                                         tp->pci_clock_ctrl | newbits3);
+                                    tp->pci_clock_ctrl | newbits3, 40);
-                        udelay(40);
+                }
+        }
+        if (!(tp->tg3_flags & TG3_FLAG_WOL_ENABLE) &&
+            !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) {
+                /* Turn off the PHY */
+                if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
+                        tg3_writephy(tp, MII_TG3_EXT_CTRL,
+                                     MII_TG3_EXT_CTRL_FORCE_LED_OFF);
+                        tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x01b2);
+                        if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700)
+                                tg3_writephy(tp, MII_BMCR, BMCR_PDOWN);
                }
        }
@@ -1277,8 +1323,12 @@ static int tg3_set_power_state(struct tg3 *tp, int state)
                val &= ~((1 << 16) | (1 << 4) | (1 << 2) | (1 << 1) | 1);
                tw32(0x7d00, val);
-                if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF))
+                if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) {
+                        tg3_nvram_lock(tp);
                        tg3_halt_cpu(tp, RX_CPU_BASE);
+                        tw32_f(NVRAM_SWARB, SWARB_REQ_CLR0);
+                        tg3_nvram_unlock(tp);
+                }
        }
        /* Finally, set the new power state. */
@@ -1812,7 +1862,7 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
                }
        }
 relink:
-        if (current_link_up == 0) {
+        if (current_link_up == 0 || tp->link_config.phy_is_low_power) {
                u32 tmp;
                tg3_phy_copper_begin(tp);
@@ -3565,12 +3615,15 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
        if (!spin_trylock(&tp->tx_lock))
                return NETDEV_TX_LOCKED; 
-        /* This is a hard error, log it. */
        if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) {
-                netif_stop_queue(dev);
+                if (!netif_queue_stopped(dev)) {
+                        netif_stop_queue(dev);
+                        /* This is a hard error, log it. */
+                        printk(KERN_ERR PFX "%s: BUG! Tx Ring full when "
+                               "queue awake!\n", dev->name);
+                }
                spin_unlock(&tp->tx_lock);
-                printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",
-                       dev->name);
                return NETDEV_TX_BUSY;
        }
@@ -7098,8 +7151,13 @@ do {	p = (u32 *)(orig_p + (reg));		\
        GET_REG32_LOOP(BUFMGR_MODE, 0x58);
        GET_REG32_LOOP(RDMAC_MODE, 0x08);
        GET_REG32_LOOP(WDMAC_MODE, 0x08);
-        GET_REG32_LOOP(RX_CPU_BASE, 0x280);
+        GET_REG32_1(RX_CPU_MODE);
-        GET_REG32_LOOP(TX_CPU_BASE, 0x280);
+        GET_REG32_1(RX_CPU_STATE);
+        GET_REG32_1(RX_CPU_PGMCTR);
+        GET_REG32_1(RX_CPU_HWBKPT);
+        GET_REG32_1(TX_CPU_MODE);
+        GET_REG32_1(TX_CPU_STATE);
+        GET_REG32_1(TX_CPU_PGMCTR);
        GET_REG32_LOOP(GRCMBOX_INTERRUPT_0, 0x110);
        GET_REG32_LOOP(FTQ_RESET, 0x120);
        GET_REG32_LOOP(MSGINT_MODE, 0x0c);
@@ -7922,13 +7980,12 @@ static int tg3_test_memory(struct tg3 *tp)
                u32 offset;
                u32 len;
        } mem_tbl_570x[] = {
-                { 0x00000000, 0x01000},
+                { 0x00000000, 0x00b50},
                { 0x00002000, 0x1c000},
                { 0xffffffff, 0x00000}
        }, mem_tbl_5705[] = {
                { 0x00000100, 0x0000c},
                { 0x00000200, 0x00008},
-                { 0x00000b50, 0x00400},
                { 0x00004000, 0x00800},
                { 0x00006000, 0x01000},
                { 0x00008000, 0x02000},
@@ -8530,6 +8587,7 @@ static void __devinit tg3_nvram_init(struct tg3 *tp)
            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701) {
                tp->tg3_flags |= TG3_FLAG_NVRAM;
+                tg3_nvram_lock(tp);
                tg3_enable_nvram_access(tp);
                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
@@ -8540,6 +8598,7 @@ static void __devinit tg3_nvram_init(struct tg3 *tp)
                tg3_get_nvram_size(tp);
                tg3_disable_nvram_access(tp);
+                tg3_nvram_unlock(tp);
        } else {
                tp->tg3_flags &= ~(TG3_FLAG_NVRAM | TG3_FLAG_NVRAM_BUFFERED);
@@ -8637,10 +8696,10 @@ static int tg3_nvram_read(struct tg3 *tp, u32 offset, u32 *val)
        if (ret == 0)
                *val = swab32(tr32(NVRAM_RDDATA));
-        tg3_nvram_unlock(tp);
        tg3_disable_nvram_access(tp);
+        tg3_nvram_unlock(tp);
        return ret;
 }
@@ -8725,6 +8784,10 @@ static int tg3_nvram_write_block_unbuffered(struct tg3 *tp, u32 offset, u32 len,
                offset = offset + (pagesize - page_off);
+                /* Nvram lock released by tg3_nvram_read() above,
+                 * so need to get it again.
+                 */
+                tg3_nvram_lock(tp);
                tg3_enable_nvram_access(tp);
                /*
@@ -10423,7 +10486,7 @@ static char * __devinit tg3_bus_string(struct tg3 *tp, char *str)
        return str;
 }
-static struct pci_dev * __devinit tg3_find_5704_peer(struct tg3 *tp)
+static struct pci_dev * __devinit tg3_find_peer(struct tg3 *tp)
 {
        struct pci_dev *peer;
        unsigned int func, devnr = tp->pdev->devfn & ~7;
@@ -10434,8 +10497,13 @@ static struct pci_dev * __devinit tg3_find_5704_peer(struct tg3 *tp)
                        break;
                pci_dev_put(peer);
        }
-        if (!peer || peer == tp->pdev)
+        /* 5704 can be configured in single-port mode, set peer to
-                BUG();
+         * tp->pdev in that case.
+         */
+        if (!peer) {
+                peer = tp->pdev;
+                return peer;
+        }
        /*
         * We don't need to keep the refcount elevated; there's no way
@@ -10671,8 +10739,9 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                tp->rx_pending = 63;
        }
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704)
+        if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
-                tp->pdev_peer = tg3_find_5704_peer(tp);
+            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714))
+                tp->pdev_peer = tg3_find_peer(tp);
        err = tg3_get_device_address(tp);
        if (err) {
@@ -10817,12 +10886,14 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state)
        tg3_full_lock(tp, 0);
        tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
+        tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;
        tg3_full_unlock(tp);
        err = tg3_set_power_state(tp, pci_choose_state(pdev, state));
        if (err) {
                tg3_full_lock(tp, 0);
+                tp->tg3_flags |= TG3_FLAG_INIT_COMPLETE;
                tg3_init_hw(tp);
                tp->timer.expires = jiffies + tp->timer_offset;
@@ -10856,6 +10927,7 @@ static int tg3_resume(struct pci_dev *pdev)
        tg3_full_lock(tp, 0);
+        tp->tg3_flags |= TG3_FLAG_INIT_COMPLETE;
        tg3_init_hw(tp);
        tp->timer.expires = jiffies + tp->timer_offset;
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index fb7e2a5f4a08..890e1635996b 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -1124,7 +1124,14 @@
 /* 0x280 --> 0x400 unused */
 #define RX_CPU_BASE                     0x00005000
+#define RX_CPU_MODE                     0x00005000
+#define RX_CPU_STATE                    0x00005004
+#define RX_CPU_PGMCTR                   0x0000501c
+#define RX_CPU_HWBKPT                   0x00005034
 #define TX_CPU_BASE                     0x00005400
+#define TX_CPU_MODE                     0x00005400
+#define TX_CPU_STATE                    0x00005404
+#define TX_CPU_PGMCTR                   0x0000541c
 /* Mailboxes */
 #define GRCMBOX_INTERRUPT_0             0x00005800 /* 64-bit */
@@ -1529,6 +1536,12 @@
 #define NIC_SRAM_MAC_ADDR_HIGH_MBOX     0x00000c14
 #define NIC_SRAM_MAC_ADDR_LOW_MBOX      0x00000c18
+#define NIC_SRAM_WOL_MBOX               0x00000d30
+#define  WOL_SIGNATURE                   0x474c0000
+#define  WOL_DRV_STATE_SHUTDOWN          0x00000001
+#define  WOL_DRV_WOL                     0x00000002
+#define  WOL_SET_MAGIC_PKT               0x00000004
 #define NIC_SRAM_DATA_CFG_2             0x00000d38
 #define  SHASTA_EXT_LED_MODE_MASK        0x00018000
@@ -1565,6 +1578,7 @@
 #define MII_TG3_EXT_CTRL                0x10 /* Extended control register */
 #define  MII_TG3_EXT_CTRL_FIFO_ELASTIC  0x0001
 #define  MII_TG3_EXT_CTRL_LNK3_LED_MODE 0x0002
+#define  MII_TG3_EXT_CTRL_FORCE_LED_OFF 0x0008
 #define  MII_TG3_EXT_CTRL_TBI           0x8000
 #define MII_TG3_EXT_STAT                0x11 /* Extended status register */
diff --git a/drivers/net/wireless/orinoco_nortel.c b/drivers/net/wireless/orinoco_nortel.c
index d8afd51ff8a5..d1a670b35338 100644
--- a/drivers/net/wireless/orinoco_nortel.c
+++ b/drivers/net/wireless/orinoco_nortel.c
@@ -1,6 +1,8 @@
 /* orinoco_nortel.c
 * 
 * Driver for Prism II devices which would usually be driven by orinoco_cs,
+ * but are connected to the PCI bus by a PCI-to-PCMCIA adapter used in
+ * Nortel emobility, Symbol LA-4113 and Symbol LA-4123.
 * but are connected to the PCI bus by a Nortel PCI-PCMCIA-Adapter. 
 *
 * Copyright (C) 2002 Tobias Hoffmann
@@ -165,7 +167,7 @@ static int nortel_pci_init_one(struct pci_dev *pdev,
                goto fail_resources;
        }
-        iomem = pci_iomap(pdev, 3, 0);
+        iomem = pci_iomap(pdev, 2, 0);
        if (!iomem) {
                err = -ENOMEM;
                goto fail_map_io;
@@ -265,6 +267,8 @@ static void __devexit nortel_pci_remove_one(struct pci_dev *pdev)
 static struct pci_device_id nortel_pci_id_table[] = {
        /* Nortel emobility PCI */
        {0x126c, 0x8030, PCI_ANY_ID, PCI_ANY_ID,},
+        /* Symbol LA-4123 PCI */
+        {0x1562, 0x0001, PCI_ANY_ID, PCI_ANY_ID,},
        {0,},
 };
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 716df015f8d0..6707df968934 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -6,6 +6,9 @@ obj-y		+= access.o bus.o probe.o remove.o pci.o quirks.o \
                        pci-driver.o search.o pci-sysfs.o rom.o setup-res.o
 obj-$(CONFIG_PROC_FS) += proc.o
+# Build PCI Express stuff if needed
+obj-$(CONFIG_PCIEPORTBUS) += pcie/
 obj-$(CONFIG_HOTPLUG) += hotplug.o
 # Build the PCI Hotplug drivers if we were asked to
@@ -40,7 +43,3 @@ endif
 ifeq ($(CONFIG_PCI_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG
 endif
-# Build PCI Express stuff if needed
-obj-$(CONFIG_PCIEPORTBUS) += pcie/
diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c
index 011915d5e243..f94f1f25eec6 100644
--- a/drivers/s390/net/qeth_eddp.c
+++ b/drivers/s390/net/qeth_eddp.c
@@ -62,7 +62,8 @@ qeth_eddp_free_context(struct qeth_eddp_context *ctx)
        for (i = 0; i < ctx->num_pages; ++i)
                free_page((unsigned long)ctx->pages[i]);
        kfree(ctx->pages);
-        kfree(ctx->elements);
+        if (ctx->elements != NULL)
+                kfree(ctx->elements);
        kfree(ctx);
 }
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 99cceb242ec4..f8f55cc468ba 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -1,6 +1,6 @@
 /*
 *
- * linux/drivers/s390/net/qeth_main.c ($Revision: 1.242 $)
+ * linux/drivers/s390/net/qeth_main.c ($Revision: 1.251 $)
 *
 * Linux on zSeries OSA Express and HiperSockets support
 *
@@ -12,7 +12,7 @@
 *                        Frank Pavlic (fpavlic@de.ibm.com) and
 *                        Thomas Spatzier <tspat@de.ibm.com>
 *
- *    $Revision: 1.242 $         $Date: 2005/05/04 20:19:18 $
+ *    $Revision: 1.251 $         $Date: 2005/05/04 20:19:18 $
 *
 * 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
@@ -72,7 +72,7 @@
 #include "qeth_eddp.h"
 #include "qeth_tso.h"
-#define VERSION_QETH_C "$Revision: 1.242 $"
+#define VERSION_QETH_C "$Revision: 1.251 $"
 static const char *version = "qeth S/390 OSA-Express driver";
 /**
@@ -518,7 +518,8 @@ __qeth_set_offline(struct ccwgroup_device *cgdev, int recovery_mode)
        QETH_DBF_TEXT(setup, 3, "setoffl");
        QETH_DBF_HEX(setup, 3, &card, sizeof(void *));
+        
+        netif_carrier_off(card->dev);
        recover_flag = card->state;
        if (qeth_stop_card(card, recovery_mode) == -ERESTARTSYS){
                PRINT_WARN("Stopping card %s interrupted by user!\n",
@@ -1020,7 +1021,6 @@ void
 qeth_schedule_recovery(struct qeth_card *card)
 {
        QETH_DBF_TEXT(trace,2,"startrec");
        if (qeth_set_thread_start_bit(card, QETH_RECOVER_THREAD) == 0)
                schedule_work(&card->kernel_thread_starter);
 }
@@ -1710,7 +1710,6 @@ qeth_check_ipa_data(struct qeth_card *card, struct qeth_cmd_buffer *iob)
                                           "IP address reset.\n",
                                           QETH_CARD_IFNAME(card),
                                           card->info.chpid);
-                                netif_carrier_on(card->dev);
                                qeth_schedule_recovery(card);
                                return NULL;
                        case IPA_CMD_MODCCID:
@@ -1959,7 +1958,7 @@ qeth_osn_send_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,
 {
        u16 s1, s2;
-QETH_DBF_TEXT(trace,4,"osndipa");
+        QETH_DBF_TEXT(trace,4,"osndipa");
        qeth_prepare_ipa_cmd(card, iob, QETH_PROT_OSN2);
        s1 = (u16)(IPA_PDU_HEADER_SIZE + data_len);
@@ -2203,24 +2202,21 @@ qeth_ulp_setup(struct qeth_card *card)
 }
 static inline int
-qeth_check_for_inbound_error(struct qeth_qdio_buffer *buf,
+qeth_check_qdio_errors(struct qdio_buffer *buf, unsigned int qdio_error,
-                             unsigned int qdio_error,
+                       unsigned int siga_error, const char *dbftext)
-                             unsigned int siga_error)
 {
-        int rc = 0;
        if (qdio_error || siga_error) {
-                QETH_DBF_TEXT(trace, 2, "qdinerr");
+                QETH_DBF_TEXT(trace, 2, dbftext);
-                QETH_DBF_TEXT(qerr, 2, "qdinerr");
+                QETH_DBF_TEXT(qerr, 2, dbftext);
                QETH_DBF_TEXT_(qerr, 2, " F15=%02X",
-                               buf->buffer->element[15].flags & 0xff);
+                               buf->element[15].flags & 0xff);
                QETH_DBF_TEXT_(qerr, 2, " F14=%02X",
-                               buf->buffer->element[14].flags & 0xff);
+                               buf->element[14].flags & 0xff);
                QETH_DBF_TEXT_(qerr, 2, " qerr=%X", qdio_error);
                QETH_DBF_TEXT_(qerr, 2, " serr=%X", siga_error);
-                rc = 1;
+                return 1;
        }
-        return rc;
+        return 0;
 }
 static inline struct sk_buff *
@@ -2769,8 +2765,9 @@ qeth_qdio_input_handler(struct ccw_device * ccwdev, unsigned int status,
        for (i = first_element; i < (first_element + count); ++i) {
                index = i % QDIO_MAX_BUFFERS_PER_Q;
                buffer = &card->qdio.in_q->bufs[index];
-                if (!((status == QDIO_STATUS_LOOK_FOR_ERROR) &&
+                if (!((status & QDIO_STATUS_LOOK_FOR_ERROR) &&
-                      qeth_check_for_inbound_error(buffer, qdio_err, siga_err)))
+                      qeth_check_qdio_errors(buffer->buffer, 
+                                             qdio_err, siga_err,"qinerr")))
                        qeth_process_inbound_buffer(card, buffer, index);
                /* clear buffer and give back to hardware */
                qeth_put_buffer_pool_entry(card, buffer->pool_entry);
@@ -2785,12 +2782,13 @@ qeth_qdio_input_handler(struct ccw_device * ccwdev, unsigned int status,
 static inline int
 qeth_handle_send_error(struct qeth_card *card,
                       struct qeth_qdio_out_buffer *buffer,
-                       int qdio_err, int siga_err)
+                       unsigned int qdio_err, unsigned int siga_err)
 {
        int sbalf15 = buffer->buffer->element[15].flags & 0xff;
        int cc = siga_err & 3;
        QETH_DBF_TEXT(trace, 6, "hdsnderr");
+        qeth_check_qdio_errors(buffer->buffer, qdio_err, siga_err, "qouterr");
        switch (cc) {
        case 0:
                if (qdio_err){
@@ -3047,7 +3045,8 @@ qeth_qdio_output_handler(struct ccw_device * ccwdev, unsigned int status,
        for(i = first_element; i < (first_element + count); ++i){
                buffer = &queue->bufs[i % QDIO_MAX_BUFFERS_PER_Q];
                /*we only handle the KICK_IT error by doing a recovery */
-                if (qeth_handle_send_error(card, buffer, qdio_error, siga_error)
+                if (qeth_handle_send_error(card, buffer,
+                                           qdio_error, siga_error)
                                == QETH_SEND_ERROR_KICK_IT){
                        netif_stop_queue(card->dev);
                        qeth_schedule_recovery(card);
@@ -3289,7 +3288,6 @@ qeth_init_qdio_info(struct qeth_card *card)
        card->qdio.in_buf_pool.buf_count = card->qdio.init_pool.buf_count;
        INIT_LIST_HEAD(&card->qdio.in_buf_pool.entry_list);
        INIT_LIST_HEAD(&card->qdio.init_pool.entry_list);
-        /* outbound */
 }
 static int
@@ -3731,6 +3729,9 @@ qeth_verify_vlan_dev(struct net_device *dev, struct qeth_card *card)
                        break;
                }
        }
+        if (rc && !(VLAN_DEV_INFO(dev)->real_dev->priv == (void *)card))
+                return 0;
 #endif
        return rc;
 }
@@ -3807,10 +3808,8 @@ qeth_open(struct net_device *dev)
        card->data.state = CH_STATE_UP;
        card->state = CARD_STATE_UP;
-        if (!card->lan_online){
+        if (!card->lan_online && netif_carrier_ok(dev))
-                if (netif_carrier_ok(dev))
+                netif_carrier_off(dev);
-                        netif_carrier_off(dev);
-        }
        return 0;
 }
@@ -5870,10 +5869,8 @@ qeth_add_multicast_ipv6(struct qeth_card *card)
        struct inet6_dev *in6_dev;
        QETH_DBF_TEXT(trace,4,"chkmcv6");
-        if ((card->options.layer2 == 0) &&
+        if (!qeth_is_supported(card, IPA_IPV6)) 
-            (!qeth_is_supported(card, IPA_IPV6)) )
                return ;
        in6_dev = in6_dev_get(card->dev);
        if (in6_dev == NULL)
                return;
@@ -7936,8 +7933,8 @@ __qeth_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                QETH_DBF_TEXT_(setup, 2, "6err%d", rc);
                goto out_remove;
        }
-/*maybe it was set offline without ifconfig down
+        netif_carrier_on(card->dev);
- * we can also use this state for recovery purposes*/
        qeth_set_allowed_threads(card, 0xffffffff, 0);
        if (recover_flag == CARD_STATE_RECOVER)
                qeth_start_again(card, recovery_mode);
diff --git a/drivers/s390/net/qeth_mpc.c b/drivers/s390/net/qeth_mpc.c
index f0a080a9e515..5f8754addc14 100644
--- a/drivers/s390/net/qeth_mpc.c
+++ b/drivers/s390/net/qeth_mpc.c
@@ -11,7 +11,7 @@
 #include <asm/cio.h>
 #include "qeth_mpc.h"
-const char *VERSION_QETH_MPC_C = "$Revision: 1.12 $";
+const char *VERSION_QETH_MPC_C = "$Revision: 1.13 $";
 unsigned char IDX_ACTIVATE_READ[]={
        0x00,0x00,0x80,0x00, 0x00,0x00,0x00,0x00,
diff --git a/drivers/s390/net/qeth_mpc.h b/drivers/s390/net/qeth_mpc.h
index 5f71486e708c..864cec5f6c62 100644
--- a/drivers/s390/net/qeth_mpc.h
+++ b/drivers/s390/net/qeth_mpc.h
@@ -14,14 +14,14 @@
 #include <asm/qeth.h>
-#define VERSION_QETH_MPC_H "$Revision: 1.44 $"
+#define VERSION_QETH_MPC_H "$Revision: 1.46 $"
 extern const char *VERSION_QETH_MPC_C;
 #define IPA_PDU_HEADER_SIZE     0x40
 #define QETH_IPA_PDU_LEN_TOTAL(buffer) (buffer+0x0e)
 #define QETH_IPA_PDU_LEN_PDU1(buffer) (buffer+0x26)
-#define QETH_IPA_PDU_LEN_PDU2(buffer) (buffer+0x2a)
+#define QETH_IPA_PDU_LEN_PDU2(buffer) (buffer+0x29)
 #define QETH_IPA_PDU_LEN_PDU3(buffer) (buffer+0x3a)
 extern unsigned char IPA_PDU_HEADER[];
diff --git a/drivers/s390/net/qeth_proc.c b/drivers/s390/net/qeth_proc.c
index f2ccfea8fdb8..7bf35098831e 100644
--- a/drivers/s390/net/qeth_proc.c
+++ b/drivers/s390/net/qeth_proc.c
@@ -1,6 +1,6 @@
 /*
 *
- * linux/drivers/s390/net/qeth_fs.c ($Revision: 1.13 $)
+ * linux/drivers/s390/net/qeth_fs.c ($Revision: 1.16 $)
 *
 * Linux on zSeries OSA Express and HiperSockets support
 * This file contains code related to procfs.
@@ -21,7 +21,7 @@
 #include "qeth_mpc.h"
 #include "qeth_fs.h"
-const char *VERSION_QETH_PROC_C = "$Revision: 1.13 $";
+const char *VERSION_QETH_PROC_C = "$Revision: 1.16 $";
 /***** /proc/qeth *****/
 #define QETH_PROCFILE_NAME "qeth"
@@ -30,30 +30,26 @@ static struct proc_dir_entry *qeth_procfile;
 static int
 qeth_procfile_seq_match(struct device *dev, void *data)
 {
-        return 1;
+        return(dev ? 1 : 0);
 }
 static void *
 qeth_procfile_seq_start(struct seq_file *s, loff_t *offset)
 {
-        struct device *dev;
+        struct device *dev = NULL;
-        loff_t nr;
+        loff_t nr = 0;
+        
        down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
+        if (*offset == 0)
-        nr = *offset;
-        if (nr == 0)
                return SEQ_START_TOKEN;
+        while (1) {
-        dev = driver_find_device(&qeth_ccwgroup_driver.driver, NULL,
-                                 NULL, qeth_procfile_seq_match);
-        /* get card at pos *offset */
-        nr = *offset;
-        while (nr-- > 1 && dev)
                dev = driver_find_device(&qeth_ccwgroup_driver.driver, dev,
                                         NULL, qeth_procfile_seq_match);
-        return (void *) dev;
+                if (++nr == *offset)
+                        break;
+                put_device(dev);
+        }
+        return dev;
 }
 static void
@@ -66,19 +62,14 @@ static void *
 qeth_procfile_seq_next(struct seq_file *s, void *it, loff_t *offset)
 {
        struct device *prev, *next;
+        
-        if (it == SEQ_START_TOKEN) {
+        if (it == SEQ_START_TOKEN) 
-                next = driver_find_device(&qeth_ccwgroup_driver.driver,
+                prev = NULL;
-                                          NULL, NULL, qeth_procfile_seq_match);
+        else
-                if (next)
+                prev = (struct device *) it;
-                        (*offset)++;
-                return (void *) next;
-        }
-        prev = (struct device *) it;
        next = driver_find_device(&qeth_ccwgroup_driver.driver,
                                  prev, NULL, qeth_procfile_seq_match);
-        if (next)
+        (*offset)++;
-                (*offset)++;
        return (void *) next;
 }
@@ -87,7 +78,7 @@ qeth_get_router_str(struct qeth_card *card, int ipv)
 {
        int routing_type = 0;
-        if (ipv == 4){
+        if (ipv == 4) {
                routing_type = card->options.route4.type;
        } else {
 #ifdef CONFIG_QETH_IPV6
@@ -154,6 +145,7 @@ qeth_procfile_seq_show(struct seq_file *s, void *it)
                                        card->qdio.in_buf_pool.buf_count);
                else
                        seq_printf(s, "  +++ LAN OFFLINE +++\n");
+                put_device(device);
        }
        return 0;
 }
@@ -184,51 +176,16 @@ static struct file_operations qeth_procfile_fops = {
 static struct proc_dir_entry *qeth_perf_procfile;
 #ifdef CONFIG_QETH_PERF_STATS
-static void *
-qeth_perf_procfile_seq_start(struct seq_file *s, loff_t *offset)
-{
-        struct device *dev = NULL;
-        int nr;
-        down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-        /* get card at pos *offset */
-        dev = driver_find_device(&qeth_ccwgroup_driver.driver, NULL, NULL,
-                                 qeth_procfile_seq_match);
-        /* get card at pos *offset */
-        nr = *offset;
-        while (nr-- > 1 && dev)
-                dev = driver_find_device(&qeth_ccwgroup_driver.driver, dev,
-                                         NULL, qeth_procfile_seq_match);
-        return (void *) dev;
-}
-static void
-qeth_perf_procfile_seq_stop(struct seq_file *s, void* it)
-{
-        up_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-}
-static void *
-qeth_perf_procfile_seq_next(struct seq_file *s, void *it, loff_t *offset)
-{
-        struct device *prev, *next;
-        prev = (struct device *) it;
-        next = driver_find_device(&qeth_ccwgroup_driver.driver, prev,
-                                  NULL, qeth_procfile_seq_match);
-        if (next)
-                (*offset)++;
-        return (void *) next;
-}
 static int
 qeth_perf_procfile_seq_show(struct seq_file *s, void *it)
 {
        struct device *device;
        struct qeth_card *card;
+        
+        if (it == SEQ_START_TOKEN)
+                return 0;
        device = (struct device *) it;
        card = device->driver_data;
        seq_printf(s, "For card with devnos %s/%s/%s (%s):\n",
@@ -295,13 +252,14 @@ qeth_perf_procfile_seq_show(struct seq_file *s, void *it)
                        card->perf_stats.outbound_do_qdio_time,
                        card->perf_stats.outbound_do_qdio_cnt
                  );
+        put_device(device);
        return 0;
 }
 static struct seq_operations qeth_perf_procfile_seq_ops = {
-        .start = qeth_perf_procfile_seq_start,
+        .start = qeth_procfile_seq_start,
-        .stop  = qeth_perf_procfile_seq_stop,
+        .stop  = qeth_procfile_seq_stop,
-        .next  = qeth_perf_procfile_seq_next,
+        .next  = qeth_procfile_seq_next,
        .show  = qeth_perf_procfile_seq_show,
 };
@@ -324,93 +282,6 @@ static struct file_operations qeth_perf_procfile_fops = {
 #define qeth_perf_procfile_created 1
 #endif /* CONFIG_QETH_PERF_STATS */
-/***** /proc/qeth_ipa_takeover *****/
-#define QETH_IPATO_PROCFILE_NAME "qeth_ipa_takeover"
-static struct proc_dir_entry *qeth_ipato_procfile;
-static void *
-qeth_ipato_procfile_seq_start(struct seq_file *s, loff_t *offset)
-{
-        struct device *dev;
-        loff_t nr;
-        down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-        /* TODO: finish this */
-        /*
-         * maybe SEQ_SATRT_TOKEN can be returned for offset 0
-         * output driver settings then;
-         * else output setting for respective card
-         */
-        dev = driver_find_device(&qeth_ccwgroup_driver.driver, NULL, NULL,
-                                 qeth_procfile_seq_match);
-        /* get card at pos *offset */
-        nr = *offset;
-        while (nr-- > 1 && dev)
-                dev = driver_find_device(&qeth_ccwgroup_driver.driver, dev,
-                                         NULL, qeth_procfile_seq_match);
-        return (void *) dev;
-}
-static void
-qeth_ipato_procfile_seq_stop(struct seq_file *s, void* it)
-{
-        up_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-}
-static void *
-qeth_ipato_procfile_seq_next(struct seq_file *s, void *it, loff_t *offset)
-{
-        struct device *prev, *next;
-        prev = (struct device *) it;
-        next = driver_find_device(&qeth_ccwgroup_driver.driver, prev,
-                                  NULL, qeth_procfile_seq_match);
-        if (next)
-                (*offset)++;
-        return (void *) next;
-}
-static int
-qeth_ipato_procfile_seq_show(struct seq_file *s, void *it)
-{
-        struct device *device;
-        struct qeth_card *card;
-        /* TODO: finish this */
-        /*
-         * maybe SEQ_SATRT_TOKEN can be returned for offset 0
-         * output driver settings then;
-         * else output setting for respective card
-         */
-        device = (struct device *) it;
-        card = device->driver_data;
-        return 0;
-}
-static struct seq_operations qeth_ipato_procfile_seq_ops = {
-        .start = qeth_ipato_procfile_seq_start,
-        .stop  = qeth_ipato_procfile_seq_stop,
-        .next  = qeth_ipato_procfile_seq_next,
-        .show  = qeth_ipato_procfile_seq_show,
-};
-static int
-qeth_ipato_procfile_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &qeth_ipato_procfile_seq_ops);
-}
-static struct file_operations qeth_ipato_procfile_fops = {
-        .owner   = THIS_MODULE,
-        .open    = qeth_ipato_procfile_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release,
-};
 int __init
 qeth_create_procfs_entries(void)
 {
@@ -426,13 +297,7 @@ qeth_create_procfs_entries(void)
                qeth_perf_procfile->proc_fops = &qeth_perf_procfile_fops;
 #endif /* CONFIG_QETH_PERF_STATS */
-        qeth_ipato_procfile = create_proc_entry(QETH_IPATO_PROCFILE_NAME,
-                                           S_IFREG | 0444, NULL);
-        if (qeth_ipato_procfile)
-                qeth_ipato_procfile->proc_fops = &qeth_ipato_procfile_fops;
        if (qeth_procfile &&
-            qeth_ipato_procfile &&
            qeth_perf_procfile_created)
                return 0;
        else
@@ -446,62 +311,5 @@ qeth_remove_procfs_entries(void)
                remove_proc_entry(QETH_PROCFILE_NAME, NULL);
        if (qeth_perf_procfile)
                remove_proc_entry(QETH_PERF_PROCFILE_NAME, NULL);
-        if (qeth_ipato_procfile)
-                remove_proc_entry(QETH_IPATO_PROCFILE_NAME, NULL);
 }
-/* ONLY FOR DEVELOPMENT! -> make it as module */
-/*
-static void
-qeth_create_sysfs_entries(void)
-{
-        struct device *dev;
-        down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-        list_for_each_entry(dev, &qeth_ccwgroup_driver.driver.devices,
-                        driver_list)
-                qeth_create_device_attributes(dev);
-        up_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-}
-static void
-qeth_remove_sysfs_entries(void)
-{
-        struct device *dev;
-        down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-        list_for_each_entry(dev, &qeth_ccwgroup_driver.driver.devices,
-                        driver_list)
-                qeth_remove_device_attributes(dev);
-        up_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
-}
-static int __init
-qeth_fs_init(void)
-{
-        printk(KERN_INFO "qeth_fs_init\n");
-        qeth_create_procfs_entries();
-        qeth_create_sysfs_entries();
-        return 0;
-}
-static void __exit
-qeth_fs_exit(void)
-{
-        printk(KERN_INFO "qeth_fs_exit\n");
-        qeth_remove_procfs_entries();
-        qeth_remove_sysfs_entries();
-}
-module_init(qeth_fs_init);
-module_exit(qeth_fs_exit);
-MODULE_LICENSE("GPL");
-*/
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c
index ddd6019ba092..0ea185f70f75 100644
--- a/drivers/s390/net/qeth_sys.c
+++ b/drivers/s390/net/qeth_sys.c
@@ -1,6 +1,6 @@
 /*
 *
- * linux/drivers/s390/net/qeth_sys.c ($Revision: 1.58 $)
+ * linux/drivers/s390/net/qeth_sys.c ($Revision: 1.60 $)
 *
 * Linux on zSeries OSA Express and HiperSockets support
 * This file contains code related to sysfs.
@@ -20,7 +20,7 @@
 #include "qeth_mpc.h"
 #include "qeth_fs.h"
-const char *VERSION_QETH_SYS_C = "$Revision: 1.58 $";
+const char *VERSION_QETH_SYS_C = "$Revision: 1.60 $";
 /*****************************************************************************/
 /*                                                                           */
@@ -160,7 +160,7 @@ qeth_dev_portname_store(struct device *dev, struct device_attribute *attr, const
                return -EPERM;
        tmp = strsep((char **) &buf, "\n");
-        if ((strlen(tmp) > 8) || (strlen(tmp) < 2))
+        if ((strlen(tmp) > 8) || (strlen(tmp) == 0))
                return -EINVAL;
        card->info.portname[0] = strlen(tmp);
diff --git a/drivers/s390/net/qeth_tso.h b/drivers/s390/net/qeth_tso.h
index e245af3c4cbd..3c50b6f24f51 100644
--- a/drivers/s390/net/qeth_tso.h
+++ b/drivers/s390/net/qeth_tso.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/s390/net/qeth_tso.h ($Revision: 1.7 $)
+ * linux/drivers/s390/net/qeth_tso.h ($Revision: 1.8 $)
 *
 * Header file for qeth TCP Segmentation Offload support.
 *
@@ -7,7 +7,7 @@
 *
 *    Author(s): Frank Pavlic <fpavlic@de.ibm.com>
 *
- *    $Revision: 1.7 $   $Date: 2005/05/04 20:19:18 $
+ *    $Revision: 1.8 $   $Date: 2005/05/04 20:19:18 $
 *
 */
 #ifndef __QETH_TSO_H__
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index c12c5046e2fa..14631ac11bc7 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -249,11 +249,11 @@ static loff_t jsf_lseek(struct file * file, loff_t offset, int orig)
 /*
 * OS SIMM Cannot be read in other size but a 32bits word.
 */
-static ssize_t jsf_read(struct file * file, char * buf, 
+static ssize_t jsf_read(struct file * file, char __user * buf, 
    size_t togo, loff_t *ppos)
 {
        unsigned long p = *ppos;
-        char *tmp = buf;
+        char __user *tmp = buf;
        union byte4 {
                char s[4];
@@ -305,7 +305,7 @@ static ssize_t jsf_read(struct file * file, char * buf,
        return tmp-buf;
 }
-static ssize_t jsf_write(struct file * file, const char * buf,
+static ssize_t jsf_write(struct file * file, const char __user * buf,
    size_t count, loff_t *ppos)
 {
        return -ENOSPC;
@@ -356,10 +356,10 @@ static int jsf_ioctl_erase(unsigned long arg)
 * Program a block of flash.
 * Very simple because we can do it byte by byte anyway.
 */
-static int jsf_ioctl_program(unsigned long arg)
+static int jsf_ioctl_program(void __user *arg)
 {
        struct jsflash_program_arg abuf;
-        char *uptr;
+        char __user *uptr;
        unsigned long p;
        unsigned int togo;
        union {
@@ -367,13 +367,13 @@ static int jsf_ioctl_program(unsigned long arg)
                char s[4];
        } b;
-        if (copy_from_user(&abuf, (char *)arg, JSFPRGSZ))
+        if (copy_from_user(&abuf, arg, JSFPRGSZ))
                return -EFAULT; 
        p = abuf.off;
        togo = abuf.size;
        if ((togo & 3) || (p & 3)) return -EINVAL;
-        uptr = (char *) (unsigned long) abuf.data;
+        uptr = (char __user *) (unsigned long) abuf.data;
        while (togo != 0) {
                togo -= 4;
                if (copy_from_user(&b.s[0], uptr, 4))
@@ -390,19 +390,20 @@ static int jsf_ioctl(struct inode *inode, struct file *f, unsigned int cmd,
    unsigned long arg)
 {
        int error = -ENOTTY;
+        void __user *argp = (void __user *)arg;
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
        switch (cmd) {
        case JSFLASH_IDENT:
-                if (copy_to_user((void *)arg, &jsf0.id, JSFIDSZ))
+                if (copy_to_user(argp, &jsf0.id, JSFIDSZ))
                        return -EFAULT;
                break;
        case JSFLASH_ERASE:
                error = jsf_ioctl_erase(arg);
                break;
        case JSFLASH_PROGRAM:
-                error = jsf_ioctl_program(arg);
+                error = jsf_ioctl_program(argp);
                break;
        }
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c
index 858cc683f85c..e2d9a7c85427 100644
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
@@ -309,7 +309,7 @@ static void uctrl_do_txn(struct uctrl_txn *txn)
        }
 }
-void uctrl_get_event_status()
+void uctrl_get_event_status(void)
 {
        struct uctrl_driver *driver = &drv;
        struct uctrl_txn txn;
@@ -318,7 +318,7 @@ void uctrl_get_event_status()
        txn.opcode = READ_EVENT_STATUS;
        txn.inbits = 0;
        txn.outbits = 2;
-        txn.inbuf = 0;
+        txn.inbuf = NULL;
        txn.outbuf = outbits;
        uctrl_do_txn(&txn);
@@ -329,7 +329,7 @@ void uctrl_get_event_status()
        dprintk(("ev is %x\n", driver->status.event_status));
 }
-void uctrl_get_external_status()
+void uctrl_get_external_status(void)
 {
        struct uctrl_driver *driver = &drv;
        struct uctrl_txn txn;
@@ -339,7 +339,7 @@ void uctrl_get_external_status()
        txn.opcode = READ_EXTERNAL_STATUS;
        txn.inbits = 0;
        txn.outbits = 2;
-        txn.inbuf = 0;
+        txn.inbuf = NULL;
        txn.outbuf = outbits;
        uctrl_do_txn(&txn);
@@ -414,7 +414,7 @@ static void __exit ts102_uctrl_cleanup(void)
        if (driver->irq)
                free_irq(driver->irq, driver);
        if (driver->regs)
-                driver->regs = 0;
+                driver->regs = NULL;
 }
 module_init(ts102_uctrl_init);
diff --git a/drivers/sbus/char/vfc.h b/drivers/sbus/char/vfc.h
index a7782e7da42e..8045cd5e7cb3 100644
--- a/drivers/sbus/char/vfc.h
+++ b/drivers/sbus/char/vfc.h
@@ -125,7 +125,7 @@ struct vfc_regs {
 struct vfc_dev {
-        volatile struct vfc_regs *regs;
+        volatile struct vfc_regs __iomem *regs;
        struct vfc_regs *phys_regs;
        unsigned int control_reg;
        struct semaphore device_lock_sem;
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index 7a103698fa3c..dfdd6be551f3 100644
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -149,7 +149,7 @@ int init_vfc_device(struct sbus_dev *sdev,struct vfc_dev *dev, int instance)
        }
        printk("Initializing vfc%d\n",instance);
        dev->regs = NULL;
-        dev->regs = (volatile struct vfc_regs *)
+        dev->regs = (volatile struct vfc_regs __iomem *)
                sbus_ioremap(&sdev->resource[0], 0,
                             sizeof(struct vfc_regs), vfcstr);
        dev->which_io = sdev->reg_addrs[0].which_io;
@@ -319,7 +319,7 @@ int vfc_capture_poll(struct vfc_dev *dev)
        int timeout = 1000;
        while (!timeout--) {
-                if (dev->regs->control & VFC_STATUS_CAPTURE)
+                if (sbus_readl(&dev->regs->control) & VFC_STATUS_CAPTURE)
                        break;
                vfc_i2c_delay_no_busy(dev, 100);
        }
@@ -718,7 +718,7 @@ static void deinit_vfc_device(struct vfc_dev *dev)
        if(dev == NULL)
                return;
        devfs_remove("vfc/%d", dev->instance);
-        sbus_iounmap((unsigned long)dev->regs, sizeof(struct vfc_regs));
+        sbus_iounmap(dev->regs, sizeof(struct vfc_regs));
        kfree(dev);
 }
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 418fc7b896ac..6252b9ddc01e 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -660,7 +660,12 @@ static int adpt_abort(struct scsi_cmnd * cmd)
        msg[2] = 0;
        msg[3]= 0; 
        msg[4] = (u32)cmd;
-        if( (rcode = adpt_i2o_post_wait(pHba, msg, sizeof(msg), FOREVER)) != 0){
+        if (pHba->host)
+                spin_lock_irq(pHba->host->host_lock);
+        rcode = adpt_i2o_post_wait(pHba, msg, sizeof(msg), FOREVER);
+        if (pHba->host)
+                spin_unlock_irq(pHba->host->host_lock);
+        if (rcode != 0) {
                if(rcode == -EOPNOTSUPP ){
                        printk(KERN_INFO"%s: Abort cmd not supported\n",pHba->name);
                        return FAILED;
@@ -697,10 +702,15 @@ static int adpt_device_reset(struct scsi_cmnd* cmd)
        msg[2] = 0;
        msg[3] = 0;
+        if (pHba->host)
+                spin_lock_irq(pHba->host->host_lock);
        old_state = d->state;
        d->state |= DPTI_DEV_RESET;
-        if( (rcode = adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER)) ){
+        rcode = adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER);
-                d->state = old_state;
+        d->state = old_state;
+        if (pHba->host)
+                spin_unlock_irq(pHba->host->host_lock);
+        if (rcode != 0) {
                if(rcode == -EOPNOTSUPP ){
                        printk(KERN_INFO"%s: Device reset not supported\n",pHba->name);
                        return FAILED;
@@ -708,7 +718,6 @@ static int adpt_device_reset(struct scsi_cmnd* cmd)
                printk(KERN_INFO"%s: Device reset failed\n",pHba->name);
                return FAILED;
        } else {
-                d->state = old_state;
                printk(KERN_INFO"%s: Device reset successful\n",pHba->name);
                return SUCCESS;
        }
@@ -721,6 +730,7 @@ static int adpt_bus_reset(struct scsi_cmnd* cmd)
 {
        adpt_hba* pHba;
        u32 msg[4];
+        u32 rcode;
        pHba = (adpt_hba*)cmd->device->host->hostdata[0];
        memset(msg, 0, sizeof(msg));
@@ -729,7 +739,12 @@ static int adpt_bus_reset(struct scsi_cmnd* cmd)
        msg[1] = (I2O_HBA_BUS_RESET<<24|HOST_TID<<12|pHba->channel[cmd->device->channel].tid);
        msg[2] = 0;
        msg[3] = 0;
-        if(adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER) ){
+        if (pHba->host)
+                spin_lock_irq(pHba->host->host_lock);
+        rcode = adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER);
+        if (pHba->host)
+                spin_unlock_irq(pHba->host->host_lock);
+        if (rcode != 0) {
                printk(KERN_WARNING"%s: Bus reset failed.\n",pHba->name);
                return FAILED;
        } else {
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.h b/drivers/scsi/ibmvscsi/ibmvscsi.h
index 8bec0438dc8a..5b0edd1f1921 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.h
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.h
@@ -100,7 +100,7 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue,
 void ibmvscsi_release_crq_queue(struct crq_queue *queue,
                                struct ibmvscsi_host_data *hostdata,
                                int max_requests);
-void ibmvscsi_reset_crq_queue(struct crq_queue *queue,
+int ibmvscsi_reset_crq_queue(struct crq_queue *queue,
                              struct ibmvscsi_host_data *hostdata);
 void ibmvscsi_handle_crq(struct viosrp_crq *crq,
diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c
index 1045872b0175..ce15d9e39621 100644
--- a/drivers/scsi/ibmvscsi/iseries_vscsi.c
+++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c
@@ -117,9 +117,10 @@ void ibmvscsi_release_crq_queue(struct crq_queue *queue,
 *
 * no-op for iSeries
 */
-void ibmvscsi_reset_crq_queue(struct crq_queue *queue,
+int ibmvscsi_reset_crq_queue(struct crq_queue *queue,
                              struct ibmvscsi_host_data *hostdata)
 {
+        return 0;
 }
 /**
diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c
index 8bf5652f1060..75db2f5c545e 100644
--- a/drivers/scsi/ibmvscsi/rpa_vscsi.c
+++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c
@@ -230,6 +230,11 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue,
        rc = plpar_hcall_norets(H_REG_CRQ,
                                vdev->unit_address,
                                queue->msg_token, PAGE_SIZE);
+        if (rc == H_Resource) 
+                /* maybe kexecing and resource is busy. try a reset */
+                rc = ibmvscsi_reset_crq_queue(queue,
+                                              hostdata);
        if (rc == 2) {
                /* Adapter is good, but other end is not ready */
                printk(KERN_WARNING "ibmvscsi: Partner adapter not ready\n");
@@ -281,7 +286,7 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue,
 * @hostdata:   ibmvscsi_host_data of host
 *
 */
-void ibmvscsi_reset_crq_queue(struct crq_queue *queue,
+int ibmvscsi_reset_crq_queue(struct crq_queue *queue,
                              struct ibmvscsi_host_data *hostdata)
 {
        int rc;
@@ -309,4 +314,5 @@ void ibmvscsi_reset_crq_queue(struct crq_queue *queue,
                printk(KERN_WARNING
                       "ibmvscsi: couldn't register crq--rc 0x%x\n", rc);
        }
+        return rc;
 }
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 4fea3e4edaa7..3d8009f55342 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -3368,7 +3368,7 @@ iscsi_conn_set_param(iscsi_connh_t connh, enum iscsi_param param,
        switch(param) {
        case ISCSI_PARAM_MAX_RECV_DLENGTH: {
                char *saveptr = conn->data;
-                int flags = GFP_KERNEL;
+                gfp_t flags = GFP_KERNEL;
                if (conn->data_size >= value) {
                        conn->max_recv_dlength = value;
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 665ae79e1fd6..d0a0fdbd0fc4 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2443,7 +2443,7 @@ static void ata_sg_clean(struct ata_queued_cmd *qc)
                        struct scatterlist *psg = &qc->pad_sgent;
                        void *addr = kmap_atomic(psg->page, KM_IRQ0);
                        memcpy(addr + psg->offset, pad_buf, qc->pad_len);
-                        kunmap_atomic(psg->page, KM_IRQ0);
+                        kunmap_atomic(addr, KM_IRQ0);
                }
        } else {
                if (sg_dma_len(&sg[0]) > 0)
@@ -2717,7 +2717,7 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)
                if (qc->tf.flags & ATA_TFLAG_WRITE) {
                        void *addr = kmap_atomic(psg->page, KM_IRQ0);
                        memcpy(pad_buf, addr + psg->offset, qc->pad_len);
-                        kunmap_atomic(psg->page, KM_IRQ0);
+                        kunmap_atomic(addr, KM_IRQ0);
                }
                sg_dma_address(psg) = ap->pad_dma + (qc->tag * ATA_DMA_PAD_SZ);
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 379e87089764..2282c04fee46 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -2044,7 +2044,7 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask)
        else {
                u8 *scsicmd = cmd->cmnd;
-                if (scsicmd[0] == INQUIRY) {
+                if ((scsicmd[0] == INQUIRY) && ((scsicmd[1] & 0x03) == 0)) {
                        u8 *buf = NULL;
                        unsigned int buflen;
@@ -2058,9 +2058,6 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask)
         * device.  2) Ensure response data format / ATAPI information
         * are always correct.
         */
-        /* FIXME: do we ever override EVPD pages and the like, with
-         * this code?
-         */
                        if (buf[2] == 0) {
                                buf[2] = 0x5;
                                buf[3] = 0x32;
@@ -2173,9 +2170,12 @@ ata_scsi_find_dev(struct ata_port *ap, const struct scsi_device *scsidev)
        if (unlikely(!ata_dev_present(dev)))
                return NULL;
-        if (!atapi_enabled) {
+        if (!atapi_enabled || (ap->flags & ATA_FLAG_NO_ATAPI)) {
-                if (unlikely(dev->class == ATA_DEV_ATAPI))
+                if (unlikely(dev->class == ATA_DEV_ATAPI)) {
+                        printk(KERN_WARNING "ata%u(%u): WARNING: ATAPI is %s, device ignored.\n",
+                               ap->id, dev->devno, atapi_enabled ? "not supported with this driver" : "disabled");
                        return NULL;
+                }
        }
        return dev;
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index f9792528e33f..578143e93a6f 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -664,7 +664,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy)
                                        sg->offset;
                        } else
                                buf = cmd->request_buffer;
-                        memset(cmd->request_buffer, 0, cmd->cmnd[4]);
+                        memset(buf, 0, cmd->cmnd[4]);
                        if (cmd->use_sg) {
                                struct scatterlist *sg;
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 7096945ea234..7b3efd531297 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2476,17 +2476,9 @@ typedef struct scsi_qla_host {
 */
 #define LOOP_TRANSITION(ha) \
        (test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \
-         test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))
+         test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \
-#define LOOP_NOT_READY(ha) \
-        ((test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \
-          test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags) || \
-          test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \
-          test_bit(LOOP_RESYNC_ACTIVE, &ha->dpc_flags)) || \
         atomic_read(&ha->loop_state) == LOOP_DOWN)
-#define LOOP_RDY(ha)    (!LOOP_NOT_READY(ha))
 #define TGT_Q(ha, t) (ha->otgt[t])
 #define to_qla_host(x)          ((scsi_qla_host_t *) (x)->hostdata)
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 2d720121a0d3..c46d2469b85f 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1259,7 +1259,7 @@ qla2x00_configure_hba(scsi_qla_host_t *ha)
        rval = qla2x00_get_adapter_id(ha,
            &loop_id, &al_pa, &area, &domain, &topo);
        if (rval != QLA_SUCCESS) {
-                if (LOOP_NOT_READY(ha) || atomic_read(&ha->loop_down_timer) ||
+                if (LOOP_TRANSITION(ha) || atomic_read(&ha->loop_down_timer) ||
                    (rval == QLA_COMMAND_ERROR && loop_id == 0x7)) {
                        DEBUG2(printk("%s(%ld) Loop is in a transition state\n",
                            __func__, ha->host_no));
@@ -1796,7 +1796,7 @@ qla2x00_configure_loop(scsi_qla_host_t *ha)
        }
        if (rval == QLA_SUCCESS && test_bit(RSCN_UPDATE, &flags)) {
-                if (LOOP_NOT_READY(ha)) {
+                if (LOOP_TRANSITION(ha)) {
                        rval = QLA_FUNCTION_FAILED;
                } else {
                        rval = qla2x00_configure_fabric(ha);
@@ -2369,7 +2369,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports)
                if (qla2x00_is_reserved_id(ha, loop_id))
                        continue;
-                if (atomic_read(&ha->loop_down_timer) || LOOP_NOT_READY(ha))
+                if (atomic_read(&ha->loop_down_timer) || LOOP_TRANSITION(ha))
                        break;
                if (swl != NULL) {
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 09afc0f06bd4..5181d966fecb 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -909,6 +909,21 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
                        resid = resid_len;
                        cp->resid = resid;
                        CMD_RESID_LEN(cp) = resid;
+                        if (!lscsi_status &&
+                            ((unsigned)(cp->request_bufflen - resid) <
+                             cp->underflow)) {
+                                qla_printk(KERN_INFO, ha,
+                                    "scsi(%ld:%d:%d:%d): Mid-layer underflow "
+                                    "detected (%x of %x bytes)...returning "
+                                    "error status.\n", ha->host_no,
+                                    cp->device->channel, cp->device->id,
+                                    cp->device->lun, resid,
+                                    cp->request_bufflen);
+                                cp->result = DID_ERROR << 16;
+                                break;
+                        }
                }
                cp->result = DID_OK << 16 | lscsi_status;
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index ab7432a5778e..9321cdf45680 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -86,7 +86,8 @@ enum {
        MV_FLAG_DUAL_HC         = (1 << 30),  /* two SATA Host Controllers */
        MV_FLAG_IRQ_COALESCE    = (1 << 29),  /* IRQ coalescing capability */
        MV_COMMON_FLAGS         = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO),
+                                   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |
+                                   ATA_FLAG_NO_ATAPI),
        MV_6XXX_FLAGS           = MV_FLAG_IRQ_COALESCE,
        CRQB_FLAG_READ          = (1 << 0),
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index 8a8e3e3ef0ed..2691625f9bce 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -70,6 +70,9 @@ enum {
        PDC_HAS_PATA            = (1 << 1), /* PDC20375 has PATA */
        PDC_RESET               = (1 << 11), /* HDMA reset */
+        PDC_COMMON_FLAGS        = ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST |
+                                  ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI,
 };
@@ -162,8 +165,7 @@ static struct ata_port_info pdc_port_info[] = {
        /* board_2037x */
        {
                .sht            = &pdc_ata_sht,
-                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                .host_flags     = PDC_COMMON_FLAGS | ATA_FLAG_SATA,
-                                  ATA_FLAG_SRST | ATA_FLAG_MMIO,
                .pio_mask       = 0x1f, /* pio0-4 */
                .mwdma_mask     = 0x07, /* mwdma0-2 */
                .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
@@ -173,8 +175,7 @@ static struct ata_port_info pdc_port_info[] = {
        /* board_20319 */
        {
                .sht            = &pdc_ata_sht,
-                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                .host_flags     = PDC_COMMON_FLAGS | ATA_FLAG_SATA,
-                                  ATA_FLAG_SRST | ATA_FLAG_MMIO,
                .pio_mask       = 0x1f, /* pio0-4 */
                .mwdma_mask     = 0x07, /* mwdma0-2 */
                .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
@@ -184,8 +185,7 @@ static struct ata_port_info pdc_port_info[] = {
        /* board_20619 */
        {
                .sht            = &pdc_ata_sht,
-                .host_flags     = ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST |
+                .host_flags     = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS,
-                                  ATA_FLAG_MMIO | ATA_FLAG_SLAVE_POSS,
                .pio_mask       = 0x1f, /* pio0-4 */
                .mwdma_mask     = 0x07, /* mwdma0-2 */
                .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index dcc3ad9a9d6e..ac7b0d819ebc 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -220,7 +220,8 @@ static struct ata_port_info pdc_port_info[] = {
        {
                .sht            = &pdc_sata_sht,
                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                  ATA_FLAG_SRST | ATA_FLAG_MMIO,
+                                  ATA_FLAG_SRST | ATA_FLAG_MMIO |
+                                  ATA_FLAG_NO_ATAPI,
                .pio_mask       = 0x1f, /* pio0-4 */
                .mwdma_mask     = 0x07, /* mwdma0-2 */
                .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 18c5d2523014..c0ae9e965f6f 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -422,10 +422,15 @@ static int scsi_eh_completed_normally(struct scsi_cmnd *scmd)
 **/
 static void scsi_eh_done(struct scsi_cmnd *scmd)
 {
+        struct completion     *eh_action;
        SCSI_LOG_ERROR_RECOVERY(3,
                printk("%s scmd: %p result: %x\n",
                        __FUNCTION__, scmd, scmd->result));
-        complete(scmd->device->host->eh_action);
+        eh_action = scmd->device->host->eh_action;
+        if (eh_action)
+                complete(eh_action);
 }
 /**
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 4afef5cdcb17..dc249cb970ea 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -542,10 +542,17 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd)
 void scsi_next_command(struct scsi_cmnd *cmd)
 {
-        struct request_queue *q = cmd->device->request_queue;
+        struct scsi_device *sdev = cmd->device;
+        struct request_queue *q = sdev->request_queue;
+        /* need to hold a reference on the device before we let go of the cmd */
+        get_device(&sdev->sdev_gendev);
        scsi_put_command(cmd);
        scsi_run_queue(q);
+        /* ok to remove device now */
+        put_device(&sdev->sdev_gendev);
 }
 void scsi_run_host_queues(struct Scsi_Host *shost)
@@ -1078,6 +1085,26 @@ static void scsi_generic_done(struct scsi_cmnd *cmd)
        scsi_io_completion(cmd, cmd->result == 0 ? cmd->bufflen : 0, 0);
 }
+void scsi_setup_blk_pc_cmnd(struct scsi_cmnd *cmd, int retries)
+{
+        struct request *req = cmd->request;
+        BUG_ON(sizeof(req->cmd) > sizeof(cmd->cmnd));
+        memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd));
+        cmd->cmd_len = req->cmd_len;
+        if (!req->data_len)
+                cmd->sc_data_direction = DMA_NONE;
+        else if (rq_data_dir(req) == WRITE)
+                cmd->sc_data_direction = DMA_TO_DEVICE;
+        else
+                cmd->sc_data_direction = DMA_FROM_DEVICE;
+        
+        cmd->transfersize = req->data_len;
+        cmd->allowed = retries;
+        cmd->timeout_per_command = req->timeout;
+}
+EXPORT_SYMBOL_GPL(scsi_setup_blk_pc_cmnd);
 static int scsi_prep_fn(struct request_queue *q, struct request *req)
 {
        struct scsi_device *sdev = q->queuedata;
@@ -1213,18 +1240,7 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
                                goto kill;
                        }
                } else {
-                        memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd));
+                        scsi_setup_blk_pc_cmnd(cmd, 3);
-                        cmd->cmd_len = req->cmd_len;
-                        if (rq_data_dir(req) == WRITE)
-                                cmd->sc_data_direction = DMA_TO_DEVICE;
-                        else if (req->data_len)
-                                cmd->sc_data_direction = DMA_FROM_DEVICE;
-                        else
-                                cmd->sc_data_direction = DMA_NONE;
-                        
-                        cmd->transfersize = req->data_len;
-                        cmd->allowed = 3;
-                        cmd->timeout_per_command = req->timeout;
                        cmd->done = scsi_generic_done;
                }
        }
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 374853df9cca..4e6709f448e1 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -266,8 +266,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
                        /*
                         * if LLDD reports slave not present, don't clutter
                         * console with alloc failure messages
                         */
                        if (ret == -ENXIO)
                                display_failure_msg = 0;
@@ -279,7 +277,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
 out_device_destroy:
        transport_destroy_device(&sdev->sdev_gendev);
-        scsi_free_queue(sdev->request_queue);
        put_device(&sdev->sdev_gendev);
 out:
        if (display_failure_msg)
@@ -403,6 +400,36 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
        return found_target;
 }
+struct work_queue_wrapper {
+        struct work_struct      work;
+        struct scsi_target      *starget;
+};
+static void scsi_target_reap_work(void *data) {
+        struct work_queue_wrapper *wqw = (struct work_queue_wrapper *)data;
+        struct scsi_target *starget = wqw->starget;
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        unsigned long flags;
+        kfree(wqw);
+        spin_lock_irqsave(shost->host_lock, flags);
+        if (--starget->reap_ref == 0 && list_empty(&starget->devices)) {
+                list_del_init(&starget->siblings);
+                spin_unlock_irqrestore(shost->host_lock, flags);
+                transport_remove_device(&starget->dev);
+                device_del(&starget->dev);
+                transport_destroy_device(&starget->dev);
+                put_device(&starget->dev);
+                return;
+        }
+        spin_unlock_irqrestore(shost->host_lock, flags);
+        return;
+}
 /**
 * scsi_target_reap - check to see if target is in use and destroy if not
 *
@@ -414,19 +441,18 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
 */
 void scsi_target_reap(struct scsi_target *starget)
 {
-        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct work_queue_wrapper *wqw = 
-        unsigned long flags;
+                kzalloc(sizeof(struct work_queue_wrapper), GFP_ATOMIC);
-        spin_lock_irqsave(shost->host_lock, flags);
-        if (--starget->reap_ref == 0 && list_empty(&starget->devices)) {
+        if (!wqw) {
-                list_del_init(&starget->siblings);
+                starget_printk(KERN_ERR, starget,
-                spin_unlock_irqrestore(shost->host_lock, flags);
+                               "Failed to allocate memory in scsi_reap_target()\n");
-                device_del(&starget->dev);
-                transport_unregister_device(&starget->dev);
-                put_device(&starget->dev);
                return;
        }
-        spin_unlock_irqrestore(shost->host_lock, flags);
+        INIT_WORK(&wqw->work, scsi_target_reap_work, wqw);
+        wqw->starget = starget;
+        schedule_work(&wqw->work);
 }
 /**
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 6cd5931d9a54..2a1a99a2ef56 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -105,6 +105,7 @@ static struct {
        { FC_PORTSTATE_LINKDOWN,        "Linkdown" },
        { FC_PORTSTATE_ERROR,           "Error" },
        { FC_PORTSTATE_LOOPBACK,        "Loopback" },
+        { FC_PORTSTATE_DELETED,         "Deleted" },
 };
 fc_enum_name_search(port_state, fc_port_state, fc_port_state_names)
 #define FC_PORTSTATE_MAX_NAMELEN        20
@@ -211,6 +212,7 @@ fc_bitfield_name_search(remote_port_roles, fc_remote_port_role_names)
 #define FC_MGMTSRVR_PORTID              0x00000a
+static void fc_shost_remove_rports(void  *data);
 static void fc_timeout_deleted_rport(void *data);
 static void fc_scsi_scan_rport(void *data);
 static void fc_rport_terminate(struct fc_rport  *rport);
@@ -318,6 +320,8 @@ static int fc_host_setup(struct transport_container *tc, struct device *dev,
        fc_host_next_rport_number(shost) = 0;
        fc_host_next_target_id(shost) = 0;
+        fc_host_flags(shost) = 0;
+        INIT_WORK(&fc_host_rport_del_work(shost), fc_shost_remove_rports, shost);
        return 0;
 }
@@ -387,6 +391,7 @@ show_fc_rport_##field (struct class_device *cdev, char *buf)		\
        struct fc_internal *i = to_fc_internal(shost->transportt);      \
        if ((i->f->get_rport_##field) &&                                \
            !((rport->port_state == FC_PORTSTATE_BLOCKED) ||            \
+              (rport->port_state == FC_PORTSTATE_DELETED) ||            \
              (rport->port_state == FC_PORTSTATE_NOTPRESENT)))          \
                i->f->get_rport_##field(rport);                         \
        return snprintf(buf, sz, format_string, cast rport->field);     \
@@ -402,6 +407,7 @@ store_fc_rport_##field(struct class_device *cdev, const char *buf,	\
        struct Scsi_Host *shost = rport_to_shost(rport);                \
        struct fc_internal *i = to_fc_internal(shost->transportt);      \
        if ((rport->port_state == FC_PORTSTATE_BLOCKED) ||              \
+            (rport->port_state == FC_PORTSTATE_DELETED) ||              \
            (rport->port_state == FC_PORTSTATE_NOTPRESENT))             \
                return -EBUSY;                                          \
        val = simple_strtoul(buf, NULL, 0);                             \
@@ -519,6 +525,7 @@ store_fc_rport_dev_loss_tmo(struct class_device *cdev, const char *buf,
        struct Scsi_Host *shost = rport_to_shost(rport);
        struct fc_internal *i = to_fc_internal(shost->transportt);
        if ((rport->port_state == FC_PORTSTATE_BLOCKED) ||
+            (rport->port_state == FC_PORTSTATE_DELETED) ||
            (rport->port_state == FC_PORTSTATE_NOTPRESENT))
                return -EBUSY;
        val = simple_strtoul(buf, NULL, 0);
@@ -1769,7 +1776,7 @@ fc_timeout_deleted_rport(void  *data)
        rport->maxframe_size = -1;
        rport->supported_classes = FC_COS_UNSPECIFIED;
        rport->roles = FC_RPORT_ROLE_UNKNOWN;
-        rport->port_state = FC_PORTSTATE_NOTPRESENT;
+        rport->port_state = FC_PORTSTATE_DELETED;
        /* remove the identifiers that aren't used in the consisting binding */
        switch (fc_host_tgtid_bind_type(shost)) {
@@ -1789,14 +1796,23 @@ fc_timeout_deleted_rport(void  *data)
                break;
        }
-        spin_unlock_irqrestore(shost->host_lock, flags);
        /*
         * As this only occurs if the remote port (scsi target)
         * went away and didn't come back - we'll remove
         * all attached scsi devices.
+         *
+         * We'll schedule the shost work item to perform the actual removal
+         * to avoid recursion in the different flush calls if we perform
+         * the removal in each target - and there are lots of targets
+         * whose timeouts fire at the same time.
         */
-        fc_rport_tgt_remove(rport);
+        if ( !(fc_host_flags(shost) & FC_SHOST_RPORT_DEL_SCHEDULED)) {
+                fc_host_flags(shost) |= FC_SHOST_RPORT_DEL_SCHEDULED;
+                scsi_queue_work(shost, &fc_host_rport_del_work(shost));
+        }
+        spin_unlock_irqrestore(shost->host_lock, flags);
 }
 /**
@@ -1818,6 +1834,41 @@ fc_scsi_scan_rport(void *data)
 }
+/**
+ * fc_shost_remove_rports - called to remove all rports that are marked
+ *                       as in a deleted (not connected) state.
+ * 
+ * @data:       shost whose rports are to be looked at
+ **/
+static void
+fc_shost_remove_rports(void  *data)
+{
+        struct Scsi_Host *shost = (struct Scsi_Host *)data;
+        struct fc_rport *rport, *next_rport;
+        unsigned long flags;
+        spin_lock_irqsave(shost->host_lock, flags);
+        while (fc_host_flags(shost) & FC_SHOST_RPORT_DEL_SCHEDULED) {
+                fc_host_flags(shost) &= ~FC_SHOST_RPORT_DEL_SCHEDULED;
+restart_search:
+                list_for_each_entry_safe(rport, next_rport,
+                                &fc_host_rport_bindings(shost), peers) {
+                        if (rport->port_state == FC_PORTSTATE_DELETED) {
+                                rport->port_state = FC_PORTSTATE_NOTPRESENT;
+                                spin_unlock_irqrestore(shost->host_lock, flags);
+                                fc_rport_tgt_remove(rport);
+                                spin_lock_irqsave(shost->host_lock, flags);
+                                goto restart_search;
+                        }
+                }
+        }
+        spin_unlock_irqrestore(shost->host_lock, flags);
+}
 MODULE_AUTHOR("Martin Hicks");
 MODULE_DESCRIPTION("FC Transport Attributes");
 MODULE_LICENSE("GPL");
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 49fd18c1a9c6..e08462d50c97 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -249,7 +249,7 @@ static inline struct list_head *skb_to_lh(struct sk_buff *skb)
 }
 static void*
-mempool_zone_alloc_skb(unsigned int gfp_mask, void *pool_data)
+mempool_zone_alloc_skb(gfp_t gfp_mask, void *pool_data)
 {
        struct mempool_zone *zone = pool_data;
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 8613a1317712..03fcbab30033 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -245,24 +245,10 @@ static int sd_init_command(struct scsi_cmnd * SCpnt)
         * SG_IO from block layer already setup, just copy cdb basically
         */
        if (blk_pc_request(rq)) {
-                if (sizeof(rq->cmd) > sizeof(SCpnt->cmnd))
+                scsi_setup_blk_pc_cmnd(SCpnt, SD_PASSTHROUGH_RETRIES);
-                        return 0;
-                memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
-                SCpnt->cmd_len = rq->cmd_len;
-                if (rq_data_dir(rq) == WRITE)
-                        SCpnt->sc_data_direction = DMA_TO_DEVICE;
-                else if (rq->data_len)
-                        SCpnt->sc_data_direction = DMA_FROM_DEVICE;
-                else
-                        SCpnt->sc_data_direction = DMA_NONE;
-                this_count = rq->data_len;
                if (rq->timeout)
                        timeout = rq->timeout;
-                SCpnt->transfersize = rq->data_len;
-                SCpnt->allowed = SD_PASSTHROUGH_RETRIES;
                goto queue;
        }
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index d68cea753bb2..fb4012b5c188 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -320,25 +320,11 @@ static int sr_init_command(struct scsi_cmnd * SCpnt)
         * these are already setup, just copy cdb basically
         */
        if (SCpnt->request->flags & REQ_BLOCK_PC) {
-                struct request *rq = SCpnt->request;
+                scsi_setup_blk_pc_cmnd(SCpnt, MAX_RETRIES);
-                if (sizeof(rq->cmd) > sizeof(SCpnt->cmnd))
+                if (SCpnt->timeout_per_command)
-                        return 0;
+                        timeout = SCpnt->timeout_per_command;
-                memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
-                SCpnt->cmd_len = rq->cmd_len;
-                if (!rq->data_len)
-                        SCpnt->sc_data_direction = DMA_NONE;
-                else if (rq_data_dir(rq) == WRITE)
-                        SCpnt->sc_data_direction = DMA_TO_DEVICE;
-                else
-                        SCpnt->sc_data_direction = DMA_FROM_DEVICE;
-                this_count = rq->data_len;
-                if (rq->timeout)
-                        timeout = rq->timeout;
-                SCpnt->transfersize = rq->data_len;
                goto queue;
        }
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 7ac6ea141fff..dd592f6a2529 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -4194,27 +4194,10 @@ static void st_intr(struct scsi_cmnd *SCpnt)
 */
 static int st_init_command(struct scsi_cmnd *SCpnt)
 {
-        struct request *rq;
        if (!(SCpnt->request->flags & REQ_BLOCK_PC))
                return 0;
-        rq = SCpnt->request;
+        scsi_setup_blk_pc_cmnd(SCpnt, 0);
-        if (sizeof(rq->cmd) > sizeof(SCpnt->cmnd))
-                return 0;
-        memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
-        SCpnt->cmd_len = rq->cmd_len;
-        if (rq_data_dir(rq) == WRITE)
-                SCpnt->sc_data_direction = DMA_TO_DEVICE;
-        else if (rq->data_len)
-                SCpnt->sc_data_direction = DMA_FROM_DEVICE;
-        else
-                SCpnt->sc_data_direction = DMA_NONE;
-        SCpnt->timeout_per_command = rq->timeout;
-        SCpnt->transfersize = rq->data_len;
        SCpnt->done = st_intr;
        return 1;
 }
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index a7420cad4547..1564ca203a3e 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -1405,7 +1405,6 @@ static void sym_check_goals(struct sym_hcb *np, struct scsi_target *starget,
                goal->iu = 0;
                goal->dt = 0;
                goal->qas = 0;
-                goal->period = 0;
                goal->offset = 0;
                return;
        }
@@ -1465,7 +1464,8 @@ static int sym_prepare_nego(struct sym_hcb *np, struct sym_ccb *cp, u_char *msgp
         * Many devices implement PPR in a buggy way, so only use it if we
         * really want to.
         */
-        if (goal->iu || goal->dt || goal->qas || (goal->period < 0xa)) {
+        if (goal->offset &&
+            (goal->iu || goal->dt || goal->qas || (goal->period < 0xa))) {
                nego = NS_PPR;
        } else if (spi_width(starget) != goal->width) {
                nego = NS_WIDE;
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 8d92adfbb8bd..8adca0ce267f 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -516,7 +516,7 @@ pci_timedia_setup(struct serial_private *priv, struct pciserial_board *board,
                break;
        case 3:
                offset = board->uart_offset;
-                bar = 1;
+                /* FALLTHROUGH */
        case 4: /* BAR 2 */
        case 5: /* BAR 3 */
        case 6: /* BAR 4 */
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index ad47c1b84c3f..812bae62c8ec 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -10,7 +10,7 @@ menu "Serial drivers"
 # The new 8250/16550 serial drivers
 config SERIAL_8250
        tristate "8250/16550 and compatible serial support"
-        depends on (BROKEN || !(SPARC64 || SPARC32))
+        depends on (BROKEN || !SPARC)
        select SERIAL_CORE
        ---help---
          This selects whether you want to include the driver for the standard
@@ -469,14 +469,14 @@ config SERIAL_IMX_CONSOLE
 config SERIAL_SUNCORE
        bool
-        depends on SPARC32 || SPARC64
+        depends on SPARC
        select SERIAL_CORE
        select SERIAL_CORE_CONSOLE
        default y
 config SERIAL_SUNZILOG
        tristate "Sun Zilog8530 serial support"
-        depends on SPARC32 || SPARC64
+        depends on SPARC
        help
          This driver supports the Zilog8530 serial ports found on many Sparc
          systems.  Say Y or M if you want to be able to these serial ports.
@@ -491,7 +491,7 @@ config SERIAL_SUNZILOG_CONSOLE
 config SERIAL_SUNSU
        tristate "Sun SU serial support"
-        depends on (SPARC32 || SPARC64) && PCI
+        depends on SPARC && PCI
        help
          This driver supports the 8250 serial ports that run the keyboard and
          mouse on (PCI) UltraSPARC systems.  Say Y or M if you want to be able
@@ -547,7 +547,7 @@ config PDC_CONSOLE
 config SERIAL_SUNSAB
        tristate "Sun Siemens SAB82532 serial support"
-        depends on (SPARC32 || SPARC64) && PCI
+        depends on SPARC && PCI
        help
          This driver supports the Siemens SAB82532 DUSCC serial ports on newer
          (PCI) UltraSPARC systems.  Say Y or M if you want to be able to these
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index 89d7bd3eaee3..d84476ee6592 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -160,7 +160,7 @@ pl011_rx_chars(struct uart_amba_port *uap)
                                flag = TTY_FRAME;
                }
-                if (uart_handle_sysrq_char(&uap->port, ch, regs))
+                if (uart_handle_sysrq_char(&uap->port, ch & 255, regs))
                        goto ignore_char;
                uart_insert_char(&uap->port, ch, UART011_DR_OE, ch, flag);
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index ff5e6309d682..cc998b99a19f 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -361,7 +361,7 @@ static int serial_pxa_startup(struct uart_port *port)
        if (port->line == 3) /* HWUART */
                up->mcr |= UART_MCR_AFE;
        else
-        up->mcr = 0;
+                up->mcr = 0;
        /*
         * Allocate the IRQ
@@ -641,7 +641,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
        int i;
        /*
-         *      First save the UER then disable the interrupts
+         *      First save the IER then disable the interrupts
         */
        ier = serial_in(up, UART_IER);
        serial_out(up, UART_IER, UART_IER_UUE);
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index e197ce9353de..e80ef9467825 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1432,7 +1432,8 @@ static int usb_generic_suspend(struct device *dev, pm_message_t message)
                        mark_quiesced(intf);
        } else {
                // FIXME else if there's no suspend method, disconnect...
-                dev_warn(dev, "no %s?\n", "suspend");
+                dev_warn(dev, "no suspend for driver %s?\n", driver->name);
+                mark_quiesced(intf);
                status = 0;
        }
        return status;
@@ -1460,8 +1461,10 @@ static int usb_generic_resume(struct device *dev)
        }
        if ((dev->driver == NULL) ||
-            (dev->driver_data == &usb_generic_driver_data))
+            (dev->driver_data == &usb_generic_driver_data)) {
+                dev->power.power_state.event = PM_EVENT_FREEZE;
                return 0;
+        }
        intf = to_usb_interface(dev);
        driver = to_usb_driver(dev->driver);
@@ -1481,7 +1484,7 @@ static int usb_generic_resume(struct device *dev)
                        mark_quiesced(intf);
                }
        } else
-                dev_warn(dev, "no %s?\n", "resume");
+                dev_warn(dev, "no resume for driver %s?\n", driver->name);
        return 0;
 }
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index ed550132db0b..79efaf7d86a3 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -717,6 +717,7 @@ static int uhci_suspend(struct usb_hcd *hcd, pm_message_t message)
         * at the source, so we must turn off PIRQ.
         */
        pci_write_config_word(to_pci_dev(uhci_dev(uhci)), USBLEGSUP, 0);
+        mb();
        clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
        uhci->hc_inaccessible = 1;
        hcd->poll_rh = 0;
@@ -738,6 +739,7 @@ static int uhci_resume(struct usb_hcd *hcd)
         * really don't want to keep a stale HCD_FLAG_HW_ACCESSIBLE=0
         */
        set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
+        mb();
        if (uhci->rh_state == UHCI_RH_RESET)    /* Dead */
                return 0;
diff --git a/drivers/usb/input/aiptek.c b/drivers/usb/input/aiptek.c
index 1c3b472a3bca..0e2505c073db 100644
--- a/drivers/usb/input/aiptek.c
+++ b/drivers/usb/input/aiptek.c
@@ -2103,7 +2103,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
         * values.
         */
        input_set_abs_params(inputdev, ABS_X, 0, 2999, 0, 0);
-        input_set_abs_params(inputdev, ABS_X, 0, 2249, 0, 0);
+        input_set_abs_params(inputdev, ABS_Y, 0, 2249, 0, 0);
        input_set_abs_params(inputdev, ABS_PRESSURE, 0, 511, 0, 0);
        input_set_abs_params(inputdev, ABS_TILT_X, AIPTEK_TILT_MIN, AIPTEK_TILT_MAX, 0, 0);
        input_set_abs_params(inputdev, ABS_TILT_Y, AIPTEK_TILT_MIN, AIPTEK_TILT_MAX, 0, 0);
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 45f3130fadea..a3e44ef1df43 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -893,8 +893,10 @@ static int hid_input_report(int type, struct urb *urb, int interrupt, struct pt_
        size = ((report->size - 1) >> 3) + 1;
-        if (len < size)
+        if (len < size) {
                dbg("report %d is too short, (%d < %d)", report->id, len, size);
+                memset(data + len, 0, size - len);
+        }
        if (hid->claimed & HID_CLAIMED_HIDDEV)
                hiddev_report_event(hid, report);
diff --git a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c
index 9ff25eb520a6..1220a5004a5c 100644
--- a/drivers/usb/input/hid-input.c
+++ b/drivers/usb/input/hid-input.c
@@ -137,6 +137,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                        switch (usage->hid & 0xffff) {
                                case 0xba: map_abs(ABS_RUDDER); break;
                                case 0xbb: map_abs(ABS_THROTTLE); break;
+                                default:   goto ignore;
                        }
                        break;
diff --git a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c
index a248664b5d1d..fd48e74e78ed 100644
--- a/drivers/usb/input/kbtab.c
+++ b/drivers/usb/input/kbtab.c
@@ -159,7 +159,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
        input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH);
        input_dev->mscbit[0] |= BIT(MSC_SERIAL);
        input_set_abs_params(input_dev, ABS_X, 0, 0x2000, 4, 0);
-        input_set_abs_params(input_dev, ABS_X, 0, 0x1750, 4, 0);
+        input_set_abs_params(input_dev, ABS_Y, 0, 0x1750, 4, 0);
        input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xff, 0, 0);
        endpoint = &intf->cur_altsetting->endpoint[0].desc;
diff --git a/drivers/usb/input/wacom.c b/drivers/usb/input/wacom.c
index aea1cfae34cc..dc099bbe12bf 100644
--- a/drivers/usb/input/wacom.c
+++ b/drivers/usb/input/wacom.c
@@ -854,7 +854,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
        input_dev->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS);
        input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH) | BIT(BTN_STYLUS);
-        input_set_abs_params(input_dev, ABS_X, 0, wacom->features->y_max, 4, 0);
+        input_set_abs_params(input_dev, ABS_X, 0, wacom->features->x_max, 4, 0);
        input_set_abs_params(input_dev, ABS_Y, 0, wacom->features->y_max, 4, 0);
        input_set_abs_params(input_dev, ABS_PRESSURE, 0, wacom->features->pressure_max, 0, 0);
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index 2a28ceeaa66a..b293db3c28c3 100644
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -1696,7 +1696,7 @@ static ssize_t auerchar_write (struct file *file, const char __user *buf, size_t
        int ret;
        wait_queue_t wait;
-        dbg ("auerchar_write %d bytes", len);
+        dbg ("auerchar_write %zd bytes", len);
        /* Error checking */
        if (!ccp)
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 4837524eada7..4ef5527028c5 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -109,7 +109,7 @@ static int slave_configure(struct scsi_device *sdev)
         * data comes from.
         */
        if (sdev->scsi_level < SCSI_2)
-                sdev->scsi_level = SCSI_2;
+                sdev->scsi_level = sdev->sdev_target->scsi_level = SCSI_2;
        /* According to the technical support people at Genesys Logic,
         * devices using their chips have problems transferring more than
@@ -162,7 +162,7 @@ static int slave_configure(struct scsi_device *sdev)
                 * a Get-Max-LUN request, we won't lose much by setting the
                 * revision level down to 2.  The only devices that would be
                 * affected are those with sparse LUNs. */
-                sdev->scsi_level = SCSI_2;
+                sdev->scsi_level = sdev->sdev_target->scsi_level = SCSI_2;
                /* USB-IDE bridges tend to report SK = 0x04 (Non-recoverable
                 * Hardware Error) when any low-level error occurs,
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 3e470c8b4193..cc8e3bf5001b 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -536,13 +536,13 @@ config FB_SUN3
 config FB_SBUS
        bool "SBUS and UPA framebuffers"
-        depends on (FB = y) && (SPARC32 || SPARC64)
+        depends on (FB = y) && SPARC
        help
          Say Y if you want support for SBUS or UPA based frame buffer device.
 config FB_BW2
        bool "BWtwo support"
-        depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+        depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -551,7 +551,7 @@ config FB_BW2
 config FB_CG3
        bool "CGthree support"
-        depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+        depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -560,7 +560,7 @@ config FB_CG3
 config FB_CG6
        bool "CGsix (GX,TurboGX) support"
-        depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+        depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        help
@@ -1268,7 +1268,7 @@ config FB_LEO
 config FB_PCI
        bool "PCI framebuffers"
-        depends on (FB = y) && PCI && (SPARC64 || SPARC32)
+        depends on (FB = y) && PCI && SPARC
 config FB_IGA
        bool "IGA 168x display support"
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index 080db812ca48..2784f0a9d693 100644
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@@ -441,7 +441,7 @@ static int arcfb_ioctl(struct inode *inode, struct file *file,
 * the fb. it's inefficient for them to do anything less than 64*8
 * writes since we update the lcd in each write() anyway.
 */
-static ssize_t arcfb_write(struct file *file, const char *buf, size_t count,
+static ssize_t arcfb_write(struct file *file, const char __user *buf, size_t count,
                                loff_t *ppos)
 {
        /* modded from epson 1355 */
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index d3728f60961e..9248fe1fbb1a 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -121,7 +121,6 @@ struct bw2_par {
        unsigned long           fbsize;
        struct sbus_dev         *sdev;
-        struct list_head        list;
 };
 /**
diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c
index cdc71572cf35..74415325b016 100644
--- a/drivers/video/cfbcopyarea.c
+++ b/drivers/video/cfbcopyarea.c
@@ -64,8 +64,8 @@ bitcpy(unsigned long __iomem *dst, int dst_idx, const unsigned long __iomem *src
        int const shift = dst_idx-src_idx;
        int left, right;
-        first = ~0UL >> dst_idx;
+        first = FB_SHIFT_HIGH(~0UL, dst_idx);
-        last = ~(~0UL >> ((dst_idx+n) % bits));
+        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
        if (!shift) {
                // Same alignment for source and dest
@@ -216,8 +216,8 @@ bitcpy_rev(unsigned long __iomem *dst, int dst_idx, const unsigned long __iomem
        shift = dst_idx-src_idx;
-        first = ~0UL << (bits - 1 - dst_idx);
+        first = FB_SHIFT_LOW(~0UL, bits - 1 - dst_idx);
-        last = ~(~0UL << (bits - 1 - ((dst_idx-n) % bits)));
+        last = ~(FB_SHIFT_LOW(~0UL, bits - 1 - ((dst_idx-n) % bits)));
        if (!shift) {
                // Same alignment for source and dest
diff --git a/drivers/video/cfbfillrect.c b/drivers/video/cfbfillrect.c
index 167d9314e6eb..e5ff62e9cfb8 100644
--- a/drivers/video/cfbfillrect.c
+++ b/drivers/video/cfbfillrect.c
@@ -110,8 +110,8 @@ bitfill_aligned(unsigned long __iomem *dst, int dst_idx, unsigned long pat, unsi
        if (!n)
                return;
-        first = ~0UL >> dst_idx;
+        first = FB_SHIFT_HIGH(~0UL, dst_idx);
-        last = ~(~0UL >> ((dst_idx+n) % bits));
+        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
        if (dst_idx+n <= bits) {
                // Single word
@@ -167,8 +167,8 @@ bitfill_unaligned(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
        if (!n)
                return;
-        first = ~0UL >> dst_idx;
+        first = FB_SHIFT_HIGH(~0UL, dst_idx);
-        last = ~(~0UL >> ((dst_idx+n) % bits));
+        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
        if (dst_idx+n <= bits) {
                // Single word
@@ -221,8 +221,8 @@ bitfill_aligned_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
        if (!n)
                return;
-        first = ~0UL >> dst_idx;
+        first = FB_SHIFT_HIGH(~0UL, dst_idx);
-        last = ~(~0UL >> ((dst_idx+n) % bits));
+        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
        if (dst_idx+n <= bits) {
                // Single word
@@ -290,8 +290,8 @@ bitfill_unaligned_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat
        if (!n)
                return;
-        first = ~0UL >> dst_idx;
+        first = FB_SHIFT_HIGH(~0UL, dst_idx);
-        last = ~(~0UL >> ((dst_idx+n) % bits));
+        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
        if (dst_idx+n <= bits) {
                // Single word
diff --git a/drivers/video/cfbimgblt.c b/drivers/video/cfbimgblt.c
index a7770c4f17d0..910e2338a27e 100644
--- a/drivers/video/cfbimgblt.c
+++ b/drivers/video/cfbimgblt.c
@@ -76,18 +76,6 @@ static u32 cfb_tab32[] = {
 #define FB_WRITEL fb_writel
 #define FB_READL  fb_readl
-#if defined (__BIG_ENDIAN)
-#define LEFT_POS(bpp)          (32 - bpp)
-#define SHIFT_HIGH(val, bits)  ((val) >> (bits))
-#define SHIFT_LOW(val, bits)   ((val) << (bits))
-#define BIT_NR(b)              (7 - (b))
-#else
-#define LEFT_POS(bpp)          (0)
-#define SHIFT_HIGH(val, bits)  ((val) << (bits))
-#define SHIFT_LOW(val, bits)   ((val) >> (bits))
-#define BIT_NR(b)              (b)
-#endif
 static inline void color_imageblit(const struct fb_image *image, 
                                   struct fb_info *p, u8 __iomem *dst1, 
                                   u32 start_index,
@@ -109,7 +97,7 @@ static inline void color_imageblit(const struct fb_image *image,
                val = 0;
                
                if (start_index) {
-                        u32 start_mask = ~(SHIFT_HIGH(~(u32)0, start_index));
+                        u32 start_mask = ~(FB_SHIFT_HIGH(~(u32)0, start_index));
                        val = FB_READL(dst) & start_mask;
                        shift = start_index;
                }
@@ -119,20 +107,20 @@ static inline void color_imageblit(const struct fb_image *image,
                                color = palette[*src];
                        else
                                color = *src;
-                        color <<= LEFT_POS(bpp);
+                        color <<= FB_LEFT_POS(bpp);
-                        val |= SHIFT_HIGH(color, shift);
+                        val |= FB_SHIFT_HIGH(color, shift);
                        if (shift >= null_bits) {
                                FB_WRITEL(val, dst++);
        
                                val = (shift == null_bits) ? 0 : 
-                                        SHIFT_LOW(color, 32 - shift);
+                                        FB_SHIFT_LOW(color, 32 - shift);
                        }
                        shift += bpp;
                        shift &= (32 - 1);
                        src++;
                }
                if (shift) {
-                        u32 end_mask = SHIFT_HIGH(~(u32)0, shift);
+                        u32 end_mask = FB_SHIFT_HIGH(~(u32)0, shift);
                        FB_WRITEL((FB_READL(dst) & end_mask) | val, dst);
                }
@@ -162,6 +150,8 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info *
        u32 i, j, l;
        
        dst2 = (u32 __iomem *) dst1;
+        fgcolor <<= FB_LEFT_POS(bpp);
+        bgcolor <<= FB_LEFT_POS(bpp);
        for (i = image->height; i--; ) {
                shift = val = 0;
@@ -172,22 +162,21 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info *
                /* write leading bits */
                if (start_index) {
-                        u32 start_mask = ~(SHIFT_HIGH(~(u32)0, start_index));
+                        u32 start_mask = ~(FB_SHIFT_HIGH(~(u32)0,start_index));
                        val = FB_READL(dst) & start_mask;
                        shift = start_index;
                }
                while (j--) {
                        l--;
-                        color = (*s & 1 << (BIT_NR(l))) ? fgcolor : bgcolor;
+                        color = (*s & 1 << (FB_BIT_NR(l))) ? fgcolor : bgcolor;
-                        color <<= LEFT_POS(bpp);
+                        val |= FB_SHIFT_HIGH(color, shift);
-                        val |= SHIFT_HIGH(color, shift);
                        
                        /* Did the bitshift spill bits to the next long? */
                        if (shift >= null_bits) {
                                FB_WRITEL(val, dst++);
                                val = (shift == null_bits) ? 0 :
-                                         SHIFT_LOW(color,32 - shift);
+                                        FB_SHIFT_LOW(color,32 - shift);
                        }
                        shift += bpp;
                        shift &= (32 - 1);
@@ -196,7 +185,7 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info *
                /* write trailing bits */
                if (shift) {
-                        u32 end_mask = SHIFT_HIGH(~(u32)0, shift);
+                        u32 end_mask = FB_SHIFT_HIGH(~(u32)0, shift);
                        FB_WRITEL((FB_READL(dst) & end_mask) | val, dst);
                }
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index 1bed50f2a276..a56147102abb 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -206,7 +206,6 @@ struct cg14_par {
        int                     mode;
        int                     ramsize;
        struct sbus_dev         *sdev;
-        struct list_head        list;
 };
 static void __cg14_reset(struct cg14_par *par)
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index a1354e7e0513..9fcd89608ed7 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -124,7 +124,6 @@ struct cg3_par {
        unsigned long           fbsize;
        struct sbus_dev         *sdev;
-        struct list_head        list;
 };
 /**
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 9debe642fd2f..050835e39aa3 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -265,7 +265,6 @@ struct cg6_par {
        unsigned long           fbsize;
        struct sbus_dev         *sdev;
-        struct list_head        list;
 };
 static int cg6_sync(struct fb_info *info)
@@ -612,7 +611,7 @@ static void cg6_chip_init(struct fb_info *info)
        struct cg6_par *par = (struct cg6_par *) info->par;
        struct cg6_tec __iomem *tec = par->tec;
        struct cg6_fbc __iomem *fbc = par->fbc;
-        u32 rev, conf, mode, tmp;
+        u32 rev, conf, mode;
        int i;
        
        /* Turn off stuff in the Transform Engine. */
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 5f74df993406..a5d09e159cd1 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -6,7 +6,7 @@ menu "Console display driver support"
 config VGA_CONSOLE
        bool "VGA text console" if EMBEDDED || !X86
-        depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC32 && !SPARC64 && !M68K && !PARISC && !ARCH_VERSATILE
+        depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !ARCH_VERSATILE
        default y
        help
          Saying Y here will allow you to use Linux in text mode through a
@@ -68,7 +68,7 @@ config SGI_NEWPORT_CONSOLE
 config PROM_CONSOLE
        bool "PROM console"
-        depends on SPARC32 || SPARC64
+        depends on SPARC
        help
          Say Y to build a console driver for Sun machines that uses the
          terminal emulation built into their console PROMS.
@@ -136,7 +136,7 @@ config FONTS
 config FONT_8x8
        bool "VGA 8x8 font" if FONTS
        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
-        default y if !SPARC32 && !SPARC64 && !FONTS
+        default y if !SPARC && !FONTS
        help
          This is the "high resolution" font for the VGA frame buffer (the one
          provided by the text console 80x50 (and higher) modes).
@@ -150,7 +150,7 @@ config FONT_8x8
 config FONT_8x16
        bool "VGA 8x16 font" if FONTS
        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE=y || STI_CONSOLE || USB_SISUSBVGA_CON 
-        default y if !SPARC32 && !SPARC64 && !FONTS
+        default y if !SPARC && !FONTS
        help
          This is the "high resolution" font for the VGA frame buffer (the one
          provided by the VGA text console 80x25 mode.
@@ -160,7 +160,7 @@ config FONT_8x16
 config FONT_6x11
        bool "Mac console 6x11 font (not supported by all drivers)" if FONTS
        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
-        default y if !SPARC32 && !SPARC64 && !FONTS && MAC
+        default y if !SPARC && !FONTS && MAC
        help
          Small console font with Macintosh-style high-half glyphs.  Some Mac
          framebuffer drivers don't support this one at all.
@@ -176,7 +176,7 @@ config FONT_7x14
 config FONT_PEARL_8x8
        bool "Pearl (old m68k) console 8x8 font" if FONTS
        depends on FRAMEBUFFER_CONSOLE
-        default y if !SPARC32 && !SPARC64 && !FONTS && AMIGA
+        default y if !SPARC && !FONTS && AMIGA
        help
          Small console font with PC-style control-character and high-half
          glyphs.
@@ -184,24 +184,24 @@ config FONT_PEARL_8x8
 config FONT_ACORN_8x8
        bool "Acorn console 8x8 font" if FONTS
        depends on FRAMEBUFFER_CONSOLE
-        default y if !SPARC32 && !SPARC64 && !FONTS && ARM && ARCH_ACORN
+        default y if !SPARC && !FONTS && ARM && ARCH_ACORN
        help
          Small console font with PC-style control characters and high-half
          glyphs.
 config FONT_MINI_4x6
        bool "Mini 4x6 font"
-        depends on !SPARC32 && !SPARC64 && FONTS
+        depends on !SPARC && FONTS
 config FONT_SUN8x16
        bool "Sparc console 8x16 font"
-        depends on FRAMEBUFFER_CONSOLE && (!SPARC32 && !SPARC64 && FONTS || SPARC32 || SPARC64)
+        depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)
        help
          This is the high resolution console font for Sun machines. Say Y.
 config FONT_SUN12x22
        bool "Sparc console 12x22 font (not supported by all drivers)"
-        depends on FRAMEBUFFER_CONSOLE && (!SPARC32 && !SPARC64 && FONTS || SPARC32 || SPARC64)
+        depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)
        help
          This is the high resolution console font for Sun machines with very
          big letters (like the letters used in the SPARC PROM). If the
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index bcea87c3cc06..3660e51b2612 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -2048,7 +2048,7 @@ static int fbcon_switch(struct vc_data *vc)
        struct fbcon_ops *ops;
        struct display *p = &fb_display[vc->vc_num];
        struct fb_var_screeninfo var;
-        int i, prev_console;
+        int i, prev_console, charcnt = 256;
        info = registered_fb[con2fb_map[vc->vc_num]];
        ops = info->fbcon_par;
@@ -2103,7 +2103,8 @@ static int fbcon_switch(struct vc_data *vc)
        fb_set_var(info, &var);
        ops->var = info->var;
-        if (old_info != NULL && old_info != info) {
+        if (old_info != NULL && (old_info != info ||
+                                 info->flags & FBINFO_MISC_ALWAYS_SETPAR)) {
                if (info->fbops->fb_set_par)
                        info->fbops->fb_set_par(info);
                fbcon_del_cursor_timer(old_info);
@@ -2120,6 +2121,13 @@ static int fbcon_switch(struct vc_data *vc)
        vc->vc_can_do_color = (fb_get_color_depth(&info->var, &info->fix)!=1);
        vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;
+        if (p->userfont)
+                charcnt = FNTCHARCNT(vc->vc_font.data);
+        if (charcnt > 256)
+                vc->vc_complement_mask <<= 1;
        updatescrollmode(p, info, vc);
        switch (p->scrollmode) {
@@ -2139,8 +2147,12 @@ static int fbcon_switch(struct vc_data *vc)
        scrollback_max = 0;
        scrollback_current = 0;
-        ops->var.xoffset = ops->var.yoffset = p->yscroll = 0;
-        ops->update_start(info);
+        if (!fbcon_is_inactive(vc, info)) {
+            ops->var.xoffset = ops->var.yoffset = p->yscroll = 0;
+            ops->update_start(info);
+        }
        fbcon_set_palette(vc, color_table);     
        fbcon_clear_margins(vc, 0);
@@ -2184,11 +2196,14 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
                ops->graphics = 1;
                if (!blank) {
+                        if (info->fbops->fb_save_state)
+                                info->fbops->fb_save_state(info);
                        var.activate = FB_ACTIVATE_NOW | FB_ACTIVATE_FORCE;
                        fb_set_var(info, &var);
                        ops->graphics = 0;
                        ops->var = info->var;
-                }
+                } else if (info->fbops->fb_restore_state)
+                        info->fbops->fb_restore_state(info);
        }
        if (!fbcon_is_inactive(vc, info)) {
@@ -2736,8 +2751,12 @@ static void fbcon_modechanged(struct fb_info *info)
                updatescrollmode(p, info, vc);
                scrollback_max = 0;
                scrollback_current = 0;
-                ops->var.xoffset = ops->var.yoffset = p->yscroll = 0;
-                ops->update_start(info);
+                if (!fbcon_is_inactive(vc, info)) {
+                    ops->var.xoffset = ops->var.yoffset = p->yscroll = 0;
+                    ops->update_start(info);
+                }
                fbcon_set_palette(vc, color_table);
                update_screen(vc);
                if (softback_buf)
@@ -2774,8 +2793,13 @@ static void fbcon_set_all_vcs(struct fb_info *info)
                        updatescrollmode(p, info, vc);
                        scrollback_max = 0;
                        scrollback_current = 0;
-                        ops->var.xoffset = ops->var.yoffset = p->yscroll = 0;
-                        ops->update_start(info);
+                        if (!fbcon_is_inactive(vc, info)) {
+                            ops->var.xoffset = ops->var.yoffset =
+                                p->yscroll = 0;
+                            ops->update_start(info);
+                        }
                        fbcon_set_palette(vc, color_table);
                        update_screen(vc);
                        if (softback_buf)
diff --git a/drivers/video/console/fbcon_ud.c b/drivers/video/console/fbcon_ud.c
index c4d7c89212b4..9dd059e8b645 100644
--- a/drivers/video/console/fbcon_ud.c
+++ b/drivers/video/console/fbcon_ud.c
@@ -420,13 +420,15 @@ static void ud_cursor(struct vc_data *vc, struct fb_info *info,
 int ud_update_start(struct fb_info *info)
 {
        struct fbcon_ops *ops = info->fbcon_par;
-        u32 xoffset, yoffset;
+        int xoffset, yoffset;
        u32 vyres = GETVYRES(ops->p->scrollmode, info);
        u32 vxres = GETVXRES(ops->p->scrollmode, info);
        int err;
-        xoffset = (vxres - info->var.xres) - ops->var.xoffset;
+        xoffset = vxres - info->var.xres - ops->var.xoffset;
-        yoffset = (vyres - info->var.yres) - ops->var.yoffset;
+        yoffset = vyres - info->var.yres - ops->var.yoffset;
+        if (yoffset < 0)
+                yoffset += vyres;
        ops->var.xoffset = xoffset;
        ops->var.yoffset = yoffset;
        err = fb_pan_display(info, &ops->var);
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index c589d23e7f91..a9300f930ef2 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1512,7 +1512,7 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb)
         * I/O cycles storing into a reserved memory space at
         * physical address 0x3000000
         */
-        unsigned char *iop;
+        unsigned char __iomem *iop;
        iop = ioremap(0x3000000, 0x5000);
        if (iop == NULL) {
@@ -1526,7 +1526,7 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb)
        writeb(EXT_BIU_MISC, iop + 0x3ce);
        writeb(EXT_BIU_MISC_LIN_ENABLE, iop + 0x3cf);
-        iounmap((void *)iop);
+        iounmap(iop);
 #else
        /*
         * Most other machine types are "normal", so
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 6240aedb4154..10dfdf035264 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -722,14 +722,30 @@ static void try_to_load(int fb)
 int
 fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
 {
+        struct fb_fix_screeninfo *fix = &info->fix;
        int xoffset = var->xoffset;
        int yoffset = var->yoffset;
-        int err;
+        int err = 0, yres = info->var.yres;
+        if (var->yoffset > 0) {
+                if (var->vmode & FB_VMODE_YWRAP) {
+                        if (!fix->ywrapstep || (var->yoffset % fix->ywrapstep))
+                                err = -EINVAL;
+                        else
+                                yres = 0;
+                } else if (!fix->ypanstep || (var->yoffset % fix->ypanstep))
+                        err = -EINVAL;
+        }
+        if (var->xoffset > 0 && (!fix->xpanstep ||
+                                 (var->xoffset % fix->xpanstep)))
+                err = -EINVAL;
+        if (err || !info->fbops->fb_pan_display || xoffset < 0 ||
+            yoffset < 0 || var->yoffset + yres > info->var.yres_virtual ||
+            var->xoffset + info->var.xres > info->var.xres_virtual)
+                return -EINVAL;
-        if (xoffset < 0 || yoffset < 0 || !info->fbops->fb_pan_display ||
-            xoffset + info->var.xres > info->var.xres_virtual ||
-            yoffset + info->var.yres > info->var.yres_virtual)
-                return -EINVAL;
        if ((err = info->fbops->fb_pan_display(var, info)))
                return err;
        info->var.xoffset = var->xoffset;
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 2584daec7bbf..c4870d559afc 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -359,7 +359,6 @@ struct ffb_par {
        int                     prom_parent_node;
        int                     dac_rev;
        int                     board_type;
-        struct list_head        list;
 };
 static void FFBFifo(struct ffb_par *par, int n)
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h
index f077ca34faba..da29d007f215 100644
--- a/drivers/video/intelfb/intelfb.h
+++ b/drivers/video/intelfb/intelfb.h
@@ -41,6 +41,10 @@
 /*** hw-related values ***/
+/* Resource Allocation */
+#define INTELFB_FB_ACQUIRED                 1
+#define INTELFB_MMIO_ACQUIRED               2
 /* PCI ids for supported devices */
 #define PCI_DEVICE_ID_INTEL_830M        0x3577
 #define PCI_DEVICE_ID_INTEL_845G        0x2562
@@ -257,6 +261,7 @@ struct intelfb_info {
        int hwcursor;
        int fixed_mode;
        int ring_active;
+        int flag;
        /* hw cursor */
        int cursor_on;
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 427689e584da..0090544842f5 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -135,9 +135,6 @@
 static void __devinit get_initial_mode(struct intelfb_info *dinfo);
 static void update_dinfo(struct intelfb_info *dinfo,
                         struct fb_var_screeninfo *var);
-static int intelfb_get_fix(struct fb_fix_screeninfo *fix,
-                           struct fb_info *info);
 static int intelfb_check_var(struct fb_var_screeninfo *var,
                             struct fb_info *info);
 static int intelfb_set_par(struct fb_info *info);
@@ -473,9 +470,9 @@ cleanup(struct intelfb_info *dinfo)
        if (dinfo->aperture.virtual)
                iounmap((void __iomem *)dinfo->aperture.virtual);
-        if (dinfo->mmio_base_phys)
+        if (dinfo->flag & INTELFB_MMIO_ACQUIRED)
                release_mem_region(dinfo->mmio_base_phys, INTEL_REG_SIZE);
-        if (dinfo->aperture.physical)
+        if (dinfo->flag & INTELFB_FB_ACQUIRED)
                release_mem_region(dinfo->aperture.physical,
                                   dinfo->aperture.size);
        framebuffer_release(dinfo->info);
@@ -572,6 +569,9 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
                cleanup(dinfo);
                return -ENODEV;
        }
+        dinfo->flag |= INTELFB_FB_ACQUIRED;
        if (!request_mem_region(dinfo->mmio_base_phys,
                                INTEL_REG_SIZE,
                                INTELFB_MODULE_NAME)) {
@@ -580,6 +580,8 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
                return -ENODEV;
        }
+        dinfo->flag |= INTELFB_MMIO_ACQUIRED;
        /* Get the chipset info. */
        dinfo->pci_chipset = pdev->device;
@@ -1091,7 +1093,17 @@ intelfb_set_fbinfo(struct intelfb_info *dinfo)
                return 1;
        info->pixmap.scan_align = 1;
+        strcpy(info->fix.id, dinfo->name);
+        info->fix.smem_start = dinfo->fb.physical;
+        info->fix.smem_len = dinfo->fb.size;
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+        info->fix.type_aux = 0;
+        info->fix.xpanstep = 8;
+        info->fix.ypanstep = 1;
+        info->fix.ywrapstep = 0;
+        info->fix.mmio_start = dinfo->mmio_base_phys;
+        info->fix.mmio_len = INTEL_REG_SIZE;
+        info->fix.accel = FB_ACCEL_I830;
        update_dinfo(dinfo, &info->var);
        return 0;
@@ -1109,7 +1121,8 @@ update_dinfo(struct intelfb_info *dinfo, struct fb_var_screeninfo *var)
        dinfo->yres = var->xres;
        dinfo->pixclock = var->pixclock;
-        intelfb_get_fix(&dinfo->info->fix, dinfo->info);
+        dinfo->info->fix.visual = dinfo->visual;
+        dinfo->info->fix.line_length = dinfo->pitch;
        switch (dinfo->bpp) {
        case 8:
@@ -1139,30 +1152,6 @@ update_dinfo(struct intelfb_info *dinfo, struct fb_var_screeninfo *var)
 /* fbops functions */
-static int
-intelfb_get_fix(struct fb_fix_screeninfo *fix, struct fb_info *info)
-{
-        struct intelfb_info *dinfo = GET_DINFO(info);
-        DBG_MSG("intelfb_get_fix\n");
-        memset(fix, 0, sizeof(*fix));
-        strcpy(fix->id, dinfo->name);
-        fix->smem_start = dinfo->fb.physical;
-        fix->smem_len = dinfo->fb.size;
-        fix->type = FB_TYPE_PACKED_PIXELS;
-        fix->type_aux = 0;
-        fix->visual = dinfo->visual;
-        fix->xpanstep = 8;
-        fix->ypanstep = 1;
-        fix->ywrapstep = 0;
-        fix->line_length = dinfo->pitch;
-        fix->mmio_start = dinfo->mmio_base_phys;
-        fix->mmio_len = INTEL_REG_SIZE;
-        fix->accel = FB_ACCEL_I830;
-        return 0;
-}
 /***************************************************************
 *                       fbdev interface                       *
 ***************************************************************/
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 376d4a171ec7..494287f8f8bf 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -197,7 +197,6 @@ struct leo_par {
        unsigned long           fbsize;
        struct sbus_dev         *sdev;
-        struct list_head        list;
 };
 static void leo_wait(struct leo_lx_krn __iomem *lx_krn)
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index 8cb7fb4db441..f0e6512c87ff 100644
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -47,7 +47,7 @@ config LOGO_SGI_CLUT224
 config LOGO_SUN_CLUT224
        bool "224-color Sun Linux logo"
-        depends on LOGO && (SPARC32 || SPARC64)
+        depends on LOGO && SPARC
        default y
 config LOGO_SUPERH_MONO
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 18bcda23d2cf..b251e754e16c 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -140,7 +140,6 @@ struct p9100_par {
        unsigned long           fbsize;
        struct sbus_dev         *sdev;
-        struct list_head        list;
 };
 /**
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 7b4cd250bec8..9fc10b9e6f57 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1396,7 +1396,8 @@ static struct platform_driver pxafb_driver = {
 int __devinit pxafb_setup(char *options)
 {
 # ifdef CONFIG_FB_PXA_PARAMETERS
-        strlcpy(g_options, options, sizeof(g_options));
+        if (options)
+                strlcpy(g_options, options, sizeof(g_options));
 # endif
        return 0;
 }
diff --git a/drivers/video/sbuslib.c b/drivers/video/sbuslib.c
index 646c43f921c5..3a74a63dd4f2 100644
--- a/drivers/video/sbuslib.c
+++ b/drivers/video/sbuslib.c
@@ -46,6 +46,9 @@ int sbusfb_mmap_helper(struct sbus_mmap_map *map,
        unsigned long off;
        int i;
                                        
+        if (!(vma->vm_flags & (VM_SHARED | VM_MAYSHARE)))
+                return -EINVAL;
        size = vma->vm_end - vma->vm_start;
        if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT))
                return -EINVAL;
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index fe4f63f3849d..2b27b4474001 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -125,7 +125,6 @@ struct tcx_par {
        int                     lowdepth;
        struct sbus_dev         *sdev;
-        struct list_head        list;
 };
 /* Reset control plane so that WID is 8-bit plane. */
@@ -444,7 +443,7 @@ static void tcx_init_one(struct sbus_dev *sdev)
        tcx_reset(&all->info);
-        tcx_blank(0, &all->info);
+        tcx_blank(FB_BLANK_UNBLANK, &all->info);
        if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
                printk(KERN_ERR "tcx: Could not allocate color map.\n");
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index 4684eb7d48c6..b3ad0bd0312f 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -501,11 +501,16 @@ int hostfs_commit_write(struct file *file, struct page *page, unsigned from,
        long long start;
        int err = 0;
-        start = (long long) (page->index << PAGE_CACHE_SHIFT) + from;
+        start = (((long long) page->index) << PAGE_CACHE_SHIFT) + from;
        buffer = kmap(page);
        err = write_file(FILE_HOSTFS_I(file)->fd, &start, buffer + from,
                         to - from);
        if(err > 0) err = 0;
+        /* Actually, if !err, write_file has added to-from to start, so, despite
+         * the appearance, we are comparing i_size against the _last_ written
+         * location, as we should. */
        if(!err && (start > inode->i_size))
                inode->i_size = start;
@@ -910,10 +915,8 @@ static struct inode_operations hostfs_dir_iops = {
 int hostfs_link_readpage(struct file *file, struct page *page)
 {
        char *buffer, *name;
-        long long start;
        int err;
-        start = page->index << PAGE_CACHE_SHIFT;
        buffer = kmap(page);
        name = inode_name(page->mapping->host, 0);
        if(name == NULL) return(-ENOMEM);
diff --git a/fs/inotify.c b/fs/inotify.c
index bf7ce1d2412b..2fecb7af4a77 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -364,11 +364,12 @@ static int inotify_dev_get_wd(struct inotify_device *dev,
 /*
 * find_inode - resolve a user-given path to a specific inode and return a nd
 */
-static int find_inode(const char __user *dirname, struct nameidata *nd)
+static int find_inode(const char __user *dirname, struct nameidata *nd,
+                      unsigned flags)
 {
        int error;
-        error = __user_walk(dirname, LOOKUP_FOLLOW, nd);
+        error = __user_walk(dirname, flags, nd);
        if (error)
                return error;
        /* you can only watch an inode if you have read permissions on it */
@@ -933,6 +934,7 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
        struct file *filp;
        int ret, fput_needed;
        int mask_add = 0;
+        unsigned flags = 0;
        filp = fget_light(fd, &fput_needed);
        if (unlikely(!filp))
@@ -944,7 +946,12 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
                goto fput_and_out;
        }
-        ret = find_inode(path, &nd);
+        if (!(mask & IN_DONT_FOLLOW))
+                flags |= LOOKUP_FOLLOW;
+        if (mask & IN_ONLYDIR)
+                flags |= LOOKUP_DIRECTORY;
+        ret = find_inode(path, &nd, flags);
        if (unlikely(ret))
                goto fput_and_out;
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index 006bb9e14579..3eaf6e701087 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -157,6 +157,8 @@ void nlmclnt_mark_reclaim(struct nlm_host *host)
                inode = fl->fl_file->f_dentry->d_inode;
                if (inode->i_sb->s_magic != NFS_SUPER_MAGIC)
                        continue;
+                if (fl->fl_u.nfs_fl.owner == NULL)
+                        continue;
                if (fl->fl_u.nfs_fl.owner->host != host)
                        continue;
                if (!(fl->fl_u.nfs_fl.flags & NFS_LCK_GRANTED))
@@ -226,6 +228,8 @@ restart:
                inode = fl->fl_file->f_dentry->d_inode;
                if (inode->i_sb->s_magic != NFS_SUPER_MAGIC)
                        continue;
+                if (fl->fl_u.nfs_fl.owner == NULL)
+                        continue;
                if (fl->fl_u.nfs_fl.owner->host != host)
                        continue;
                if (!(fl->fl_u.nfs_fl.flags & NFS_LCK_RECLAIM))
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index b497c71384e8..079228817603 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -678,15 +678,9 @@ nfs_file_direct_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t
        if (!count)
                goto out;
-        if (mapping->nrpages) {
+        retval = nfs_sync_mapping(mapping);
-                retval = filemap_fdatawrite(mapping);
+        if (retval)
-                if (retval == 0)
+                goto out;
-                        retval = nfs_wb_all(inode);
-                if (retval == 0)
-                        retval = filemap_fdatawait(mapping);
-                if (retval)
-                        goto out;
-        }
        retval = nfs_direct_read(inode, ctx, &iov, pos, 1);
        if (retval > 0)
@@ -764,15 +758,9 @@ nfs_file_direct_write(struct kiocb *iocb, const char __user *buf, size_t count,
        if (!count)
                goto out;
-        if (mapping->nrpages) {
+        retval = nfs_sync_mapping(mapping);
-                retval = filemap_fdatawrite(mapping);
+        if (retval)
-                if (retval == 0)
+                goto out;
-                        retval = nfs_wb_all(inode);
-                if (retval == 0)
-                        retval = filemap_fdatawait(mapping);
-                if (retval)
-                        goto out;
-        }
        retval = nfs_direct_write(inode, ctx, &iov, pos, 1);
        if (mapping->nrpages)
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 57d3e77d97ee..7a79fbe9f539 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -433,11 +433,7 @@ static int do_unlk(struct file *filp, int cmd, struct file_lock *fl)
         * Flush all pending writes before doing anything
         * with locks..
         */
-        filemap_fdatawrite(filp->f_mapping);
+        nfs_sync_mapping(filp->f_mapping);
-        down(&inode->i_sem);
-        nfs_wb_all(inode);
-        up(&inode->i_sem);
-        filemap_fdatawait(filp->f_mapping);
        /* NOTE: special case
         *      If we're signalled while cleaning up locks on process exit, we
@@ -465,15 +461,8 @@ static int do_setlk(struct file *filp, int cmd, struct file_lock *fl)
         * Flush all pending writes before doing anything
         * with locks..
         */
-        status = filemap_fdatawrite(filp->f_mapping);
+        status = nfs_sync_mapping(filp->f_mapping);
-        if (status == 0) {
+        if (status != 0)
-                down(&inode->i_sem);
-                status = nfs_wb_all(inode);
-                up(&inode->i_sem);
-                if (status == 0)
-                        status = filemap_fdatawait(filp->f_mapping);
-        }
-        if (status < 0)
                goto out;
        lock_kernel();
@@ -497,11 +486,7 @@ static int do_setlk(struct file *filp, int cmd, struct file_lock *fl)
         * Make sure we clear the cache whenever we try to get the lock.
         * This makes locking act as a cache coherency point.
         */
-        filemap_fdatawrite(filp->f_mapping);
+        nfs_sync_mapping(filp->f_mapping);
-        down(&inode->i_sem);
-        nfs_wb_all(inode);      /* we may have slept */
-        up(&inode->i_sem);
-        filemap_fdatawait(filp->f_mapping);
        nfs_zap_caches(inode);
 out:
        rpc_clnt_sigunmask(NFS_CLIENT(inode), &oldset);
@@ -524,7 +509,8 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl)
                return -EINVAL;
        /* No mandatory locks over NFS */
-        if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID)
+        if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID &&
+            fl->fl_type != F_UNLCK)
                return -ENOLCK;
        if (IS_GETLK(cmd))
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index afd75d0463fd..432f41cd75e6 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -640,6 +640,27 @@ static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt)
        return 0;
 }
+/**
+ * nfs_sync_mapping - helper to flush all mmapped dirty data to disk
+ */
+int nfs_sync_mapping(struct address_space *mapping)
+{
+        int ret;
+        if (mapping->nrpages == 0)
+                return 0;
+        unmap_mapping_range(mapping, 0, 0, 0);
+        ret = filemap_fdatawrite(mapping);
+        if (ret != 0)
+                goto out;
+        ret = filemap_fdatawait(mapping);
+        if (ret != 0)
+                goto out;
+        ret = nfs_wb_all(mapping->host);
+out:
+        return ret;
+}
 /*
 * Invalidate the local caches
 */
@@ -1179,11 +1200,8 @@ void nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)
        struct nfs_inode *nfsi = NFS_I(inode);
        if (nfsi->cache_validity & NFS_INO_INVALID_DATA) {
-                if (S_ISREG(inode->i_mode)) {
+                if (S_ISREG(inode->i_mode))
-                        if (filemap_fdatawrite(mapping) == 0)
+                        nfs_sync_mapping(mapping);
-                                filemap_fdatawait(mapping);
-                        nfs_wb_all(inode);
-                }
                invalidate_inode_pages2(mapping);
                spin_lock(&inode->i_lock);
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
index 7cbf0682b2f0..fc95c4df6693 100644
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@@ -107,7 +107,7 @@ static int nfsacld_proc_setacl(struct svc_rqst * rqstp,
        dprintk("nfsd: SETACL(2acl)   %s\n", SVCFH_fmt(&argp->fh));
        fh = fh_copy(&resp->fh, &argp->fh);
-        nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP);
+        nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_SATTR);
        if (!nfserr) {
                nfserr = nfserrno( nfsd_set_posix_acl(
diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c
index 64ba40572fea..16e10c170aed 100644
--- a/fs/nfsd/nfs3acl.c
+++ b/fs/nfsd/nfs3acl.c
@@ -101,7 +101,7 @@ static int nfsd3_proc_setacl(struct svc_rqst * rqstp,
        int nfserr = 0;
        fh = fh_copy(&resp->fh, &argp->fh);
-        nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP);
+        nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_SATTR);
        if (!nfserr) {
                nfserr = nfserrno( nfsd_set_posix_acl(
diff --git a/fs/partitions/Kconfig b/fs/partitions/Kconfig
index deb25b661f04..656bc43431b9 100644
--- a/fs/partitions/Kconfig
+++ b/fs/partitions/Kconfig
@@ -203,7 +203,7 @@ config ULTRIX_PARTITION
 config SUN_PARTITION
        bool "Sun partition tables support" if PARTITION_ADVANCED
-        default y if (SPARC32 || SPARC64 || SUN3 || SUN3X)
+        default y if (SPARC || SUN3 || SUN3X)
        ---help---
          Like most systems, SunOS uses its own hard disk partition table
          format, incompatible with all others. Saying Y here allows you to
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index b638fb500743..72b431d0a0a4 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -54,6 +54,18 @@ proc_file_read(struct file *file, char __user *buf, size_t nbytes,
        ssize_t n, count;
        char    *start;
        struct proc_dir_entry * dp;
+        unsigned long long pos;
+        /*
+         * Gaah, please just use "seq_file" instead. The legacy /proc
+         * interfaces cut loff_t down to off_t for reads, and ignore
+         * the offset entirely for writes..
+         */
+        pos = *ppos;
+        if (pos > MAX_NON_LFS)
+                return 0;
+        if (nbytes > MAX_NON_LFS - pos)
+                nbytes = MAX_NON_LFS - pos;
        dp = PDE(inode);
        if (!(page = (char*) __get_free_page(GFP_KERNEL)))
@@ -202,30 +214,17 @@ proc_file_write(struct file *file, const char __user *buffer,
 static loff_t
 proc_file_lseek(struct file *file, loff_t offset, int orig)
 {
-    lock_kernel();
+        loff_t retval = -EINVAL;
+        switch (orig) {
-    switch (orig) {
+        case 1:
-    case 0:
+                offset += file->f_pos;
-        if (offset < 0)
+        /* fallthrough */
-            goto out;
+        case 0:
-        file->f_pos = offset;
+                if (offset < 0 || offset > MAX_NON_LFS)
-        unlock_kernel();
+                        break;
-        return(file->f_pos);
+                file->f_pos = retval = offset;
-    case 1:
+        }
-        if (offset + file->f_pos < 0)
+        return retval;
-            goto out;
-        file->f_pos += offset;
-        unlock_kernel();
-        return(file->f_pos);
-    case 2:
-        goto out;
-    default:
-        goto out;
-    }
-out:
-    unlock_kernel();
-    return -EINVAL;
 }
 static int proc_notify_change(struct dentry *dentry, struct iattr *iattr)
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 0a044ad98885..a5e3a0ddbe53 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -32,6 +32,7 @@ void reiserfs_delete_inode(struct inode *inode)
            JOURNAL_PER_BALANCE_CNT * 2 +
            2 * REISERFS_QUOTA_INIT_BLOCKS(inode->i_sb);
        struct reiserfs_transaction_handle th;
+        int err;
        truncate_inode_pages(&inode->i_data, 0);
@@ -49,15 +50,13 @@ void reiserfs_delete_inode(struct inode *inode)
                }
                reiserfs_update_inode_transaction(inode);
-                if (reiserfs_delete_object(&th, inode)) {
+                err = reiserfs_delete_object(&th, inode);
-                        up(&inode->i_sem);
-                        goto out;
-                }
                /* Do quota update inside a transaction for journaled quotas. We must do that
                 * after delete_object so that quota updates go into the same transaction as
                 * stat data deletion */
-                DQUOT_FREE_INODE(inode);
+                if (!err) 
+                        DQUOT_FREE_INODE(inode);
                if (journal_end(&th, inode->i_sb, jbegin_count)) {
                        up(&inode->i_sem);
@@ -66,6 +65,12 @@ void reiserfs_delete_inode(struct inode *inode)
                up(&inode->i_sem);
+                /* check return value from reiserfs_delete_object after
+                 * ending the transaction
+                 */
+                if (err)
+                    goto out;
                /* all items of file are deleted, so we can remove "save" link */
                remove_save_link(inode, 0 /* not truncate */ ); /* we can't do anything
                                                                 * about an error here */
@@ -2099,6 +2104,7 @@ int reiserfs_truncate_file(struct inode *p_s_inode, int update_timestamps)
        struct page *page = NULL;
        int error;
        struct buffer_head *bh = NULL;
+        int err2;
        reiserfs_write_lock(p_s_inode->i_sb);
@@ -2136,14 +2142,18 @@ int reiserfs_truncate_file(struct inode *p_s_inode, int update_timestamps)
                   transaction of truncating gets committed - on reboot the file
                   either appears truncated properly or not truncated at all */
                add_save_link(&th, p_s_inode, 1);
-        error = reiserfs_do_truncate(&th, p_s_inode, page, update_timestamps);
+        err2 = reiserfs_do_truncate(&th, p_s_inode, page, update_timestamps);
-        if (error)
-                goto out;
        error =
            journal_end(&th, p_s_inode->i_sb, JOURNAL_PER_BALANCE_CNT * 2 + 1);
        if (error)
                goto out;
+        /* check reiserfs_do_truncate after ending the transaction */
+        if (err2) {
+                error = err2;
+                goto out;
+        }
+        
        if (update_timestamps) {
                error = remove_save_link(p_s_inode, 1 /* truncate */ );
                if (error)
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index 68b7b78638ff..3f17ef844fb6 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -1039,6 +1039,10 @@ static int flush_commit_list(struct super_block *s,
        }
        atomic_dec(&journal->j_async_throttle);
+        /* We're skipping the commit if there's an error */
+        if (retval || reiserfs_is_journal_aborted(journal))
+                barrier = 0;
        /* wait on everything written so far before writing the commit
         * if we are in barrier mode, send the commit down now
         */
@@ -1077,10 +1081,16 @@ static int flush_commit_list(struct super_block *s,
        BUG_ON(atomic_read(&(jl->j_commit_left)) != 1);
        if (!barrier) {
-                if (buffer_dirty(jl->j_commit_bh))
+                /* If there was a write error in the journal - we can't commit
-                        BUG();
+                 * this transaction - it will be invalid and, if successful,
-                mark_buffer_dirty(jl->j_commit_bh);
+                 * will just end up propogating the write error out to
-                sync_dirty_buffer(jl->j_commit_bh);
+                 * the file system. */
+                if (likely(!retval && !reiserfs_is_journal_aborted (journal))) {
+                        if (buffer_dirty(jl->j_commit_bh))
+                                BUG();
+                        mark_buffer_dirty(jl->j_commit_bh) ;
+                        sync_dirty_buffer(jl->j_commit_bh) ;
+                }
        } else
                wait_on_buffer(jl->j_commit_bh);
diff --git a/fs/relayfs/relay.c b/fs/relayfs/relay.c
index 16446a15c96d..2a6f7f12b7f9 100644
--- a/fs/relayfs/relay.c
+++ b/fs/relayfs/relay.c
@@ -333,8 +333,7 @@ size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length)
        return length;
 toobig:
-        printk(KERN_WARNING "relayfs: event too large (%Zd)\n", length);
+        buf->chan->last_toobig = length;
-        WARN_ON(1);
        return 0;
 }
@@ -399,6 +398,11 @@ void relay_close(struct rchan *chan)
                relay_close_buf(chan->buf[i]);
        }
+        if (chan->last_toobig)
+                printk(KERN_WARNING "relayfs: one or more items not logged "
+                       "[item size (%Zd) > sub-buffer size (%Zd)]\n",
+                       chan->last_toobig, chan->subbuf_size);
        kref_put(&chan->kref, relay_destroy_channel);
 }
diff --git a/fs/xattr.c b/fs/xattr.c
index a9db22557998..bcc2156d4d28 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -245,7 +245,7 @@ listxattr(struct dentry *d, char __user *list, size_t size)
                error = d->d_inode->i_op->listxattr(d, klist, size);
        } else {
                error = security_inode_listsecurity(d->d_inode, klist, size);
-                if (size && error >= size)
+                if (size && error > size)
                        error = -ERANGE;
        }
        if (error > 0) {
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c
index 1aea42d71a64..5328a2937127 100644
--- a/fs/xfs/quota/xfs_qm.c
+++ b/fs/xfs/quota/xfs_qm.c
@@ -78,7 +78,7 @@ STATIC int	xfs_qm_dqhashlock_nowait(xfs_dquot_t *);
 STATIC int      xfs_qm_init_quotainos(xfs_mount_t *);
 STATIC int      xfs_qm_init_quotainfo(xfs_mount_t *);
-STATIC int      xfs_qm_shake(int, unsigned int);
+STATIC int      xfs_qm_shake(int, gfp_t);
 #ifdef DEBUG
 extern mutex_t  qcheck_lock;
@@ -2197,7 +2197,7 @@ xfs_qm_shake_freelist(
 */
 /* ARGSUSED */
 STATIC int
-xfs_qm_shake(int nr_to_scan, unsigned int gfp_mask)
+xfs_qm_shake(int nr_to_scan, gfp_t gfp_mask)
 {
        int     ndqused, nfree, n;
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h
index e9c2790139ec..4ab2ca18b8df 100644
--- a/include/acpi/acglobal.h
+++ b/include/acpi/acglobal.h
@@ -211,7 +211,7 @@ ACPI_EXTERN u32 acpi_gbl_original_mode;
 ACPI_EXTERN u32 acpi_gbl_rsdp_original_location;
 ACPI_EXTERN u32 acpi_gbl_ns_lookup_count;
 ACPI_EXTERN u32 acpi_gbl_ps_find_count;
-ACPI_EXTERN u32 acpi_gbl_owner_id_mask;
+ACPI_EXTERN u64 acpi_gbl_owner_id_mask;
 ACPI_EXTERN u16 acpi_gbl_pm1_enable_register_save;
 ACPI_EXTERN u16 acpi_gbl_global_lock_handle;
 ACPI_EXTERN u8 acpi_gbl_debugger_configuration;
diff --git a/include/asm-arm/arch-pxa/irq.h b/include/asm-arm/arch-pxa/irq.h
index d770e4b37ae1..48c60f5eff6a 100644
--- a/include/asm-arm/arch-pxa/irq.h
+++ b/include/asm-arm/arch-pxa/irq.h
@@ -12,8 +12,3 @@
 #define fixup_irq(x)    (x)
-/*
- * This prototype is required for cascading of multiplexed interrupts.
- * Since it doesn't exist elsewhere, we'll put it here for now.
- */
-extern void do_IRQ(int irq, struct pt_regs *regs);
diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h
index 7da97a937548..2d44b42d1847 100644
--- a/include/asm-arm/elf.h
+++ b/include/asm-arm/elf.h
@@ -22,6 +22,8 @@ typedef unsigned long elf_freg_t[3];
 #define R_ARM_NONE      0
 #define R_ARM_PC24      1
 #define R_ARM_ABS32     2
+#define R_ARM_CALL      28
+#define R_ARM_JUMP24    29
 #define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))
 typedef elf_greg_t elf_gregset_t[ELF_NGREG];
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h
index ae69db4a1010..0cf4d4f99600 100644
--- a/include/asm-arm/io.h
+++ b/include/asm-arm/io.h
@@ -42,9 +42,9 @@ extern void __raw_writesb(void __iomem *addr, const void *data, int bytelen);
 extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen);
 extern void __raw_writesl(void __iomem *addr, const void *data, int longlen);
-extern void __raw_readsb(void __iomem *addr, void *data, int bytelen);
+extern void __raw_readsb(const void __iomem *addr, void *data, int bytelen);
-extern void __raw_readsw(void __iomem *addr, void *data, int wordlen);
+extern void __raw_readsw(const void __iomem *addr, void *data, int wordlen);
-extern void __raw_readsl(void __iomem *addr, void *data, int longlen);
+extern void __raw_readsl(const void __iomem *addr, void *data, int longlen);
 #define __raw_writeb(v,a)       (__chk_io_ptr(a), *(volatile unsigned char __force  *)(a) = (v))
 #define __raw_writew(v,a)       (__chk_io_ptr(a), *(volatile unsigned short __force *)(a) = (v))
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h
index a547ee598c6c..3e572364ee73 100644
--- a/include/asm-arm/memory.h
+++ b/include/asm-arm/memory.h
@@ -122,6 +122,7 @@ static inline void *phys_to_virt(unsigned long x)
 */
 #define __pa(x)                 __virt_to_phys((unsigned long)(x))
 #define __va(x)                 ((void *)__phys_to_virt((unsigned long)(x)))
+#define pfn_to_kaddr(pfn)       __va((pfn) << PAGE_SHIFT)
 /*
 * Virtual <-> DMA view memory address translations
diff --git a/include/asm-i386/param.h b/include/asm-i386/param.h
index fa02e67ea86b..095580f3a45c 100644
--- a/include/asm-i386/param.h
+++ b/include/asm-i386/param.h
@@ -1,9 +1,8 @@
-#include <linux/config.h>
 #ifndef _ASMi386_PARAM_H
 #define _ASMi386_PARAM_H
 #ifdef __KERNEL__
+# include <linux/config.h>
 # define HZ             CONFIG_HZ       /* Internal kernel timer frequency */
 # define USER_HZ        100             /* .. some user interfaces are in "ticks" */
 # define CLOCKS_PER_SEC         (USER_HZ)       /* like times() */
diff --git a/include/asm-ia64/delay.h b/include/asm-ia64/delay.h
index 57182d6f2b9a..bba702076391 100644
--- a/include/asm-ia64/delay.h
+++ b/include/asm-ia64/delay.h
@@ -84,14 +84,6 @@ __delay (unsigned long loops)
        ia64_delay_loop (loops - 1);
 }
-static __inline__ void
+extern void udelay (unsigned long usecs);
-udelay (unsigned long usecs)
-{
-        unsigned long start = ia64_get_itc();
-        unsigned long cycles = usecs*local_cpu_data->cyc_per_usec;
-        while (ia64_get_itc() - start < cycles)
-                cpu_relax();
-}
 #endif /* _ASM_IA64_DELAY_H */
diff --git a/include/asm-ia64/ia32.h b/include/asm-ia64/ia32.h
index 8e746b2413a6..f8044a1169cd 100644
--- a/include/asm-ia64/ia32.h
+++ b/include/asm-ia64/ia32.h
@@ -13,6 +13,8 @@
 # ifdef CONFIG_IA32_SUPPORT
+#define IA32_PAGE_OFFSET        0xc0000000
 extern void ia32_cpu_init (void);
 extern void ia32_mem_init (void);
 extern void ia32_gdt_init (void);
diff --git a/include/asm-ia64/local.h b/include/asm-ia64/local.h
index 1dbd584ad851..dc519092ef4d 100644
--- a/include/asm-ia64/local.h
+++ b/include/asm-ia64/local.h
@@ -17,8 +17,8 @@ typedef struct {
 #define local_set(l, i) atomic64_set(&(l)->val, i)
 #define local_inc(l)    atomic64_inc(&(l)->val)
 #define local_dec(l)    atomic64_dec(&(l)->val)
-#define local_add(l)    atomic64_add(&(l)->val)
+#define local_add(i, l) atomic64_add((i), &(l)->val)
-#define local_sub(l)    atomic64_sub(&(l)->val)
+#define local_sub(i, l) atomic64_sub((i), &(l)->val)
 /* Non-atomic variants, i.e., preemption disabled and won't be touched in interrupt, etc.  */
diff --git a/include/asm-ia64/sal.h b/include/asm-ia64/sal.h
index 29df88bdd2bc..313cad0628d0 100644
--- a/include/asm-ia64/sal.h
+++ b/include/asm-ia64/sal.h
@@ -320,7 +320,8 @@ typedef struct sal_log_timestamp {
 typedef struct sal_log_record_header {
        u64 id;                         /* Unique monotonically increasing ID */
        sal_log_revision_t revision;    /* Major and Minor revision of header */
-        u16 severity;                   /* Error Severity */
+        u8 severity;                    /* Error Severity */
+        u8 validation_bits;             /* 0: platform_guid, 1: !timestamp */
        u32 len;                        /* Length of this error log in bytes */
        sal_log_timestamp_t timestamp;  /* Timestamp */
        efi_guid_t platform_guid;       /* Unique OEM Platform ID */
diff --git a/include/asm-ia64/sn/pcidev.h b/include/asm-ia64/sn/pcidev.h
index 49711d00ad04..f65d222ca5e8 100644
--- a/include/asm-ia64/sn/pcidev.h
+++ b/include/asm-ia64/sn/pcidev.h
@@ -3,15 +3,27 @@
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 *
- * Copyright (C) 1992 - 1997, 2000-2004 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All rights reserved.
 */
 #ifndef _ASM_IA64_SN_PCI_PCIDEV_H
 #define _ASM_IA64_SN_PCI_PCIDEV_H
 #include <linux/pci.h>
-#define SN_PCIDEV_INFO(pci_dev) \
+/*
-        ((struct pcidev_info *)(pci_dev)->sysdata)
+ * In ia64, pci_dev->sysdata must be a *pci_controller. To provide access to
+ * the pcidev_info structs for all devices under a controller, we extend the
+ * definition of pci_controller, via sn_pci_controller, to include a list
+ * of pcidev_info.
+ */
+struct sn_pci_controller {
+        struct pci_controller pci_controller;
+        struct list_head pcidev_info;
+};
+#define SN_PCI_CONTROLLER(dev) ((struct sn_pci_controller *) dev->sysdata)
+#define SN_PCIDEV_INFO(dev)     sn_pcidev_info_get(dev)
 #define SN_PCIBUS_BUSSOFT_INFO(pci_bus) \
        (struct pcibus_info *)((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data))
@@ -53,11 +65,13 @@ struct pcidev_info {
        struct sn_irq_info      *pdi_sn_irq_info;
        struct sn_pcibus_provider *pdi_provider;        /* sn pci ops */
        struct pci_dev          *host_pci_dev;          /* host bus link */
+        struct list_head        pdi_list;               /* List of pcidev_info */
 };
 extern void sn_irq_fixup(struct pci_dev *pci_dev,
                         struct sn_irq_info *sn_irq_info);
 extern void sn_irq_unfixup(struct pci_dev *pci_dev);
+extern struct pcidev_info * sn_pcidev_info_get(struct pci_dev *);
 extern void sn_pci_controller_fixup(int segment, int busnum,
                                    struct pci_bus *bus);
 extern void sn_bus_store_sysdata(struct pci_dev *dev);
diff --git a/include/asm-ia64/spinlock.h b/include/asm-ia64/spinlock.h
index 5b78611411c3..0c91a76c5ea3 100644
--- a/include/asm-ia64/spinlock.h
+++ b/include/asm-ia64/spinlock.h
@@ -201,6 +201,16 @@ static inline void __raw_write_unlock(raw_rwlock_t *x)
 #endif /* !ASM_SUPPORTED */
-#define __raw_read_trylock(lock) generic__raw_read_trylock(lock)
+static inline int __raw_read_trylock(raw_rwlock_t *x)
+{
+        union {
+                raw_rwlock_t lock;
+                __u32 word;
+        } old, new;
+        old.lock = new.lock = *x;
+        old.lock.write_lock = new.lock.write_lock = 0;
+        ++new.lock.read_counter;
+        return (u32)ia64_cmpxchg4_acq((__u32 *)(x), new.word, old.word) == old.word;
+}
 #endif /*  _ASM_IA64_SPINLOCK_H */
diff --git a/include/asm-ia64/topology.h b/include/asm-ia64/topology.h
index a9f738bf18a7..f7c330467e7e 100644
--- a/include/asm-ia64/topology.h
+++ b/include/asm-ia64/topology.h
@@ -38,7 +38,7 @@
 /*
 * Returns the number of the first CPU on Node 'node'.
 */
-#define node_to_first_cpu(node) (__ffs(node_to_cpumask(node)))
+#define node_to_first_cpu(node) (first_cpu(node_to_cpumask(node)))
 /*
 * Determines the node for a given pci bus
diff --git a/include/asm-mips/mach-au1x00/au1xxx_ide.h b/include/asm-mips/mach-au1x00/au1xxx_ide.h
index 33d275c3b84c..e867b4ef96d1 100644
--- a/include/asm-mips/mach-au1x00/au1xxx_ide.h
+++ b/include/asm-mips/mach-au1x00/au1xxx_ide.h
@@ -74,9 +74,6 @@ typedef struct
        u8                      white_list, black_list;
        struct dbdma_cmd        *dma_table_cpu;
        dma_addr_t              dma_table_dma;
-        struct scatterlist      *sg_table;
-        int                     sg_nents;
-        int                     sg_dma_direction;
 #endif
        struct device           *dev;
        int                     irq;
@@ -87,11 +84,6 @@ typedef struct
 } _auide_hwif;
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-struct drive_list_entry {
-        const char * id_model;
-        const char * id_firmware;
-};
 /* HD white list */
 static const struct drive_list_entry dma_white_list [] = {
 /*
@@ -167,13 +159,9 @@ int __init auide_probe(void);
 * Multi-Word DMA + DbDMA functions
 */
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-        static int in_drive_list(struct hd_driveid *id,
-                                 const struct drive_list_entry *drive_table);
        static int auide_build_sglist(ide_drive_t *drive,  struct request *rq);
        static int auide_build_dmatable(ide_drive_t *drive);
        static int auide_dma_end(ide_drive_t *drive);
-        static void auide_dma_start(ide_drive_t *drive );
        ide_startstop_t auide_dma_intr (ide_drive_t *drive);
        static void auide_dma_exec_cmd(ide_drive_t *drive, u8 command);
        static int auide_dma_setup(ide_drive_t *drive);
@@ -188,8 +176,6 @@ int __init auide_probe(void);
        static void auide_ddma_rx_callback(int irq, void *param,
                                           struct pt_regs *regs);
        static int auide_dma_off_quietly(ide_drive_t *drive);
-        static int auide_dma_timeout(ide_drive_t *drive);
 #endif /* end CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */
 /*******************************************************************************
@@ -299,3 +285,11 @@ int __init auide_probe(void);
 #define SBC_IDE_MDMA2_TPM     (0x00<<6)
 #define SBC_IDE_MDMA2_TA      (0x12<<0)
+#define SBC_IDE_TIMING(mode) \
+         SBC_IDE_##mode##_TWCS | \
+         SBC_IDE_##mode##_TCSH | \
+         SBC_IDE_##mode##_TCSOFF | \
+         SBC_IDE_##mode##_TWP | \
+         SBC_IDE_##mode##_TCSW | \
+         SBC_IDE_##mode##_TPM | \
+         SBC_IDE_##mode##_TA
diff --git a/include/asm-powerpc/mmu.h b/include/asm-powerpc/mmu.h
index c1b4bbabbe97..29b0bb0086d3 100644
--- a/include/asm-powerpc/mmu.h
+++ b/include/asm-powerpc/mmu.h
@@ -220,7 +220,8 @@ extern int __hash_page_64K(unsigned long ea, unsigned long access,
                           unsigned int local);
 struct mm_struct;
 extern int hash_huge_page(struct mm_struct *mm, unsigned long access,
-                          unsigned long ea, unsigned long vsid, int local);
+                          unsigned long ea, unsigned long vsid, int local,
+                          unsigned long trap);
 extern void htab_finish_init(void);
 extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
diff --git a/include/asm-ppc/ppc4xx_dma.h b/include/asm-ppc/ppc4xx_dma.h
index a415001165fa..46a086fff816 100644
--- a/include/asm-ppc/ppc4xx_dma.h
+++ b/include/asm-ppc/ppc4xx_dma.h
@@ -33,9 +33,6 @@
 #define MAX_PPC4xx_DMA_CHANNELS         4
-/* in arch/ppc/kernel/setup.c -- Cort */
-extern unsigned long DMA_MODE_WRITE, DMA_MODE_READ;
 /*
 * Function return status codes
 * These values are used to indicate whether or not the function
diff --git a/include/asm-sparc/memreg.h b/include/asm-sparc/memreg.h
index c0498d3baf93..5fb95c828da6 100644
--- a/include/asm-sparc/memreg.h
+++ b/include/asm-sparc/memreg.h
@@ -36,7 +36,7 @@
 /* Memory parity error register with associated bit constants. */
 #ifndef __ASSEMBLY__
-extern __volatile__ unsigned long *sun4c_memerr_reg;
+extern __volatile__ unsigned long __iomem *sun4c_memerr_reg;
 #endif
 #define SUN4C_MPE_ERROR 0x80    /* Parity error detected. (ro) */
diff --git a/include/asm-sparc/pcic.h b/include/asm-sparc/pcic.h
index 301ae8022ddd..dedea14d87c8 100644
--- a/include/asm-sparc/pcic.h
+++ b/include/asm-sparc/pcic.h
@@ -16,10 +16,10 @@
 #include <asm/pbm.h>
 struct linux_pcic {
-        void * __iomem          pcic_regs;
+        void __iomem            *pcic_regs;
        unsigned long           pcic_io;
-        void * __iomem          pcic_config_space_addr;
+        void __iomem            *pcic_config_space_addr;
-        void * __iomem          pcic_config_space_data;
+        void __iomem            *pcic_config_space_data;
        struct resource         pcic_res_regs;
        struct resource         pcic_res_io;
        struct resource         pcic_res_cfg_addr;
diff --git a/include/asm-x86_64/param.h b/include/asm-x86_64/param.h
index 40b11937180d..5956b23b57c2 100644
--- a/include/asm-x86_64/param.h
+++ b/include/asm-x86_64/param.h
@@ -1,9 +1,8 @@
-#include <linux/config.h>
 #ifndef _ASMx86_64_PARAM_H
 #define _ASMx86_64_PARAM_H
 #ifdef __KERNEL__
+# include <linux/config.h>
 # define HZ            CONFIG_HZ        /* Internal kernel timer frequency */
 # define USER_HZ       100              /* .. some user interfaces are in "ticks */
 #define CLOCKS_PER_SEC        (USER_HZ)       /* like times() */
diff --git a/include/asm-x86_64/rwlock.h b/include/asm-x86_64/rwlock.h
index 8a78a4ace53c..9942cc393064 100644
--- a/include/asm-x86_64/rwlock.h
+++ b/include/asm-x86_64/rwlock.h
@@ -64,7 +64,7 @@
                     ::"a" (rw) : "memory")
 #define __build_write_lock_const(rw, helper) \
-        asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
+        asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
                     "jnz 2f\n" \
                     "1:\n" \
                    LOCK_SECTION_START("") \
diff --git a/include/asm-x86_64/topology.h b/include/asm-x86_64/topology.h
index d39ebd5263ed..7d82bc56b9fa 100644
--- a/include/asm-x86_64/topology.h
+++ b/include/asm-x86_64/topology.h
@@ -23,7 +23,7 @@ extern int __node_distance(int, int);
 #define cpu_to_node(cpu)                (cpu_to_node[cpu])
 #define parent_node(node)               (node)
-#define node_to_first_cpu(node)         (__ffs(node_to_cpumask[node]))
+#define node_to_first_cpu(node)         (first_cpu(node_to_cpumask[node]))
 #define node_to_cpumask(node)           (node_to_cpumask[node])
 #define pcibus_to_node(bus)             ((long)(bus->sysdata))  
 #define pcibus_to_cpumask(bus)          node_to_cpumask(pcibus_to_node(bus));
diff --git a/include/linux/cache.h b/include/linux/cache.h
index f6b5a46c5f82..0b7ecf3af78a 100644
--- a/include/linux/cache.h
+++ b/include/linux/cache.h
@@ -13,7 +13,7 @@
 #define SMP_CACHE_BYTES L1_CACHE_BYTES
 #endif
-#if defined(CONFIG_X86) || defined(CONFIG_SPARC64)
+#if defined(CONFIG_X86) || defined(CONFIG_SPARC64) || defined(CONFIG_IA64)
 #define __read_mostly __attribute__((__section__(".data.read_mostly")))
 #else
 #define __read_mostly
diff --git a/include/linux/cn_proc.h b/include/linux/cn_proc.h
index c948f678e04e..1417de935057 100644
--- a/include/linux/cn_proc.h
+++ b/include/linux/cn_proc.h
@@ -26,6 +26,7 @@
 #define CN_PROC_H
 #include <linux/types.h>
+#include <linux/time.h>
 #include <linux/connector.h>
 /*
@@ -65,6 +66,7 @@ struct proc_event {
                PROC_EVENT_EXIT = 0x80000000
        } what;
        __u32 cpu;
+        struct timespec timestamp;
        union { /* must be last field of proc_event struct */
                struct {
                        __u32 err;
diff --git a/include/linux/dvb/audio.h b/include/linux/dvb/audio.h
index cc314443f1c4..2b8797084685 100644
--- a/include/linux/dvb/audio.h
+++ b/include/linux/dvb/audio.h
@@ -32,39 +32,39 @@
 typedef enum {
-        AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */
+        AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */
        AUDIO_SOURCE_MEMORY /* Select internal memory as the main source */
 } audio_stream_source_t;
 typedef enum {
        AUDIO_STOPPED,      /* Device is stopped */
-        AUDIO_PLAYING,      /* Device is currently playing */
+        AUDIO_PLAYING,      /* Device is currently playing */
        AUDIO_PAUSED        /* Device is paused */
 } audio_play_state_t;
 typedef enum {
-        AUDIO_STEREO,
+        AUDIO_STEREO,
-        AUDIO_MONO_LEFT,
+        AUDIO_MONO_LEFT,
        AUDIO_MONO_RIGHT
 } audio_channel_select_t;
 typedef struct audio_mixer {
-        unsigned int volume_left;
+        unsigned int volume_left;
-        unsigned int volume_right;
+        unsigned int volume_right;
  // what else do we need? bass, pass-through, ...
 } audio_mixer_t;
 typedef struct audio_status {
-        int                    AV_sync_state;  /* sync audio and video? */
+        int                    AV_sync_state;  /* sync audio and video? */
-        int                    mute_state;     /* audio is muted */
+        int                    mute_state;     /* audio is muted */
-        audio_play_state_t     play_state;     /* current playback state */
+        audio_play_state_t     play_state;     /* current playback state */
-        audio_stream_source_t  stream_source;  /* current stream source */
+        audio_stream_source_t  stream_source;  /* current stream source */
-        audio_channel_select_t channel_select; /* currently selected channel */
+        audio_channel_select_t channel_select; /* currently selected channel */
-        int                    bypass_mode;    /* pass on audio data to */
+        int                    bypass_mode;    /* pass on audio data to */
        audio_mixer_t          mixer_state;    /* current mixer state */
 } audio_status_t;                              /* separate decoder hardware */
@@ -74,8 +74,8 @@ struct audio_karaoke{  /* if Vocal1 or Vocal2 are non-zero, they get mixed  */
        int vocal1;    /* into left and right t at 70% each */
        int vocal2;    /* if both, Vocal1 and Vocal2 are non-zero, Vocal1 gets*/
        int melody;    /* mixed into the left channel and */
-                       /* Vocal2 into the right channel at 100% each. */
+                       /* Vocal2 into the right channel at 100% each. */
-                       /* if Melody is non-zero, the melody channel gets mixed*/
+                       /* if Melody is non-zero, the melody channel gets mixed*/
 } audio_karaoke_t;     /* into left and right  */
diff --git a/include/linux/dvb/ca.h b/include/linux/dvb/ca.h
index 558af0cc7692..c18537f3e449 100644
--- a/include/linux/dvb/ca.h
+++ b/include/linux/dvb/ca.h
@@ -27,16 +27,16 @@
 /* slot interface types and info */
 typedef struct ca_slot_info {
-        int num;               /* slot number */
+        int num;               /* slot number */
-        int type;              /* CA interface this slot supports */
+        int type;              /* CA interface this slot supports */
 #define CA_CI            1     /* CI high level interface */
 #define CA_CI_LINK       2     /* CI link layer level interface */
 #define CA_CI_PHYS       4     /* CI physical layer level interface */
 #define CA_DESCR         8     /* built-in descrambler */
 #define CA_SC          128     /* simple smart card interface */
-        unsigned int flags;
+        unsigned int flags;
 #define CA_CI_MODULE_PRESENT 1 /* module (or card) inserted */
 #define CA_CI_MODULE_READY   2
 } ca_slot_info_t;
@@ -45,37 +45,37 @@ typedef struct ca_slot_info {
 /* descrambler types and info */
 typedef struct ca_descr_info {
-        unsigned int num;          /* number of available descramblers (keys) */
+        unsigned int num;          /* number of available descramblers (keys) */
-        unsigned int type;         /* type of supported scrambling system */
+        unsigned int type;         /* type of supported scrambling system */
 #define CA_ECD           1
 #define CA_NDS           2
 #define CA_DSS           4
 } ca_descr_info_t;
 typedef struct ca_caps {
-        unsigned int slot_num;     /* total number of CA card and module slots */
+        unsigned int slot_num;     /* total number of CA card and module slots */
-        unsigned int slot_type;    /* OR of all supported types */
+        unsigned int slot_type;    /* OR of all supported types */
-        unsigned int descr_num;    /* total number of descrambler slots (keys) */
+        unsigned int descr_num;    /* total number of descrambler slots (keys) */
-        unsigned int descr_type;   /* OR of all supported types */
+        unsigned int descr_type;   /* OR of all supported types */
 } ca_caps_t;
 /* a message to/from a CI-CAM */
 typedef struct ca_msg {
-        unsigned int index;
+        unsigned int index;
-        unsigned int type;
+        unsigned int type;
-        unsigned int length;
+        unsigned int length;
-        unsigned char msg[256];
+        unsigned char msg[256];
 } ca_msg_t;
 typedef struct ca_descr {
-        unsigned int index;
+        unsigned int index;
-        unsigned int parity;    /* 0 == even, 1 == odd */
+        unsigned int parity;    /* 0 == even, 1 == odd */
-        unsigned char cw[8];
+        unsigned char cw[8];
 } ca_descr_t;
 typedef struct ca_pid {
-        unsigned int pid;
+        unsigned int pid;
-        int index;              /* -1 == disable*/
+        int index;              /* -1 == disable*/
 } ca_pid_t;
 #define CA_RESET          _IO('o', 128)
diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h
index ce3f829da82c..2787b8a22ff1 100644
--- a/include/linux/dvb/dmx.h
+++ b/include/linux/dvb/dmx.h
@@ -1,4 +1,4 @@
-/* 
+/*
 * dmx.h
 *
 * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
@@ -38,10 +38,10 @@ typedef enum
 {
        DMX_OUT_DECODER, /* Streaming directly to decoder. */
        DMX_OUT_TAP,     /* Output going to a memory buffer */
-                         /* (to be retrieved via the read command).*/
+                         /* (to be retrieved via the read command).*/
        DMX_OUT_TS_TAP   /* Output multiplexed into a new TS  */
-                         /* (to be retrieved by reading from the */
+                         /* (to be retrieved by reading from the */
-                         /* logical DVR device).                 */
+                         /* logical DVR device).                 */
 } dmx_output_t;
@@ -54,25 +54,25 @@ typedef enum
 typedef enum
 {
-        DMX_PES_AUDIO0,
+        DMX_PES_AUDIO0,
        DMX_PES_VIDEO0,
        DMX_PES_TELETEXT0,
        DMX_PES_SUBTITLE0,
        DMX_PES_PCR0,
-        DMX_PES_AUDIO1,
+        DMX_PES_AUDIO1,
        DMX_PES_VIDEO1,
        DMX_PES_TELETEXT1,
        DMX_PES_SUBTITLE1,
        DMX_PES_PCR1,
-        DMX_PES_AUDIO2,
+        DMX_PES_AUDIO2,
        DMX_PES_VIDEO2,
        DMX_PES_TELETEXT2,
        DMX_PES_SUBTITLE2,
        DMX_PES_PCR2,
-        DMX_PES_AUDIO3,
+        DMX_PES_AUDIO3,
        DMX_PES_VIDEO3,
        DMX_PES_TELETEXT3,
        DMX_PES_SUBTITLE3,
@@ -90,8 +90,8 @@ typedef enum
 typedef enum
 {
-        DMX_SCRAMBLING_EV,
+        DMX_SCRAMBLING_EV,
-        DMX_FRONTEND_EV
+        DMX_FRONTEND_EV
 } dmx_event_t;
diff --git a/include/linux/dvb/osd.h b/include/linux/dvb/osd.h
index 0e1973d54a6b..880e68435832 100644
--- a/include/linux/dvb/osd.h
+++ b/include/linux/dvb/osd.h
@@ -98,43 +98,43 @@ typedef enum {
 } OSD_Command;
 typedef struct osd_cmd_s {
-        OSD_Command cmd;
+        OSD_Command cmd;
-        int x0;
+        int x0;
-        int y0;
+        int y0;
-        int x1;
+        int x1;
-        int y1;
+        int y1;
-        int color;
+        int color;
-        void __user *data;
+        void __user *data;
 } osd_cmd_t;
 /* OSD_OpenRaw: set 'color' to desired window type */
 typedef enum {
-        OSD_BITMAP1,           /* 1 bit bitmap */
+        OSD_BITMAP1,           /* 1 bit bitmap */
-        OSD_BITMAP2,           /* 2 bit bitmap */
+        OSD_BITMAP2,           /* 2 bit bitmap */
-        OSD_BITMAP4,           /* 4 bit bitmap */
+        OSD_BITMAP4,           /* 4 bit bitmap */
-        OSD_BITMAP8,           /* 8 bit bitmap */
+        OSD_BITMAP8,           /* 8 bit bitmap */
-        OSD_BITMAP1HR,         /* 1 Bit bitmap half resolution */
+        OSD_BITMAP1HR,         /* 1 Bit bitmap half resolution */
-        OSD_BITMAP2HR,         /* 2 bit bitmap half resolution */
+        OSD_BITMAP2HR,         /* 2 bit bitmap half resolution */
-        OSD_BITMAP4HR,         /* 4 bit bitmap half resolution */
+        OSD_BITMAP4HR,         /* 4 bit bitmap half resolution */
-        OSD_BITMAP8HR,         /* 8 bit bitmap half resolution */
+        OSD_BITMAP8HR,         /* 8 bit bitmap half resolution */
-        OSD_YCRCB422,          /* 4:2:2 YCRCB Graphic Display */
+        OSD_YCRCB422,          /* 4:2:2 YCRCB Graphic Display */
-        OSD_YCRCB444,          /* 4:4:4 YCRCB Graphic Display */
+        OSD_YCRCB444,          /* 4:4:4 YCRCB Graphic Display */
-        OSD_YCRCB444HR,        /* 4:4:4 YCRCB graphic half resolution */
+        OSD_YCRCB444HR,        /* 4:4:4 YCRCB graphic half resolution */
-        OSD_VIDEOTSIZE,        /* True Size Normal MPEG Video Display */
+        OSD_VIDEOTSIZE,        /* True Size Normal MPEG Video Display */
-        OSD_VIDEOHSIZE,        /* MPEG Video Display Half Resolution */
+        OSD_VIDEOHSIZE,        /* MPEG Video Display Half Resolution */
-        OSD_VIDEOQSIZE,        /* MPEG Video Display Quarter Resolution */
+        OSD_VIDEOQSIZE,        /* MPEG Video Display Quarter Resolution */
-        OSD_VIDEODSIZE,        /* MPEG Video Display Double Resolution */
+        OSD_VIDEODSIZE,        /* MPEG Video Display Double Resolution */
-        OSD_VIDEOTHSIZE,       /* True Size MPEG Video Display Half Resolution */
+        OSD_VIDEOTHSIZE,       /* True Size MPEG Video Display Half Resolution */
-        OSD_VIDEOTQSIZE,       /* True Size MPEG Video Display Quarter Resolution*/
+        OSD_VIDEOTQSIZE,       /* True Size MPEG Video Display Quarter Resolution*/
-        OSD_VIDEOTDSIZE,       /* True Size MPEG Video Display Double Resolution */
+        OSD_VIDEOTDSIZE,       /* True Size MPEG Video Display Double Resolution */
-        OSD_VIDEONSIZE,        /* Full Size MPEG Video Display */
+        OSD_VIDEONSIZE,        /* Full Size MPEG Video Display */
-        OSD_CURSOR             /* Cursor */
+        OSD_CURSOR             /* Cursor */
 } osd_raw_window_t;
 typedef struct osd_cap_s {
-        int  cmd;
+        int  cmd;
 #define OSD_CAP_MEMSIZE         1  /* memory size */
-        long val;
+        long val;
 } osd_cap_t;
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h
index 941045e9ab89..b1999bfeaa56 100644
--- a/include/linux/dvb/video.h
+++ b/include/linux/dvb/video.h
@@ -36,7 +36,7 @@
 typedef enum {
        VIDEO_FORMAT_4_3,     /* Select 4:3 format */
-        VIDEO_FORMAT_16_9,    /* Select 16:9 format. */
+        VIDEO_FORMAT_16_9,    /* Select 16:9 format. */
        VIDEO_FORMAT_221_1    /* 2.21:1 */
 } video_format_t;
@@ -54,7 +54,7 @@ typedef enum {
 typedef enum {
-        VIDEO_PAN_SCAN,       /* use pan and scan format */
+        VIDEO_PAN_SCAN,       /* use pan and scan format */
        VIDEO_LETTER_BOX,     /* use letterbox format */
        VIDEO_CENTER_CUT_OUT  /* use center cut out format */
 } video_displayformat_t;
@@ -66,7 +66,7 @@ typedef struct {
 } video_size_t;
 typedef enum {
-        VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */
+        VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */
        VIDEO_SOURCE_MEMORY /* If this source is selected, the stream
                               comes from the user through the write
                               system call */
@@ -75,35 +75,35 @@ typedef enum {
 typedef enum {
        VIDEO_STOPPED, /* Video is stopped */
-        VIDEO_PLAYING, /* Video is currently playing */
+        VIDEO_PLAYING, /* Video is currently playing */
        VIDEO_FREEZED  /* Video is freezed */
 } video_play_state_t;
 struct video_event {
-        int32_t type;
+        int32_t type;
 #define VIDEO_EVENT_SIZE_CHANGED        1
 #define VIDEO_EVENT_FRAME_RATE_CHANGED  2
-        time_t timestamp;
+        time_t timestamp;
        union {
-                video_size_t size;
+                video_size_t size;
                unsigned int frame_rate;        /* in frames per 1000sec */
        } u;
 };
 struct video_status {
-        int                   video_blank;   /* blank video on freeze? */
+        int                   video_blank;   /* blank video on freeze? */
-        video_play_state_t    play_state;    /* current state of playback */
+        video_play_state_t    play_state;    /* current state of playback */
-        video_stream_source_t stream_source; /* current source (demux/memory) */
+        video_stream_source_t stream_source; /* current source (demux/memory) */
-        video_format_t        video_format;  /* current aspect ratio of stream*/
+        video_format_t        video_format;  /* current aspect ratio of stream*/
-        video_displayformat_t display_format;/* selected cropping mode */
+        video_displayformat_t display_format;/* selected cropping mode */
 };
 struct video_still_picture {
-        char __user *iFrame;        /* pointer to a single iframe in memory */
+        char __user *iFrame;        /* pointer to a single iframe in memory */
-        int32_t size;
+        int32_t size;
 };
@@ -111,19 +111,19 @@ typedef
 struct video_highlight {
        int     active;      /*    1=show highlight, 0=hide highlight */
        uint8_t contrast1;   /*    7- 4  Pattern pixel contrast */
-                             /*    3- 0  Background pixel contrast */
+                             /*    3- 0  Background pixel contrast */
        uint8_t contrast2;   /*    7- 4  Emphasis pixel-2 contrast */
-                             /*    3- 0  Emphasis pixel-1 contrast */
+                             /*    3- 0  Emphasis pixel-1 contrast */
        uint8_t color1;      /*    7- 4  Pattern pixel color */
-                             /*    3- 0  Background pixel color */
+                             /*    3- 0  Background pixel color */
        uint8_t color2;      /*    7- 4  Emphasis pixel-2 color */
-                             /*    3- 0  Emphasis pixel-1 color */
+                             /*    3- 0  Emphasis pixel-1 color */
        uint32_t ypos;       /*   23-22  auto action mode */
-                             /*   21-12  start y */
+                             /*   21-12  start y */
-                             /*    9- 0  end y */
+                             /*    9- 0  end y */
        uint32_t xpos;       /*   23-22  button color number */
-                             /*   21-12  start x */
+                             /*   21-12  start x */
-                             /*    9- 0  end x */
+                             /*    9- 0  end x */
 } video_highlight_t;
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 04a58f33ec53..a973be2cfe61 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -617,6 +617,12 @@ struct fb_ops {
        /* perform fb specific mmap */
        int (*fb_mmap)(struct fb_info *info, struct file *file, struct vm_area_struct *vma);
+        /* save current hardware state */
+        void (*fb_save_state)(struct fb_info *info);
+        /* restore saved state */
+        void (*fb_restore_state)(struct fb_info *info);
 };
 #ifdef CONFIG_FB_TILEBLITTING
@@ -726,6 +732,18 @@ struct fb_tile_ops {
                                                  from userspace */
 #define FBINFO_MISC_TILEBLITTING       0x20000 /* use tile blitting */
+/* A driver may set this flag to indicate that it does want a set_par to be
+ * called every time when fbcon_switch is executed. The advantage is that with
+ * this flag set you can really be shure that set_par is always called before
+ * any of the functions dependant on the correct hardware state or altering
+ * that state, even if you are using some broken X releases. The disadvantage
+ * is that it introduces unwanted delays to every console switch if set_par
+ * is slow. It is a good idea to try this flag in the drivers initialization
+ * code whenever there is a bug report related to switching between X and the
+ * framebuffer console.
+ */
+#define FBINFO_MISC_ALWAYS_SETPAR   0x40000
 struct fb_info {
        int node;
        int flags;
@@ -817,6 +835,18 @@ struct fb_info {
 #endif
+#if defined (__BIG_ENDIAN)
+#define FB_LEFT_POS(bpp)          (32 - bpp)
+#define FB_SHIFT_HIGH(val, bits)  ((val) >> (bits))
+#define FB_SHIFT_LOW(val, bits)   ((val) << (bits))
+#define FB_BIT_NR(b)              (7 - (b))
+#else
+#define FB_LEFT_POS(bpp)          (0)
+#define FB_SHIFT_HIGH(val, bits)  ((val) << (bits))
+#define FB_SHIFT_LOW(val, bits)   ((val) >> (bits))
+#define FB_BIT_NR(b)              (b)
+#endif
    /*
     *  `Generic' versions of the frame buffer device operations
     */
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index ef3b5632e63a..006c81ef4d50 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -108,7 +108,7 @@
 #define I2C_DRIVERID_SAA7127    72      /* saa7124 video encoder        */
 #define I2C_DRIVERID_SAA711X    73      /* saa711x video encoders       */
 #define I2C_DRIVERID_AKITAIOEXP 74      /* IO Expander on Sharp SL-C1000 */
-#define I2C_DRIVERID_I2C_IR     75      /* I2C InfraRed on Video boards */
+#define I2C_DRIVERID_INFRARED   75      /* I2C InfraRed on Video boards */
 #define I2C_DRIVERID_EXP0       0xF0    /* experimental use id's        */
 #define I2C_DRIVERID_EXP1       0xF1
diff --git a/include/linux/ide.h b/include/linux/ide.h
index a39c3c59789d..7b6a6a58e465 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -23,17 +23,6 @@
 #include <asm/io.h>
 #include <asm/semaphore.h>
-/*
- * This is the multiple IDE interface driver, as evolved from hd.c.
- * It supports up to four IDE interfaces, on one or more IRQs (usually 14 & 15).
- * There can be up to two drives per interface, as per the ATA-2 spec.
- *
- * Primary i/f:    ide0: major=3;  (hda)         minor=0; (hdb)         minor=64
- * Secondary i/f:  ide1: major=22; (hdc or hd1a) minor=0; (hdd or hd1b) minor=64
- * Tertiary i/f:   ide2: major=33; (hde)         minor=0; (hdf)         minor=64
- * Quaternary i/f: ide3: major=34; (hdg)         minor=0; (hdh)         minor=64
- */
 /******************************************************************************
 * IDE driver configuration options (play with these as desired):
 *
@@ -193,11 +182,6 @@ typedef unsigned char	byte;	/* used everywhere */
 #define WAIT_CMD        (10*HZ) /* 10sec  - maximum wait for an IRQ to happen */
 #define WAIT_MIN_SLEEP  (2*HZ/100)      /* 20msec - minimum sleep time */
-#define HOST(hwif,chipset)                                      \
-{                                                               \
-        return ((hwif)->chipset == chipset) ? 1 : 0;            \
-}
 /*
 * Check for an interrupt and acknowledge the interrupt status
 */
@@ -391,45 +375,6 @@ typedef union {
 } ata_nsector_t, ata_data_t, atapi_bcount_t, ata_index_t;
 /*
- * ATA-IDE Error Register
- *
- * mark         : Bad address mark
- * tzero        : Couldn't find track 0
- * abrt         : Aborted Command
- * mcr          : Media Change Request
- * id           : ID field not found
- * mce          : Media Change Event
- * ecc          : Uncorrectable ECC error
- * bdd          : dual meaing
- */
-typedef union {
-        unsigned all                    :8;
-        struct {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-                unsigned mark           :1;
-                unsigned tzero          :1;
-                unsigned abrt           :1;
-                unsigned mcr            :1;
-                unsigned id             :1;
-                unsigned mce            :1;
-                unsigned ecc            :1;
-                unsigned bdd            :1;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-                unsigned bdd            :1;
-                unsigned ecc            :1;
-                unsigned mce            :1;
-                unsigned id             :1;
-                unsigned mcr            :1;
-                unsigned abrt           :1;
-                unsigned tzero          :1;
-                unsigned mark           :1;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-        } b;
-} ata_error_t;
-/*
 * ATA-IDE Select Register, aka Device-Head
 *
 * head         : always zeros here
@@ -504,39 +449,6 @@ typedef union {
 } ata_status_t, atapi_status_t;
 /*
- * ATA-IDE Control Register
- *
- * bit0         : Should be set to zero
- * nIEN         : device INTRQ to host
- * SRST         : host soft reset bit
- * bit3         : ATA-2 thingy, Should be set to 1
- * reserved456  : Reserved
- * HOB          : 48-bit address ordering, High Ordered Bit
- */
-typedef union {
-        unsigned all                    : 8;
-        struct {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-                unsigned bit0           : 1;
-                unsigned nIEN           : 1;
-                unsigned SRST           : 1;
-                unsigned bit3           : 1;
-                unsigned reserved456    : 3;
-                unsigned HOB            : 1;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-                unsigned HOB            : 1;
-                unsigned reserved456    : 3;
-                unsigned bit3           : 1;
-                unsigned SRST           : 1;
-                unsigned nIEN           : 1;
-                unsigned bit0           : 1;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-        } b;
-} ata_control_t;
-/*
 * ATAPI Feature Register
 *
 * dma          : Using DMA or PIO
@@ -618,39 +530,6 @@ typedef union {
 } atapi_error_t;
 /*
- * ATAPI floppy Drive Select Register
- *
- * sam_lun      : Logical unit number
- * reserved3    : Reserved
- * drv          : The responding drive will be drive 0 (0) or drive 1 (1)
- * one5         : Should be set to 1
- * reserved6    : Reserved
- * one7         : Should be set to 1
- */
-typedef union {
-        unsigned all                    :8;
-        struct {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-                unsigned sam_lun        :3;
-                unsigned reserved3      :1;
-                unsigned drv            :1;
-                unsigned one5           :1;
-                unsigned reserved6      :1;
-                unsigned one7           :1;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-                unsigned one7           :1;
-                unsigned reserved6      :1;
-                unsigned one5           :1;
-                unsigned drv            :1;
-                unsigned reserved3      :1;
-                unsigned sam_lun        :3;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-        } b;
-} atapi_select_t;
-/*
 * Status returned from various ide_ functions
 */
 typedef enum {
@@ -1101,10 +980,7 @@ typedef struct ide_driver_s {
        int             (*end_request)(ide_drive_t *, int, int);
        ide_startstop_t (*error)(ide_drive_t *, struct request *rq, u8, u8);
        ide_startstop_t (*abort)(ide_drive_t *, struct request *rq);
-        int             (*ioctl)(ide_drive_t *, struct inode *, struct file *, unsigned int, unsigned long);
        ide_proc_entry_t        *proc;
-        void            (*ata_prebuilder)(ide_drive_t *);
-        void            (*atapi_prebuilder)(ide_drive_t *);
        struct device_driver    gen_driver;
 } ide_driver_t;
@@ -1298,7 +1174,6 @@ extern int ide_spin_wait_hwgroup(ide_drive_t *);
 extern void ide_timer_expiry(unsigned long);
 extern irqreturn_t ide_intr(int irq, void *dev_id, struct pt_regs *regs);
 extern void do_ide_request(request_queue_t *);
-extern void ide_init_subdrivers(void);
 void ide_init_disk(struct gendisk *, ide_drive_t *);
@@ -1371,6 +1246,12 @@ void ide_init_sg_cmd(ide_drive_t *, struct request *);
 #define GOOD_DMA_DRIVE          1
 #ifdef CONFIG_BLK_DEV_IDEDMA
+struct drive_list_entry {
+        const char *id_model;
+        const char *id_firmware;
+};
+int ide_in_drive_list(struct hd_driveid *, const struct drive_list_entry *);
 int __ide_dma_bad_drive(ide_drive_t *);
 int __ide_dma_good_drive(ide_drive_t *);
 int ide_use_dma(ide_drive_t *);
diff --git a/include/linux/inotify.h b/include/linux/inotify.h
index ee5b239092ed..267c88b5f742 100644
--- a/include/linux/inotify.h
+++ b/include/linux/inotify.h
@@ -47,6 +47,8 @@ struct inotify_event {
 #define IN_MOVE                 (IN_MOVED_FROM | IN_MOVED_TO) /* moves */
 /* special flags */
+#define IN_ONLYDIR              0x01000000      /* only watch the path if it is a directory */
+#define IN_DONT_FOLLOW          0x02000000      /* don't follow a sym link */
 #define IN_MASK_ADD             0x20000000      /* add to the mask of an already existing watch */
 #define IN_ISDIR                0x40000000      /* event occurred against dir */
 #define IN_ONESHOT              0x80000000      /* only send event once */
diff --git a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h
index e2f935038013..d7c41d1d706a 100644
--- a/include/linux/ipv6_route.h
+++ b/include/linux/ipv6_route.h
@@ -18,6 +18,7 @@
                                           fallback, no routers on link */
 #define RTF_ADDRCONF    0x00040000      /* addrconf route - RA          */
 #define RTF_PREFIX_RT   0x00080000      /* A prefix only route - RA     */
+#define RTF_ANYCAST     0x00100000      /* Anycast                      */
 #define RTF_NONEXTHOP   0x00200000      /* route with no nexthop        */
 #define RTF_EXPIRES     0x00400000
diff --git a/include/linux/irq.h b/include/linux/irq.h
index c516382fbec2..f04ba20712a2 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -10,7 +10,7 @@
 */
 #include <linux/config.h>
-#include <asm/smp.h>            /* cpu_online_map */
+#include <linux/smp.h>
 #if !defined(CONFIG_ARCH_S390)
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index e373c4a9de53..c03f2dc933de 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -37,6 +37,7 @@
 #include <linux/spinlock.h>
 #include <linux/rcupdate.h>
+#ifdef CONFIG_KPROBES
 #include <asm/kprobes.h>
 /* kprobe_status settings */
@@ -147,7 +148,6 @@ struct kretprobe_instance {
        struct task_struct *task;
 };
-#ifdef CONFIG_KPROBES
 extern spinlock_t kretprobe_lock;
 extern int arch_prepare_kprobe(struct kprobe *p);
 extern void arch_copy_kprobe(struct kprobe *p);
@@ -158,6 +158,7 @@ extern int arch_init_kprobes(void);
 extern void show_registers(struct pt_regs *regs);
 extern kprobe_opcode_t *get_insn_slot(void);
 extern void free_insn_slot(kprobe_opcode_t *slot);
+extern void kprobes_inc_nmissed_count(struct kprobe *p);
 /* Get the kprobe at this addr (if any) - called with preemption disabled */
 struct kprobe *get_kprobe(void *addr);
@@ -195,6 +196,11 @@ void add_rp_inst(struct kretprobe_instance *ri);
 void kprobe_flush_task(struct task_struct *tk);
 void recycle_rp_inst(struct kretprobe_instance *ri);
 #else /* CONFIG_KPROBES */
+#define __kprobes       /**/
+struct jprobe;
+struct kretprobe;
 static inline struct kprobe *kprobe_running(void)
 {
        return NULL;
diff --git a/include/linux/libata.h b/include/linux/libata.h
index f2dbb684ce9e..41ea7dbc1755 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -122,6 +122,7 @@ enum {
        ATA_FLAG_NOINTR         = (1 << 9), /* FIXME: Remove this once
                                             * proper HSM is in place. */
        ATA_FLAG_DEBUGMSG       = (1 << 10),
+        ATA_FLAG_NO_ATAPI       = (1 << 11), /* No ATAPI support */
        ATA_QCFLAG_ACTIVE       = (1 << 1), /* cmd not yet ack'd to scsi lyer */
        ATA_QCFLAG_SG           = (1 << 3), /* have s/g table? */
diff --git a/include/linux/list.h b/include/linux/list.h
index fbfca73355a3..8e3388284530 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -202,12 +202,15 @@ static inline void list_del_rcu(struct list_head *entry)
 *
 * The old entry will be replaced with the new entry atomically.
 */
-static inline void list_replace_rcu(struct list_head *old, struct list_head *new){
+static inline void list_replace_rcu(struct list_head *old,
+                                struct list_head *new)
+{
        new->next = old->next;
        new->prev = old->prev;
        smp_wmb();
        new->next->prev = new;
        new->prev->next = new;
+        old->prev = LIST_POISON2;
 }
 /**
@@ -578,6 +581,27 @@ static inline void hlist_del_init(struct hlist_node *n)
        }
 }
+/*
+ * hlist_replace_rcu - replace old entry by new one
+ * @old : the element to be replaced
+ * @new : the new element to insert
+ *
+ * The old entry will be replaced with the new entry atomically.
+ */
+static inline void hlist_replace_rcu(struct hlist_node *old,
+                                        struct hlist_node *new)
+{
+        struct hlist_node *next = old->next;
+        new->next = next;
+        new->pprev = old->pprev;
+        smp_wmb();
+        if (next)
+                new->next->pprev = &new->next;
+        *new->pprev = new;
+        old->pprev = LIST_POISON2;
+}
 static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
 {
        struct hlist_node *first = h->first;
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 29f02d8513f6..a06a84d347fb 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -163,7 +163,7 @@ extern unsigned int kobjsize(const void *objp);
 #define VM_HUGETLB      0x00400000      /* Huge TLB Page VM */
 #define VM_NONLINEAR    0x00800000      /* Is non-linear (remap_file_pages) */
 #define VM_MAPPED_COPY  0x01000000      /* T if mapped copy of data (nommu mmap) */
-#define VM_INCOMPLETE   0x02000000      /* Strange partial PFN mapping marker */
+#define VM_INSERTPAGE   0x02000000      /* The vma has had "vm_insert_page()" done on it */
 #ifndef VM_STACK_DEFAULT_FLAGS          /* arch can override this */
 #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS
diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h
index f1fd4215686a..7419b5fab133 100644
--- a/include/linux/mtd/onenand.h
+++ b/include/linux/mtd/onenand.h
@@ -17,7 +17,6 @@
 #include <linux/mtd/bbm.h>
 #define MAX_BUFFERRAM           2
-#define MAX_ONENAND_PAGESIZE    (2048 + 64)
 /* Scan and identify a OneNAND device */
 extern int onenand_scan(struct mtd_info *mtd, int max_chips);
@@ -110,6 +109,7 @@ struct onenand_chip {
        spinlock_t              chip_lock;
        wait_queue_head_t       wq;
        onenand_state_t         state;
+        unsigned char           *page_buf;
        struct nand_oobinfo     *autooob;
@@ -134,13 +134,12 @@ struct onenand_chip {
 * Options bits
 */
 #define ONENAND_CONT_LOCK               (0x0001)
+#define ONENAND_PAGEBUF_ALLOC           (0x1000)
 /*
 * OneNAND Flash Manufacturer ID Codes
 */
 #define ONENAND_MFR_SAMSUNG     0xec
-#define ONENAND_MFR_UNKNOWN     0x00
 /**
 * struct nand_manufacturers - NAND Flash Manufacturer ID Structure
diff --git a/include/linux/n_r3964.h b/include/linux/n_r3964.h
index 2352bcd31a06..db4f3776978a 100644
--- a/include/linux/n_r3964.h
+++ b/include/linux/n_r3964.h
@@ -13,6 +13,10 @@
 * L. Haag
 *
 * $Log: r3964.h,v $
+ * Revision 1.4  2005/12/21 19:54:24  Kurt Huwig <kurt huwig de>
+ * Fixed HZ usage on 2.6 kernels
+ * Removed unnecessary include
+ *
 * Revision 1.3  2001/03/18 13:02:24  dwmw2
 * Fix timer usage, use spinlocks properly.
 *
@@ -45,9 +49,11 @@
 #define __LINUX_N_R3964_H__
 /* line disciplines for r3964 protocol */
-#include <asm/termios.h>
 #ifdef __KERNEL__
+#include <linux/param.h>
 /*
 * Common ascii handshake characters:
 */
@@ -58,14 +64,14 @@
 #define NAK 0x15
 /*
- * Timeouts (msecs/10 msecs per timer interrupt):
+ * Timeouts (from milliseconds to jiffies)
 */
-#define R3964_TO_QVZ 550/10
+#define R3964_TO_QVZ ((550)*HZ/1000)
-#define R3964_TO_ZVZ 220/10
+#define R3964_TO_ZVZ ((220)*HZ/1000)
-#define R3964_TO_NO_BUF 400/10
+#define R3964_TO_NO_BUF ((400)*HZ/1000)
-#define R3964_NO_TX_ROOM 100/10
+#define R3964_NO_TX_ROOM ((100)*HZ/1000)
-#define R3964_TO_RX_PANIC 4000/10
+#define R3964_TO_RX_PANIC ((4000)*HZ/1000)
 #define R3964_MAX_RETRIES 5
 #endif
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 12787a9b0259..2516adeccecf 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -291,6 +291,7 @@ static inline int nfs_verify_change_attribute(struct inode *inode, unsigned long
 /*
 * linux/fs/nfs/inode.c
 */
+extern int nfs_sync_mapping(struct address_space *mapping);
 extern void nfs_zap_caches(struct inode *);
 extern struct inode *nfs_fhget(struct super_block *, struct nfs_fh *,
                                struct nfs_fattr *);
diff --git a/include/linux/parport_pc.h b/include/linux/parport_pc.h
index 7825c76cbd00..c6f762470879 100644
--- a/include/linux/parport_pc.h
+++ b/include/linux/parport_pc.h
@@ -86,7 +86,7 @@ extern __inline__ void dump_parport_state (char *str, struct parport *p)
        unsigned char dcr = inb (CONTROL (p));
        unsigned char dsr = inb (STATUS (p));
        static char *ecr_modes[] = {"SPP", "PS2", "PPFIFO", "ECP", "xXx", "yYy", "TST", "CFG"};
-        const struct parport_pc_private *priv = (parport_pc_private *)p->physport->private_data;
+        const struct parport_pc_private *priv = p->physport->private_data;
        int i;
        printk (KERN_DEBUG "*** parport state (%s): ecr=[%s", str, ecr_modes[(ecr & 0xe0) >> 5]);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 1e737e269db9..4db67b3b05cc 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1244,6 +1244,7 @@
 #define PCI_DEVICE_ID_VIA_8378_0        0x3205
 #define PCI_DEVICE_ID_VIA_8783_0        0x3208
 #define PCI_DEVICE_ID_VIA_8237          0x3227
+#define PCI_DEVICE_ID_VIA_8251          0x3287
 #define PCI_DEVICE_ID_VIA_3296_0        0x0296
 #define PCI_DEVICE_ID_VIA_8231          0x8231
 #define PCI_DEVICE_ID_VIA_8231_4        0x8235
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index d9a2f5254a51..5769d14d1e6a 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -48,6 +48,7 @@ do { \
 #define preempt_enable() \
 do { \
        preempt_enable_no_resched(); \
+        barrier(); \
        preempt_check_resched(); \
 } while (0)
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index cce25591eec2..a471f3bb713e 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -100,6 +100,7 @@ struct rcu_data {
        struct rcu_head *donelist;
        struct rcu_head **donetail;
        int cpu;
+        struct rcu_head barrier;
 };
 DECLARE_PER_CPU(struct rcu_data, rcu_data);
@@ -285,6 +286,7 @@ extern void FASTCALL(call_rcu_bh(struct rcu_head *head,
 extern __deprecated_for_modules void synchronize_kernel(void);
 extern void synchronize_rcu(void);
 void synchronize_idle(void);
+extern void rcu_barrier(void);
 #endif /* __KERNEL__ */
 #endif /* __LINUX_RCUPDATE_H */
diff --git a/include/linux/relayfs_fs.h b/include/linux/relayfs_fs.h
index cfafc3e76bc2..fb7e80737325 100644
--- a/include/linux/relayfs_fs.h
+++ b/include/linux/relayfs_fs.h
@@ -20,9 +20,9 @@
 #include <linux/kref.h>
 /*
- * Tracks changes to rchan_buf struct
+ * Tracks changes to rchan/rchan_buf structs
 */
-#define RELAYFS_CHANNEL_VERSION         5
+#define RELAYFS_CHANNEL_VERSION         6
 /*
 * Per-cpu relay channel buffer
@@ -60,6 +60,7 @@ struct rchan
        struct rchan_callbacks *cb;     /* client callbacks */
        struct kref kref;               /* channel refcount */
        void *private_data;             /* for user-defined data */
+        size_t last_toobig;             /* tried to log event > subbuf size */
        struct rchan_buf *buf[NR_CPUS]; /* per-cpu channel buffers */
 };
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index c231e9a08f0b..d50482ba27fe 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -866,6 +866,7 @@ enum rtnetlink_groups {
 #define RTNLGRP_IPV4_MROUTE     RTNLGRP_IPV4_MROUTE
        RTNLGRP_IPV4_ROUTE,
 #define RTNLGRP_IPV4_ROUTE      RTNLGRP_IPV4_ROUTE
+        RTNLGRP_NOP1,
        RTNLGRP_IPV6_IFADDR,
 #define RTNLGRP_IPV6_IFADDR     RTNLGRP_IPV6_IFADDR
        RTNLGRP_IPV6_MROUTE,
@@ -876,8 +877,11 @@ enum rtnetlink_groups {
 #define RTNLGRP_IPV6_IFINFO     RTNLGRP_IPV6_IFINFO
        RTNLGRP_DECnet_IFADDR,
 #define RTNLGRP_DECnet_IFADDR   RTNLGRP_DECnet_IFADDR
+        RTNLGRP_NOP2,
        RTNLGRP_DECnet_ROUTE,
 #define RTNLGRP_DECnet_ROUTE    RTNLGRP_DECnet_ROUTE
+        RTNLGRP_NOP3,
+        RTNLGRP_NOP4,
        RTNLGRP_IPV6_PREFIX,
 #define RTNLGRP_IPV6_PREFIX     RTNLGRP_IPV6_PREFIX
        __RTNLGRP_MAX
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 6bc03c911a83..4be34ef8c2f7 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -670,6 +670,9 @@ enum {
        NET_DECNET_DST_GC_INTERVAL = 9,
        NET_DECNET_CONF = 10,
        NET_DECNET_NO_FC_MAX_CWND = 11,
+        NET_DECNET_MEM = 12,
+        NET_DECNET_RMEM = 13,
+        NET_DECNET_WMEM = 14,
        NET_DECNET_DEBUG_LEVEL = 255
 };
diff --git a/include/linux/time.h b/include/linux/time.h
index bfbe92d0767c..797ccd813bb0 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -95,6 +95,7 @@ struct itimerval;
 extern int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue);
 extern int do_getitimer(int which, struct itimerval *value);
 extern void getnstimeofday (struct timespec *tv);
+extern void getnstimestamp(struct timespec *ts);
 extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index 2a897c3a6a9a..e5be2b9b846b 100644
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -14,7 +14,7 @@
 #include <linux/vmalloc.h>      /* for vmalloc() */
 #include <linux/mm.h>           /* for vmalloc_to_page() */
-#define SAA7146_VERSION_CODE 0x000500   /* 0.5.0 */
+#define SAA7146_VERSION_CODE 0x000500   /* 0.5.0 */
 #define saa7146_write(sxy,adr,dat)    writel((dat),(sxy->mem+(adr)))
 #define saa7146_read(sxy,adr)         readl(sxy->mem+(adr))
@@ -112,7 +112,7 @@ struct saa7146_dev
        /* different device locks */
        spinlock_t                      slock;
-        struct semaphore                lock;
+        struct semaphore                lock;
        unsigned char                   __iomem *mem;           /* pointer to mapped IO memory */
        int                             revision;       /* chip revision; needed for bug-workarounds*/
@@ -133,7 +133,7 @@ struct saa7146_dev
        void (*vv_callback)(struct saa7146_dev *dev, unsigned long status);
        /* i2c-stuff */
-        struct semaphore        i2c_lock;
+        struct semaphore        i2c_lock;
        u32                     i2c_bitrate;
        struct saa7146_dma      d_i2c;  /* pointer to i2c memory */
        wait_queue_head_t       i2c_wq;
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index 64691753721e..16af9299315f 100644
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -113,7 +113,7 @@ struct saa7146_vv
        /* vbi capture */
        struct saa7146_dmaqueue         vbi_q;
        /* vbi workaround interrupt queue */
-        wait_queue_head_t               vbi_wq;
+        wait_queue_head_t               vbi_wq;
        int                             vbi_fieldcount;
        struct saa7146_fh               *vbi_streaming;
@@ -181,10 +181,10 @@ struct saa7146_ext_vv
 };
 struct saa7146_use_ops  {
-        void (*init)(struct saa7146_dev *, struct saa7146_vv *);
+        void (*init)(struct saa7146_dev *, struct saa7146_vv *);
-        int(*open)(struct saa7146_dev *, struct file *);
+        int(*open)(struct saa7146_dev *, struct file *);
-        void (*release)(struct saa7146_dev *, struct file *);
+        void (*release)(struct saa7146_dev *, struct file *);
-        void (*irq_done)(struct saa7146_dev *, unsigned long status);
+        void (*irq_done)(struct saa7146_dev *, unsigned long status);
        ssize_t (*read)(struct file *, char __user *, size_t, loff_t *);
 };
diff --git a/include/net/dn.h b/include/net/dn.h
index c1dbbd222793..a4b6168e1e25 100644
--- a/include/net/dn.h
+++ b/include/net/dn.h
@@ -234,4 +234,8 @@ extern int decnet_di_count;
 extern int decnet_dr_count;
 extern int decnet_no_fc_max_cwnd;
+extern int sysctl_decnet_mem[3];
+extern int sysctl_decnet_wmem[3];
+extern int sysctl_decnet_rmem[3];
 #endif /* _NET_DN_H */
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index e97a9accb71d..eb8afe3499a9 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -24,6 +24,7 @@
 #define IF_RA_MANAGED   0x40
 #define IF_RA_RCVD      0x20
 #define IF_RS_SENT      0x10
+#define IF_READY        0x80000000
 /* prefix flags */
 #define IF_PREFIX_ONLINK        0x01
@@ -82,6 +83,7 @@ struct ipv6_mc_socklist
        struct in6_addr         addr;
        int                     ifindex;
        struct ipv6_mc_socklist *next;
+        rwlock_t                sflock;
        unsigned int            sfmode;         /* MCAST_{INCLUDE,EXCLUDE} */
        struct ip6_sf_socklist  *sflist;
 };
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 5beae1ccd574..1cdb87912137 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -890,6 +890,7 @@ struct xfrm_state * xfrm_find_acq(u8 mode, u32 reqid, u8 proto,
 extern void xfrm_policy_flush(void);
 extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol);
 extern int xfrm_flush_bundles(void);
+extern void xfrm_flush_all_bundles(void);
 extern int xfrm_bundle_ok(struct xfrm_dst *xdst, struct flowi *fl, int family);
 extern void xfrm_init_pmtu(struct dst_entry *dst);
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 7529f4388bb4..20da282d4abb 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -151,5 +151,6 @@ extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);
 extern void scsi_put_command(struct scsi_cmnd *);
 extern void scsi_io_completion(struct scsi_cmnd *, unsigned int, unsigned int);
 extern void scsi_finish_command(struct scsi_cmnd *cmd);
+extern void scsi_setup_blk_pc_cmnd(struct scsi_cmnd *cmd, int retries);
 #endif /* _SCSI_SCSI_CMND_H */
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index fac547d32a98..394f14a5b7cb 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -79,6 +79,7 @@ enum fc_port_state {
        FC_PORTSTATE_LINKDOWN,
        FC_PORTSTATE_ERROR,
        FC_PORTSTATE_LOOPBACK,
+        FC_PORTSTATE_DELETED,
 };
@@ -325,8 +326,14 @@ struct fc_host_attrs {
        struct list_head rport_bindings;
        u32 next_rport_number;
        u32 next_target_id;
+        u8 flags;
+        struct work_struct rport_del_work;
 };
+/* values for struct fc_host_attrs "flags" field: */
+#define FC_SHOST_RPORT_DEL_SCHEDULED    0x01
 #define fc_host_node_name(x) \
        (((struct fc_host_attrs *)(x)->shost_data)->node_name)
 #define fc_host_port_name(x)    \
@@ -365,6 +372,10 @@ struct fc_host_attrs {
        (((struct fc_host_attrs *)(x)->shost_data)->next_rport_number)
 #define fc_host_next_target_id(x) \
        (((struct fc_host_attrs *)(x)->shost_data)->next_target_id)
+#define fc_host_flags(x) \
+        (((struct fc_host_attrs *)(x)->shost_data)->flags)
+#define fc_host_rport_del_work(x) \
+        (((struct fc_host_attrs *)(x)->shost_data)->rport_del_work)
 /* The functions by which the transport class and the driver communicate */
diff --git a/init/Kconfig b/init/Kconfig
index ea097e0a9c02..9fc0759fa942 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -206,7 +206,7 @@ config HOTPLUG
          outside the kernel tree does. Such modules require Y here.
 config KOBJECT_UEVENT
-        bool "Kernel Userspace Events"
+        bool "Kernel Userspace Events" if EMBEDDED
        depends on NET
        default y
        help
@@ -256,6 +256,19 @@ config CPUSETS
 source "usr/Kconfig"
+config CC_OPTIMIZE_FOR_SIZE
+        bool "Optimize for size (Look out for broken compilers!)"
+        default y
+        depends on ARM || H8300 || EXPERIMENTAL
+        help
+          Enabling this option will pass "-Os" instead of "-O2" to gcc
+          resulting in a smaller kernel.
+          WARNING: some versions of gcc may generate incorrect code with this
+          option.  If problems are observed, a gcc upgrade may be needed.
+          If unsure, say N.
 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
        help
@@ -338,18 +351,6 @@ config EPOLL
          Disabling this option will cause the kernel to be built without
          support for epoll family of system calls.
-config CC_OPTIMIZE_FOR_SIZE
-        bool "Optimize for size" if EMBEDDED
-        default y if ARM || H8300
-        help
-          Enabling this option will pass "-Os" instead of "-O2" to gcc
-          resulting in a smaller kernel.
-          WARNING: some versions of gcc may generate incorrect code with this
-          option.  If problems are observed, a gcc upgrade may be needed.
-          If unsure, say N.
 config SHMEM
        bool "Use full shmem filesystem" if EMBEDDED
        default y
diff --git a/ipc/sem.c b/ipc/sem.c
index 19af028a3e38..cb5bb2a5df96 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -381,6 +381,7 @@ static void update_queue (struct sem_array * sma)
                        /* hands-off: q will disappear immediately after
                         * writing q->status.
                         */
+                        smp_wmb();
                        q->status = error;
                        q = n;
                } else {
@@ -461,6 +462,7 @@ static void freeary (struct sem_array *sma, int id)
                n = q->next;
                q->status = IN_WAKEUP;
                wake_up_process(q->sleeper); /* doesn't sleep */
+                smp_wmb();
                q->status = -EIDRM;     /* hands-off q */
                q = n;
        }
diff --git a/kernel/audit.c b/kernel/audit.c
index 0c56320d38dc..32fa03ad1984 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -291,8 +291,10 @@ int kauditd_thread(void *dummy)
                        set_current_state(TASK_INTERRUPTIBLE);
                        add_wait_queue(&kauditd_wait, &wait);
-                        if (!skb_queue_len(&audit_skb_queue))
+                        if (!skb_queue_len(&audit_skb_queue)) {
+                                try_to_freeze();
                                schedule();
+                        }
                        __set_current_state(TASK_RUNNING);
                        remove_wait_queue(&kauditd_wait, &wait);
diff --git a/kernel/futex.c b/kernel/futex.c
index 5872e3507f35..5e71a6bf6f6b 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -270,7 +270,13 @@ static void wake_futex(struct futex_q *q)
        /*
         * The waiting task can free the futex_q as soon as this is written,
         * without taking any locks.  This must come last.
+         *
+         * A memory barrier is required here to prevent the following store
+         * to lock_ptr from getting ahead of the wakeup. Clearing the lock
+         * at the end of wake_up_all() does not prevent this store from
+         * moving.
         */
+        wmb();
        q->lock_ptr = NULL;
 }
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 5beda378cc75..3bb71e63a37e 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -246,6 +246,19 @@ static int __kprobes aggr_break_handler(struct kprobe *p, struct pt_regs *regs)
        return ret;
 }
+/* Walks the list and increments nmissed count for multiprobe case */
+void __kprobes kprobes_inc_nmissed_count(struct kprobe *p)
+{
+        struct kprobe *kp;
+        if (p->pre_handler != aggr_pre_handler) {
+                p->nmissed++;
+        } else {
+                list_for_each_entry_rcu(kp, &p->list, list)
+                        kp->nmissed++;
+        }
+        return;
+}
 /* Called with kretprobe_lock held */
 struct kretprobe_instance __kprobes *get_free_rp_inst(struct kretprobe *rp)
 {
@@ -399,10 +412,7 @@ static inline void add_aggr_kprobe(struct kprobe *ap, struct kprobe *p)
        INIT_LIST_HEAD(&ap->list);
        list_add_rcu(&p->list, &ap->list);
-        INIT_HLIST_NODE(&ap->hlist);
+        hlist_replace_rcu(&p->hlist, &ap->hlist);
-        hlist_del_rcu(&p->hlist);
-        hlist_add_head_rcu(&ap->hlist,
-                &kprobe_table[hash_ptr(ap->addr, KPROBE_HASH_BITS)]);
 }
 /*
@@ -462,9 +472,16 @@ int __kprobes register_kprobe(struct kprobe *p)
        int ret = 0;
        unsigned long flags = 0;
        struct kprobe *old_p;
+        struct module *mod;
+        if ((!kernel_text_address((unsigned long) p->addr)) ||
+                in_kprobes_functions((unsigned long) p->addr))
+                return -EINVAL;
+        if ((mod = module_text_address((unsigned long) p->addr)) &&
+                        (unlikely(!try_module_get(mod))))
+                return -EINVAL;
-        if ((ret = in_kprobes_functions((unsigned long) p->addr)) != 0)
-                return ret;
        if ((ret = arch_prepare_kprobe(p)) != 0)
                goto rm_kprobe;
@@ -488,6 +505,8 @@ out:
 rm_kprobe:
        if (ret == -EEXIST)
                arch_remove_kprobe(p);
+        if (ret && mod)
+                module_put(mod);
        return ret;
 }
@@ -495,6 +514,7 @@ void __kprobes unregister_kprobe(struct kprobe *p)
 {
        unsigned long flags;
        struct kprobe *old_p;
+        struct module *mod;
        spin_lock_irqsave(&kprobe_lock, flags);
        old_p = get_kprobe(p->addr);
@@ -506,6 +526,10 @@ void __kprobes unregister_kprobe(struct kprobe *p)
                        cleanup_kprobe(p, flags);
                synchronize_sched();
+                if ((mod = module_text_address((unsigned long)p->addr)))
+                        module_put(mod);
                if (old_p->pre_handler == aggr_pre_handler &&
                                list_empty(&old_p->list))
                        kfree(old_p);
diff --git a/kernel/params.c b/kernel/params.c
index 47ba69547945..c76ad25e6a21 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -619,7 +619,7 @@ static void __init param_sysfs_builtin(void)
 /* module-related sysfs stuff */
-#ifdef CONFIG_MODULES
+#ifdef CONFIG_SYSFS
 #define to_module_attr(n) container_of(n, struct module_attribute, attr);
 #define to_module_kobject(n) container_of(n, struct module_kobject, kobj);
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
index c4d159a21e04..48d3bce465b8 100644
--- a/kernel/rcupdate.c
+++ b/kernel/rcupdate.c
@@ -116,6 +116,10 @@ void fastcall call_rcu(struct rcu_head *head,
        local_irq_restore(flags);
 }
+static atomic_t rcu_barrier_cpu_count;
+static struct semaphore rcu_barrier_sema;
+static struct completion rcu_barrier_completion;
 /**
 * call_rcu_bh - Queue an RCU for invocation after a quicker grace period.
 * @head: structure to be used for queueing the RCU updates.
@@ -162,6 +166,42 @@ long rcu_batches_completed(void)
        return rcu_ctrlblk.completed;
 }
+static void rcu_barrier_callback(struct rcu_head *notused)
+{
+        if (atomic_dec_and_test(&rcu_barrier_cpu_count))
+                complete(&rcu_barrier_completion);
+}
+/*
+ * Called with preemption disabled, and from cross-cpu IRQ context.
+ */
+static void rcu_barrier_func(void *notused)
+{
+        int cpu = smp_processor_id();
+        struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
+        struct rcu_head *head;
+        head = &rdp->barrier;
+        atomic_inc(&rcu_barrier_cpu_count);
+        call_rcu(head, rcu_barrier_callback);
+}
+/**
+ * rcu_barrier - Wait until all the in-flight RCUs are complete.
+ */
+void rcu_barrier(void)
+{
+        BUG_ON(in_interrupt());
+        /* Take cpucontrol semaphore to protect against CPU hotplug */
+        down(&rcu_barrier_sema);
+        init_completion(&rcu_barrier_completion);
+        atomic_set(&rcu_barrier_cpu_count, 0);
+        on_each_cpu(rcu_barrier_func, NULL, 0, 1);
+        wait_for_completion(&rcu_barrier_completion);
+        up(&rcu_barrier_sema);
+}
+EXPORT_SYMBOL_GPL(rcu_barrier);
 /*
 * Invoke the completed RCU callbacks. They are expected to be in
 * a per-cpu list.
@@ -217,15 +257,23 @@ static void rcu_start_batch(struct rcu_ctrlblk *rcp, struct rcu_state *rsp,
        if (rcp->next_pending &&
                        rcp->completed == rcp->cur) {
-                /* Can't change, since spin lock held. */
-                cpus_andnot(rsp->cpumask, cpu_online_map, nohz_cpu_mask);
                rcp->next_pending = 0;
-                /* next_pending == 0 must be visible in __rcu_process_callbacks()
+                /*
-                 * before it can see new value of cur.
+                 * next_pending == 0 must be visible in
+                 * __rcu_process_callbacks() before it can see new value of cur.
                 */
                smp_wmb();
                rcp->cur++;
+                /*
+                 * Accessing nohz_cpu_mask before incrementing rcp->cur needs a
+                 * Barrier  Otherwise it can cause tickless idle CPUs to be
+                 * included in rsp->cpumask, which will extend graceperiods
+                 * unnecessarily.
+                 */
+                smp_mb();
+                cpus_andnot(rsp->cpumask, cpu_online_map, nohz_cpu_mask);
        }
 }
@@ -457,6 +505,7 @@ static struct notifier_block __devinitdata rcu_nb = {
 */
 void __init rcu_init(void)
 {
+        sema_init(&rcu_barrier_sema, 1);
        rcu_cpu_notify(&rcu_nb, CPU_UP_PREPARE,
                        (void *)(long)smp_processor_id());
        /* Register notifier for non-boot CPUs */
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
index 88c28d476550..49fbbeff201c 100644
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
@@ -409,9 +409,8 @@ rcu_torture_cleanup(void)
        stats_task = NULL;
        /* Wait for all RCU callbacks to fire.  */
+        rcu_barrier();
-        for (i = 0; i < RCU_TORTURE_PIPE_LEN; i++)
-                synchronize_rcu();
        rcu_torture_stats_print();  /* -After- the stats thread is stopped! */
        printk(KERN_ALERT TORTURE_FLAG
               "--- End of test: %s\n",
diff --git a/kernel/sys.c b/kernel/sys.c
index bce933ebb29f..eecf84526afe 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -32,6 +32,7 @@
 #include <linux/compat.h>
 #include <linux/syscalls.h>
+#include <linux/kprobes.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -168,7 +169,7 @@ EXPORT_SYMBOL(notifier_chain_unregister);
 *      of the last notifier function called.
 */
 
-int notifier_call_chain(struct notifier_block **n, unsigned long val, void *v)
+int __kprobes notifier_call_chain(struct notifier_block **n, unsigned long val, void *v)
 {
        int ret=NOTIFY_DONE;
        struct notifier_block *nb = *n;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 9990e10192e8..b53115b882e1 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -2192,29 +2192,32 @@ int sysctl_string(ctl_table *table, int __user *name, int nlen,
                  void __user *oldval, size_t __user *oldlenp,
                  void __user *newval, size_t newlen, void **context)
 {
-        size_t l, len;
-        
        if (!table->data || !table->maxlen) 
                return -ENOTDIR;
        
        if (oldval && oldlenp) {
-                if (get_user(len, oldlenp))
+                size_t bufsize;
+                if (get_user(bufsize, oldlenp))
                        return -EFAULT;
-                if (len) {
+                if (bufsize) {
-                        l = strlen(table->data);
+                        size_t len = strlen(table->data), copied;
-                        if (len > l) len = l;
-                        if (len >= table->maxlen)
+                        /* This shouldn't trigger for a well-formed sysctl */
+                        if (len > table->maxlen)
                                len = table->maxlen;
-                        if(copy_to_user(oldval, table->data, len))
-                                return -EFAULT;
+                        /* Copy up to a max of bufsize-1 bytes of the string */
-                        if(put_user(0, ((char __user *) oldval) + len))
+                        copied = (len >= bufsize) ? bufsize - 1 : len;
+                        if (copy_to_user(oldval, table->data, copied) ||
+                            put_user(0, (char __user *)(oldval + copied)))
                                return -EFAULT;
-                        if(put_user(len, oldlenp))
+                        if (put_user(len, oldlenp))
                                return -EFAULT;
                }
        }
        if (newval && newlen) {
-                len = newlen;
+                size_t len = newlen;
                if (len > table->maxlen)
                        len = table->maxlen;
                if(copy_from_user(table->data, newval, len))
@@ -2223,7 +2226,7 @@ int sysctl_string(ctl_table *table, int __user *name, int nlen,
                        len--;
                ((char *) table->data)[len] = 0;
        }
-        return 0;
+        return 1;
 }
 /*
diff --git a/kernel/time.c b/kernel/time.c
index 245d595a13cb..b94bfa8c03e0 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -561,6 +561,28 @@ void getnstimeofday(struct timespec *tv)
 EXPORT_SYMBOL_GPL(getnstimeofday);
 #endif
+void getnstimestamp(struct timespec *ts)
+{
+        unsigned int seq;
+        struct timespec wall2mono;
+        /* synchronize with settimeofday() changes */
+        do {
+                seq = read_seqbegin(&xtime_lock);
+                getnstimeofday(ts);
+                wall2mono = wall_to_monotonic;
+        } while(unlikely(read_seqretry(&xtime_lock, seq)));
+        /* adjust to monotonicaly-increasing values */
+        ts->tv_sec += wall2mono.tv_sec;
+        ts->tv_nsec += wall2mono.tv_nsec;
+        while (unlikely(ts->tv_nsec >= NSEC_PER_SEC)) {
+                ts->tv_nsec -= NSEC_PER_SEC;
+                ts->tv_sec++;
+        }
+}
+EXPORT_SYMBOL_GPL(getnstimestamp);
 #if (BITS_PER_LONG < 64)
 u64 get_jiffies_64(void)
 {
diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c
index 906ad101eab3..dcd4be9bd4e5 100644
--- a/lib/spinlock_debug.c
+++ b/lib/spinlock_debug.c
@@ -20,7 +20,8 @@ static void spin_bug(spinlock_t *lock, const char *msg)
                if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT)
                        owner = lock->owner;
                printk("BUG: spinlock %s on CPU#%d, %s/%d\n",
-                        msg, smp_processor_id(), current->comm, current->pid);
+                        msg, raw_smp_processor_id(),
+                        current->comm, current->pid);
                printk(" lock: %p, .magic: %08x, .owner: %s/%d, .owner_cpu: %d\n",
                        lock, lock->magic,
                        owner ? owner->comm : "<none>",
@@ -78,8 +79,8 @@ static void __spin_lock_debug(spinlock_t *lock)
                if (print_once) {
                        print_once = 0;
                        printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p\n",
-                                smp_processor_id(), current->comm, current->pid,
+                                raw_smp_processor_id(), current->comm,
-                                        lock);
+                                current->pid, lock);
                        dump_stack();
                }
        }
@@ -120,7 +121,8 @@ static void rwlock_bug(rwlock_t *lock, const char *msg)
        if (xchg(&print_once, 0)) {
                printk("BUG: rwlock %s on CPU#%d, %s/%d, %p\n", msg,
-                        smp_processor_id(), current->comm, current->pid, lock);
+                        raw_smp_processor_id(), current->comm,
+                        current->pid, lock);
                dump_stack();
 #ifdef CONFIG_SMP
                /*
@@ -148,8 +150,8 @@ static void __read_lock_debug(rwlock_t *lock)
                if (print_once) {
                        print_once = 0;
                        printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p\n",
-                                smp_processor_id(), current->comm, current->pid,
+                                raw_smp_processor_id(), current->comm,
-                                        lock);
+                                current->pid, lock);
                        dump_stack();
                }
        }
@@ -220,8 +222,8 @@ static void __write_lock_debug(rwlock_t *lock)
                if (print_once) {
                        print_once = 0;
                        printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p\n",
-                                smp_processor_id(), current->comm, current->pid,
+                                raw_smp_processor_id(), current->comm,
-                                        lock);
+                                current->pid, lock);
                        dump_stack();
                }
        }
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 57216f3544ca..1ff8dcebf7c6 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -704,8 +704,9 @@ swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg, int nelems,
                addr = SG_ENT_VIRT_ADDRESS(sg);
                dev_addr = virt_to_phys(addr);
                if (swiotlb_force || address_needs_mapping(hwdev, dev_addr)) {
-                        sg->dma_address = (dma_addr_t) virt_to_phys(map_single(hwdev, addr, sg->length, dir));
+                        void *map = map_single(hwdev, addr, sg->length, dir);
-                        if (!sg->dma_address) {
+                        sg->dma_address = virt_to_bus(map);
+                        if (!map) {
                                /* Don't panic here, we expect map_sg users
                                   to do proper error handling. */
                                swiotlb_full(hwdev, sg->length, dir, 0);
diff --git a/mm/bootmem.c b/mm/bootmem.c
index e8c567177dcf..16b9465eb4eb 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -204,6 +204,8 @@ restart_scan:
                unsigned long j;
                i = find_next_zero_bit(bdata->node_bootmem_map, eidx, i);
                i = ALIGN(i, incr);
+                if (i >= eidx)
+                        break;
                if (test_bit(i, bdata->node_bootmem_map))
                        continue;
                for (j = i + 1; j < i + areasize; ++j) {
diff --git a/mm/memory.c b/mm/memory.c
index aa8af0e20269..d8dde07a3656 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -349,6 +349,11 @@ void print_bad_pte(struct vm_area_struct *vma, pte_t pte, unsigned long vaddr)
        dump_stack();
 }
+static inline int is_cow_mapping(unsigned int flags)
+{
+        return (flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE;
+}
 /*
 * This function gets the "struct page" associated with a pte.
 *
@@ -377,6 +382,8 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr, pte_
                unsigned long off = (addr - vma->vm_start) >> PAGE_SHIFT;
                if (pfn == vma->vm_pgoff + off)
                        return NULL;
+                if (!is_cow_mapping(vma->vm_flags))
+                        return NULL;
        }
        /*
@@ -437,7 +444,7 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,
         * If it's a COW mapping, write protect it both
         * in the parent and the child
         */
-        if ((vm_flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE) {
+        if (is_cow_mapping(vm_flags)) {
                ptep_set_wrprotect(src_mm, addr, src_pte);
                pte = *src_pte;
        }
@@ -567,7 +574,7 @@ int copy_page_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
         * readonly mappings. The tradeoff is that copy_page_range is more
         * efficient than faulting.
         */
-        if (!(vma->vm_flags & (VM_HUGETLB|VM_NONLINEAR|VM_PFNMAP))) {
+        if (!(vma->vm_flags & (VM_HUGETLB|VM_NONLINEAR|VM_PFNMAP|VM_INSERTPAGE))) {
                if (!vma->anon_vma)
                        return 0;
        }
@@ -1002,7 +1009,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
                        continue;
                }
-                if (!vma || (vma->vm_flags & VM_IO)
+                if (!vma || (vma->vm_flags & (VM_IO | VM_PFNMAP))
                                || !(vm_flags & vma->vm_flags))
                        return i ? : -EFAULT;
@@ -1221,55 +1228,12 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, struct page *
                return -EFAULT;
        if (!page_count(page))
                return -EINVAL;
+        vma->vm_flags |= VM_INSERTPAGE;
        return insert_page(vma->vm_mm, addr, page, vma->vm_page_prot);
 }
 EXPORT_SYMBOL(vm_insert_page);
 /*
- * Somebody does a pfn remapping that doesn't actually work as a vma.
- *
- * Do it as individual pages instead, and warn about it. It's bad form,
- * and very inefficient.
- */
-static int incomplete_pfn_remap(struct vm_area_struct *vma,
-                unsigned long start, unsigned long end,
-                unsigned long pfn, pgprot_t prot)
-{
-        static int warn = 10;
-        struct page *page;
-        int retval;
-        if (!(vma->vm_flags & VM_INCOMPLETE)) {
-                if (warn) {
-                        warn--;
-                        printk("%s does an incomplete pfn remapping", current->comm);
-                        dump_stack();
-                }
-        }
-        vma->vm_flags |= VM_INCOMPLETE | VM_IO | VM_RESERVED;
-        if (start < vma->vm_start || end > vma->vm_end)
-                return -EINVAL;
-        if (!pfn_valid(pfn))
-                return -EINVAL;
-        page = pfn_to_page(pfn);
-        if (!PageReserved(page))
-                return -EINVAL;
-        retval = 0;
-        while (start < end) {
-                retval = insert_page(vma->vm_mm, start, page, prot);
-                if (retval < 0)
-                        break;
-                start += PAGE_SIZE;
-                page++;
-        }
-        return retval;
-}
-/*
 * maps a range of physical memory into the requested pages. the old
 * mappings are removed. any references to nonexistent pages results
 * in null mappings (currently treated as "copy-on-access")
@@ -1343,9 +1307,6 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
        struct mm_struct *mm = vma->vm_mm;
        int err;
-        if (addr != vma->vm_start || end != vma->vm_end)
-                return incomplete_pfn_remap(vma, addr, end, pfn, prot);
        /*
         * Physically remapped pages are special. Tell the
         * rest of the world about it:
@@ -1359,9 +1320,18 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
         *   VM_PFNMAP tells the core MM that the base pages are just
         *      raw PFN mappings, and do not have a "struct page" associated
         *      with them.
+         *
+         * There's a horrible special case to handle copy-on-write
+         * behaviour that some programs depend on. We mark the "original"
+         * un-COW'ed pages by matching them up with "vma->vm_pgoff".
         */
+        if (is_cow_mapping(vma->vm_flags)) {
+                if (addr != vma->vm_start || end != vma->vm_end)
+                        return -EINVAL;
+                vma->vm_pgoff = pfn;
+        }
        vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
-        vma->vm_pgoff = pfn;
        BUG_ON(addr >= end);
        pfn -= addr >> PAGE_SHIFT;
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 431a64f021c0..f6d4af8af8a8 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -104,7 +104,7 @@ static void grow_pgdat_span(struct pglist_data *pgdat,
                pgdat->node_start_pfn = start_pfn;
        if (end_pfn > old_pgdat_end_pfn)
-                pgdat->node_spanned_pages = end_pfn - pgdat->node_spanned_pages;
+                pgdat->node_spanned_pages = end_pfn - pgdat->node_start_pfn;
 }
 int online_pages(unsigned long pfn, unsigned long nr_pages)
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index bec88c81244e..72f402cc9c9a 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -161,6 +161,10 @@ static struct mempolicy *mpol_new(int mode, nodemask_t *nodes)
        switch (mode) {
        case MPOL_INTERLEAVE:
                policy->v.nodes = *nodes;
+                if (nodes_weight(*nodes) == 0) {
+                        kmem_cache_free(policy_cache, policy);
+                        return ERR_PTR(-EINVAL);
+                }
                break;
        case MPOL_PREFERRED:
                policy->v.preferred_node = first_node(*nodes);
diff --git a/mm/mmap.c b/mm/mmap.c
index 11ca5927d5ff..64ba4dbcb7de 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -611,7 +611,7 @@ again:			remove_next = 1 + (end > next->vm_end);
 * If the vma has a ->close operation then the driver probably needs to release
 * per-vma resources, so we don't attempt to merge those.
 */
-#define VM_SPECIAL (VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED)
+#define VM_SPECIAL (VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED | VM_PFNMAP)
 static inline int is_mergeable_vma(struct vm_area_struct *vma,
                        struct file *file, unsigned long vm_flags)
diff --git a/mm/mremap.c b/mm/mremap.c
index b535438c363c..ddaeee9a0b69 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -323,7 +323,7 @@ unsigned long do_mremap(unsigned long addr,
        /* We can't remap across vm area boundaries */
        if (old_len > vma->vm_end - addr)
                goto out;
-        if (vma->vm_flags & VM_DONTEXPAND) {
+        if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP)) {
                if (new_len > old_len)
                        goto out;
        }
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3b21a13d841c..fe14a8c87fc2 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1896,7 +1896,7 @@ static int __devinit pageset_cpuup_callback(struct notifier_block *nfb,
 static struct notifier_block pageset_notifier =
        { &pageset_cpuup_callback, NULL, 0 };
-void __init setup_per_cpu_pageset()
+void __init setup_per_cpu_pageset(void)
 {
        int err;
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 91e412b0ab00..67465b65abe4 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -753,6 +753,8 @@ static int vlan_ioctl_handler(void __user *arg)
                break;
        case GET_VLAN_REALDEV_NAME_CMD:
                err = vlan_dev_get_realdev_name(args.device1, args.u.device2);
+                if (err)
+                        goto out;
                if (copy_to_user(arg, &args,
                                 sizeof(struct vlan_ioctl_args))) {
                        err = -EFAULT;
@@ -761,6 +763,8 @@ static int vlan_ioctl_handler(void __user *arg)
        case GET_VLAN_VID_CMD:
                err = vlan_dev_get_vid(args.device1, &vid);
+                if (err)
+                        goto out;
                args.u.VID = vid;
                if (copy_to_user(arg, &args,
                                 sizeof(struct vlan_ioctl_args))) {
@@ -774,7 +778,7 @@ static int vlan_ioctl_handler(void __user *arg)
                        __FUNCTION__, args.cmd);
                return -EINVAL;
        };
+out:
        return err;
 }
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index b74864889670..f2a8750bbf1d 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -165,6 +165,9 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
        skb_pull(skb, VLAN_HLEN); /* take off the VLAN header (4 bytes currently) */
+        /* Need to correct hardware checksum */
+        skb_postpull_rcsum(skb, vhdr, VLAN_HLEN);
        /* Ok, lets check to make sure the device (dev) we
         * came in on is what this VLAN is attached to.
         */
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index d8e36b775125..23422bd53a5e 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -295,7 +295,7 @@ static int check_hbh_len(struct sk_buff *skb)
        len -= 2;
        while (len > 0) {
-                int optlen = raw[off+1]+2;
+                int optlen = skb->nh.raw[off+1]+2;
                switch (skb->nh.raw[off]) {
                case IPV6_TLV_PAD0:
@@ -308,18 +308,15 @@ static int check_hbh_len(struct sk_buff *skb)
                case IPV6_TLV_JUMBO:
                        if (skb->nh.raw[off+1] != 4 || (off&3) != 2)
                                goto bad;
                        pkt_len = ntohl(*(u32*)(skb->nh.raw+off+2));
+                        if (pkt_len <= IPV6_MAXPLEN ||
+                            skb->nh.ipv6h->payload_len)
+                                goto bad;
                        if (pkt_len > skb->len - sizeof(struct ipv6hdr))
                                goto bad;
-                        if (pkt_len + sizeof(struct ipv6hdr) < skb->len) {
+                        if (pskb_trim_rcsum(skb,
-                                if (__pskb_trim(skb,
+                            pkt_len+sizeof(struct ipv6hdr)))
-                                    pkt_len + sizeof(struct ipv6hdr)))
+                                goto bad;
-                                        goto bad;
-                                if (skb->ip_summed == CHECKSUM_HW)
-                                        skb->ip_summed = CHECKSUM_NONE;
-                        }
                        break;
                default:
                        if (optlen > len)
@@ -372,6 +369,7 @@ static unsigned int br_nf_pre_routing_ipv6(unsigned int hook,
        if (hdr->nexthdr == NEXTHDR_HOP && check_hbh_len(skb))
                        goto inhdr_error;
+        nf_bridge_put(skb->nf_bridge);
        if ((nf_bridge = nf_bridge_alloc(skb)) == NULL)
                return NF_DROP;
        setup_pre_routing(skb);
@@ -455,6 +453,7 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
                        skb->ip_summed = CHECKSUM_NONE;
        }
+        nf_bridge_put(skb->nf_bridge);
        if ((nf_bridge = nf_bridge_alloc(skb)) == NULL)
                return NF_DROP;
        setup_pre_routing(skb);
diff --git a/net/core/dev.c b/net/core/dev.c
index 0b48e294aafe..a5efc9ae010b 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1113,7 +1113,8 @@ out:
 void netdev_rx_csum_fault(struct net_device *dev)
 {
        if (net_ratelimit()) {
-                printk(KERN_ERR "%s: hw csum failure.\n", dev->name);
+                printk(KERN_ERR "%s: hw csum failure.\n", 
+                        dev ? dev->name : "<unknown>");
                dump_stack();
        }
 }
diff --git a/net/core/filter.c b/net/core/filter.c
index 2841bfce29d6..3a10e0bc90e8 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -293,7 +293,7 @@ int sk_chk_filter(struct sock_filter *filter, int flen)
        struct sock_filter *ftest;
        int pc;
-        if (((unsigned int)flen >= (~0U / sizeof(struct sock_filter))) || flen == 0)
+        if (flen == 0 || flen > BPF_MAXINSNS)
                return -EINVAL;
        /* check the filter code now */
@@ -360,7 +360,7 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
        int err;
        /* Make sure new filter is there and in the right amounts. */
-        if (fprog->filter == NULL || fprog->len > BPF_MAXINSNS)
+        if (fprog->filter == NULL)
                return -EINVAL;
        fp = sock_kmalloc(sk, fsize+sizeof(*fp), GFP_KERNEL);
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index b7d13a4fff48..83fee37de38e 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -1725,7 +1725,7 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from,
 * of the skb if any page alloc fails user this procedure returns  -ENOMEM
 */
 int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb,
-                        int getfrag(void *from, char *to, int offset,
+                        int (*getfrag)(void *from, char *to, int offset,
                                        int len, int odd, struct sk_buff *skb),
                        void *from, int length)
 {
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index ca03521112c5..656e13e38cfb 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -1251,7 +1251,7 @@ static int dccp_v4_destroy_sock(struct sock *sk)
        struct dccp_sock *dp = dccp_sk(sk);
        /*
-         * DCCP doesn't use sk_qrite_queue, just sk_send_head
+         * DCCP doesn't use sk_write_queue, just sk_send_head
         * for retransmissions
         */
        if (sk->sk_send_head != NULL) {
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index f89e55f814d9..d402e9020c68 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -153,6 +153,7 @@ static struct proto_ops dn_proto_ops;
 static DEFINE_RWLOCK(dn_hash_lock);
 static struct hlist_head dn_sk_hash[DN_SK_HASH_SIZE];
 static struct hlist_head dn_wild_sk;
+static atomic_t decnet_memory_allocated;
 static int __dn_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen, int flags);
 static int __dn_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen, int flags);
@@ -446,10 +447,26 @@ static void dn_destruct(struct sock *sk)
        dst_release(xchg(&sk->sk_dst_cache, NULL));
 }
+static int dn_memory_pressure;
+static void dn_enter_memory_pressure(void)
+{
+        if (!dn_memory_pressure) {
+                dn_memory_pressure = 1;
+        }
+}
 static struct proto dn_proto = {
-        .name     = "DECNET",
+        .name                   = "NSP",
-        .owner    = THIS_MODULE,
+        .owner                  = THIS_MODULE,
-        .obj_size = sizeof(struct dn_sock),
+        .enter_memory_pressure  = dn_enter_memory_pressure,
+        .memory_pressure        = &dn_memory_pressure,
+        .memory_allocated       = &decnet_memory_allocated,
+        .sysctl_mem             = sysctl_decnet_mem,
+        .sysctl_wmem            = sysctl_decnet_wmem,
+        .sysctl_rmem            = sysctl_decnet_rmem,
+        .max_header             = DN_MAX_NSP_DATA_HEADER + 64,
+        .obj_size               = sizeof(struct dn_sock),
 };
 static struct sock *dn_alloc_sock(struct socket *sock, gfp_t gfp)
@@ -470,6 +487,8 @@ static struct sock *dn_alloc_sock(struct socket *sock, gfp_t gfp)
        sk->sk_family      = PF_DECnet;
        sk->sk_protocol    = 0;
        sk->sk_allocation  = gfp;
+        sk->sk_sndbuf      = sysctl_decnet_wmem[1];
+        sk->sk_rcvbuf      = sysctl_decnet_rmem[1];
        /* Initialization of DECnet Session Control Port                */
        scp = DN_SK(sk);
diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
index 02bca49cb508..0e9d2c571165 100644
--- a/net/decnet/sysctl_net_decnet.c
+++ b/net/decnet/sysctl_net_decnet.c
@@ -10,6 +10,7 @@
 *
 * Changes:
 * Steve Whitehouse - C99 changes and default device handling
+ * Steve Whitehouse - Memory buffer settings, like the tcp ones
 *
 */
 #include <linux/config.h>
@@ -37,6 +38,11 @@ int decnet_dr_count = 3;
 int decnet_log_martians = 1;
 int decnet_no_fc_max_cwnd = NSP_MIN_WINDOW;
+/* Reasonable defaults, I hope, based on tcp's defaults */
+int sysctl_decnet_mem[3] = { 768 << 3, 1024 << 3, 1536 << 3 };
+int sysctl_decnet_wmem[3] = { 4 * 1024, 16 * 1024, 128 * 1024 };
+int sysctl_decnet_rmem[3] = { 4 * 1024, 87380, 87380 * 2 };
 #ifdef CONFIG_SYSCTL
 extern int decnet_dst_gc_interval;
 static int min_decnet_time_wait[] = { 5 };
@@ -428,6 +434,33 @@ static ctl_table dn_table[] = {
                .extra1 = &min_decnet_no_fc_max_cwnd,
                .extra2 = &max_decnet_no_fc_max_cwnd
        },
+       {
+                .ctl_name = NET_DECNET_MEM,
+                .procname = "decnet_mem",
+                .data = &sysctl_decnet_mem,
+                .maxlen = sizeof(sysctl_decnet_mem),
+                .mode = 0644,
+                .proc_handler = &proc_dointvec,
+                .strategy = &sysctl_intvec,
+        },
+        {
+                .ctl_name = NET_DECNET_RMEM,
+                .procname = "decnet_rmem",
+                .data = &sysctl_decnet_rmem,
+                .maxlen = sizeof(sysctl_decnet_rmem),
+                .mode = 0644,
+                .proc_handler = &proc_dointvec,
+                .strategy = &sysctl_intvec,
+        },
+        {
+                .ctl_name = NET_DECNET_WMEM,
+                .procname = "decnet_wmem",
+                .data = &sysctl_decnet_wmem,
+                .maxlen = sizeof(sysctl_decnet_wmem),
+                .mode = 0644,
+                .proc_handler = &proc_dointvec,
+                .strategy = &sysctl_intvec,
+        },
        {
                .ctl_name = NET_DECNET_DEBUG_LEVEL,
                .procname = "debug",
diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index 91b16fbf91f0..d18ccba3ea9e 100644
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -55,7 +55,7 @@ config IEEE80211_CRYPT_CCMP
 config IEEE80211_CRYPT_TKIP
        tristate "IEEE 802.11i TKIP encryption"
-        depends on IEEE80211
+        depends on IEEE80211 && NET_RADIO
        select CRYPTO
        select CRYPTO_MICHAEL_MIC
        ---help---
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index a4c347c3b8e3..46f9d9cf7a5f 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -618,7 +618,7 @@ static int ipgre_rcv(struct sk_buff *skb)
                skb->mac.raw = skb->nh.raw;
                skb->nh.raw = __pskb_pull(skb, offset);
-                skb_postpull_rcsum(skb, skb->mac.raw, offset);
+                skb_postpull_rcsum(skb, skb->h.raw, offset);
                memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
                skb->pkt_type = PACKET_HOST;
 #ifdef CONFIG_NET_IPGRE_BROADCAST
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 0bc00528d888..88a60650e6b8 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -56,8 +56,8 @@ config IP_NF_CONNTRACK_MARK
          instead of the individual packets.
        
 config IP_NF_CONNTRACK_EVENTS
-        bool "Connection tracking events"
+        bool "Connection tracking events (EXPERIMENTAL)"
-        depends on IP_NF_CONNTRACK
+        depends on EXPERIMENTAL && IP_NF_CONNTRACK
        help
          If this option is enabled, the connection tracking code will
          provide a notifier chain that can be used by other kernel code
@@ -66,8 +66,8 @@ config IP_NF_CONNTRACK_EVENTS
          IF unsure, say `N'.
 config IP_NF_CONNTRACK_NETLINK
-        tristate 'Connection tracking netlink interface'
+        tristate 'Connection tracking netlink interface (EXPERIMENTAL)'
-        depends on IP_NF_CONNTRACK && NETFILTER_NETLINK
+        depends on EXPERIMENTAL && IP_NF_CONNTRACK && NETFILTER_NETLINK
        depends on IP_NF_CONNTRACK!=y || NETFILTER_NETLINK!=m
        help
          This option enables support for a netlink-based userspace interface
diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile
index 058c48e258fc..d0a447e520a2 100644
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -12,6 +12,7 @@ ip_nat_pptp-objs	:= ip_nat_helper_pptp.o ip_nat_proto_gre.o
 # connection tracking
 obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o
+obj-$(CONFIG_IP_NF_NAT) += ip_nat.o
 # conntrack netlink interface
 obj-$(CONFIG_IP_NF_CONNTRACK_NETLINK) += ip_conntrack_netlink.o
@@ -41,7 +42,7 @@ obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
 # the three instances of ip_tables
 obj-$(CONFIG_IP_NF_FILTER) += iptable_filter.o
 obj-$(CONFIG_IP_NF_MANGLE) += iptable_mangle.o
-obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o ip_nat.o
+obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o
 obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o
 # matches
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
index 7a4ecddd597b..84c66dbfedaf 100644
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -1345,6 +1345,11 @@ static int kill_all(struct ip_conntrack *i, void *data)
        return 1;
 }
+void ip_conntrack_flush(void)
+{
+        ip_ct_iterate_cleanup(kill_all, NULL);
+}
 static void free_conntrack_hash(struct list_head *hash, int vmalloced,int size)
 {
        if (vmalloced)
@@ -1354,8 +1359,12 @@ static void free_conntrack_hash(struct list_head *hash, int vmalloced,int size)
                           get_order(sizeof(struct list_head) * size));
 }
-void ip_conntrack_flush(void)
+/* Mishearing the voices in his head, our hero wonders how he's
+   supposed to kill the mall. */
+void ip_conntrack_cleanup(void)
 {
+        ip_ct_attach = NULL;
        /* This makes sure all current packets have passed through
           netfilter framework.  Roll on, two-stage module
           delete... */
@@ -1363,7 +1372,7 @@ void ip_conntrack_flush(void)
        ip_ct_event_cache_flush();
 i_see_dead_people:
-        ip_ct_iterate_cleanup(kill_all, NULL);
+        ip_conntrack_flush();
        if (atomic_read(&ip_conntrack_count) != 0) {
                schedule();
                goto i_see_dead_people;
@@ -1371,14 +1380,7 @@ void ip_conntrack_flush(void)
        /* wait until all references to ip_conntrack_untracked are dropped */
        while (atomic_read(&ip_conntrack_untracked.ct_general.use) > 1)
                schedule();
-}
-/* Mishearing the voices in his head, our hero wonders how he's
-   supposed to kill the mall. */
-void ip_conntrack_cleanup(void)
-{
-        ip_ct_attach = NULL;
-        ip_conntrack_flush();
        kmem_cache_destroy(ip_conntrack_cachep);
        kmem_cache_destroy(ip_conntrack_expect_cachep);
        free_conntrack_hash(ip_conntrack_hash, ip_conntrack_vmalloc,
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c
index 3fce91bcc0ba..91fe8f2e38ff 100644
--- a/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -503,7 +503,7 @@ ctnetlink_parse_tuple_ip(struct nfattr *attr, struct ip_conntrack_tuple *tuple)
 }
 static const size_t cta_min_proto[CTA_PROTO_MAX] = {
-        [CTA_PROTO_NUM-1]       = sizeof(u_int16_t),
+        [CTA_PROTO_NUM-1]       = sizeof(u_int8_t),
        [CTA_PROTO_SRC_PORT-1]  = sizeof(u_int16_t),
        [CTA_PROTO_DST_PORT-1]  = sizeof(u_int16_t),
        [CTA_PROTO_ICMP_TYPE-1] = sizeof(u_int8_t),
@@ -528,7 +528,7 @@ ctnetlink_parse_tuple_proto(struct nfattr *attr,
        if (!tb[CTA_PROTO_NUM-1])
                return -EINVAL;
-        tuple->dst.protonum = *(u_int16_t *)NFA_DATA(tb[CTA_PROTO_NUM-1]);
+        tuple->dst.protonum = *(u_int8_t *)NFA_DATA(tb[CTA_PROTO_NUM-1]);
        proto = ip_conntrack_proto_find_get(tuple->dst.protonum);
@@ -728,11 +728,9 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
                        return -ENOENT;
                }
        }       
-        if (del_timer(&ct->timeout)) {
+        if (del_timer(&ct->timeout))
-                ip_conntrack_put(ct);
                ct->timeout.function((unsigned long)ct);
-                return 0;
-        }
        ip_conntrack_put(ct);
        DEBUGP("leaving\n");
@@ -877,7 +875,7 @@ ctnetlink_change_status(struct ip_conntrack *ct, struct nfattr *cda[])
                DEBUGP("NAT status: %lu\n", 
                       status & (IPS_NAT_MASK | IPS_NAT_DONE_MASK));
                
-                if (ip_nat_initialized(ct, hooknum))
+                if (ip_nat_initialized(ct, HOOK2MANIP(hooknum)))
                        return -EEXIST;
                ip_nat_setup_info(ct, &range, hooknum);
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
index aeb7353d4777..e7fa29e576dc 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -341,9 +341,10 @@ static int tcp_print_conntrack(struct seq_file *s,
 static int tcp_to_nfattr(struct sk_buff *skb, struct nfattr *nfa,
                         const struct ip_conntrack *ct)
 {
-        struct nfattr *nest_parms = NFA_NEST(skb, CTA_PROTOINFO_TCP);
+        struct nfattr *nest_parms;
        
        read_lock_bh(&tcp_lock);
+        nest_parms = NFA_NEST(skb, CTA_PROTOINFO_TCP);
        NFA_PUT(skb, CTA_PROTOINFO_TCP_STATE, sizeof(u_int8_t),
                &ct->proto.tcp.state);
        read_unlock_bh(&tcp_lock);
diff --git a/net/ipv4/netfilter/ip_nat_tftp.c b/net/ipv4/netfilter/ip_nat_tftp.c
index 2215317c76b7..43c3bd7c118e 100644
--- a/net/ipv4/netfilter/ip_nat_tftp.c
+++ b/net/ipv4/netfilter/ip_nat_tftp.c
@@ -42,7 +42,10 @@ static unsigned int help(struct sk_buff **pskb,
                         enum ip_conntrack_info ctinfo,
                         struct ip_conntrack_expect *exp)
 {
-        exp->saved_proto.udp.port = exp->tuple.dst.u.tcp.port;
+        struct ip_conntrack *ct = exp->master;
+        exp->saved_proto.udp.port
+                = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.udp.port;
        exp->dir = IP_CT_DIR_REPLY;
        exp->expectfn = ip_nat_follow_master;
        if (ip_conntrack_expect_related(exp) != 0)
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 029c70dfb585..b7325e0b406a 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -262,122 +262,139 @@ static __inline__ u16 tcp_select_window(struct sock *sk)
 * We are working here with either a clone of the original
 * SKB, or a fresh unique copy made by the retransmit engine.
 */
-static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb)
+static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, gfp_t gfp_mask)
 {
-        if (skb != NULL) {
+        const struct inet_connection_sock *icsk = inet_csk(sk);
-                const struct inet_connection_sock *icsk = inet_csk(sk);
+        struct inet_sock *inet;
-                struct inet_sock *inet = inet_sk(sk);
+        struct tcp_sock *tp;
-                struct tcp_sock *tp = tcp_sk(sk);
+        struct tcp_skb_cb *tcb;
-                struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
+        int tcp_header_size;
-                int tcp_header_size = tp->tcp_header_len;
+        struct tcphdr *th;
-                struct tcphdr *th;
+        int sysctl_flags;
-                int sysctl_flags;
+        int err;
-                int err;
+        BUG_ON(!skb || !tcp_skb_pcount(skb));
+        /* If congestion control is doing timestamping, we must
+         * take such a timestamp before we potentially clone/copy.
+         */
+        if (icsk->icsk_ca_ops->rtt_sample)
+                __net_timestamp(skb);
+        if (likely(clone_it)) {
+                if (unlikely(skb_cloned(skb)))
+                        skb = pskb_copy(skb, gfp_mask);
+                else
+                        skb = skb_clone(skb, gfp_mask);
+                if (unlikely(!skb))
+                        return -ENOBUFS;
+        }
-                BUG_ON(!tcp_skb_pcount(skb));
+        inet = inet_sk(sk);
+        tp = tcp_sk(sk);
+        tcb = TCP_SKB_CB(skb);
+        tcp_header_size = tp->tcp_header_len;
 #define SYSCTL_FLAG_TSTAMPS     0x1
 #define SYSCTL_FLAG_WSCALE      0x2
 #define SYSCTL_FLAG_SACK        0x4
-                /* If congestion control is doing timestamping */
+        sysctl_flags = 0;
-                if (icsk->icsk_ca_ops->rtt_sample)
+        if (unlikely(tcb->flags & TCPCB_FLAG_SYN)) {
-                        __net_timestamp(skb);
+                tcp_header_size = sizeof(struct tcphdr) + TCPOLEN_MSS;
+                if(sysctl_tcp_timestamps) {
-                sysctl_flags = 0;
+                        tcp_header_size += TCPOLEN_TSTAMP_ALIGNED;
-                if (tcb->flags & TCPCB_FLAG_SYN) {
+                        sysctl_flags |= SYSCTL_FLAG_TSTAMPS;
-                        tcp_header_size = sizeof(struct tcphdr) + TCPOLEN_MSS;
-                        if(sysctl_tcp_timestamps) {
-                                tcp_header_size += TCPOLEN_TSTAMP_ALIGNED;
-                                sysctl_flags |= SYSCTL_FLAG_TSTAMPS;
-                        }
-                        if(sysctl_tcp_window_scaling) {
-                                tcp_header_size += TCPOLEN_WSCALE_ALIGNED;
-                                sysctl_flags |= SYSCTL_FLAG_WSCALE;
-                        }
-                        if(sysctl_tcp_sack) {
-                                sysctl_flags |= SYSCTL_FLAG_SACK;
-                                if(!(sysctl_flags & SYSCTL_FLAG_TSTAMPS))
-                                        tcp_header_size += TCPOLEN_SACKPERM_ALIGNED;
-                        }
-                } else if (tp->rx_opt.eff_sacks) {
-                        /* A SACK is 2 pad bytes, a 2 byte header, plus
-                         * 2 32-bit sequence numbers for each SACK block.
-                         */
-                        tcp_header_size += (TCPOLEN_SACK_BASE_ALIGNED +
-                                            (tp->rx_opt.eff_sacks * TCPOLEN_SACK_PERBLOCK));
                }
-                
+                if (sysctl_tcp_window_scaling) {
-                if (tcp_packets_in_flight(tp) == 0)
+                        tcp_header_size += TCPOLEN_WSCALE_ALIGNED;
-                        tcp_ca_event(sk, CA_EVENT_TX_START);
+                        sysctl_flags |= SYSCTL_FLAG_WSCALE;
-                th = (struct tcphdr *) skb_push(skb, tcp_header_size);
-                skb->h.th = th;
-                skb_set_owner_w(skb, sk);
-                /* Build TCP header and checksum it. */
-                th->source              = inet->sport;
-                th->dest                = inet->dport;
-                th->seq                 = htonl(tcb->seq);
-                th->ack_seq             = htonl(tp->rcv_nxt);
-                *(((__u16 *)th) + 6)    = htons(((tcp_header_size >> 2) << 12) | tcb->flags);
-                if (tcb->flags & TCPCB_FLAG_SYN) {
-                        /* RFC1323: The window in SYN & SYN/ACK segments
-                         * is never scaled.
-                         */
-                        th->window      = htons(tp->rcv_wnd);
-                } else {
-                        th->window      = htons(tcp_select_window(sk));
                }
-                th->check               = 0;
+                if (sysctl_tcp_sack) {
-                th->urg_ptr             = 0;
+                        sysctl_flags |= SYSCTL_FLAG_SACK;
+                        if (!(sysctl_flags & SYSCTL_FLAG_TSTAMPS))
-                if (tp->urg_mode &&
+                                tcp_header_size += TCPOLEN_SACKPERM_ALIGNED;
-                    between(tp->snd_up, tcb->seq+1, tcb->seq+0xFFFF)) {
-                        th->urg_ptr             = htons(tp->snd_up-tcb->seq);
-                        th->urg                 = 1;
                }
+        } else if (unlikely(tp->rx_opt.eff_sacks)) {
+                /* A SACK is 2 pad bytes, a 2 byte header, plus
+                 * 2 32-bit sequence numbers for each SACK block.
+                 */
+                tcp_header_size += (TCPOLEN_SACK_BASE_ALIGNED +
+                                    (tp->rx_opt.eff_sacks *
+                                     TCPOLEN_SACK_PERBLOCK));
+        }
+                
+        if (tcp_packets_in_flight(tp) == 0)
+                tcp_ca_event(sk, CA_EVENT_TX_START);
+        th = (struct tcphdr *) skb_push(skb, tcp_header_size);
+        skb->h.th = th;
+        skb_set_owner_w(skb, sk);
+        /* Build TCP header and checksum it. */
+        th->source              = inet->sport;
+        th->dest                = inet->dport;
+        th->seq                 = htonl(tcb->seq);
+        th->ack_seq             = htonl(tp->rcv_nxt);
+        *(((__u16 *)th) + 6)    = htons(((tcp_header_size >> 2) << 12) |
+                                        tcb->flags);
+        if (unlikely(tcb->flags & TCPCB_FLAG_SYN)) {
+                /* RFC1323: The window in SYN & SYN/ACK segments
+                 * is never scaled.
+                 */
+                th->window      = htons(tp->rcv_wnd);
+        } else {
+                th->window      = htons(tcp_select_window(sk));
+        }
+        th->check               = 0;
+        th->urg_ptr             = 0;
-                if (tcb->flags & TCPCB_FLAG_SYN) {
+        if (unlikely(tp->urg_mode &&
-                        tcp_syn_build_options((__u32 *)(th + 1),
+                     between(tp->snd_up, tcb->seq+1, tcb->seq+0xFFFF))) {
-                                              tcp_advertise_mss(sk),
+                th->urg_ptr             = htons(tp->snd_up-tcb->seq);
-                                              (sysctl_flags & SYSCTL_FLAG_TSTAMPS),
+                th->urg                 = 1;
-                                              (sysctl_flags & SYSCTL_FLAG_SACK),
+        }
-                                              (sysctl_flags & SYSCTL_FLAG_WSCALE),
-                                              tp->rx_opt.rcv_wscale,
-                                              tcb->when,
-                                              tp->rx_opt.ts_recent);
-                } else {
-                        tcp_build_and_update_options((__u32 *)(th + 1),
-                                                     tp, tcb->when);
-                        TCP_ECN_send(sk, tp, skb, tcp_header_size);
+        if (unlikely(tcb->flags & TCPCB_FLAG_SYN)) {
-                }
+                tcp_syn_build_options((__u32 *)(th + 1),
-                tp->af_specific->send_check(sk, th, skb->len, skb);
+                                      tcp_advertise_mss(sk),
+                                      (sysctl_flags & SYSCTL_FLAG_TSTAMPS),
+                                      (sysctl_flags & SYSCTL_FLAG_SACK),
+                                      (sysctl_flags & SYSCTL_FLAG_WSCALE),
+                                      tp->rx_opt.rcv_wscale,
+                                      tcb->when,
+                                      tp->rx_opt.ts_recent);
+        } else {
+                tcp_build_and_update_options((__u32 *)(th + 1),
+                                             tp, tcb->when);
+                TCP_ECN_send(sk, tp, skb, tcp_header_size);
+        }
-                if (tcb->flags & TCPCB_FLAG_ACK)
+        tp->af_specific->send_check(sk, th, skb->len, skb);
-                        tcp_event_ack_sent(sk, tcp_skb_pcount(skb));
-                if (skb->len != tcp_header_size)
+        if (likely(tcb->flags & TCPCB_FLAG_ACK))
-                        tcp_event_data_sent(tp, skb, sk);
+                tcp_event_ack_sent(sk, tcp_skb_pcount(skb));
-                TCP_INC_STATS(TCP_MIB_OUTSEGS);
+        if (skb->len != tcp_header_size)
+                tcp_event_data_sent(tp, skb, sk);
-                err = tp->af_specific->queue_xmit(skb, 0);
+        TCP_INC_STATS(TCP_MIB_OUTSEGS);
-                if (err <= 0)
-                        return err;
-                tcp_enter_cwr(sk);
+        err = tp->af_specific->queue_xmit(skb, 0);
+        if (unlikely(err <= 0))
+                return err;
+        tcp_enter_cwr(sk);
+        /* NET_XMIT_CN is special. It does not guarantee,
+         * that this packet is lost. It tells that device
+         * is about to start to drop packets or already
+         * drops some packets of the same priority and
+         * invokes us to send less aggressively.
+         */
+        return err == NET_XMIT_CN ? 0 : err;
-                /* NET_XMIT_CN is special. It does not guarantee,
-                 * that this packet is lost. It tells that device
-                 * is about to start to drop packets or already
-                 * drops some packets of the same priority and
-                 * invokes us to send less aggressively.
-                 */
-                return err == NET_XMIT_CN ? 0 : err;
-        }
-        return -ENOBUFS;
 #undef SYSCTL_FLAG_TSTAMPS
 #undef SYSCTL_FLAG_WSCALE
 #undef SYSCTL_FLAG_SACK
@@ -1036,7 +1053,7 @@ static int tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle)
                TCP_SKB_CB(skb)->when = tcp_time_stamp;
-                if (unlikely(tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC))))
+                if (unlikely(tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC)))
                        break;
                /* Advance the send_head.  This one is sent out.
@@ -1109,7 +1126,7 @@ void tcp_push_one(struct sock *sk, unsigned int mss_now)
                /* Send it out now. */
                TCP_SKB_CB(skb)->when = tcp_time_stamp;
-                if (likely(!tcp_transmit_skb(sk, skb_clone(skb, sk->sk_allocation)))) {
+                if (likely(!tcp_transmit_skb(sk, skb, 1, sk->sk_allocation))) {
                        update_send_head(sk, tp, skb);
                        tcp_cwnd_validate(sk, tp);
                        return;
@@ -1429,9 +1446,7 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)
         */
        TCP_SKB_CB(skb)->when = tcp_time_stamp;
-        err = tcp_transmit_skb(sk, (skb_cloned(skb) ?
+        err = tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC);
-                                    pskb_copy(skb, GFP_ATOMIC):
-                                    skb_clone(skb, GFP_ATOMIC)));
        if (err == 0) {
                /* Update global TCP statistics. */
@@ -1665,7 +1680,7 @@ void tcp_send_active_reset(struct sock *sk, gfp_t priority)
        TCP_SKB_CB(skb)->seq = tcp_acceptable_seq(sk, tp);
        TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq;
        TCP_SKB_CB(skb)->when = tcp_time_stamp;
-        if (tcp_transmit_skb(sk, skb))
+        if (tcp_transmit_skb(sk, skb, 0, priority))
                NET_INC_STATS(LINUX_MIB_TCPABORTFAILED);
 }
@@ -1700,7 +1715,7 @@ int tcp_send_synack(struct sock *sk)
                TCP_ECN_send_synack(tcp_sk(sk), skb);
        }
        TCP_SKB_CB(skb)->when = tcp_time_stamp;
-        return tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC));
+        return tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC);
 }
 /*
@@ -1861,7 +1876,7 @@ int tcp_connect(struct sock *sk)
        __skb_queue_tail(&sk->sk_write_queue, buff);
        sk_charge_skb(sk, buff);
        tp->packets_out += tcp_skb_pcount(buff);
-        tcp_transmit_skb(sk, skb_clone(buff, GFP_KERNEL));
+        tcp_transmit_skb(sk, buff, 1, GFP_KERNEL);
        TCP_INC_STATS(TCP_MIB_ACTIVEOPENS);
        /* Timer for repeating the SYN until an answer. */
@@ -1957,7 +1972,7 @@ void tcp_send_ack(struct sock *sk)
                /* Send it off, this clears delayed acks for us. */
                TCP_SKB_CB(buff)->seq = TCP_SKB_CB(buff)->end_seq = tcp_acceptable_seq(sk, tp);
                TCP_SKB_CB(buff)->when = tcp_time_stamp;
-                tcp_transmit_skb(sk, buff);
+                tcp_transmit_skb(sk, buff, 0, GFP_ATOMIC);
        }
 }
@@ -1997,7 +2012,7 @@ static int tcp_xmit_probe_skb(struct sock *sk, int urgent)
        TCP_SKB_CB(skb)->seq = urgent ? tp->snd_una : tp->snd_una - 1;
        TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq;
        TCP_SKB_CB(skb)->when = tcp_time_stamp;
-        return tcp_transmit_skb(sk, skb);
+        return tcp_transmit_skb(sk, skb, 0, GFP_ATOMIC);
 }
 int tcp_write_wakeup(struct sock *sk)
@@ -2030,7 +2045,7 @@ int tcp_write_wakeup(struct sock *sk)
                        TCP_SKB_CB(skb)->flags |= TCPCB_FLAG_PSH;
                        TCP_SKB_CB(skb)->when = tcp_time_stamp;
-                        err = tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC));
+                        err = tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC);
                        if (!err) {
                                update_send_head(sk, tp, skb);
                        }
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c
index b7d296a8ac6d..13e7e6e8df16 100644
--- a/net/ipv4/tcp_vegas.c
+++ b/net/ipv4/tcp_vegas.c
@@ -215,14 +215,6 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack,
                vegas->beg_snd_nxt  = tp->snd_nxt;
                vegas->beg_snd_cwnd = tp->snd_cwnd;
-                /* Take into account the current RTT sample too, to
-                 * decrease the impact of delayed acks. This double counts
-                 * this sample since we count it for the next window as well,
-                 * but that's not too awful, since we're taking the min,
-                 * rather than averaging.
-                 */
-                tcp_vegas_rtt_calc(sk, seq_rtt * 1000);
                /* We do the Vegas calculations only if we got enough RTT
                 * samples that we can be reasonably sure that we got
                 * at least one RTT sample that wasn't from a delayed ACK.
@@ -333,11 +325,11 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack,
                        else if (tp->snd_cwnd > tp->snd_cwnd_clamp)
                                tp->snd_cwnd = tp->snd_cwnd_clamp;
                }
-        }
-        /* Wipe the slate clean for the next RTT. */
+                /* Wipe the slate clean for the next RTT. */
-        vegas->cntRTT = 0;
+                vegas->cntRTT = 0;
-        vegas->minRTT = 0x7fffffff;
+                vegas->minRTT = 0x7fffffff;
+        }
 }
 /* Extract info for Tcp socket info provided via netlink. */
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index b2b60f3e9cdd..42196ba3b0b9 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -182,6 +182,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl)
                case IPPROTO_UDP:
                case IPPROTO_TCP:
                case IPPROTO_SCTP:
+                case IPPROTO_DCCP:
                        if (pskb_may_pull(skb, xprth + 4 - skb->data)) {
                                u16 *ports = (u16 *)xprth;
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 76ff9f4fe89d..a60585fd85ad 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -137,6 +137,7 @@ static int addrconf_ifdown(struct net_device *dev, int how);
 static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags);
 static void addrconf_dad_timer(unsigned long data);
 static void addrconf_dad_completed(struct inet6_ifaddr *ifp);
+static void addrconf_dad_run(struct inet6_dev *idev);
 static void addrconf_rs_timer(unsigned long data);
 static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifa);
 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifa);
@@ -379,8 +380,8 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
                    dev->type == ARPHRD_NONE ||
                    dev->type == ARPHRD_SIT) {
                        printk(KERN_INFO
-                                "Disabled Privacy Extensions on device %p(%s)\n",
+                               "%s: Disabled Privacy Extensions\n",
-                                dev, dev->name);
+                               dev->name);
                        ndev->cnf.use_tempaddr = -1;
                } else {
                        in6_dev_hold(ndev);
@@ -388,6 +389,9 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
                }
 #endif
+                if (netif_carrier_ok(dev))
+                        ndev->if_flags |= IF_READY;
                write_lock_bh(&addrconf_lock);
                dev->ip6_ptr = ndev;
                write_unlock_bh(&addrconf_lock);
@@ -415,6 +419,7 @@ static struct inet6_dev * ipv6_find_idev(struct net_device *dev)
                if ((idev = ipv6_add_dev(dev)) == NULL)
                        return NULL;
        }
        if (dev->flags&IFF_UP)
                ipv6_mc_up(idev);
        return idev;
@@ -634,8 +639,7 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)
        }
 #endif
-        for (ifap = &idev->addr_list; (ifa=*ifap) != NULL;
+        for (ifap = &idev->addr_list; (ifa=*ifap) != NULL;) {
-             ifap = &ifa->if_next) {
                if (ifa == ifp) {
                        *ifap = ifa->if_next;
                        __in6_ifa_put(ifp);
@@ -643,6 +647,7 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)
                        if (!(ifp->flags & IFA_F_PERMANENT) || onlink > 0)
                                break;
                        deleted = 1;
+                        continue;
                } else if (ifp->flags & IFA_F_PERMANENT) {
                        if (ipv6_prefix_equal(&ifa->addr, &ifp->addr,
                                              ifp->prefix_len)) {
@@ -666,6 +671,7 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)
                                }
                        }
                }
+                ifap = &ifa->if_next;
        }
        write_unlock_bh(&idev->lock);
@@ -903,11 +909,18 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
                        score.addr_type = __ipv6_addr_type(&ifa->addr);
-                        /* Rule 0: Candidate Source Address (section 4)
+                        /* Rule 0:
+                         * - Tentative Address (RFC2462 section 5.4)
+                         *  - A tentative address is not considered
+                         *    "assigned to an interface" in the traditional
+                         *    sense.
+                         * - Candidate Source Address (section 4)
                         *  - In any case, anycast addresses, multicast
                         *    addresses, and the unspecified address MUST
                         *    NOT be included in a candidate set.
                         */
+                        if (ifa->flags & IFA_F_TENTATIVE)
+                                continue;
                        if (unlikely(score.addr_type == IPV6_ADDR_ANY ||
                                     score.addr_type & IPV6_ADDR_MULTICAST)) {
                                LIMIT_NETDEBUG(KERN_DEBUG
@@ -1215,10 +1228,8 @@ int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
 /* Gets referenced address, destroys ifaddr */
-void addrconf_dad_failure(struct inet6_ifaddr *ifp)
+void addrconf_dad_stop(struct inet6_ifaddr *ifp)
 {
-        if (net_ratelimit())
-                printk(KERN_INFO "%s: duplicate address detected!\n", ifp->idev->dev->name);
        if (ifp->flags&IFA_F_PERMANENT) {
                spin_lock_bh(&ifp->lock);
                addrconf_del_timer(ifp);
@@ -1244,6 +1255,12 @@ void addrconf_dad_failure(struct inet6_ifaddr *ifp)
                ipv6_del_addr(ifp);
 }
+void addrconf_dad_failure(struct inet6_ifaddr *ifp)
+{
+        if (net_ratelimit())
+                printk(KERN_INFO "%s: duplicate address detected!\n", ifp->idev->dev->name);
+        addrconf_dad_stop(ifp);
+}
 /* Join to solicited addr multicast group. */
@@ -1596,9 +1613,17 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len)
           not good.
         */
        if (valid_lft >= 0x7FFFFFFF/HZ)
-                rt_expires = 0;
+                rt_expires = 0x7FFFFFFF - (0x7FFFFFFF % HZ);
        else
-                rt_expires = jiffies + valid_lft * HZ;
+                rt_expires = valid_lft * HZ;
+        /*
+         * We convert this (in jiffies) to clock_t later.
+         * Avoid arithmetic overflow there as well.
+         * Overflow can happen only if HZ < USER_HZ.
+         */
+        if (HZ < USER_HZ && rt_expires > 0x7FFFFFFF / USER_HZ)
+                rt_expires = 0x7FFFFFFF / USER_HZ;
        if (pinfo->onlink) {
                struct rt6_info *rt;
@@ -1610,12 +1635,12 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len)
                                        ip6_del_rt(rt, NULL, NULL, NULL);
                                        rt = NULL;
                                } else {
-                                        rt->rt6i_expires = rt_expires;
+                                        rt->rt6i_expires = jiffies + rt_expires;
                                }
                        }
                } else if (valid_lft) {
                        addrconf_prefix_route(&pinfo->prefix, pinfo->prefix_len,
-                                              dev, rt_expires, RTF_ADDRCONF|RTF_EXPIRES|RTF_PREFIX_RT);
+                                              dev, jiffies_to_clock_t(rt_expires), RTF_ADDRCONF|RTF_EXPIRES|RTF_PREFIX_RT);
                }
                if (rt)
                        dst_release(&rt->u.dst);
@@ -2125,9 +2150,42 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
 {
        struct net_device *dev = (struct net_device *) data;
        struct inet6_dev *idev = __in6_dev_get(dev);
+        int run_pending = 0;
        switch(event) {
        case NETDEV_UP:
+        case NETDEV_CHANGE:
+                if (event == NETDEV_UP) {
+                        if (!netif_carrier_ok(dev)) {
+                                /* device is not ready yet. */
+                                printk(KERN_INFO
+                                        "ADDRCONF(NETDEV_UP): %s: "
+                                        "link is not ready\n",
+                                        dev->name);
+                                break;
+                        }
+                } else {
+                        if (!netif_carrier_ok(dev)) {
+                                /* device is still not ready. */
+                                break;
+                        }
+                        if (idev) {
+                                if (idev->if_flags & IF_READY) {
+                                        /* device is already configured. */
+                                        break;
+                                }
+                                idev->if_flags |= IF_READY;
+                        }
+                        printk(KERN_INFO
+                                        "ADDRCONF(NETDEV_CHANGE): %s: "
+                                        "link becomes ready\n",
+                                        dev->name);
+                        run_pending = 1;
+                }
                switch(dev->type) {
                case ARPHRD_SIT:
                        addrconf_sit_config(dev);
@@ -2144,6 +2202,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
                        break;
                };
                if (idev) {
+                        if (run_pending)
+                                addrconf_dad_run(idev);
                        /* If the MTU changed during the interface down, when the
                           interface up, the changed MTU must be reflected in the
                           idev as well as routers.
@@ -2178,8 +2239,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
                 */
                addrconf_ifdown(dev, event != NETDEV_DOWN);
                break;
-        case NETDEV_CHANGE:
-                break;
        case NETDEV_CHANGENAME:
 #ifdef CONFIG_SYSCTL
                if (idev) {
@@ -2260,7 +2320,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)
        /* Step 3: clear flags for stateless addrconf */
        if (how != 1)
-                idev->if_flags &= ~(IF_RS_SENT|IF_RA_RCVD);
+                idev->if_flags &= ~(IF_RS_SENT|IF_RA_RCVD|IF_READY);
        /* Step 4: clear address list */
 #ifdef CONFIG_IPV6_PRIVACY
@@ -2369,11 +2429,20 @@ out:
 /*
 *      Duplicate Address Detection
 */
+static void addrconf_dad_kick(struct inet6_ifaddr *ifp)
+{
+        unsigned long rand_num;
+        struct inet6_dev *idev = ifp->idev;
+        rand_num = net_random() % (idev->cnf.rtr_solicit_delay ? : 1);
+        ifp->probes = idev->cnf.dad_transmits;
+        addrconf_mod_timer(ifp, AC_DAD, rand_num);
+}
 static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
 {
        struct inet6_dev *idev = ifp->idev;
        struct net_device *dev = idev->dev;
-        unsigned long rand_num;
        addrconf_join_solict(dev, &ifp->addr);
@@ -2382,7 +2451,6 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
                                        flags);
        net_srandom(ifp->addr.s6_addr32[3]);
-        rand_num = net_random() % (idev->cnf.rtr_solicit_delay ? : 1);
        read_lock_bh(&idev->lock);
        if (ifp->dead)
@@ -2399,9 +2467,19 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
                return;
        }
-        ifp->probes = idev->cnf.dad_transmits;
+        if (!(idev->if_flags & IF_READY)) {
-        addrconf_mod_timer(ifp, AC_DAD, rand_num);
+                spin_unlock_bh(&ifp->lock);
+                read_unlock_bh(&idev->lock);
+                /*
+                 * If the defice is not ready:
+                 * - keep it tentative if it is a permanent address.
+                 * - otherwise, kill it.
+                 */
+                in6_ifa_hold(ifp);
+                addrconf_dad_stop(ifp);
+                return;
+        }
+        addrconf_dad_kick(ifp);
        spin_unlock_bh(&ifp->lock);
 out:
        read_unlock_bh(&idev->lock);
@@ -2484,6 +2562,22 @@ static void addrconf_dad_completed(struct inet6_ifaddr *ifp)
        }
 }
+static void addrconf_dad_run(struct inet6_dev *idev) {
+        struct inet6_ifaddr *ifp;
+        read_lock_bh(&idev->lock);
+        for (ifp = idev->addr_list; ifp; ifp = ifp->if_next) {
+                spin_lock_bh(&ifp->lock);
+                if (!(ifp->flags & IFA_F_TENTATIVE)) {
+                        spin_unlock_bh(&ifp->lock);
+                        continue;
+                }
+                spin_unlock_bh(&ifp->lock);
+                addrconf_dad_kick(ifp);
+        }
+        read_unlock_bh(&idev->lock);
+}
 #ifdef CONFIG_PROC_FS
 struct if6_iter_state {
        int bucket;
@@ -2689,6 +2783,9 @@ restart:
                                                in6_ifa_hold(ifpub);
                                                spin_unlock(&ifp->lock);
                                                read_unlock(&addrconf_hash_lock);
+                                                spin_lock(&ifpub->lock);
+                                                ifpub->regen_count = 0;
+                                                spin_unlock(&ifpub->lock);
                                                ipv6_create_tempaddr(ifpub, ifp);
                                                in6_ifa_put(ifpub);
                                                in6_ifa_put(ifp);
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 40d9a1935ab5..8bfbe9970793 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -248,7 +248,7 @@ static u32 esp6_get_max_size(struct xfrm_state *x, int mtu)
        if (esp->conf.padlen)
                mtu = ALIGN(mtu, esp->conf.padlen);
-        return mtu + x->props.header_len + esp->auth.icv_full_len;
+        return mtu + x->props.header_len + esp->auth.icv_trunc_len;
 }
 static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 34a332225c17..6ec6a2b549bb 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -328,8 +328,10 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info,
                iif = skb->dev->ifindex;
        /*
-         *      Must not send if we know that source is Anycast also.
+         *      Must not send error if the source does not uniquely
-         *      for now we don't know that.
+         *      identify a single node (RFC2463 Section 2.4).
+         *      We check unspecified / multicast addresses here,
+         *      and anycast addresses will be checked later.
         */
        if ((addr_type == IPV6_ADDR_ANY) || (addr_type & IPV6_ADDR_MULTICAST)) {
                LIMIT_NETDEBUG(KERN_DEBUG "icmpv6_send: addr_any/mcast source\n");
@@ -373,6 +375,16 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info,
        err = ip6_dst_lookup(sk, &dst, &fl);
        if (err)
                goto out;
+        /*
+         * We won't send icmp if the destination is known
+         * anycast.
+         */
+        if (((struct rt6_info *)dst)->rt6i_flags & RTF_ANYCAST) {
+                LIMIT_NETDEBUG(KERN_DEBUG "icmpv6_send: acast source\n");
+                goto out_dst_release;
+        }
        if ((err = xfrm_lookup(&dst, &fl, sk, 0)) < 0)
                goto out;
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index fd939da090c4..f829a4ad3ccc 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -170,7 +170,7 @@ static int ip6_mc_leave_src(struct sock *sk, struct ipv6_mc_socklist *iml,
 #define MLDV2_QQIC(value) MLDV2_EXP(0x80, 4, 3, value)
 #define MLDV2_MRC(value) MLDV2_EXP(0x8000, 12, 3, value)
-#define IPV6_MLD_MAX_MSF        10
+#define IPV6_MLD_MAX_MSF        64
 int sysctl_mld_max_msf = IPV6_MLD_MAX_MSF;
@@ -224,6 +224,7 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, struct in6_addr *addr)
        mc_lst->ifindex = dev->ifindex;
        mc_lst->sfmode = MCAST_EXCLUDE;
+        mc_lst->sflock = RW_LOCK_UNLOCKED;
        mc_lst->sflist = NULL;
        /*
@@ -360,6 +361,7 @@ int ip6_mc_source(int add, int omode, struct sock *sk,
        struct ip6_sf_socklist *psl;
        int i, j, rv;
        int leavegroup = 0;
+        int pmclocked = 0;
        int err;
        if (pgsr->gsr_group.ss_family != AF_INET6 ||
@@ -403,6 +405,9 @@ int ip6_mc_source(int add, int omode, struct sock *sk,
                pmc->sfmode = omode;
        }
+        write_lock_bh(&pmc->sflock);
+        pmclocked = 1;
        psl = pmc->sflist;
        if (!add) {
                if (!psl)
@@ -475,6 +480,8 @@ int ip6_mc_source(int add, int omode, struct sock *sk,
        /* update the interface list */
        ip6_mc_add_src(idev, group, omode, 1, source, 1);
 done:
+        if (pmclocked)
+                write_unlock_bh(&pmc->sflock);
        read_unlock_bh(&ipv6_sk_mc_lock);
        read_unlock_bh(&idev->lock);
        in6_dev_put(idev);
@@ -510,6 +517,8 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf)
        dev = idev->dev;
        err = 0;
+        read_lock_bh(&ipv6_sk_mc_lock);
        if (gsf->gf_fmode == MCAST_INCLUDE && gsf->gf_numsrc == 0) {
                leavegroup = 1;
                goto done;
@@ -549,6 +558,8 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf)
                newpsl = NULL;
                (void) ip6_mc_add_src(idev, group, gsf->gf_fmode, 0, NULL, 0);
        }
+        write_lock_bh(&pmc->sflock);
        psl = pmc->sflist;
        if (psl) {
                (void) ip6_mc_del_src(idev, group, pmc->sfmode,
@@ -558,8 +569,10 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf)
                (void) ip6_mc_del_src(idev, group, pmc->sfmode, 0, NULL, 0);
        pmc->sflist = newpsl;
        pmc->sfmode = gsf->gf_fmode;
+        write_unlock_bh(&pmc->sflock);
        err = 0;
 done:
+        read_unlock_bh(&ipv6_sk_mc_lock);
        read_unlock_bh(&idev->lock);
        in6_dev_put(idev);
        dev_put(dev);
@@ -592,6 +605,11 @@ int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf,
        dev = idev->dev;
        err = -EADDRNOTAVAIL;
+        /*
+         * changes to the ipv6_mc_list require the socket lock and
+         * a read lock on ip6_sk_mc_lock. We have the socket lock,
+         * so reading the list is safe.
+         */
        for (pmc=inet6->ipv6_mc_list; pmc; pmc=pmc->next) {
                if (pmc->ifindex != gsf->gf_interface)
@@ -614,6 +632,10 @@ int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf,
            copy_to_user(optval, gsf, GROUP_FILTER_SIZE(0))) {
                return -EFAULT;
        }
+        /* changes to psl require the socket lock, a read lock on
+         * on ipv6_sk_mc_lock and a write lock on pmc->sflock. We
+         * have the socket lock, so reading here is safe.
+         */
        for (i=0; i<copycount; i++) {
                struct sockaddr_in6 *psin6;
                struct sockaddr_storage ss;
@@ -650,6 +672,7 @@ int inet6_mc_check(struct sock *sk, struct in6_addr *mc_addr,
                read_unlock(&ipv6_sk_mc_lock);
                return 1;
        }
+        read_lock(&mc->sflock);
        psl = mc->sflist;
        if (!psl) {
                rv = mc->sfmode == MCAST_EXCLUDE;
@@ -665,6 +688,7 @@ int inet6_mc_check(struct sock *sk, struct in6_addr *mc_addr,
                if (mc->sfmode == MCAST_EXCLUDE && i < psl->sl_count)
                        rv = 0;
        }
+        read_unlock(&mc->sflock);
        read_unlock(&ipv6_sk_mc_lock);
        return rv;
@@ -1068,7 +1092,8 @@ static void igmp6_group_queried(struct ifmcaddr6 *ma, unsigned long resptime)
        ma->mca_flags |= MAF_TIMER_RUNNING;
 }
-static void mld_marksources(struct ifmcaddr6 *pmc, int nsrcs,
+/* mark EXCLUDE-mode sources */
+static int mld_xmarksources(struct ifmcaddr6 *pmc, int nsrcs,
        struct in6_addr *srcs)
 {
        struct ip6_sf_list *psf;
@@ -1078,13 +1103,53 @@ static void mld_marksources(struct ifmcaddr6 *pmc, int nsrcs,
        for (psf=pmc->mca_sources; psf; psf=psf->sf_next) {
                if (scount == nsrcs)
                        break;
-                for (i=0; i<nsrcs; i++)
+                for (i=0; i<nsrcs; i++) {
+                        /* skip inactive filters */
+                        if (pmc->mca_sfcount[MCAST_INCLUDE] ||
+                            pmc->mca_sfcount[MCAST_EXCLUDE] !=
+                            psf->sf_count[MCAST_EXCLUDE])
+                                continue;
+                        if (ipv6_addr_equal(&srcs[i], &psf->sf_addr)) {
+                                scount++;
+                                break;
+                        }
+                }
+        }
+        pmc->mca_flags &= ~MAF_GSQUERY;
+        if (scount == nsrcs)    /* all sources excluded */
+                return 0;
+        return 1;
+}
+static int mld_marksources(struct ifmcaddr6 *pmc, int nsrcs,
+        struct in6_addr *srcs)
+{
+        struct ip6_sf_list *psf;
+        int i, scount;
+        if (pmc->mca_sfmode == MCAST_EXCLUDE)
+                return mld_xmarksources(pmc, nsrcs, srcs);
+        /* mark INCLUDE-mode sources */
+        scount = 0;
+        for (psf=pmc->mca_sources; psf; psf=psf->sf_next) {
+                if (scount == nsrcs)
+                        break;
+                for (i=0; i<nsrcs; i++) {
                        if (ipv6_addr_equal(&srcs[i], &psf->sf_addr)) {
                                psf->sf_gsresp = 1;
                                scount++;
                                break;
                        }
+                }
+        }
+        if (!scount) {
+                pmc->mca_flags &= ~MAF_GSQUERY;
+                return 0;
        }
+        pmc->mca_flags |= MAF_GSQUERY;
+        return 1;
 }
 int igmp6_event_query(struct sk_buff *skb)
@@ -1167,7 +1232,7 @@ int igmp6_event_query(struct sk_buff *skb)
                /* mark sources to include, if group & source-specific */
                if (mlh2->nsrcs != 0) {
                        if (!pskb_may_pull(skb, srcs_offset + 
-                                mlh2->nsrcs * sizeof(struct in6_addr))) {
+                            ntohs(mlh2->nsrcs) * sizeof(struct in6_addr))) {
                                in6_dev_put(idev);
                                return -EINVAL;
                        }
@@ -1203,10 +1268,9 @@ int igmp6_event_query(struct sk_buff *skb)
                                else
                                        ma->mca_flags &= ~MAF_GSQUERY;
                        }
-                        if (ma->mca_flags & MAF_GSQUERY)
+                        if (!(ma->mca_flags & MAF_GSQUERY) ||
-                                mld_marksources(ma, ntohs(mlh2->nsrcs),
+                           mld_marksources(ma, ntohs(mlh2->nsrcs), mlh2->srcs))
-                                        mlh2->srcs);
+                                igmp6_group_queried(ma, max_delay);
-                        igmp6_group_queried(ma, max_delay);
                        spin_unlock_bh(&ma->mca_lock);
                        if (group_type != IPV6_ADDR_ANY)
                                break;
@@ -1281,7 +1345,18 @@ static int is_in(struct ifmcaddr6 *pmc, struct ip6_sf_list *psf, int type,
        case MLD2_MODE_IS_EXCLUDE:
                if (gdeleted || sdeleted)
                        return 0;
-                return !((pmc->mca_flags & MAF_GSQUERY) && !psf->sf_gsresp);
+                if (!((pmc->mca_flags & MAF_GSQUERY) && !psf->sf_gsresp)) {
+                        if (pmc->mca_sfmode == MCAST_INCLUDE)
+                                return 1;
+                        /* don't include if this source is excluded
+                         * in all filters
+                         */
+                        if (psf->sf_count[MCAST_INCLUDE])
+                                return 0;
+                        return pmc->mca_sfcount[MCAST_EXCLUDE] ==
+                                psf->sf_count[MCAST_EXCLUDE];
+                }
+                return 0;
        case MLD2_CHANGE_TO_INCLUDE:
                if (gdeleted || sdeleted)
                        return 0;
@@ -1450,7 +1525,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc,
        struct mld2_report *pmr;
        struct mld2_grec *pgr = NULL;
        struct ip6_sf_list *psf, *psf_next, *psf_prev, **psf_list;
-        int scount, first, isquery, truncate;
+        int scount, stotal, first, isquery, truncate;
        if (pmc->mca_flags & MAF_NOREPORT)
                return skb;
@@ -1460,25 +1535,13 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc,
        truncate = type == MLD2_MODE_IS_EXCLUDE ||
                    type == MLD2_CHANGE_TO_EXCLUDE;
+        stotal = scount = 0;
        psf_list = sdeleted ? &pmc->mca_tomb : &pmc->mca_sources;
-        if (!*psf_list) {
+        if (!*psf_list)
-                if (type == MLD2_ALLOW_NEW_SOURCES ||
+                goto empty_source;
-                    type == MLD2_BLOCK_OLD_SOURCES)
-                        return skb;
-                if (pmc->mca_crcount || isquery) {
-                        /* make sure we have room for group header and at
-                         * least one source.
-                         */
-                        if (skb && AVAILABLE(skb) < sizeof(struct mld2_grec)+
-                            sizeof(struct in6_addr)) {
-                                mld_sendpack(skb);
-                                skb = NULL; /* add_grhead will get a new one */
-                        }
-                        skb = add_grhead(skb, pmc, type, &pgr);
-                }
-                return skb;
-        }
        pmr = skb ? (struct mld2_report *)skb->h.raw : NULL;
        /* EX and TO_EX get a fresh packet, if needed */
@@ -1491,7 +1554,6 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc,
                }
        }
        first = 1;
-        scount = 0;
        psf_prev = NULL;
        for (psf=*psf_list; psf; psf=psf_next) {
                struct in6_addr *psrc;
@@ -1525,7 +1587,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc,
                }
                psrc = (struct in6_addr *)skb_put(skb, sizeof(*psrc));
                *psrc = psf->sf_addr;
-                scount++;
+                scount++; stotal++;
                if ((type == MLD2_ALLOW_NEW_SOURCES ||
                     type == MLD2_BLOCK_OLD_SOURCES) && psf->sf_crcount) {
                        psf->sf_crcount--;
@@ -1540,6 +1602,21 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc,
                }
                psf_prev = psf;
        }
+empty_source:
+        if (!stotal) {
+                if (type == MLD2_ALLOW_NEW_SOURCES ||
+                    type == MLD2_BLOCK_OLD_SOURCES)
+                        return skb;
+                if (pmc->mca_crcount || isquery) {
+                        /* make sure we have room for group header */
+                        if (skb && AVAILABLE(skb) < sizeof(struct mld2_grec)) {
+                                mld_sendpack(skb);
+                                skb = NULL; /* add_grhead will get a new one */
+                        }
+                        skb = add_grhead(skb, pmc, type, &pgr);
+                }
+        }
        if (pgr)
                pgr->grec_nsrcs = htons(scount);
@@ -1621,11 +1698,11 @@ static void mld_send_cr(struct inet6_dev *idev)
                        skb = add_grec(skb, pmc, dtype, 1, 1);
                }
                if (pmc->mca_crcount) {
-                        pmc->mca_crcount--;
                        if (pmc->mca_sfmode == MCAST_EXCLUDE) {
                                type = MLD2_CHANGE_TO_INCLUDE;
                                skb = add_grec(skb, pmc, type, 1, 0);
                        }
+                        pmc->mca_crcount--;
                        if (pmc->mca_crcount == 0) {
                                mld_clear_zeros(&pmc->mca_tomb);
                                mld_clear_zeros(&pmc->mca_sources);
@@ -1659,12 +1736,12 @@ static void mld_send_cr(struct inet6_dev *idev)
                /* filter mode changes */
                if (pmc->mca_crcount) {
-                        pmc->mca_crcount--;
                        if (pmc->mca_sfmode == MCAST_EXCLUDE)
                                type = MLD2_CHANGE_TO_EXCLUDE;
                        else
                                type = MLD2_CHANGE_TO_INCLUDE;
                        skb = add_grec(skb, pmc, type, 0, 0);
+                        pmc->mca_crcount--;
                }
                spin_unlock_bh(&pmc->mca_lock);
        }
@@ -2023,6 +2100,9 @@ static int ip6_mc_leave_src(struct sock *sk, struct ipv6_mc_socklist *iml,
 {
        int err;
+        /* callers have the socket lock and a write lock on ipv6_sk_mc_lock,
+         * so no other readers or writers of iml or its sflist
+         */
        if (iml->sflist == 0) {
                /* any-source empty exclude case */
                return ip6_mc_del_src(idev, &iml->addr, iml->sfmode, 0, NULL, 0);
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index 060d61202412..04912f9b35c3 100644
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -211,7 +211,7 @@ config IP6_NF_TARGET_REJECT
 config IP6_NF_TARGET_NFQUEUE
        tristate "NFQUEUE Target Support"
-        depends on IP_NF_IPTABLES
+        depends on IP6_NF_IPTABLES
        help
          This Target replaced the old obsolete QUEUE target.
diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
index c0f1da5497a9..a7e03cfacd06 100644
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
@@ -68,8 +68,8 @@ static int icmpv6_invert_tuple(struct nf_conntrack_tuple *tuple,
                [ICMPV6_NI_REPLY - 128]         = ICMPV6_NI_REPLY +1
        };
-        __u8 type = orig->dst.u.icmp.type - 128;
+        int type = orig->dst.u.icmp.type - 128;
-        if (type >= sizeof(invmap) || !invmap[type])
+        if (type < 0 || type >= sizeof(invmap) || !invmap[type])
                return 0;
        tuple->src.u.icmp.id   = orig->src.u.icmp.id;
@@ -129,12 +129,12 @@ static int icmpv6_new(struct nf_conn *conntrack,
                [ICMPV6_ECHO_REQUEST - 128] = 1,
                [ICMPV6_NI_QUERY - 128] = 1
        };
+        int type = conntrack->tuplehash[0].tuple.dst.u.icmp.type - 128;
-        if (conntrack->tuplehash[0].tuple.dst.u.icmp.type - 128 >= sizeof(valid_new)
+        if (type < 0 || type >= sizeof(valid_new) || !valid_new[type]) {
-            || !valid_new[conntrack->tuplehash[0].tuple.dst.u.icmp.type - 128]) {
                /* Can't create a new ICMPv6 `conn' with this. */
-                DEBUGP("icmp: can't create new conn with type %u\n",
+                DEBUGP("icmpv6: can't create new conn with type %u\n",
-                       conntrack->tuplehash[0].tuple.dst.u.icmp.type);
+                       type + 128);
                NF_CT_DUMP_TUPLE(&conntrack->tuplehash[0].tuple);
                return 0;
        }
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index a7a537b50595..66140f13d119 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -413,11 +413,14 @@ static struct rt6_info *rt6_cow(struct rt6_info *ort, struct in6_addr *daddr,
        rt = ip6_rt_copy(ort);
        if (rt) {
-                ipv6_addr_copy(&rt->rt6i_dst.addr, daddr);
+                if (!(rt->rt6i_flags&RTF_GATEWAY)) {
+                        if (rt->rt6i_dst.plen != 128 &&
-                if (!(rt->rt6i_flags&RTF_GATEWAY))
+                            ipv6_addr_equal(&rt->rt6i_dst.addr, daddr))
+                                rt->rt6i_flags |= RTF_ANYCAST;
                        ipv6_addr_copy(&rt->rt6i_gateway, daddr);
+                }
+                ipv6_addr_copy(&rt->rt6i_dst.addr, daddr);
                rt->rt6i_dst.plen = 128;
                rt->rt6i_flags |= RTF_CACHE;
                rt->u.dst.flags |= DST_HOST;
@@ -829,7 +832,7 @@ int ip6_route_add(struct in6_rtmsg *rtmsg, struct nlmsghdr *nlh,
        }
        rt->u.dst.obsolete = -1;
-        rt->rt6i_expires = clock_t_to_jiffies(rtmsg->rtmsg_info);
+        rt->rt6i_expires = jiffies + clock_t_to_jiffies(rtmsg->rtmsg_info);
        if (nlh && (r = NLMSG_DATA(nlh))) {
                rt->rt6i_protocol = r->rtm_protocol;
        } else {
@@ -1413,7 +1416,9 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
        rt->u.dst.obsolete = -1;
        rt->rt6i_flags = RTF_UP | RTF_NONEXTHOP;
-        if (!anycast)
+        if (anycast)
+                rt->rt6i_flags |= RTF_ANYCAST;
+        else
                rt->rt6i_flags |= RTF_LOCAL;
        rt->rt6i_nexthop = ndisc_get_neigh(rt->rt6i_dev, &rt->rt6i_gateway);
        if (rt->rt6i_nexthop == NULL) {
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 62c0e5bd931c..8827389abaf7 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -992,13 +992,12 @@ static void tcp_v6_send_reset(struct sk_buff *skb)
        /* sk = NULL, but it is safe for now. RST socket required. */
        if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) {
-                if ((xfrm_lookup(&buff->dst, &fl, NULL, 0)) < 0)
+                if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {
+                        ip6_xmit(NULL, buff, &fl, NULL, 0);
+                        TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);
+                        TCP_INC_STATS_BH(TCP_MIB_OUTRSTS);
                        return;
+                }
-                ip6_xmit(NULL, buff, &fl, NULL, 0);
-                TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);
-                TCP_INC_STATS_BH(TCP_MIB_OUTRSTS);
-                return;
        }
        kfree_skb(buff);
@@ -1057,11 +1056,11 @@ static void tcp_v6_send_ack(struct sk_buff *skb, u32 seq, u32 ack, u32 win, u32
        fl.fl_ip_sport = t1->source;
        if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) {
-                if ((xfrm_lookup(&buff->dst, &fl, NULL, 0)) < 0)
+                if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {
+                        ip6_xmit(NULL, buff, &fl, NULL, 0);
+                        TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);
                        return;
-                ip6_xmit(NULL, buff, &fl, NULL, 0);
+                }
-                TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);
-                return;
        }
        kfree_skb(buff);
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index cf1d91e74c82..69bd957380e7 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -214,6 +214,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl)
                case IPPROTO_UDP:
                case IPPROTO_TCP:
                case IPPROTO_SCTP:
+                case IPPROTO_DCCP:
                        if (pskb_may_pull(skb, skb->nh.raw + offset + 4 - skb->data)) {
                                u16 *ports = (u16 *)exthdr;
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index a84f9221e5f0..794c41d19b28 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -61,8 +61,8 @@ config NF_CONNTRACK_MARK
          instead of the individual packets.
 config NF_CONNTRACK_EVENTS
-        bool "Connection tracking events"
+        bool "Connection tracking events (EXPERIMENTAL)"
-        depends on NF_CONNTRACK
+        depends on EXPERIMENTAL && NF_CONNTRACK
        help
          If this option is enabled, the connection tracking code will
          provide a notifier chain that can be used by other kernel code
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 1da678303d78..a7c7b490cf22 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1383,6 +1383,9 @@ void nf_conntrack_cleanup(void)
                schedule();
                goto i_see_dead_people;
        }
+        /* wait until all references to nf_conntrack_untracked are dropped */
+        while (atomic_read(&nf_conntrack_untracked.ct_general.use) > 1)
+                schedule();
        for (i = 0; i < NF_CT_F_NUM; i++) {
                if (nf_ct_cache[i].use == 0)
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index a60c59b97631..95fdf04f1d88 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -162,7 +162,7 @@ nfnetlink_check_attributes(struct nfnetlink_subsystem *subsys,
                return -EINVAL;
        }
-        min_len = NLMSG_ALIGN(sizeof(struct nfgenmsg));
+        min_len = NLMSG_SPACE(sizeof(struct nfgenmsg));
        if (unlikely(nlh->nlmsg_len < min_len))
                return -EINVAL;
@@ -236,8 +236,7 @@ static inline int nfnetlink_rcv_msg(struct sk_buff *skb,
        }
        /* All the messages must at least contain nfgenmsg */
-        if (nlh->nlmsg_len < 
+        if (nlh->nlmsg_len < NLMSG_SPACE(sizeof(struct nfgenmsg))) {
-                        NLMSG_LENGTH(NLMSG_ALIGN(sizeof(struct nfgenmsg)))) {
                DEBUGP("received message was too short\n");
                return 0;
        }
diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c
index 004e8599b8fe..a7d88b5ad756 100644
--- a/net/netrom/nr_in.c
+++ b/net/netrom/nr_in.c
@@ -99,7 +99,7 @@ static int nr_state1_machine(struct sock *sk, struct sk_buff *skb,
                break;
        case NR_RESET:
-                if (sysctl_netrom_reset_circuit);
+                if (sysctl_netrom_reset_circuit)
                        nr_disconnect(sk, ECONNRESET);
                break;
@@ -130,7 +130,7 @@ static int nr_state2_machine(struct sock *sk, struct sk_buff *skb,
                break;
        case NR_RESET:
-                if (sysctl_netrom_reset_circuit);
+                if (sysctl_netrom_reset_circuit)
                        nr_disconnect(sk, ECONNRESET);
                break;
@@ -265,7 +265,7 @@ static int nr_state3_machine(struct sock *sk, struct sk_buff *skb, int frametype
                break;
        case NR_RESET:
-                if (sysctl_netrom_reset_circuit);
+                if (sysctl_netrom_reset_circuit)
                        nr_disconnect(sk, ECONNRESET);
                break;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 499ae3df4a44..3e2462760413 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1587,23 +1587,47 @@ static inline struct page *pg_vec_endpage(char *one_pg_vec, unsigned int order)
        return virt_to_page(one_pg_vec + (PAGE_SIZE << order) - 1);
 }
-static void free_pg_vec(char **pg_vec, unsigned order, unsigned len)
+static void free_pg_vec(char **pg_vec, unsigned int order, unsigned int len)
 {
        int i;
-        for (i=0; i<len; i++) {
+        for (i = 0; i < len; i++) {
-                if (pg_vec[i]) {
+                if (likely(pg_vec[i]))
-                        struct page *page, *pend;
+                        free_pages((unsigned long) pg_vec[i], order);
-                        pend = pg_vec_endpage(pg_vec[i], order);
-                        for (page = virt_to_page(pg_vec[i]); page <= pend; page++)
-                                ClearPageReserved(page);
-                        free_pages((unsigned long)pg_vec[i], order);
-                }
        }
        kfree(pg_vec);
 }
+static inline char *alloc_one_pg_vec_page(unsigned long order)
+{
+        return (char *) __get_free_pages(GFP_KERNEL | __GFP_COMP | __GFP_ZERO,
+                                         order);
+}
+static char **alloc_pg_vec(struct tpacket_req *req, int order)
+{
+        unsigned int block_nr = req->tp_block_nr;
+        char **pg_vec;
+        int i;
+        pg_vec = kzalloc(block_nr * sizeof(char *), GFP_KERNEL);
+        if (unlikely(!pg_vec))
+                goto out;
+        for (i = 0; i < block_nr; i++) {
+                pg_vec[i] = alloc_one_pg_vec_page(order);
+                if (unlikely(!pg_vec[i]))
+                        goto out_free_pgvec;
+        }
+out:
+        return pg_vec;
+out_free_pgvec:
+        free_pg_vec(pg_vec, order, block_nr);
+        pg_vec = NULL;
+        goto out;
+}
 static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing)
 {
@@ -1617,64 +1641,46 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing
                /* Sanity tests and some calculations */
-                if (po->pg_vec)
+                if (unlikely(po->pg_vec))
                        return -EBUSY;
-                if ((int)req->tp_block_size <= 0)
+                if (unlikely((int)req->tp_block_size <= 0))
                        return -EINVAL;
-                if (req->tp_block_size&(PAGE_SIZE-1))
+                if (unlikely(req->tp_block_size & (PAGE_SIZE - 1)))
                        return -EINVAL;
-                if (req->tp_frame_size < TPACKET_HDRLEN)
+                if (unlikely(req->tp_frame_size < TPACKET_HDRLEN))
                        return -EINVAL;
-                if (req->tp_frame_size&(TPACKET_ALIGNMENT-1))
+                if (unlikely(req->tp_frame_size & (TPACKET_ALIGNMENT - 1)))
                        return -EINVAL;
                po->frames_per_block = req->tp_block_size/req->tp_frame_size;
-                if (po->frames_per_block <= 0)
+                if (unlikely(po->frames_per_block <= 0))
                        return -EINVAL;
-                if (po->frames_per_block*req->tp_block_nr != req->tp_frame_nr)
+                if (unlikely((po->frames_per_block * req->tp_block_nr) !=
+                             req->tp_frame_nr))
                        return -EINVAL;
-                /* OK! */
-                /* Allocate page vector */
-                while ((PAGE_SIZE<<order) < req->tp_block_size)
-                        order++;
                err = -ENOMEM;
+                order = get_order(req->tp_block_size);
-                pg_vec = kmalloc(req->tp_block_nr*sizeof(char *), GFP_KERNEL);
+                pg_vec = alloc_pg_vec(req, order);
-                if (pg_vec == NULL)
+                if (unlikely(!pg_vec))
                        goto out;
-                memset(pg_vec, 0, req->tp_block_nr*sizeof(char **));
-                for (i=0; i<req->tp_block_nr; i++) {
-                        struct page *page, *pend;
-                        pg_vec[i] = (char *)__get_free_pages(GFP_KERNEL, order);
-                        if (!pg_vec[i])
-                                goto out_free_pgvec;
-                        pend = pg_vec_endpage(pg_vec[i], order);
-                        for (page = virt_to_page(pg_vec[i]); page <= pend; page++)
-                                SetPageReserved(page);
-                }
-                /* Page vector is allocated */
                l = 0;
-                for (i=0; i<req->tp_block_nr; i++) {
+                for (i = 0; i < req->tp_block_nr; i++) {
                        char *ptr = pg_vec[i];
                        struct tpacket_hdr *header;
                        int k;
-                        for (k=0; k<po->frames_per_block; k++) {
+                        for (k = 0; k < po->frames_per_block; k++) {
-                                
+                                header = (struct tpacket_hdr *) ptr;
-                                header = (struct tpacket_hdr*)ptr;
                                header->tp_status = TP_STATUS_KERNEL;
                                ptr += req->tp_frame_size;
                        }
                }
                /* Done */
        } else {
-                if (req->tp_frame_nr)
+                if (unlikely(req->tp_frame_nr))
                        return -EINVAL;
        }
@@ -1701,7 +1707,7 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing
                spin_lock_bh(&sk->sk_receive_queue.lock);
                pg_vec = XC(po->pg_vec, pg_vec);
-                po->frame_max = req->tp_frame_nr-1;
+                po->frame_max = (req->tp_frame_nr - 1);
                po->head = 0;
                po->frame_size = req->tp_frame_size;
                spin_unlock_bh(&sk->sk_receive_queue.lock);
@@ -1728,7 +1734,6 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing
        release_sock(sk);
-out_free_pgvec:
        if (pg_vec)
                free_pg_vec(pg_vec, order, req->tp_block_nr);
 out:
@@ -1755,17 +1760,19 @@ static int packet_mmap(struct file *file, struct socket *sock, struct vm_area_st
        if (size != po->pg_vec_len*po->pg_vec_pages*PAGE_SIZE)
                goto out;
-        atomic_inc(&po->mapped);
        start = vma->vm_start;
-        err = -EAGAIN;
+        for (i = 0; i < po->pg_vec_len; i++) {
-        for (i=0; i<po->pg_vec_len; i++) {
+                struct page *page = virt_to_page(po->pg_vec[i]);
-                if (remap_pfn_range(vma, start,
+                int pg_num;
-                                     __pa(po->pg_vec[i]) >> PAGE_SHIFT,
-                                     po->pg_vec_pages*PAGE_SIZE,
+                for (pg_num = 0; pg_num < po->pg_vec_pages; pg_num++, page++) {
-                                     vma->vm_page_prot))
+                        err = vm_insert_page(vma, start, page);
-                        goto out;
+                        if (unlikely(err))
-                start += po->pg_vec_pages*PAGE_SIZE;
+                                goto out;
+                        start += PAGE_SIZE;
+                }
        }
+        atomic_inc(&po->mapped);
        vma->vm_ops = &packet_mmap_ops;
        err = 0;
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 8aebe8f6d271..2ce1cb2aa2ed 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -34,7 +34,7 @@
 #include <net/sch_generic.h>
 #include <net/act_api.h>
-#if 1 /* control */
+#if 0 /* control */
 #define DPRINTK(format, args...) printk(KERN_DEBUG format, ##args)
 #else
 #define DPRINTK(format, args...)
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index d890dfa8818f..9df888e932c5 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -156,10 +156,6 @@ static inline void sctp_set_owner_w(struct sctp_chunk *chunk)
                                sizeof(struct sk_buff) +
                                sizeof(struct sctp_chunk);
-        sk->sk_wmem_queued += SCTP_DATA_SNDSIZE(chunk) +
-                                sizeof(struct sk_buff) +
-                                sizeof(struct sctp_chunk);
        atomic_add(sizeof(struct sctp_chunk), &sk->sk_wmem_alloc);
 }
@@ -3425,7 +3421,7 @@ static int sctp_copy_laddrs_to_user_old(struct sock *sk, __u16 port, int max_add
 }
 static int sctp_copy_laddrs_to_user(struct sock *sk, __u16 port,
-                                    void * __user *to, size_t space_left)
+                                    void __user **to, size_t space_left)
 {
        struct list_head *pos;
        struct sctp_sockaddr_entry *addr;
@@ -4426,7 +4422,7 @@ cleanup:
 * tcp_poll().  Note that, based on these implementations, we don't
 * lock the socket in this function, even though it seems that,
 * ideally, locking or some other mechanisms can be used to ensure
- * the integrity of the counters (sndbuf and wmem_queued) used
+ * the integrity of the counters (sndbuf and wmem_alloc) used
 * in this place.  We assume that we don't need locks either until proven
 * otherwise.
 *
@@ -4833,10 +4829,6 @@ static void sctp_wfree(struct sk_buff *skb)
                                sizeof(struct sk_buff) +
                                sizeof(struct sctp_chunk);
-        sk->sk_wmem_queued -= SCTP_DATA_SNDSIZE(chunk) +
-                                sizeof(struct sk_buff) +
-                                sizeof(struct sctp_chunk);
        atomic_sub(sizeof(struct sctp_chunk), &sk->sk_wmem_alloc);
        sock_wfree(skb);
@@ -4920,7 +4912,7 @@ void sctp_write_space(struct sock *sk)
 /* Is there any sndbuf space available on the socket?
 *
- * Note that wmem_queued is the sum of the send buffers on all of the
+ * Note that sk_wmem_alloc is the sum of the send buffers on all of the
 * associations on the same socket.  For a UDP-style socket with
 * multiple associations, it is possible for it to be "unwriteable"
 * prematurely.  I assume that this is acceptable because
@@ -4933,7 +4925,7 @@ static int sctp_writeable(struct sock *sk)
 {
        int amt = 0;
-        amt = sk->sk_sndbuf - sk->sk_wmem_queued;
+        amt = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc);
        if (amt < 0)
                amt = 0;
        return amt;
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index f44f46f1d8e0..8d782282ec19 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -638,7 +638,7 @@ gss_pipe_destroy_msg(struct rpc_pipe_msg *msg)
                                gss_msg);
                atomic_inc(&gss_msg->count);
                gss_unhash_msg(gss_msg);
-                if (msg->errno == -ETIMEDOUT || msg->errno == -EPIPE) {
+                if (msg->errno == -ETIMEDOUT) {
                        unsigned long now = jiffies;
                        if (time_after(now, ratelimit)) {
                                printk(KERN_WARNING "RPC: AUTH_GSS upcall timed out.\n"
@@ -786,7 +786,9 @@ gss_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int taskflags)
        cred->gc_flags = 0;
        cred->gc_base.cr_ops = &gss_credops;
        cred->gc_service = gss_auth->service;
-        err = gss_create_upcall(gss_auth, cred);
+        do {
+                err = gss_create_upcall(gss_auth, cred);
+        } while (err == -EAGAIN);
        if (err < 0)
                goto out_err;
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index c76ea221798c..16a2458f38f7 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -174,7 +174,7 @@ rpc_pipe_release(struct inode *inode, struct file *filp)
                goto out;
        msg = (struct rpc_pipe_msg *)filp->private_data;
        if (msg != NULL) {
-                msg->errno = -EPIPE;
+                msg->errno = -EAGAIN;
                list_del_init(&msg->list);
                rpci->ops->destroy_msg(msg);
        }
@@ -183,7 +183,7 @@ rpc_pipe_release(struct inode *inode, struct file *filp)
        if (filp->f_mode & FMODE_READ)
                rpci->nreaders --;
        if (!rpci->nreaders)
-                __rpc_purge_upcall(inode, -EPIPE);
+                __rpc_purge_upcall(inode, -EAGAIN);
        if (rpci->ops->release_pipe)
                rpci->ops->release_pipe(inode);
 out:
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 0a51fd46a848..77e8800d4127 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -990,6 +990,7 @@ static void xs_udp_connect_worker(void *args)
                sk->sk_data_ready = xs_udp_data_ready;
                sk->sk_write_space = xs_udp_write_space;
                sk->sk_no_check = UDP_CSUM_NORCV;
+                sk->sk_allocation = GFP_ATOMIC;
                xprt_set_connected(xprt);
@@ -1074,6 +1075,7 @@ static void xs_tcp_connect_worker(void *args)
                sk->sk_data_ready = xs_tcp_data_ready;
                sk->sk_state_change = xs_tcp_state_change;
                sk->sk_write_space = xs_tcp_write_space;
+                sk->sk_allocation = GFP_ATOMIC;
                /* socket options */
                sk->sk_userlocks |= SOCK_BINDPORT_LOCK;
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 0db9e57013fd..d19e274b9c4a 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -346,6 +346,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
        struct xfrm_policy *pol, **p;
        struct xfrm_policy *delpol = NULL;
        struct xfrm_policy **newpos = NULL;
+        struct dst_entry *gc_list;
        write_lock_bh(&xfrm_policy_lock);
        for (p = &xfrm_policy_list[dir]; (pol=*p)!=NULL;) {
@@ -381,9 +382,36 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
                xfrm_pol_hold(policy);
        write_unlock_bh(&xfrm_policy_lock);
-        if (delpol) {
+        if (delpol)
                xfrm_policy_kill(delpol);
+        read_lock_bh(&xfrm_policy_lock);
+        gc_list = NULL;
+        for (policy = policy->next; policy; policy = policy->next) {
+                struct dst_entry *dst;
+                write_lock(&policy->lock);
+                dst = policy->bundles;
+                if (dst) {
+                        struct dst_entry *tail = dst;
+                        while (tail->next)
+                                tail = tail->next;
+                        tail->next = gc_list;
+                        gc_list = dst;
+                        policy->bundles = NULL;
+                }
+                write_unlock(&policy->lock);
+        }
+        read_unlock_bh(&xfrm_policy_lock);
+        while (gc_list) {
+                struct dst_entry *dst = gc_list;
+                gc_list = dst->next;
+                dst_free(dst);
        }
        return 0;
 }
 EXPORT_SYMBOL(xfrm_policy_insert);
@@ -1014,13 +1042,12 @@ int __xfrm_route_forward(struct sk_buff *skb, unsigned short family)
 }
 EXPORT_SYMBOL(__xfrm_route_forward);
-/* Optimize later using cookies and generation ids. */
 static struct dst_entry *xfrm_dst_check(struct dst_entry *dst, u32 cookie)
 {
-        if (!stale_bundle(dst))
+        /* If it is marked obsolete, which is how we even get here,
-                return dst;
+         * then we have purged it from the policy bundle list and we
+         * did that for a good reason.
+         */
        return NULL;
 }
@@ -1104,6 +1131,16 @@ int xfrm_flush_bundles(void)
        return 0;
 }
+static int always_true(struct dst_entry *dst)
+{
+        return 1;
+}
+void xfrm_flush_all_bundles(void)
+{
+        xfrm_prune_bundles(always_true);
+}
 void xfrm_init_pmtu(struct dst_entry *dst)
 {
        do {
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 7cf48aa6c95b..479effc97666 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -431,6 +431,8 @@ void xfrm_state_insert(struct xfrm_state *x)
        spin_lock_bh(&xfrm_state_lock);
        __xfrm_state_insert(x);
        spin_unlock_bh(&xfrm_state_lock);
+        xfrm_flush_all_bundles();
 }
 EXPORT_SYMBOL(xfrm_state_insert);
@@ -478,6 +480,9 @@ out:
        spin_unlock_bh(&xfrm_state_lock);
        xfrm_state_put_afinfo(afinfo);
+        if (!err)
+                xfrm_flush_all_bundles();
        if (x1) {
                xfrm_state_delete(x1);
                xfrm_state_put(x1);
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index 6b46a8a4b1cc..b963c550dae6 100644
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -578,17 +578,15 @@ set_recv_slots(int num_channels)
        } while ((stat & PSC_AC97STAT_DR) == 0);
 }
+/* Hold spinlock for both start_dac() and start_adc() calls */
 static void
 start_dac(struct au1550_state *s)
 {
        struct dmabuf  *db = &s->dma_dac;
-        unsigned long   flags;
        if (!db->stopped)
                return;
-        spin_lock_irqsave(&s->lock, flags);
        set_xmit_slots(db->num_channels);
        au_writel(PSC_AC97PCR_TC, PSC_AC97PCR);
        au_sync();
@@ -598,8 +596,6 @@ start_dac(struct au1550_state *s)
        au1xxx_dbdma_start(db->dmanr);
        db->stopped = 0;
-        spin_unlock_irqrestore(&s->lock, flags);
 }
 static void
@@ -718,7 +714,6 @@ prog_dmabuf_dac(struct au1550_state *s)
 }
-/* hold spinlock for the following */
 static void
 dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
@@ -726,6 +721,8 @@ dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        struct dmabuf  *db = &s->dma_dac;
        u32     ac97c_stat;
+        spin_lock(&s->lock);
        ac97c_stat = au_readl(PSC_AC97STAT);
        if (ac97c_stat & (AC97C_XU | AC97C_XO | AC97C_TE))
                pr_debug("AC97C status = 0x%08x\n", ac97c_stat);
@@ -747,6 +744,8 @@ dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        /* wake up anybody listening */
        if (waitqueue_active(&db->wait))
                wake_up(&db->wait);
+        spin_unlock(&s->lock);
 }
@@ -758,6 +757,8 @@ adc_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        u32     obytes;
        char    *obuf;
+        spin_lock(&s->lock);
        /* Pull the buffer from the dma queue.
        */
        au1xxx_dbdma_get_dest(dp->dmanr, (void *)(&obuf), &obytes);
@@ -765,6 +766,7 @@ adc_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        if ((dp->count + obytes) > dp->dmasize) {
                /* Overrun. Stop ADC and log the error
                */
+                spin_unlock(&s->lock);
                stop_adc(s);
                dp->error++;
                err("adc overrun");
@@ -787,6 +789,7 @@ adc_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        if (waitqueue_active(&dp->wait))
                wake_up(&dp->wait);
+        spin_unlock(&s->lock);
 }
 static loff_t
@@ -1048,9 +1051,9 @@ au1550_read(struct file *file, char *buffer, size_t count, loff_t *ppos)
                /* wait for samples in ADC dma buffer
                */
                do {
+                        spin_lock_irqsave(&s->lock, flags);
                        if (db->stopped)
                                start_adc(s);
-                        spin_lock_irqsave(&s->lock, flags);
                        avail = db->count;
                        if (avail <= 0)
                                __set_current_state(TASK_INTERRUPTIBLE);
@@ -1570,15 +1573,19 @@ au1550_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                if (get_user(val, (int *) arg))
                        return -EFAULT;
                if (file->f_mode & FMODE_READ) {
-                        if (val & PCM_ENABLE_INPUT)
+                        if (val & PCM_ENABLE_INPUT) {
+                                spin_lock_irqsave(&s->lock, flags);
                                start_adc(s);
-                        else
+                                spin_unlock_irqrestore(&s->lock, flags);
+                        } else
                                stop_adc(s);
                }
                if (file->f_mode & FMODE_WRITE) {
-                        if (val & PCM_ENABLE_OUTPUT)
+                        if (val & PCM_ENABLE_OUTPUT) {
+                                spin_lock_irqsave(&s->lock, flags);
                                start_dac(s);
-                        else
+                                spin_unlock_irqrestore(&s->lock, flags);
+                        } else
                                stop_dac(s);
                }
                return 0;
diff --git a/sound/sparc/Kconfig b/sound/sparc/Kconfig
index 09ab138646a6..ef022a846b06 100644
--- a/sound/sparc/Kconfig
+++ b/sound/sparc/Kconfig
@@ -1,7 +1,7 @@
 # ALSA Sparc drivers
 menu "ALSA Sparc devices"
-        depends on SND!=n && (SPARC32 || SPARC64)
+        depends on SND!=n && SPARC
 config SND_SUN_AMD7930
        tristate "Sun AMD7930"