195 files changed, 6037 insertions, 1820 deletions
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 1d96efec5e8f..237d54c44bc5 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -305,7 +305,7 @@ point out some special detail about the sign-off.
 The canonical patch subject line is:
-    Subject: [PATCH 001/123] [<area>:] <explanation>
+    Subject: [PATCH 001/123] subsystem: summary phrase
 The canonical patch message body contains the following:
@@ -330,9 +330,25 @@ alphabetically by subject line - pretty much any email reader will
 support that - since because the sequence number is zero-padded,
 the numerical and alphabetic sort is the same.
-See further details on how to phrase the "<explanation>" in the
+The "subsystem" in the email's Subject should identify which
-"Subject:" line in Andrew Morton's "The perfect patch", referenced
+area or subsystem of the kernel is being patched.
-below.
+The "summary phrase" in the email's Subject should concisely
+describe the patch which that email contains.  The "summary
+phrase" should not be a filename.  Do not use the same "summary
+phrase" for every patch in a whole patch series.
+Bear in mind that the "summary phrase" of your email becomes
+a globally-unique identifier for that patch.  It propagates
+all the way into the git changelog.  The "summary phrase" may
+later be used in developer discussions which refer to the patch.
+People will want to google for the "summary phrase" to read
+discussion regarding that patch.
+A couple of example Subjects:
+    Subject: [patch 2/5] ext2: improve scalability of bitmap searching
+    Subject: [PATCHv2 001/207] x86: fix eflags tracking
 The "from" line must be the very first line in the message body,
 and has the form:
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index ab65714d95fc..b433c8a27e2d 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -355,10 +355,14 @@ ip_dynaddr - BOOLEAN
        Default: 0
 icmp_echo_ignore_all - BOOLEAN
+        If set non-zero, then the kernel will ignore all ICMP ECHO
+        requests sent to it.
+        Default: 0
 icmp_echo_ignore_broadcasts - BOOLEAN
-        If either is set to true, then the kernel will ignore either all
+        If set non-zero, then the kernel will ignore all ICMP ECHO and
-        ICMP ECHO requests sent to it or just those to broadcast/multicast
+        TIMESTAMP requests sent to it via broadcast/multicast.
-        addresses, respectively.
+        Default: 1
 icmp_ratelimit - INTEGER
        Limit the maximal rates for sending ICMP packets whose type matches
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index 42629ff84f5a..ea569ba482b1 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -305,7 +305,7 @@ long execve(const char *filename, char **argv, char **envp)
                  "Ir" (THREAD_START_SP - sizeof(regs)),
                  "r" (&regs),
                  "Ir" (sizeof(regs))
-                : "r0", "r1", "r2", "r3", "ip", "memory");
+                : "r0", "r1", "r2", "r3", "ip", "lr", "memory");
 out:
        return ret;
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index e7d22dbcb691..f6de76e0a45d 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -504,7 +504,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
                bad_access:
                spin_unlock(&mm->page_table_lock);
-                /* simulate a read access fault */
+                /* simulate a write access fault */
                do_DataAbort(addr, 15 + (1 << 11), regs);
                return -1;
        }
diff --git a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c
index 41e5849ae8da..f8a742bb2d5b 100644
--- a/arch/arm/mach-imx/generic.c
+++ b/arch/arm/mach-imx/generic.c
@@ -28,14 +28,15 @@
 #include <linux/module.h>
 #include <asm/arch/imxfb.h>
 #include <asm/hardware.h>
+#include <asm/arch/imx-regs.h>
 #include <asm/mach/map.h>
 void imx_gpio_mode(int gpio_mode)
 {
        unsigned int pin = gpio_mode & GPIO_PIN_MASK;
-        unsigned int port = (gpio_mode & GPIO_PORT_MASK) >> 5;
+        unsigned int port = (gpio_mode & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
-        unsigned int ocr = (gpio_mode & GPIO_OCR_MASK) >> 10;
+        unsigned int ocr = (gpio_mode & GPIO_OCR_MASK) >> GPIO_OCR_SHIFT;
        unsigned int tmp;
        /* Pullup enable */
@@ -57,7 +58,7 @@ void imx_gpio_mode(int gpio_mode)
                GPR(port) &= ~(1<<pin);
        /* use as gpio? */
-        if( ocr == 3 )
+        if(gpio_mode &  GPIO_GIUS)
                GIUS(port) |= (1<<pin);
        else
                GIUS(port) &= ~(1<<pin);
@@ -72,20 +73,20 @@ void imx_gpio_mode(int gpio_mode)
                tmp |= (ocr << (pin*2));
                OCR1(port) = tmp;
-                if( gpio_mode & GPIO_AOUT )
+                ICONFA1(port) &= ~( 3<<(pin*2));
-                        ICONFA1(port) &= ~( 3<<(pin*2));
+                ICONFA1(port) |= ((gpio_mode >> GPIO_AOUT_SHIFT) & 3) << (pin * 2);
-                if( gpio_mode & GPIO_BOUT )
+                ICONFB1(port) &= ~( 3<<(pin*2));
-                        ICONFB1(port) &= ~( 3<<(pin*2));
+                ICONFB1(port) |= ((gpio_mode >> GPIO_BOUT_SHIFT) & 3) << (pin * 2);
        } else {
                tmp = OCR2(port);
                tmp &= ~( 3<<((pin-16)*2));
                tmp |= (ocr << ((pin-16)*2));
                OCR2(port) = tmp;
-                if( gpio_mode & GPIO_AOUT )
+                ICONFA2(port) &= ~( 3<<((pin-16)*2));
-                        ICONFA2(port) &= ~( 3<<((pin-16)*2));
+                ICONFA2(port) |= ((gpio_mode >> GPIO_AOUT_SHIFT) & 3) << ((pin-16) * 2);
-                if( gpio_mode & GPIO_BOUT )
+                ICONFB2(port) &= ~( 3<<((pin-16)*2));
-                        ICONFB2(port) &= ~( 3<<((pin-16)*2));
+                ICONFB2(port) |= ((gpio_mode >> GPIO_BOUT_SHIFT) & 3) << ((pin-16) * 2);
        }
 }
diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c
index 5d25434d332c..a7511ddfe364 100644
--- a/arch/arm/mach-imx/mx1ads.c
+++ b/arch/arm/mach-imx/mx1ads.c
@@ -55,7 +55,7 @@ static void __init
 mx1ads_init(void)
 {
 #ifdef CONFIG_LEDS
-        imx_gpio_mode(GPIO_PORTA | GPIO_OUT | GPIO_GPIO | 2);
+        imx_gpio_mode(GPIO_PORTA | GPIO_OUT | 2);
 #endif
        platform_add_devices(devices, ARRAY_SIZE(devices));
 }
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index db5e47dfc303..c54e04c995ee 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -370,21 +370,21 @@ config CPU_BIG_ENDIAN
 config CPU_ICACHE_DISABLE
        bool "Disable I-Cache"
-        depends on CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020
+        depends on CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020 || CPU_V6
        help
          Say Y here to disable the processor instruction cache. Unless
          you have a reason not to or are unsure, say N.
 config CPU_DCACHE_DISABLE
        bool "Disable D-Cache"
-        depends on CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020
+        depends on CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020 || CPU_V6
        help
          Say Y here to disable the processor data cache. Unless
          you have a reason not to or are unsure, say N.
 config CPU_DCACHE_WRITETHROUGH
        bool "Force write through D-cache"
-        depends on (CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020) && !CPU_DCACHE_DISABLE
+        depends on (CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020 || CPU_V6) && !CPU_DCACHE_DISABLE
        default y if CPU_ARM925T
        help
          Say Y here to use the data cache in writethrough mode. Unless you
@@ -399,7 +399,7 @@ config CPU_CACHE_ROUND_ROBIN
 config CPU_BPREDICT_DISABLE
        bool "Disable branch prediction"
-        depends on CPU_ARM1020
+        depends on CPU_ARM1020 || CPU_V6
        help
          Say Y here to disable branch prediction.  If unsure, say N.
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 6dc726ad7137..d0a5106fba24 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1016,6 +1016,11 @@ ia64_mca_cmc_int_handler(int cmc_irq, void *arg, struct pt_regs *ptregs)
                        cmc_polling_enabled = 1;
                        spin_unlock(&cmc_history_lock);
+                        /* If we're being hit with CMC interrupts, we won't
+                         * ever execute the schedule_work() below.  Need to
+                         * disable CMC interrupts on this processor now.
+                         */
+                        ia64_mca_cmc_vector_disable(NULL);
                        schedule_work(&cmc_disable_work);
                        /*
diff --git a/arch/ppc/platforms/pmac_time.c b/arch/ppc/platforms/pmac_time.c
index 778ce4fec368..efb819f9490d 100644
--- a/arch/ppc/platforms/pmac_time.c
+++ b/arch/ppc/platforms/pmac_time.c
@@ -195,7 +195,7 @@ via_calibrate_decr(void)
                ;
        dend = get_dec();
-        tb_ticks_per_jiffy = (dstart - dend) / (6 * (HZ/100));
+        tb_ticks_per_jiffy = (dstart - dend) / ((6 * HZ)/100);
        tb_to_us = mulhwu_scale_factor(dstart - dend, 60000);
        printk(KERN_INFO "via_calibrate_decr: ticks per jiffy = %u (%u ticks)\n",
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index aba05394d30a..6537445dac0e 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -25,62 +25,6 @@ source "init/Kconfig"
 menu "General machine setup"
-config VT
-        bool
-        select INPUT
-        default y
-        ---help---
-          If you say Y here, you will get support for terminal devices with
-          display and keyboard devices. These are called "virtual" because you
-          can run several virtual terminals (also called virtual consoles) on
-          one physical terminal. This is rather useful, for example one
-          virtual terminal can collect system messages and warnings, another
-          one can be used for a text-mode user session, and a third could run
-          an X session, all in parallel. Switching between virtual terminals
-          is done with certain key combinations, usually Alt-<function key>.
-          The setterm command ("man setterm") can be used to change the
-          properties (such as colors or beeping) of a virtual terminal. The
-          man page console_codes(4) ("man console_codes") contains the special
-          character sequences that can be used to change those properties
-          directly. The fonts used on virtual terminals can be changed with
-          the setfont ("man setfont") command and the key bindings are defined
-          with the loadkeys ("man loadkeys") command.
-          You need at least one virtual terminal device in order to make use
-          of your keyboard and monitor. Therefore, only people configuring an
-          embedded system would want to say N here in order to save some
-          memory; the only way to log into such a system is then via a serial
-          or network connection.
-          If unsure, say Y, or else you won't be able to do much with your new
-          shiny Linux system :-)
-config VT_CONSOLE
-        bool
-        default y
-        ---help---
-          The system console is the device which receives all kernel messages
-          and warnings and which allows logins in single user mode. If you
-          answer Y here, a virtual terminal (the device used to interact with
-          a physical terminal) can be used as system console. This is the most
-          common mode of operations, so you should say Y here unless you want
-          the kernel messages be output only to a serial port (in which case
-          you should say Y to "Console on serial port", below).
-          If you do say Y here, by default the currently visible virtual
-          terminal (/dev/tty0) will be used as system console. You can change
-          that with a kernel command line option such as "console=tty3" which
-          would use the third virtual terminal as system console. (Try "man
-          bootparam" or see the documentation of your boot loader (lilo or
-          loadlin) about how to pass options to the kernel at boot time.)
-          If unsure, say Y.
-config HW_CONSOLE
-        bool
-        default y
 config SMP
        bool "Symmetric multi-processing support (does not work on sun4/sun4c)"
        depends on BROKEN
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index bc015e980341..279a62627c10 100644
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -457,7 +457,7 @@ void __init time_init(void)
        sbus_time_init();
 }
-extern __inline__ unsigned long do_gettimeoffset(void)
+static inline unsigned long do_gettimeoffset(void)
 {
        return (*master_l10_counter >> 10) & 0x1fffff;
 }
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index c89a803cbc20..c664b962987c 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -260,7 +260,7 @@ static inline pte_t srmmu_pte_modify(pte_t pte, pgprot_t newprot)
 { return __pte((pte_val(pte) & SRMMU_CHG_MASK) | pgprot_val(newprot)); }
 /* to find an entry in a top-level page table... */
-extern inline pgd_t *srmmu_pgd_offset(struct mm_struct * mm, unsigned long address)
+static inline pgd_t *srmmu_pgd_offset(struct mm_struct * mm, unsigned long address)
 { return mm->pgd + (address >> SRMMU_PGDIR_SHIFT); }
 /* Find an entry in the second-level page table.. */
diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index 2879b1072921..f685035dbdb8 100644
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -97,8 +97,8 @@ do_fpdis:
        faddd           %f0, %f2, %f4
        fmuld           %f0, %f2, %f6
        ldxa            [%g3] ASI_DMMU, %g5
-cplus_fptrap_insn_1:
+        sethi           %hi(sparc64_kern_sec_context), %g2
-        sethi           %hi(0), %g2
+        ldx             [%g2 + %lo(sparc64_kern_sec_context)], %g2
        stxa            %g2, [%g3] ASI_DMMU
        membar          #Sync
        add             %g6, TI_FPREGS + 0xc0, %g2
@@ -126,8 +126,8 @@ cplus_fptrap_insn_1:
        fzero           %f34
        ldxa            [%g3] ASI_DMMU, %g5
        add             %g6, TI_FPREGS, %g1
-cplus_fptrap_insn_2:
+        sethi           %hi(sparc64_kern_sec_context), %g2
-        sethi           %hi(0), %g2
+        ldx             [%g2 + %lo(sparc64_kern_sec_context)], %g2
        stxa            %g2, [%g3] ASI_DMMU
        membar          #Sync
        add             %g6, TI_FPREGS + 0x40, %g2
@@ -153,8 +153,8 @@ cplus_fptrap_insn_2:
 3:      mov             SECONDARY_CONTEXT, %g3
        add             %g6, TI_FPREGS, %g1
        ldxa            [%g3] ASI_DMMU, %g5
-cplus_fptrap_insn_3:
+        sethi           %hi(sparc64_kern_sec_context), %g2
-        sethi           %hi(0), %g2
+        ldx             [%g2 + %lo(sparc64_kern_sec_context)], %g2
        stxa            %g2, [%g3] ASI_DMMU
        membar          #Sync
        mov             0x40, %g2
@@ -319,8 +319,8 @@ do_fptrap_after_fsr:
        stx             %g3, [%g6 + TI_GSR]
        mov             SECONDARY_CONTEXT, %g3
        ldxa            [%g3] ASI_DMMU, %g5
-cplus_fptrap_insn_4:
+        sethi           %hi(sparc64_kern_sec_context), %g2
-        sethi           %hi(0), %g2
+        ldx             [%g2 + %lo(sparc64_kern_sec_context)], %g2
        stxa            %g2, [%g3] ASI_DMMU
        membar          #Sync
        add             %g6, TI_FPREGS, %g2
@@ -341,33 +341,6 @@ cplus_fptrap_insn_4:
        ba,pt           %xcc, etrap
         wr             %g0, 0, %fprs
-cplus_fptrap_1:
-        sethi           %hi(CTX_CHEETAH_PLUS_CTX0), %g2
-        .globl          cheetah_plus_patch_fpdis
-cheetah_plus_patch_fpdis:
-        /* We configure the dTLB512_0 for 4MB pages and the
-         * dTLB512_1 for 8K pages when in context zero.
-         */
-        sethi                   %hi(cplus_fptrap_1), %o0
-        lduw                    [%o0 + %lo(cplus_fptrap_1)], %o1
-        set                     cplus_fptrap_insn_1, %o2
-        stw                     %o1, [%o2]
-        flush                   %o2
-        set                     cplus_fptrap_insn_2, %o2
-        stw                     %o1, [%o2]
-        flush                   %o2
-        set                     cplus_fptrap_insn_3, %o2
-        stw                     %o1, [%o2]
-        flush                   %o2
-        set                     cplus_fptrap_insn_4, %o2
-        stw                     %o1, [%o2]
-        flush                   %o2
-        retl
-         nop
        /* The registers for cross calls will be:
         *
         * DATA 0: [low 32-bits]  Address of function to call, jmp to this
diff --git a/arch/sparc64/kernel/etrap.S b/arch/sparc64/kernel/etrap.S
index 50d2af1d98ae..0d8eba21111b 100644
--- a/arch/sparc64/kernel/etrap.S
+++ b/arch/sparc64/kernel/etrap.S
@@ -68,12 +68,8 @@ etrap_irq:
                wrpr    %g3, 0, %otherwin
                wrpr    %g2, 0, %wstate
-cplus_etrap_insn_1:
+                sethi   %hi(sparc64_kern_pri_context), %g2
-                sethi   %hi(0), %g3
+                ldx     [%g2 + %lo(sparc64_kern_pri_context)], %g3
-                sllx    %g3, 32, %g3
-cplus_etrap_insn_2:
-                sethi   %hi(0), %g2
-                or      %g3, %g2, %g3
                stxa    %g3, [%l4] ASI_DMMU
                flush   %l6
                wr      %g0, ASI_AIUS, %asi
@@ -215,12 +211,8 @@ scetrap:	rdpr	%pil, %g2
                mov     PRIMARY_CONTEXT, %l4
                wrpr    %g3, 0, %otherwin
                wrpr    %g2, 0, %wstate
-cplus_etrap_insn_3:
+                sethi   %hi(sparc64_kern_pri_context), %g2
-                sethi   %hi(0), %g3
+                ldx     [%g2 + %lo(sparc64_kern_pri_context)], %g3
-                sllx    %g3, 32, %g3
-cplus_etrap_insn_4:
-                sethi   %hi(0), %g2
-                or      %g3, %g2, %g3
                stxa    %g3, [%l4] ASI_DMMU
                flush   %l6
@@ -264,38 +256,3 @@ cplus_etrap_insn_4:
 #undef TASK_REGOFF
 #undef ETRAP_PSTATE1
-cplus_einsn_1:
-                sethi                   %uhi(CTX_CHEETAH_PLUS_NUC), %g3
-cplus_einsn_2:
-                sethi                   %hi(CTX_CHEETAH_PLUS_CTX0), %g2
-                .globl                  cheetah_plus_patch_etrap
-cheetah_plus_patch_etrap:
-                /* We configure the dTLB512_0 for 4MB pages and the
-                 * dTLB512_1 for 8K pages when in context zero.
-                 */
-                sethi                   %hi(cplus_einsn_1), %o0
-                sethi                   %hi(cplus_etrap_insn_1), %o2
-                lduw                    [%o0 + %lo(cplus_einsn_1)], %o1
-                or                      %o2, %lo(cplus_etrap_insn_1), %o2
-                stw                     %o1, [%o2]
-                flush                   %o2
-                sethi                   %hi(cplus_etrap_insn_3), %o2
-                or                      %o2, %lo(cplus_etrap_insn_3), %o2
-                stw                     %o1, [%o2]
-                flush                   %o2
-                sethi                   %hi(cplus_einsn_2), %o0
-                sethi                   %hi(cplus_etrap_insn_2), %o2
-                lduw                    [%o0 + %lo(cplus_einsn_2)], %o1
-                or                      %o2, %lo(cplus_etrap_insn_2), %o2
-                stw                     %o1, [%o2]
-                flush                   %o2
-                sethi                   %hi(cplus_etrap_insn_4), %o2
-                or                      %o2, %lo(cplus_etrap_insn_4), %o2
-                stw                     %o1, [%o2]
-                flush                   %o2
-                retl
-                 nop
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index 89406f9649a9..24340496cdd3 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -325,23 +325,7 @@ cheetah_tlb_fixup:
 1:      sethi   %hi(tlb_type), %g1
        stw     %g2, [%g1 + %lo(tlb_type)]
-        BRANCH_IF_CHEETAH_PLUS_OR_FOLLOWON(g1,g7,1f)
+        /* Patch copy/page operations to cheetah optimized versions. */
-        ba,pt   %xcc, 2f
-         nop
-1:      /* Patch context register writes to support nucleus page
-         * size correctly.
-         */
-        call    cheetah_plus_patch_etrap
-         nop
-        call    cheetah_plus_patch_rtrap
-         nop
-        call    cheetah_plus_patch_fpdis
-         nop
-        call    cheetah_plus_patch_winfixup
-         nop
-2:      /* Patch copy/page operations to cheetah optimized versions. */
        call    cheetah_patch_copyops
         nop
        call    cheetah_patch_copy_page
@@ -484,20 +468,13 @@ spitfire_vpte_base:
        call    prom_set_trap_table
         sethi  %hi(sparc64_ttable_tl0), %o0
-        BRANCH_IF_CHEETAH_PLUS_OR_FOLLOWON(g2,g3,1f)
+        /* Start using proper page size encodings in ctx register.  */
-        ba,pt   %xcc, 2f
+        sethi   %hi(sparc64_kern_pri_context), %g3
-         nop
+        ldx     [%g3 + %lo(sparc64_kern_pri_context)], %g2
-1:      /* Start using proper page size encodings in ctx register.  */
-        sethi   %uhi(CTX_CHEETAH_PLUS_NUC), %g3
        mov     PRIMARY_CONTEXT, %g1
-        sllx    %g3, 32, %g3
+        stxa    %g2, [%g1] ASI_DMMU
-        sethi   %hi(CTX_CHEETAH_PLUS_CTX0), %g2
-        or      %g3, %g2, %g3
-        stxa    %g3, [%g1] ASI_DMMU
        membar  #Sync
-2:
        rdpr    %pstate, %o1
        or      %o1, PSTATE_IE, %o1
        wrpr    %o1, 0, %pstate
diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S
index fafd227735fa..ecfb42a69a44 100644
--- a/arch/sparc64/kernel/rtrap.S
+++ b/arch/sparc64/kernel/rtrap.S
@@ -256,9 +256,8 @@ rt_continue:	ldx			[%sp + PTREGS_OFF + PT_V9_G1], %g1
                brnz,pn                 %l3, kern_rtt
                 mov                    PRIMARY_CONTEXT, %l7
                ldxa                    [%l7 + %l7] ASI_DMMU, %l0
-cplus_rtrap_insn_1:
+                sethi                   %hi(sparc64_kern_pri_nuc_bits), %l1
-                sethi                   %hi(0), %l1
+                ldx                     [%l1 + %lo(sparc64_kern_pri_nuc_bits)], %l1
-                sllx                    %l1, 32, %l1
                or                      %l0, %l1, %l0
                stxa                    %l0, [%l7] ASI_DMMU
                flush                   %g6
@@ -345,21 +344,3 @@ kern_fpucheck:	ldub			[%g6 + TI_FPDEPTH], %l5
                wr                      %g0, FPRS_DU, %fprs
                ba,pt                   %xcc, rt_continue
                 stb                    %l5, [%g6 + TI_FPDEPTH]
-cplus_rinsn_1:
-                sethi                   %uhi(CTX_CHEETAH_PLUS_NUC), %l1
-                .globl                  cheetah_plus_patch_rtrap
-cheetah_plus_patch_rtrap:
-                /* We configure the dTLB512_0 for 4MB pages and the
-                 * dTLB512_1 for 8K pages when in context zero.
-                 */
-                sethi                   %hi(cplus_rinsn_1), %o0
-                sethi                   %hi(cplus_rtrap_insn_1), %o2
-                lduw                    [%o0 + %lo(cplus_rinsn_1)], %o1
-                or                      %o2, %lo(cplus_rtrap_insn_1), %o2
-                stw                     %o1, [%o2]
-                flush                   %o2
-                retl
-                 nop
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 4c9c8f241748..c1f34237cdf2 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -187,17 +187,13 @@ int prom_callback(long *args)
                }
                if ((va >= KERNBASE) && (va < (KERNBASE + (4 * 1024 * 1024)))) {
-                        unsigned long kernel_pctx = 0;
+                        extern unsigned long sparc64_kern_pri_context;
-                        if (tlb_type == cheetah_plus)
-                                kernel_pctx |= (CTX_CHEETAH_PLUS_NUC |
-                                                CTX_CHEETAH_PLUS_CTX0);
                        /* Spitfire Errata #32 workaround */
                        __asm__ __volatile__("stxa      %0, [%1] %2\n\t"
                                             "flush     %%g6"
                                             : /* No outputs */
-                                             : "r" (kernel_pctx),
+                                             : "r" (sparc64_kern_pri_context),
                                               "r" (PRIMARY_CONTEXT),
                                               "i" (ASI_DMMU));
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S
index 89f2fcfcd662..9478551cb020 100644
--- a/arch/sparc64/kernel/trampoline.S
+++ b/arch/sparc64/kernel/trampoline.S
@@ -336,20 +336,13 @@ do_unlock:
        call            init_irqwork_curcpu
         nop
-        BRANCH_IF_CHEETAH_PLUS_OR_FOLLOWON(g2,g3,1f)
+        /* Start using proper page size encodings in ctx register.  */
-        ba,pt   %xcc, 2f
+        sethi   %hi(sparc64_kern_pri_context), %g3
-         nop
+        ldx     [%g3 + %lo(sparc64_kern_pri_context)], %g2
-1:      /* Start using proper page size encodings in ctx register.  */
-        sethi   %uhi(CTX_CHEETAH_PLUS_NUC), %g3
        mov     PRIMARY_CONTEXT, %g1
-        sllx    %g3, 32, %g3
+        stxa    %g2, [%g1] ASI_DMMU
-        sethi   %hi(CTX_CHEETAH_PLUS_CTX0), %g2
-        or      %g3, %g2, %g3
-        stxa    %g3, [%g1] ASI_DMMU
        membar  #Sync
-2:
        rdpr            %pstate, %o1
        or              %o1, PSTATE_IE, %o1
        wrpr            %o1, 0, %pstate
diff --git a/arch/sparc64/kernel/winfixup.S b/arch/sparc64/kernel/winfixup.S
index 99c809a1e5ac..39160926267b 100644
--- a/arch/sparc64/kernel/winfixup.S
+++ b/arch/sparc64/kernel/winfixup.S
@@ -16,23 +16,14 @@
        .text
 set_pcontext:
-cplus_winfixup_insn_1:
+        sethi   %hi(sparc64_kern_pri_context), %l1
-        sethi   %hi(0), %l1
+        ldx     [%l1 + %lo(sparc64_kern_pri_context)], %l1
        mov     PRIMARY_CONTEXT, %g1
-        sllx    %l1, 32, %l1
-cplus_winfixup_insn_2:
-        sethi   %hi(0), %g2
-        or      %l1, %g2, %l1
        stxa    %l1, [%g1] ASI_DMMU
        flush   %g6
        retl
         nop
-cplus_wfinsn_1:
-        sethi   %uhi(CTX_CHEETAH_PLUS_NUC), %l1
-cplus_wfinsn_2:
-        sethi   %hi(CTX_CHEETAH_PLUS_CTX0), %g2
        .align  32
        /* Here are the rules, pay attention.
@@ -395,23 +386,3 @@ window_dax_from_user_common:
         add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         clr            %l6
-        
-        .globl          cheetah_plus_patch_winfixup
-cheetah_plus_patch_winfixup:
-        sethi                   %hi(cplus_wfinsn_1), %o0
-        sethi                   %hi(cplus_winfixup_insn_1), %o2
-        lduw                    [%o0 + %lo(cplus_wfinsn_1)], %o1
-        or                      %o2, %lo(cplus_winfixup_insn_1), %o2
-        stw                     %o1, [%o2]
-        flush                   %o2
-        sethi                   %hi(cplus_wfinsn_2), %o0
-        sethi                   %hi(cplus_winfixup_insn_2), %o2
-        lduw                    [%o0 + %lo(cplus_wfinsn_2)], %o1
-        or                      %o2, %lo(cplus_winfixup_insn_2), %o2
-        stw                     %o1, [%o2]
-        flush                   %o2
-        retl
-         nop
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 5db50524f20d..0d2e967c7200 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -133,6 +133,12 @@ extern unsigned int sparc_ramdisk_size;
 struct page *mem_map_zero __read_mostly;
+unsigned int sparc64_highest_unlocked_tlb_ent __read_mostly;
+unsigned long sparc64_kern_pri_context __read_mostly;
+unsigned long sparc64_kern_pri_nuc_bits __read_mostly;
+unsigned long sparc64_kern_sec_context __read_mostly;
 int bigkernel = 0;
 /* XXX Tune this... */
@@ -362,6 +368,7 @@ struct linux_prom_translation {
        unsigned long data;
 };
 static struct linux_prom_translation prom_trans[512] __initdata;
+static unsigned int prom_trans_ents __initdata;
 extern unsigned long prom_boot_page;
 extern void prom_remap(unsigned long physpage, unsigned long virtpage, int mmu_ihandle);
@@ -375,57 +382,7 @@ unsigned long kern_locked_tte_data;
 unsigned long prom_pmd_phys __read_mostly;
 unsigned int swapper_pgd_zero __read_mostly;
-/* Allocate power-of-2 aligned chunks from the end of the
+static pmd_t *prompmd __read_mostly;
- * kernel image.  Return physical address.
- */
-static inline unsigned long early_alloc_phys(unsigned long size)
-{
-        unsigned long base;
-        BUILD_BUG_ON(size & (size - 1));
-        kern_size = (kern_size + (size - 1)) & ~(size - 1);
-        base = kern_base + kern_size;
-        kern_size += size;
-        return base;
-}
-static inline unsigned long load_phys32(unsigned long pa)
-{
-        unsigned long val;
-        __asm__ __volatile__("lduwa     [%1] %2, %0"
-                             : "=&r" (val)
-                             : "r" (pa), "i" (ASI_PHYS_USE_EC));
-        return val;
-}
-static inline unsigned long load_phys64(unsigned long pa)
-{
-        unsigned long val;
-        __asm__ __volatile__("ldxa      [%1] %2, %0"
-                             : "=&r" (val)
-                             : "r" (pa), "i" (ASI_PHYS_USE_EC));
-        return val;
-}
-static inline void store_phys32(unsigned long pa, unsigned long val)
-{
-        __asm__ __volatile__("stwa      %0, [%1] %2"
-                             : /* no outputs */
-                             : "r" (val), "r" (pa), "i" (ASI_PHYS_USE_EC));
-}
-static inline void store_phys64(unsigned long pa, unsigned long val)
-{
-        __asm__ __volatile__("stxa      %0, [%1] %2"
-                             : /* no outputs */
-                             : "r" (val), "r" (pa), "i" (ASI_PHYS_USE_EC));
-}
 #define BASE_PAGE_SIZE 8192
@@ -435,34 +392,28 @@ static inline void store_phys64(unsigned long pa, unsigned long val)
 */
 unsigned long prom_virt_to_phys(unsigned long promva, int *error)
 {
-        unsigned long pmd_phys = (prom_pmd_phys +
+        pmd_t *pmdp = prompmd + ((promva >> 23) & 0x7ff);
-                                  ((promva >> 23) & 0x7ff) * sizeof(pmd_t));
+        pte_t *ptep;
-        unsigned long pte_phys;
-        pmd_t pmd_ent;
-        pte_t pte_ent;
        unsigned long base;
-        pmd_val(pmd_ent) = load_phys32(pmd_phys);
+        if (pmd_none(*pmdp)) {
-        if (pmd_none(pmd_ent)) {
                if (error)
                        *error = 1;
                return 0;
        }
+        ptep = (pte_t *)__pmd_page(*pmdp) + ((promva >> 13) & 0x3ff);
-        pte_phys = (unsigned long)pmd_val(pmd_ent) << 11UL;
+        if (!pte_present(*ptep)) {
-        pte_phys += ((promva >> 13) & 0x3ff) * sizeof(pte_t);
-        pte_val(pte_ent) = load_phys64(pte_phys);
-        if (!pte_present(pte_ent)) {
                if (error)
                        *error = 1;
                return 0;
        }
        if (error) {
                *error = 0;
-                return pte_val(pte_ent);
+                return pte_val(*ptep);
        }
-        base = pte_val(pte_ent) & _PAGE_PADDR;
+        base = pte_val(*ptep) & _PAGE_PADDR;
-        return (base + (promva & (BASE_PAGE_SIZE - 1)));
+        return base + (promva & (BASE_PAGE_SIZE - 1));
 }
 /* The obp translations are saved based on 8k pagesize, since obp can
@@ -475,25 +426,20 @@ static void __init build_obp_range(unsigned long start, unsigned long end, unsig
        unsigned long vaddr;
        for (vaddr = start; vaddr < end; vaddr += BASE_PAGE_SIZE) {
-                unsigned long val, pte_phys, pmd_phys;
+                unsigned long val;
-                pmd_t pmd_ent;
+                pmd_t *pmd;
-                int i;
+                pte_t *pte;
-                pmd_phys = (prom_pmd_phys +
-                            (((vaddr >> 23) & 0x7ff) * sizeof(pmd_t)));
-                pmd_val(pmd_ent) = load_phys32(pmd_phys);
-                if (pmd_none(pmd_ent)) {
-                        pte_phys = early_alloc_phys(BASE_PAGE_SIZE);
-                        for (i = 0; i < BASE_PAGE_SIZE / sizeof(pte_t); i++)
-                                store_phys64(pte_phys+i*sizeof(pte_t),0);
-                        pmd_val(pmd_ent) = pte_phys >> 11UL;
+                pmd = prompmd + ((vaddr >> 23) & 0x7ff);
-                        store_phys32(pmd_phys, pmd_val(pmd_ent));
+                if (pmd_none(*pmd)) {
+                        pte = __alloc_bootmem(BASE_PAGE_SIZE, BASE_PAGE_SIZE,
+                                              PAGE_SIZE);
+                        if (!pte)
+                                prom_halt();
+                        memset(pte, 0, BASE_PAGE_SIZE);
+                        pmd_set(pmd, pte);
                }
+                pte = (pte_t *) __pmd_page(*pmd) + ((vaddr >> 13) & 0x3ff);
-                pte_phys = (unsigned long)pmd_val(pmd_ent) << 11UL;
-                pte_phys += (((vaddr >> 13) & 0x3ff) * sizeof(pte_t));
                val = data;
@@ -501,7 +447,8 @@ static void __init build_obp_range(unsigned long start, unsigned long end, unsig
                if (tlb_type == spitfire)
                        val &= ~0x0003fe0000000000UL;
-                store_phys64(pte_phys, val | _PAGE_MODIFIED);
+                set_pte_at(&init_mm, vaddr, pte,
+                           __pte(val | _PAGE_MODIFIED));
                data += BASE_PAGE_SIZE;
        }
@@ -514,13 +461,17 @@ static inline int in_obp_range(unsigned long vaddr)
 }
 #define OBP_PMD_SIZE 2048
-static void __init build_obp_pgtable(int prom_trans_ents)
+static void __init build_obp_pgtable(void)
 {
        unsigned long i;
-        prom_pmd_phys = early_alloc_phys(OBP_PMD_SIZE);
+        prompmd = __alloc_bootmem(OBP_PMD_SIZE, OBP_PMD_SIZE, PAGE_SIZE);
-        for (i = 0; i < OBP_PMD_SIZE; i += 4)
+        if (!prompmd)
-                store_phys32(prom_pmd_phys + i, 0);
+                prom_halt();
+        memset(prompmd, 0, OBP_PMD_SIZE);
+        prom_pmd_phys = __pa(prompmd);
        for (i = 0; i < prom_trans_ents; i++) {
                unsigned long start, end;
@@ -540,7 +491,7 @@ static void __init build_obp_pgtable(int prom_trans_ents)
 /* Read OBP translations property into 'prom_trans[]'.
 * Return the number of entries.
 */
-static int __init read_obp_translations(void)
+static void __init read_obp_translations(void)
 {
        int n, node;
@@ -561,8 +512,10 @@ static int __init read_obp_translations(void)
                prom_printf("prom_mappings: Couldn't get property.\n");
                prom_halt();
        }
        n = n / sizeof(struct linux_prom_translation);
-        return n;
+        prom_trans_ents = n;
 }
 static void __init remap_kernel(void)
@@ -582,28 +535,38 @@ static void __init remap_kernel(void)
        prom_dtlb_load(tlb_ent, tte_data, tte_vaddr);
        prom_itlb_load(tlb_ent, tte_data, tte_vaddr);
        if (bigkernel) {
-                prom_dtlb_load(tlb_ent - 1,
+                tlb_ent -= 1;
+                prom_dtlb_load(tlb_ent,
                               tte_data + 0x400000, 
                               tte_vaddr + 0x400000);
-                prom_itlb_load(tlb_ent - 1,
+                prom_itlb_load(tlb_ent,
                               tte_data + 0x400000, 
                               tte_vaddr + 0x400000);
        }
+        sparc64_highest_unlocked_tlb_ent = tlb_ent - 1;
+        if (tlb_type == cheetah_plus) {
+                sparc64_kern_pri_context = (CTX_CHEETAH_PLUS_CTX0 |
+                                            CTX_CHEETAH_PLUS_NUC);
+                sparc64_kern_pri_nuc_bits = CTX_CHEETAH_PLUS_NUC;
+                sparc64_kern_sec_context = CTX_CHEETAH_PLUS_CTX0;
+        }
 }
-static void __init inherit_prom_mappings(void)
-{
-        int n;
-        n = read_obp_translations();
+static void __init inherit_prom_mappings_pre(void)
-        build_obp_pgtable(n);
+{
+        read_obp_translations();
        /* Now fixup OBP's idea about where we really are mapped. */
        prom_printf("Remapping the kernel... ");
        remap_kernel();
        prom_printf("done.\n");
+}
+static void __init inherit_prom_mappings_post(void)
+{
+        build_obp_pgtable();
        register_prom_callbacks();
 }
@@ -788,8 +751,8 @@ void inherit_locked_prom_mappings(int save_p)
                }
        }
        if (tlb_type == spitfire) {
-                int high = SPITFIRE_HIGHEST_LOCKED_TLBENT - bigkernel;
+                int high = sparc64_highest_unlocked_tlb_ent;
-                for (i = 0; i < high; i++) {
+                for (i = 0; i <= high; i++) {
                        unsigned long data;
                        /* Spitfire Errata #32 workaround */
@@ -877,9 +840,9 @@ void inherit_locked_prom_mappings(int save_p)
                        }
                }
        } else if (tlb_type == cheetah || tlb_type == cheetah_plus) {
-                int high = CHEETAH_HIGHEST_LOCKED_TLBENT - bigkernel;
+                int high = sparc64_highest_unlocked_tlb_ent;
-                for (i = 0; i < high; i++) {
+                for (i = 0; i <= high; i++) {
                        unsigned long data;
                        data = cheetah_get_ldtlb_data(i);
@@ -1556,8 +1519,7 @@ void __init paging_init(void)
        
        swapper_pgd_zero = pgd_val(swapper_pg_dir[0]);
        
-        /* Inherit non-locked OBP mappings. */
+        inherit_prom_mappings_pre();
-        inherit_prom_mappings();
        
        /* Ok, we can use our TLB miss and window trap handlers safely.
         * We need to do a quick peek here to see if we are on StarFire
@@ -1568,15 +1530,23 @@ void __init paging_init(void)
                extern void setup_tba(int);
                setup_tba(this_is_starfire);
        }
-        inherit_locked_prom_mappings(1);
        __flush_tlb_all();
+        /* Everything from this point forward, until we are done with
+         * inherit_prom_mappings_post(), must complete successfully
+         * without calling into the firmware.  The firwmare page tables
+         * have not been built, but we are running on the Linux kernel's
+         * trap table.
+         */
        /* Setup bootmem... */
        pages_avail = 0;
        last_valid_pfn = end_pfn = bootmem_init(&pages_avail);
+        inherit_prom_mappings_post();
+        inherit_locked_prom_mappings(1);
 #ifdef CONFIG_DEBUG_PAGEALLOC
        kernel_physical_mapping_init();
 #endif
diff --git a/arch/um/include/registers.h b/arch/um/include/registers.h
index 0a35e6d0baa0..4892e5fcef07 100644
--- a/arch/um/include/registers.h
+++ b/arch/um/include/registers.h
@@ -15,16 +15,6 @@ extern void save_registers(int pid, union uml_pt_regs *regs);
 extern void restore_registers(int pid, union uml_pt_regs *regs);
 extern void init_registers(int pid);
 extern void get_safe_registers(unsigned long * regs);
+extern void get_thread_regs(union uml_pt_regs *uml_regs, void *buffer);
 #endif
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/include/sysdep-x86_64/ptrace.h b/arch/um/include/sysdep-x86_64/ptrace.h
index 331aa2d1f3f5..8f0656766c21 100644
--- a/arch/um/include/sysdep-x86_64/ptrace.h
+++ b/arch/um/include/sysdep-x86_64/ptrace.h
@@ -218,10 +218,6 @@ struct syscall_args {
                case RBP: UPT_RBP(regs) = __upt_val; break; \
                case ORIG_RAX: UPT_ORIG_RAX(regs) = __upt_val; break; \
                case CS: UPT_CS(regs) = __upt_val; break; \
-                case DS: UPT_DS(regs) = __upt_val; break; \
-                case ES: UPT_ES(regs) = __upt_val; break; \
-                case FS: UPT_FS(regs) = __upt_val; break; \
-                case GS: UPT_GS(regs) = __upt_val; break; \
                case EFLAGS: UPT_EFLAGS(regs) = __upt_val; break; \
                default :  \
                        panic("Bad register in UPT_SET : %d\n", reg);  \
diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c
index f80850091e79..b331e970002f 100644
--- a/arch/um/kernel/sysrq.c
+++ b/arch/um/kernel/sysrq.c
@@ -62,13 +62,7 @@ void show_stack(struct task_struct *task, unsigned long *esp)
        if (esp == NULL) {
                if (task != current && task != NULL) {
-                        /* XXX: Isn't this bogus? I.e. isn't this the
-                         * *userspace* stack of this task? If not so, use this
-                         * even when task == current (as in i386).
-                         */
                        esp = (unsigned long *) KSTK_ESP(task);
-                        /* Which one? No actual difference - just coding style.*/
-                        //esp = (unsigned long *) PT_REGS_IP(&task->thread.regs);
                } else {
                        esp = (unsigned long *) &esp;
                }
@@ -84,5 +78,5 @@ void show_stack(struct task_struct *task, unsigned long *esp)
        }
        printk("Call Trace: \n");
-        show_trace(current, esp);
+        show_trace(task, esp);
 }
diff --git a/arch/um/os-Linux/sys-i386/registers.c b/arch/um/os-Linux/sys-i386/registers.c
index 3125d320722c..aee4812333c6 100644
--- a/arch/um/os-Linux/sys-i386/registers.c
+++ b/arch/um/os-Linux/sys-i386/registers.c
@@ -5,6 +5,7 @@
 #include <errno.h>
 #include <string.h>
+#include <setjmp.h>
 #include "sysdep/ptrace_user.h"
 #include "sysdep/ptrace.h"
 #include "uml-config.h"
@@ -126,13 +127,11 @@ void get_safe_registers(unsigned long *regs)
        memcpy(regs, exec_regs, HOST_FRAME_SIZE * sizeof(unsigned long));
 }
-/*
+void get_thread_regs(union uml_pt_regs *uml_regs, void *buffer)
- * Overrides for Emacs so that we follow Linus's tabbing style.
+{
- * Emacs will notice this stuff at the end of the file and automatically
+        struct __jmp_buf_tag *jmpbuf = buffer;
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
+        UPT_SET(uml_regs, EIP, jmpbuf->__jmpbuf[JB_PC]);
- * ---------------------------------------------------------------------------
+        UPT_SET(uml_regs, UESP, jmpbuf->__jmpbuf[JB_SP]);
- * Local variables:
+        UPT_SET(uml_regs, EBP, jmpbuf->__jmpbuf[JB_BP]);
- * c-file-style: "linux"
+}
- * End:
- */
diff --git a/arch/um/os-Linux/sys-x86_64/registers.c b/arch/um/os-Linux/sys-x86_64/registers.c
index 44438d15c3d6..4b638dfb52b0 100644
--- a/arch/um/os-Linux/sys-x86_64/registers.c
+++ b/arch/um/os-Linux/sys-x86_64/registers.c
@@ -5,6 +5,7 @@
 #include <errno.h>
 #include <string.h>
+#include <setjmp.h>
 #include "ptrace_user.h"
 #include "uml-config.h"
 #include "skas_ptregs.h"
@@ -74,13 +75,11 @@ void get_safe_registers(unsigned long *regs)
        memcpy(regs, exec_regs, HOST_FRAME_SIZE * sizeof(unsigned long));
 }
-/*
+void get_thread_regs(union uml_pt_regs *uml_regs, void *buffer)
- * Overrides for Emacs so that we follow Linus's tabbing style.
+{
- * Emacs will notice this stuff at the end of the file and automatically
+        struct __jmp_buf_tag *jmpbuf = buffer;
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
+        UPT_SET(uml_regs, RIP, jmpbuf->__jmpbuf[JB_PC]);
- * ---------------------------------------------------------------------------
+        UPT_SET(uml_regs, RSP, jmpbuf->__jmpbuf[JB_RSP]);
- * Local variables:
+        UPT_SET(uml_regs, RBP, jmpbuf->__jmpbuf[JB_RBP]);
- * c-file-style: "linux"
+}
- * End:
- */
diff --git a/arch/um/sys-i386/sysrq.c b/arch/um/sys-i386/sysrq.c
index e3706d15c4f5..d5244f070539 100644
--- a/arch/um/sys-i386/sysrq.c
+++ b/arch/um/sys-i386/sysrq.c
@@ -88,9 +88,7 @@ void show_trace(struct task_struct* task, unsigned long * stack)
                task = current;
        if (task != current) {
-                //ebp = (unsigned long) KSTK_EBP(task);
+                ebp = (unsigned long) KSTK_EBP(task);
-                /* Which one? No actual difference - just coding style.*/
-                ebp = (unsigned long) PT_REGS_EBP(&task->thread.regs);
        } else {
                asm ("movl %%ebp, %0" : "=r" (ebp) : );
        }
@@ -99,15 +97,6 @@ void show_trace(struct task_struct* task, unsigned long * stack)
                ((unsigned long)stack & (~(THREAD_SIZE - 1)));
        print_context_stack(context, stack, ebp);
-        /*while (((long) stack & (THREAD_SIZE-1)) != 0) {
-                addr = *stack;
-                if (__kernel_text_address(addr)) {
-                        printk("%08lx:  [<%08lx>]", (unsigned long) stack, addr);
-                        print_symbol(" %s", addr);
-                        printk("\n");
-                }
-                stack++;
-        }*/
        printk("\n");
 }
diff --git a/arch/um/sys-i386/user-offsets.c b/arch/um/sys-i386/user-offsets.c
index 677fc26a9bbe..26b68675053d 100644
--- a/arch/um/sys-i386/user-offsets.c
+++ b/arch/um/sys-i386/user-offsets.c
@@ -46,7 +46,7 @@ void foo(void)
        OFFSET(HOST_SC_FP_ST, _fpstate, _st);
        OFFSET(HOST_SC_FXSR_ENV, _fpstate, _fxsr_env);
-        DEFINE_LONGS(HOST_FRAME_SIZE, FRAME_SIZE);
+        DEFINE(HOST_FRAME_SIZE, FRAME_SIZE);
        DEFINE_LONGS(HOST_FP_SIZE, sizeof(struct user_i387_struct));
        DEFINE_LONGS(HOST_XFP_SIZE, sizeof(struct user_fxsr_struct));
diff --git a/arch/x86_64/kernel/head.S b/arch/x86_64/kernel/head.S
index 4592bf21fcaf..b92e5f45ed46 100644
--- a/arch/x86_64/kernel/head.S
+++ b/arch/x86_64/kernel/head.S
@@ -270,26 +270,26 @@ ENTRY(level3_kernel_pgt)
 .org 0x4000
 ENTRY(level2_ident_pgt)
        /* 40MB for bootup.     */
-        .quad   0x0000000000000183
+        .quad   0x0000000000000083
-        .quad   0x0000000000200183
+        .quad   0x0000000000200083
-        .quad   0x0000000000400183
+        .quad   0x0000000000400083
-        .quad   0x0000000000600183
+        .quad   0x0000000000600083
-        .quad   0x0000000000800183
+        .quad   0x0000000000800083
-        .quad   0x0000000000A00183
+        .quad   0x0000000000A00083
-        .quad   0x0000000000C00183
+        .quad   0x0000000000C00083
-        .quad   0x0000000000E00183
+        .quad   0x0000000000E00083
-        .quad   0x0000000001000183
+        .quad   0x0000000001000083
-        .quad   0x0000000001200183
+        .quad   0x0000000001200083
-        .quad   0x0000000001400183
+        .quad   0x0000000001400083
-        .quad   0x0000000001600183
+        .quad   0x0000000001600083
-        .quad   0x0000000001800183
+        .quad   0x0000000001800083
-        .quad   0x0000000001A00183
+        .quad   0x0000000001A00083
-        .quad   0x0000000001C00183
+        .quad   0x0000000001C00083
-        .quad   0x0000000001E00183
+        .quad   0x0000000001E00083
-        .quad   0x0000000002000183
+        .quad   0x0000000002000083
-        .quad   0x0000000002200183
+        .quad   0x0000000002200083
-        .quad   0x0000000002400183
+        .quad   0x0000000002400083
-        .quad   0x0000000002600183
+        .quad   0x0000000002600083
        /* Temporary mappings for the super early allocator in arch/x86_64/mm/init.c */
        .globl temp_boot_pmds
 temp_boot_pmds:
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 257f5ba17902..cb28df14ff6f 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -967,13 +967,12 @@ static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c)
 static void srat_detect_node(void)
 {
 #ifdef CONFIG_NUMA
-        unsigned apicid, node;
+        unsigned node;
        int cpu = smp_processor_id();
        /* Don't do the funky fallback heuristics the AMD version employs
           for now. */
-        apicid = phys_proc_id[cpu];
+        node = apicid_to_node[hard_smp_processor_id()];
-        node = apicid_to_node[apicid];
        if (node == NUMA_NO_NODE)
                node = 0;
        cpu_to_node[cpu] = node;
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 2bf723a7b6e6..6f1a83c9d9e0 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -178,14 +178,12 @@ fore200e_irq_itoa(int irq)
 static void*
-fore200e_kmalloc(int size, int flags)
+fore200e_kmalloc(int size, unsigned int __nocast flags)
 {
-    void* chunk = kmalloc(size, flags);
+    void *chunk = kzalloc(size, flags);
-    if (chunk)
+    if (!chunk)
-        memset(chunk, 0x00, size);
+        printk(FORE200E "kmalloc() failed, requested size = %d, flags = 0x%x\n",                        size, flags);
-    else
-        printk(FORE200E "kmalloc() failed, requested size = %d, flags = 0x%x\n", size, flags);
    
    return chunk;
 }
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c
index 95a976c96eb8..70458cb061c6 100644
--- a/drivers/char/drm/drm_stub.c
+++ b/drivers/char/drm/drm_stub.c
@@ -47,7 +47,7 @@ MODULE_PARM_DESC(cards_limit, "Maximum number of graphics cards");
 MODULE_PARM_DESC(debug, "Enable debug output");
 module_param_named(cards_limit, drm_cards_limit, int, 0444);
-module_param_named(debug, drm_debug, int, 0666);
+module_param_named(debug, drm_debug, int, 0600);
 drm_head_t **drm_heads;
 struct drm_sysfs_class *drm_class;
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index bb0b3a8de14b..1422285d537c 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -69,7 +69,8 @@ int cn_already_initialized = 0;
 * a new message.
 *
 */
-int cn_netlink_send(struct cn_msg *msg, u32 __group, int gfp_mask)
+int cn_netlink_send(struct cn_msg *msg, u32 __group,
+                    unsigned int __nocast gfp_mask)
 {
        struct cn_callback_entry *__cbq;
        unsigned int size;
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index ffbcd40418d5..23a3f56c7899 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -503,6 +503,25 @@ err_free_aux:
        return err;
 }
+static void mthca_free_icms(struct mthca_dev *mdev)
+{
+        u8 status;
+        mthca_free_icm_table(mdev, mdev->mcg_table.table);
+        if (mdev->mthca_flags & MTHCA_FLAG_SRQ)
+                mthca_free_icm_table(mdev, mdev->srq_table.table);
+        mthca_free_icm_table(mdev, mdev->cq_table.table);
+        mthca_free_icm_table(mdev, mdev->qp_table.rdb_table);
+        mthca_free_icm_table(mdev, mdev->qp_table.eqp_table);
+        mthca_free_icm_table(mdev, mdev->qp_table.qp_table);
+        mthca_free_icm_table(mdev, mdev->mr_table.mpt_table);
+        mthca_free_icm_table(mdev, mdev->mr_table.mtt_table);
+        mthca_unmap_eq_icm(mdev);
+        mthca_UNMAP_ICM_AUX(mdev, &status);
+        mthca_free_icm(mdev, mdev->fw.arbel.aux_icm);
+}
 static int __devinit mthca_init_arbel(struct mthca_dev *mdev)
 {
        struct mthca_dev_lim        dev_lim;
@@ -580,18 +599,7 @@ static int __devinit mthca_init_arbel(struct mthca_dev *mdev)
        return 0;
 err_free_icm:
-        if (mdev->mthca_flags & MTHCA_FLAG_SRQ)
+        mthca_free_icms(mdev);
-                mthca_free_icm_table(mdev, mdev->srq_table.table);
-        mthca_free_icm_table(mdev, mdev->cq_table.table);
-        mthca_free_icm_table(mdev, mdev->qp_table.rdb_table);
-        mthca_free_icm_table(mdev, mdev->qp_table.eqp_table);
-        mthca_free_icm_table(mdev, mdev->qp_table.qp_table);
-        mthca_free_icm_table(mdev, mdev->mr_table.mpt_table);
-        mthca_free_icm_table(mdev, mdev->mr_table.mtt_table);
-        mthca_unmap_eq_icm(mdev);
-        mthca_UNMAP_ICM_AUX(mdev, &status);
-        mthca_free_icm(mdev, mdev->fw.arbel.aux_icm);
 err_stop_fw:
        mthca_UNMAP_FA(mdev, &status);
@@ -611,18 +619,7 @@ static void mthca_close_hca(struct mthca_dev *mdev)
        mthca_CLOSE_HCA(mdev, 0, &status);
        if (mthca_is_memfree(mdev)) {
-                if (mdev->mthca_flags & MTHCA_FLAG_SRQ)
+                mthca_free_icms(mdev);
-                        mthca_free_icm_table(mdev, mdev->srq_table.table);
-                mthca_free_icm_table(mdev, mdev->cq_table.table);
-                mthca_free_icm_table(mdev, mdev->qp_table.rdb_table);
-                mthca_free_icm_table(mdev, mdev->qp_table.eqp_table);
-                mthca_free_icm_table(mdev, mdev->qp_table.qp_table);
-                mthca_free_icm_table(mdev, mdev->mr_table.mpt_table);
-                mthca_free_icm_table(mdev, mdev->mr_table.mtt_table);
-                mthca_unmap_eq_icm(mdev);
-                mthca_UNMAP_ICM_AUX(mdev, &status);
-                mthca_free_icm(mdev, mdev->fw.arbel.aux_icm);
                mthca_UNMAP_FA(mdev, &status);
                mthca_free_icm(mdev, mdev->fw.arbel.fw_icm);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 704f48e0b6a7..6c5bf07489f4 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -474,7 +474,7 @@ err:
        spin_unlock(&priv->lock);
 }
-static void path_lookup(struct sk_buff *skb, struct net_device *dev)
+static void ipoib_path_lookup(struct sk_buff *skb, struct net_device *dev)
 {
        struct ipoib_dev_priv *priv = netdev_priv(skb->dev);
@@ -569,7 +569,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
        if (skb->dst && skb->dst->neighbour) {
                if (unlikely(!*to_ipoib_neigh(skb->dst->neighbour))) {
-                        path_lookup(skb, dev);
+                        ipoib_path_lookup(skb, dev);
                        goto out;
                }
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index 10f6ce1bc0ab..612564ac6f7b 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -642,8 +642,6 @@ static void __exit ucb1x00_exit(void)
 module_init(ucb1x00_init);
 module_exit(ucb1x00_exit);
-EXPORT_SYMBOL(ucb1x00_class);
 EXPORT_SYMBOL(ucb1x00_io_set_dir);
 EXPORT_SYMBOL(ucb1x00_io_write);
 EXPORT_SYMBOL(ucb1x00_io_read);
diff --git a/drivers/mfd/ucb1x00.h b/drivers/mfd/ucb1x00.h
index 6b632644f59a..9c9a647d8b7b 100644
--- a/drivers/mfd/ucb1x00.h
+++ b/drivers/mfd/ucb1x00.h
@@ -106,8 +106,6 @@ struct ucb1x00_irq {
        void (*fn)(int, void *);
 };
-extern struct class ucb1x00_class;
 struct ucb1x00 {
        spinlock_t              lock;
        struct mcp              *mcp;
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2a908c4690a7..c748b0e16419 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1655,7 +1655,7 @@ config LAN_SAA9730
 config NET_POCKET
        bool "Pocket and portable adapters"
-        depends on NET_ETHERNET && ISA
+        depends on NET_ETHERNET && PARPORT
        ---help---
          Cute little network (Ethernet) devices which attach to the parallel
          port ("pocket adapters"), commonly used with laptops. If you have
@@ -1679,7 +1679,7 @@ config NET_POCKET
 config ATP
        tristate "AT-LAN-TEC/RealTek pocket adapter support"
-        depends on NET_POCKET && ISA && X86
+        depends on NET_POCKET && PARPORT && X86
        select CRC32
        ---help---
          This is a network (Ethernet) device which attaches to your parallel
@@ -1694,7 +1694,7 @@ config ATP
 config DE600
        tristate "D-Link DE600 pocket adapter support"
-        depends on NET_POCKET && ISA
+        depends on NET_POCKET && PARPORT
        ---help---
          This is a network (Ethernet) device which attaches to your parallel
          port. Read <file:Documentation/networking/DLINK.txt> as well as the
@@ -1709,7 +1709,7 @@ config DE600
 config DE620
        tristate "D-Link DE620 pocket adapter support"
-        depends on NET_POCKET && ISA
+        depends on NET_POCKET && PARPORT
        ---help---
          This is a network (Ethernet) device which attaches to your parallel
          port. Read <file:Documentation/networking/DLINK.txt> as well as the
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 6d00c3de1a83..f0a5b772a386 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -487,6 +487,8 @@
 *        * Added xmit_hash_policy_layer34()
 *      - Modified by Jay Vosburgh <fubar@us.ibm.com> to also support mode 4.
 *        Set version to 2.6.3.
+ * 2005/09/26 - Jay Vosburgh <fubar@us.ibm.com>
+ *      - Removed backwards compatibility for old ifenslaves.  Version 2.6.4.
 */
 //#define BONDING_DEBUG 1
@@ -595,14 +597,7 @@ static int arp_ip_count	= 0;
 static int bond_mode    = BOND_MODE_ROUNDROBIN;
 static int xmit_hashtype= BOND_XMIT_POLICY_LAYER2;
 static int lacp_fast    = 0;
-static int app_abi_ver  = 0;
-static int orig_app_abi_ver = -1; /* This is used to save the first ABI version
-                                   * we receive from the application. Once set,
-                                   * it won't be changed, and the module will
-                                   * refuse to enslave/release interfaces if the
-                                   * command comes from an application using
-                                   * another ABI version.
-                                   */
 struct bond_parm_tbl {
        char *modename;
        int mode;
@@ -1294,12 +1289,13 @@ static void bond_mc_list_destroy(struct bonding *bond)
 /*
 * Copy all the Multicast addresses from src to the bonding device dst
 */
-static int bond_mc_list_copy(struct dev_mc_list *mc_list, struct bonding *bond, int gpf_flag)
+static int bond_mc_list_copy(struct dev_mc_list *mc_list, struct bonding *bond,
+                             unsigned int __nocast gfp_flag)
 {
        struct dev_mc_list *dmi, *new_dmi;
        for (dmi = mc_list; dmi; dmi = dmi->next) {
-                new_dmi = kmalloc(sizeof(struct dev_mc_list), gpf_flag);
+                new_dmi = kmalloc(sizeof(struct dev_mc_list), gfp_flag);
                if (!new_dmi) {
                        /* FIXME: Potential memory leak !!! */
@@ -1702,51 +1698,29 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
                }
        }
-        if (app_abi_ver >= 1) {
+        /*
-                /* The application is using an ABI, which requires the
+         * Old ifenslave binaries are no longer supported.  These can
-                 * slave interface to be closed.
+         * be identified with moderate accurary by the state of the slave:
-                 */
+         * the current ifenslave will set the interface down prior to
-                if ((slave_dev->flags & IFF_UP)) {
+         * enslaving it; the old ifenslave will not.
-                        printk(KERN_ERR DRV_NAME
+         */
-                               ": Error: %s is up\n",
+        if ((slave_dev->flags & IFF_UP)) {
-                               slave_dev->name);
+                printk(KERN_ERR DRV_NAME ": %s is up. "
-                        res = -EPERM;
+                       "This may be due to an out of date ifenslave.\n",
-                        goto err_undo_flags;
+                       slave_dev->name);
-                }
+                res = -EPERM;
+                goto err_undo_flags;
-                if (slave_dev->set_mac_address == NULL) {
+        }
-                        printk(KERN_ERR DRV_NAME
-                               ": Error: The slave device you specified does "
-                               "not support setting the MAC address.\n");
-                        printk(KERN_ERR
-                               "Your kernel likely does not support slave "
-                               "devices.\n");
-                        res = -EOPNOTSUPP;
+        if (slave_dev->set_mac_address == NULL) {
-                        goto err_undo_flags;
+                printk(KERN_ERR DRV_NAME
-                }
+                       ": Error: The slave device you specified does "
-        } else {
+                       "not support setting the MAC address.\n");
-                /* The application is not using an ABI, which requires the
+                printk(KERN_ERR
-                 * slave interface to be open.
+                       "Your kernel likely does not support slave devices.\n");
-                 */
-                if (!(slave_dev->flags & IFF_UP)) {
-                        printk(KERN_ERR DRV_NAME
-                               ": Error: %s is not running\n",
-                               slave_dev->name);
-                        res = -EINVAL;
-                        goto err_undo_flags;
-                }
-                if ((bond->params.mode == BOND_MODE_8023AD) ||
+                res = -EOPNOTSUPP;
-                    (bond->params.mode == BOND_MODE_TLB)    ||
+                goto err_undo_flags;
-                    (bond->params.mode == BOND_MODE_ALB)) {
-                        printk(KERN_ERR DRV_NAME
-                               ": Error: to use %s mode, you must upgrade "
-                               "ifenslave.\n",
-                               bond_mode_name(bond->params.mode));
-                        res = -EOPNOTSUPP;
-                        goto err_undo_flags;
-                }
        }
        new_slave = kmalloc(sizeof(struct slave), GFP_KERNEL);
@@ -1762,41 +1736,36 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
         */
        new_slave->original_flags = slave_dev->flags;
-        if (app_abi_ver >= 1) {
+        /*
-                /* save slave's original ("permanent") mac address for
+         * Save slave's original ("permanent") mac address for modes
-                 * modes that needs it, and for restoring it upon release,
+         * that need it, and for restoring it upon release, and then
-                 * and then set it to the master's address
+         * set it to the master's address
-                 */
+         */
-                memcpy(new_slave->perm_hwaddr, slave_dev->dev_addr, ETH_ALEN);
+        memcpy(new_slave->perm_hwaddr, slave_dev->dev_addr, ETH_ALEN);
-                /* set slave to master's mac address
+        /*
-                 * The application already set the master's
+         * Set slave to master's mac address.  The application already
-                 * mac address to that of the first slave
+         * set the master's mac address to that of the first slave
-                 */
+         */
-                memcpy(addr.sa_data, bond_dev->dev_addr, bond_dev->addr_len);
+        memcpy(addr.sa_data, bond_dev->dev_addr, bond_dev->addr_len);
-                addr.sa_family = slave_dev->type;
+        addr.sa_family = slave_dev->type;
-                res = dev_set_mac_address(slave_dev, &addr);
+        res = dev_set_mac_address(slave_dev, &addr);
-                if (res) {
+        if (res) {
-                        dprintk("Error %d calling set_mac_address\n", res);
+                dprintk("Error %d calling set_mac_address\n", res);
-                        goto err_free;
+                goto err_free;
-                }
+        }
-                /* open the slave since the application closed it */
+        /* open the slave since the application closed it */
-                res = dev_open(slave_dev);
+        res = dev_open(slave_dev);
-                if (res) {
+        if (res) {
-                        dprintk("Openning slave %s failed\n", slave_dev->name);
+                dprintk("Openning slave %s failed\n", slave_dev->name);
-                        goto err_restore_mac;
+                goto err_restore_mac;
-                }
        }
        res = netdev_set_master(slave_dev, bond_dev);
        if (res) {
                dprintk("Error %d calling netdev_set_master\n", res);
-                if (app_abi_ver < 1) {
+                goto err_close;
-                        goto err_free;
-                } else {
-                        goto err_close;
-                }
        }
        new_slave->dev = slave_dev;
@@ -1997,39 +1966,6 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
        write_unlock_bh(&bond->lock);
-        if (app_abi_ver < 1) {
-                /*
-                 * !!! This is to support old versions of ifenslave.
-                 * We can remove this in 2.5 because our ifenslave takes
-                 * care of this for us.
-                 * We check to see if the master has a mac address yet.
-                 * If not, we'll give it the mac address of our slave device.
-                 */
-                int ndx = 0;
-                for (ndx = 0; ndx < bond_dev->addr_len; ndx++) {
-                        dprintk("Checking ndx=%d of bond_dev->dev_addr\n",
-                                ndx);
-                        if (bond_dev->dev_addr[ndx] != 0) {
-                                dprintk("Found non-zero byte at ndx=%d\n",
-                                        ndx);
-                                break;
-                        }
-                }
-                if (ndx == bond_dev->addr_len) {
-                        /*
-                         * We got all the way through the address and it was
-                         * all 0's.
-                         */
-                        dprintk("%s doesn't have a MAC address yet.  \n",
-                                bond_dev->name);
-                        dprintk("Going to give assign it from %s.\n",
-                                slave_dev->name);
-                        bond_sethwaddr(bond_dev, slave_dev);
-                }
-        }
        printk(KERN_INFO DRV_NAME
               ": %s: enslaving %s as a%s interface with a%s link.\n",
               bond_dev->name, slave_dev->name,
@@ -2227,12 +2163,10 @@ static int bond_release(struct net_device *bond_dev, struct net_device *slave_de
        /* close slave before restoring its mac address */
        dev_close(slave_dev);
-        if (app_abi_ver >= 1) {
+        /* restore original ("permanent") mac address */
-                /* restore original ("permanent") mac address */
+        memcpy(addr.sa_data, slave->perm_hwaddr, ETH_ALEN);
-                memcpy(addr.sa_data, slave->perm_hwaddr, ETH_ALEN);
+        addr.sa_family = slave_dev->type;
-                addr.sa_family = slave_dev->type;
+        dev_set_mac_address(slave_dev, &addr);
-                dev_set_mac_address(slave_dev, &addr);
-        }
        /* restore the original state of the
         * IFF_NOARP flag that might have been
@@ -2320,12 +2254,10 @@ static int bond_release_all(struct net_device *bond_dev)
                /* close slave before restoring its mac address */
                dev_close(slave_dev);
-                if (app_abi_ver >= 1) {
+                /* restore original ("permanent") mac address*/
-                        /* restore original ("permanent") mac address*/
+                memcpy(addr.sa_data, slave->perm_hwaddr, ETH_ALEN);
-                        memcpy(addr.sa_data, slave->perm_hwaddr, ETH_ALEN);
+                addr.sa_family = slave_dev->type;
-                        addr.sa_family = slave_dev->type;
+                dev_set_mac_address(slave_dev, &addr);
-                        dev_set_mac_address(slave_dev, &addr);
-                }
                /* restore the original state of the IFF_NOARP flag that might have
                 * been set by bond_set_slave_inactive_flags()
@@ -2423,57 +2355,6 @@ static int bond_ioctl_change_active(struct net_device *bond_dev, struct net_devi
        return res;
 }
-static int bond_ethtool_ioctl(struct net_device *bond_dev, struct ifreq *ifr)
-{
-        struct ethtool_drvinfo info;
-        void __user *addr = ifr->ifr_data;
-        uint32_t cmd;
-        if (get_user(cmd, (uint32_t __user *)addr)) {
-                return -EFAULT;
-        }
-        switch (cmd) {
-        case ETHTOOL_GDRVINFO:
-                if (copy_from_user(&info, addr, sizeof(info))) {
-                        return -EFAULT;
-                }
-                if (strcmp(info.driver, "ifenslave") == 0) {
-                        int new_abi_ver;
-                        char *endptr;
-                        new_abi_ver = simple_strtoul(info.fw_version,
-                                                     &endptr, 0);
-                        if (*endptr) {
-                                printk(KERN_ERR DRV_NAME
-                                       ": Error: got invalid ABI "
-                                       "version from application\n");
-                                return -EINVAL;
-                        }
-                        if (orig_app_abi_ver == -1) {
-                                orig_app_abi_ver  = new_abi_ver;
-                        }
-                        app_abi_ver = new_abi_ver;
-                }
-                strncpy(info.driver,  DRV_NAME, 32);
-                strncpy(info.version, DRV_VERSION, 32);
-                snprintf(info.fw_version, 32, "%d", BOND_ABI_VERSION);
-                if (copy_to_user(addr, &info, sizeof(info))) {
-                        return -EFAULT;
-                }
-                return 0;
-        default:
-                return -EOPNOTSUPP;
-        }
-}
 static int bond_info_query(struct net_device *bond_dev, struct ifbond *info)
 {
        struct bonding *bond = bond_dev->priv;
@@ -2776,7 +2657,7 @@ static u32 bond_glean_dev_ip(struct net_device *dev)
                return 0;
        rcu_read_lock();
-        idev = __in_dev_get(dev);
+        idev = __in_dev_get_rcu(dev);
        if (!idev)
                goto out;
@@ -3442,16 +3323,11 @@ static void bond_info_show_slave(struct seq_file *seq, const struct slave *slave
        seq_printf(seq, "Link Failure Count: %d\n",
                   slave->link_failure_count);
-        if (app_abi_ver >= 1) {
+        seq_printf(seq,
-                seq_printf(seq,
+                   "Permanent HW addr: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                           "Permanent HW addr: %02x:%02x:%02x:%02x:%02x:%02x\n",
+                   slave->perm_hwaddr[0], slave->perm_hwaddr[1],
-                           slave->perm_hwaddr[0],
+                   slave->perm_hwaddr[2], slave->perm_hwaddr[3],
-                           slave->perm_hwaddr[1],
+                   slave->perm_hwaddr[4], slave->perm_hwaddr[5]);
-                           slave->perm_hwaddr[2],
-                           slave->perm_hwaddr[3],
-                           slave->perm_hwaddr[4],
-                           slave->perm_hwaddr[5]);
-        }
        if (bond->params.mode == BOND_MODE_8023AD) {
                const struct aggregator *agg
@@ -4010,15 +3886,12 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
        struct ifslave k_sinfo;
        struct ifslave __user *u_sinfo = NULL;
        struct mii_ioctl_data *mii = NULL;
-        int prev_abi_ver = orig_app_abi_ver;
        int res = 0;
        dprintk("bond_ioctl: master=%s, cmd=%d\n",
                bond_dev->name, cmd);
        switch (cmd) {
-        case SIOCETHTOOL:
-                return bond_ethtool_ioctl(bond_dev, ifr);
        case SIOCGMIIPHY:
                mii = if_mii(ifr);
                if (!mii) {
@@ -4090,21 +3963,6 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
                return -EPERM;
        }
-        if (orig_app_abi_ver == -1) {
-                /* no orig_app_abi_ver was provided yet, so we'll use the
-                 * current one from now on, even if it's 0
-                 */
-                orig_app_abi_ver = app_abi_ver;
-        } else if (orig_app_abi_ver != app_abi_ver) {
-                printk(KERN_ERR DRV_NAME
-                       ": Error: already using ifenslave ABI version %d; to "
-                       "upgrade ifenslave to version %d, you must first "
-                       "reload bonding.\n",
-                       orig_app_abi_ver, app_abi_ver);
-                return -EINVAL;
-        }
        slave_dev = dev_get_by_name(ifr->ifr_slave);
        dprintk("slave_dev=%p: \n", slave_dev);
@@ -4137,14 +3995,6 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
                dev_put(slave_dev);
        }
-        if (res < 0) {
-                /* The ioctl failed, so there's no point in changing the
-                 * orig_app_abi_ver. We'll restore it's value just in case
-                 * we've changed it earlier in this function.
-                 */
-                orig_app_abi_ver = prev_abi_ver;
-        }
        return res;
 }
@@ -4578,9 +4428,18 @@ static inline void bond_set_mode_ops(struct bonding *bond, int mode)
        }
 }
+static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,
+                                    struct ethtool_drvinfo *drvinfo)
+{
+        strncpy(drvinfo->driver, DRV_NAME, 32);
+        strncpy(drvinfo->version, DRV_VERSION, 32);
+        snprintf(drvinfo->fw_version, 32, "%d", BOND_ABI_VERSION);
+}
 static struct ethtool_ops bond_ethtool_ops = {
        .get_tx_csum            = ethtool_op_get_tx_csum,
        .get_sg                 = ethtool_op_get_sg,
+        .get_drvinfo            = bond_ethtool_get_drvinfo,
 };
 /*
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 388196980862..bbf9da8af624 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -40,8 +40,8 @@
 #include "bond_3ad.h"
 #include "bond_alb.h"
-#define DRV_VERSION     "2.6.3"
+#define DRV_VERSION     "2.6.4"
-#define DRV_RELDATE     "June 8, 2005"
+#define DRV_RELDATE     "September 26, 2005"
 #define DRV_NAME        "bonding"
 #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 45831fb377a0..2e617424d3fb 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -4423,18 +4423,14 @@ static struct {
 #define CAS_REG_LEN     (sizeof(ethtool_register_table)/sizeof(int))
 #define CAS_MAX_REGS    (sizeof (u32)*CAS_REG_LEN)
-static u8 *cas_get_regs(struct cas *cp)
+static void cas_read_regs(struct cas *cp, u8 *ptr, int len)
 {
-        u8 *ptr = kmalloc(CAS_MAX_REGS, GFP_KERNEL);
        u8 *p;
        int i;
        unsigned long flags;
-        if (!ptr)
-                return NULL;
        spin_lock_irqsave(&cp->lock, flags);
-        for (i = 0, p = ptr; i < CAS_REG_LEN ; i ++, p += sizeof(u32)) {
+        for (i = 0, p = ptr; i < len ; i ++, p += sizeof(u32)) {
                u16 hval;
                u32 val;
                if (ethtool_register_table[i].offsets < 0) {
@@ -4447,8 +4443,6 @@ static u8 *cas_get_regs(struct cas *cp)
                memcpy(p, (u8 *)&val, sizeof(u32));
        }
        spin_unlock_irqrestore(&cp->lock, flags);
-        return ptr;
 }
 static struct net_device_stats *cas_get_stats(struct net_device *dev)
@@ -4561,316 +4555,251 @@ static void cas_set_multicast(struct net_device *dev)
        spin_unlock_irqrestore(&cp->lock, flags);
 }
-/* Eventually add support for changing the advertisement
+static void cas_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
- * on autoneg.
+{
- */
+        struct cas *cp = netdev_priv(dev);
-static int cas_ethtool_ioctl(struct net_device *dev, void __user *ep_user)
+        strncpy(info->driver, DRV_MODULE_NAME, ETHTOOL_BUSINFO_LEN);
+        strncpy(info->version, DRV_MODULE_VERSION, ETHTOOL_BUSINFO_LEN);
+        info->fw_version[0] = '\0';
+        strncpy(info->bus_info, pci_name(cp->pdev), ETHTOOL_BUSINFO_LEN);
+        info->regdump_len = cp->casreg_len < CAS_MAX_REGS ?
+                cp->casreg_len : CAS_MAX_REGS;
+        info->n_stats = CAS_NUM_STAT_KEYS;
+}
+static int cas_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        struct cas *cp = netdev_priv(dev);
        u16 bmcr;
        int full_duplex, speed, pause;
-        struct ethtool_cmd ecmd;
        unsigned long flags;
        enum link_state linkstate = link_up;
-        if (copy_from_user(&ecmd, ep_user, sizeof(ecmd)))
+        cmd->advertising = 0;
-                return -EFAULT;
+        cmd->supported = SUPPORTED_Autoneg;
-                
+        if (cp->cas_flags & CAS_FLAG_1000MB_CAP) {
-        switch(ecmd.cmd) {
+                cmd->supported |= SUPPORTED_1000baseT_Full;
-        case ETHTOOL_GDRVINFO: {
+                cmd->advertising |= ADVERTISED_1000baseT_Full;
-                struct ethtool_drvinfo info = { .cmd = ETHTOOL_GDRVINFO };
-                strncpy(info.driver, DRV_MODULE_NAME,
-                        ETHTOOL_BUSINFO_LEN);
-                strncpy(info.version, DRV_MODULE_VERSION,
-                        ETHTOOL_BUSINFO_LEN);
-                info.fw_version[0] = '\0';
-                strncpy(info.bus_info, pci_name(cp->pdev),
-                        ETHTOOL_BUSINFO_LEN);
-                info.regdump_len = cp->casreg_len < CAS_MAX_REGS ?
-                        cp->casreg_len : CAS_MAX_REGS;
-                info.n_stats = CAS_NUM_STAT_KEYS;
-                if (copy_to_user(ep_user, &info, sizeof(info)))
-                        return -EFAULT;
-                return 0;
        }
-        case ETHTOOL_GSET:
+        /* Record PHY settings if HW is on. */
-                ecmd.advertising = 0;
+        spin_lock_irqsave(&cp->lock, flags);
-                ecmd.supported = SUPPORTED_Autoneg;
+        bmcr = 0;
-                if (cp->cas_flags & CAS_FLAG_1000MB_CAP) {
+        linkstate = cp->lstate;
-                        ecmd.supported |= SUPPORTED_1000baseT_Full;
+        if (CAS_PHY_MII(cp->phy_type)) {
-                        ecmd.advertising |= ADVERTISED_1000baseT_Full;
+                cmd->port = PORT_MII;
+                cmd->transceiver = (cp->cas_flags & CAS_FLAG_SATURN) ?
+                        XCVR_INTERNAL : XCVR_EXTERNAL;
+                cmd->phy_address = cp->phy_addr;
+                cmd->advertising |= ADVERTISED_TP | ADVERTISED_MII |
+                        ADVERTISED_10baseT_Half | 
+                        ADVERTISED_10baseT_Full | 
+                        ADVERTISED_100baseT_Half | 
+                        ADVERTISED_100baseT_Full;
+                cmd->supported |=
+                        (SUPPORTED_10baseT_Half | 
+                         SUPPORTED_10baseT_Full |
+                         SUPPORTED_100baseT_Half | 
+                         SUPPORTED_100baseT_Full |
+                         SUPPORTED_TP | SUPPORTED_MII);
+                if (cp->hw_running) {
+                        cas_mif_poll(cp, 0);
+                        bmcr = cas_phy_read(cp, MII_BMCR);
+                        cas_read_mii_link_mode(cp, &full_duplex, 
+                                               &speed, &pause);
+                        cas_mif_poll(cp, 1);
                }
-                /* Record PHY settings if HW is on. */
+        } else {
-                spin_lock_irqsave(&cp->lock, flags);
+                cmd->port = PORT_FIBRE;
-                bmcr = 0;
+                cmd->transceiver = XCVR_INTERNAL;
-                linkstate = cp->lstate;
+                cmd->phy_address = 0;
-                if (CAS_PHY_MII(cp->phy_type)) {
+                cmd->supported   |= SUPPORTED_FIBRE;
-                        ecmd.port = PORT_MII;
+                cmd->advertising |= ADVERTISED_FIBRE;
-                        ecmd.transceiver = (cp->cas_flags & CAS_FLAG_SATURN) ?
-                                XCVR_INTERNAL : XCVR_EXTERNAL;
+                if (cp->hw_running) {
-                        ecmd.phy_address = cp->phy_addr;
+                        /* pcs uses the same bits as mii */ 
-                        ecmd.advertising |= ADVERTISED_TP | ADVERTISED_MII |
+                        bmcr = readl(cp->regs + REG_PCS_MII_CTRL);
-                                ADVERTISED_10baseT_Half | 
+                        cas_read_pcs_link_mode(cp, &full_duplex, 
-                                ADVERTISED_10baseT_Full | 
+                                               &speed, &pause);
-                                ADVERTISED_100baseT_Half | 
-                                ADVERTISED_100baseT_Full;
-                        ecmd.supported |=
-                                (SUPPORTED_10baseT_Half | 
-                                 SUPPORTED_10baseT_Full |
-                                 SUPPORTED_100baseT_Half | 
-                                 SUPPORTED_100baseT_Full |
-                                 SUPPORTED_TP | SUPPORTED_MII);
-                        if (cp->hw_running) {
-                                cas_mif_poll(cp, 0);
-                                bmcr = cas_phy_read(cp, MII_BMCR);
-                                cas_read_mii_link_mode(cp, &full_duplex, 
-                                                       &speed, &pause);
-                                cas_mif_poll(cp, 1);
-                        }
-                } else {
-                        ecmd.port = PORT_FIBRE;
-                        ecmd.transceiver = XCVR_INTERNAL;
-                        ecmd.phy_address = 0;
-                        ecmd.supported   |= SUPPORTED_FIBRE;
-                        ecmd.advertising |= ADVERTISED_FIBRE;
-                        if (cp->hw_running) {
-                                /* pcs uses the same bits as mii */ 
-                                bmcr = readl(cp->regs + REG_PCS_MII_CTRL);
-                                cas_read_pcs_link_mode(cp, &full_duplex, 
-                                                       &speed, &pause);
-                        }
                }
-                spin_unlock_irqrestore(&cp->lock, flags);
+        }
+        spin_unlock_irqrestore(&cp->lock, flags);
-                if (bmcr & BMCR_ANENABLE) {
+        if (bmcr & BMCR_ANENABLE) {
-                        ecmd.advertising |= ADVERTISED_Autoneg;
+                cmd->advertising |= ADVERTISED_Autoneg;
-                        ecmd.autoneg = AUTONEG_ENABLE;
+                cmd->autoneg = AUTONEG_ENABLE;
-                        ecmd.speed = ((speed == 10) ?
+                cmd->speed = ((speed == 10) ?
-                                      SPEED_10 :
+                              SPEED_10 :
-                                      ((speed == 1000) ?
+                              ((speed == 1000) ?
-                                       SPEED_1000 : SPEED_100));
+                               SPEED_1000 : SPEED_100));
-                        ecmd.duplex = full_duplex ? DUPLEX_FULL : DUPLEX_HALF;
+                cmd->duplex = full_duplex ? DUPLEX_FULL : DUPLEX_HALF;
+        } else {
+                cmd->autoneg = AUTONEG_DISABLE;
+                cmd->speed =
+                        (bmcr & CAS_BMCR_SPEED1000) ?
+                        SPEED_1000 : 
+                        ((bmcr & BMCR_SPEED100) ? SPEED_100: 
+                         SPEED_10);
+                cmd->duplex =
+                        (bmcr & BMCR_FULLDPLX) ?
+                        DUPLEX_FULL : DUPLEX_HALF;
+        }
+        if (linkstate != link_up) {
+                /* Force these to "unknown" if the link is not up and
+                 * autonogotiation in enabled. We can set the link 
+                 * speed to 0, but not cmd->duplex,
+                 * because its legal values are 0 and 1.  Ethtool will
+                 * print the value reported in parentheses after the
+                 * word "Unknown" for unrecognized values.
+                 *
+                 * If in forced mode, we report the speed and duplex
+                 * settings that we configured.
+                 */
+                if (cp->link_cntl & BMCR_ANENABLE) {
+                        cmd->speed = 0;
+                        cmd->duplex = 0xff;
                } else {
-                        ecmd.autoneg = AUTONEG_DISABLE;
+                        cmd->speed = SPEED_10;
-                        ecmd.speed =
+                        if (cp->link_cntl & BMCR_SPEED100) {
-                                (bmcr & CAS_BMCR_SPEED1000) ?
+                                cmd->speed = SPEED_100;
-                                SPEED_1000 : 
+                        } else if (cp->link_cntl & CAS_BMCR_SPEED1000) {
-                                ((bmcr & BMCR_SPEED100) ? SPEED_100: 
+                                cmd->speed = SPEED_1000;
-                                 SPEED_10);
-                        ecmd.duplex =
-                                (bmcr & BMCR_FULLDPLX) ?
-                                DUPLEX_FULL : DUPLEX_HALF;
-                }
-                if (linkstate != link_up) {
-                        /* Force these to "unknown" if the link is not up and
-                         * autonogotiation in enabled. We can set the link 
-                         * speed to 0, but not ecmd.duplex,
-                         * because its legal values are 0 and 1.  Ethtool will
-                         * print the value reported in parentheses after the
-                         * word "Unknown" for unrecognized values.
-                         *
-                         * If in forced mode, we report the speed and duplex
-                         * settings that we configured.
-                         */
-                        if (cp->link_cntl & BMCR_ANENABLE) {
-                                ecmd.speed = 0;
-                                ecmd.duplex = 0xff;
-                        } else {
-                                ecmd.speed = SPEED_10;
-                                if (cp->link_cntl & BMCR_SPEED100) {
-                                        ecmd.speed = SPEED_100;
-                                } else if (cp->link_cntl & CAS_BMCR_SPEED1000) {
-                                        ecmd.speed = SPEED_1000;
-                                }
-                                ecmd.duplex = (cp->link_cntl & BMCR_FULLDPLX)?
-                                        DUPLEX_FULL : DUPLEX_HALF;
                        }
+                        cmd->duplex = (cp->link_cntl & BMCR_FULLDPLX)?
+                                DUPLEX_FULL : DUPLEX_HALF;
                }
-                if (copy_to_user(ep_user, &ecmd, sizeof(ecmd)))
+        }
-                        return -EFAULT;
+        return 0;
-                return 0;
+}
-        case ETHTOOL_SSET:
+static int cas_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-                if (!capable(CAP_NET_ADMIN))
+{
-                        return -EPERM;
+        struct cas *cp = netdev_priv(dev);
+        unsigned long flags;
-                /* Verify the settings we care about. */
+        /* Verify the settings we care about. */
-                if (ecmd.autoneg != AUTONEG_ENABLE &&
+        if (cmd->autoneg != AUTONEG_ENABLE &&
-                    ecmd.autoneg != AUTONEG_DISABLE)
+            cmd->autoneg != AUTONEG_DISABLE)
-                        return -EINVAL;
+                return -EINVAL;
-                if (ecmd.autoneg == AUTONEG_DISABLE &&
+        if (cmd->autoneg == AUTONEG_DISABLE &&
-                    ((ecmd.speed != SPEED_1000 &&
+            ((cmd->speed != SPEED_1000 &&
-                      ecmd.speed != SPEED_100 &&
+              cmd->speed != SPEED_100 &&
-                      ecmd.speed != SPEED_10) ||
+              cmd->speed != SPEED_10) ||
-                     (ecmd.duplex != DUPLEX_HALF &&
+             (cmd->duplex != DUPLEX_HALF &&
-                      ecmd.duplex != DUPLEX_FULL)))
+              cmd->duplex != DUPLEX_FULL)))
-                        return -EINVAL;
+                return -EINVAL;
-                /* Apply settings and restart link process. */
+        /* Apply settings and restart link process. */
-                spin_lock_irqsave(&cp->lock, flags);
+        spin_lock_irqsave(&cp->lock, flags);
-                cas_begin_auto_negotiation(cp, &ecmd);
+        cas_begin_auto_negotiation(cp, cmd);
-                spin_unlock_irqrestore(&cp->lock, flags);
+        spin_unlock_irqrestore(&cp->lock, flags);
-                return 0;
+        return 0;
+}
-        case ETHTOOL_NWAY_RST:
+static int cas_nway_reset(struct net_device *dev)
-                if ((cp->link_cntl & BMCR_ANENABLE) == 0)
+{
-                        return -EINVAL;
+        struct cas *cp = netdev_priv(dev);
+        unsigned long flags;
-                /* Restart link process. */
+        if ((cp->link_cntl & BMCR_ANENABLE) == 0)
-                spin_lock_irqsave(&cp->lock, flags);
+                return -EINVAL;
-                cas_begin_auto_negotiation(cp, NULL);
-                spin_unlock_irqrestore(&cp->lock, flags);
-                return 0;
+        /* Restart link process. */
+        spin_lock_irqsave(&cp->lock, flags);
+        cas_begin_auto_negotiation(cp, NULL);
+        spin_unlock_irqrestore(&cp->lock, flags);
-        case ETHTOOL_GWOL:
+        return 0;
-        case ETHTOOL_SWOL:
+}
-                break; /* doesn't exist */
-        /* get link status */
+static u32 cas_get_link(struct net_device *dev)
-        case ETHTOOL_GLINK: {
+{
-                struct ethtool_value edata = { .cmd = ETHTOOL_GLINK };
+        struct cas *cp = netdev_priv(dev);
+        return cp->lstate == link_up;
+}
-                edata.data = (cp->lstate == link_up);
+static u32 cas_get_msglevel(struct net_device *dev)
-                if (copy_to_user(ep_user, &edata, sizeof(edata)))
+{
-                        return -EFAULT;
+        struct cas *cp = netdev_priv(dev);
-                return 0;
+        return cp->msg_enable;
-        }
+}
-        /* get message-level */
+static void cas_set_msglevel(struct net_device *dev, u32 value)
-        case ETHTOOL_GMSGLVL: {
+{
-                struct ethtool_value edata = { .cmd = ETHTOOL_GMSGLVL };
+        struct cas *cp = netdev_priv(dev);
+        cp->msg_enable = value;
+}
-                edata.data = cp->msg_enable;
+static int cas_get_regs_len(struct net_device *dev)
-                if (copy_to_user(ep_user, &edata, sizeof(edata)))
+{
-                        return -EFAULT;
+        struct cas *cp = netdev_priv(dev);
-                return 0;
+        return cp->casreg_len < CAS_MAX_REGS ? cp->casreg_len: CAS_MAX_REGS;
-        }
+}
-        /* set message-level */
+static void cas_get_regs(struct net_device *dev, struct ethtool_regs *regs,
-        case ETHTOOL_SMSGLVL: {
+                             void *p)
-                struct ethtool_value edata;
+{
+        struct cas *cp = netdev_priv(dev);
+        regs->version = 0;
+        /* cas_read_regs handles locks (cp->lock).  */
+        cas_read_regs(cp, p, regs->len / sizeof(u32));
+}
-                if (!capable(CAP_NET_ADMIN)) {
+static int cas_get_stats_count(struct net_device *dev)
-                        return (-EPERM);
+{
-                }
+        return CAS_NUM_STAT_KEYS;
-                if (copy_from_user(&edata, ep_user, sizeof(edata)))
+}
-                        return -EFAULT;
-                cp->msg_enable = edata.data;
-                return 0;
-        }
-        case ETHTOOL_GREGS: {
+static void cas_get_strings(struct net_device *dev, u32 stringset, u8 *data)
-                struct ethtool_regs edata;
+{
-                u8 *ptr;
+         memcpy(data, &ethtool_cassini_statnames, 
-                int len = cp->casreg_len < CAS_MAX_REGS ?
+                                         CAS_NUM_STAT_KEYS * ETH_GSTRING_LEN);
-                        cp->casreg_len: CAS_MAX_REGS;
+}
-                if (copy_from_user(&edata, ep_user, sizeof (edata)))
-                        return -EFAULT;
-                if (edata.len > len)
-                        edata.len = len;
-                edata.version = 0;
-                if (copy_to_user (ep_user, &edata, sizeof(edata)))
-                        return -EFAULT;
-                /* cas_get_regs handles locks (cp->lock).  */
-                ptr = cas_get_regs(cp);
-                if (ptr == NULL)
-                        return -ENOMEM;
-                if (copy_to_user(ep_user + sizeof (edata), ptr, edata.len))
-                        return -EFAULT;
-                kfree(ptr);
-                return (0);
-        }
-        case ETHTOOL_GSTRINGS: {
-                struct ethtool_gstrings edata;
-                int len;
-                if (copy_from_user(&edata, ep_user, sizeof(edata)))
-                        return -EFAULT;
-                len = edata.len;
-                switch(edata.string_set) {
-                case ETH_SS_STATS:
-                        edata.len = (len < CAS_NUM_STAT_KEYS) ?
-                                len : CAS_NUM_STAT_KEYS;
-                        if (copy_to_user(ep_user, &edata, sizeof(edata)))
-                                return -EFAULT;
-                        if (copy_to_user(ep_user + sizeof(edata),
-                                         &ethtool_cassini_statnames, 
-                                         (edata.len * ETH_GSTRING_LEN)))
-                                return -EFAULT;
-                        return 0;
-                default:
-                        return -EINVAL;
-                }
-        }
-        case ETHTOOL_GSTATS: {
-                int i = 0;
-                u64 *tmp;
-                struct ethtool_stats edata;
-                struct net_device_stats *stats;
-                int len;
-                if (copy_from_user(&edata, ep_user, sizeof(edata)))
-                        return -EFAULT;
-                len = edata.n_stats;
-                stats = cas_get_stats(cp->dev);
-                edata.cmd = ETHTOOL_GSTATS;
-                edata.n_stats = (len < CAS_NUM_STAT_KEYS) ?
-                        len : CAS_NUM_STAT_KEYS;
-                if (copy_to_user(ep_user, &edata, sizeof (edata)))
-                        return -EFAULT;
-                tmp = kmalloc(sizeof(u64)*CAS_NUM_STAT_KEYS, GFP_KERNEL);
-                if (tmp) {
-                        tmp[i++] = stats->collisions;
-                        tmp[i++] = stats->rx_bytes;
-                        tmp[i++] = stats->rx_crc_errors;
-                        tmp[i++] = stats->rx_dropped;
-                        tmp[i++] = stats->rx_errors;
-                        tmp[i++] = stats->rx_fifo_errors;
-                        tmp[i++] = stats->rx_frame_errors;
-                        tmp[i++] = stats->rx_length_errors;
-                        tmp[i++] = stats->rx_over_errors;
-                        tmp[i++] = stats->rx_packets;
-                        tmp[i++] = stats->tx_aborted_errors;
-                        tmp[i++] = stats->tx_bytes;
-                        tmp[i++] = stats->tx_dropped;
-                        tmp[i++] = stats->tx_errors;
-                        tmp[i++] = stats->tx_fifo_errors;
-                        tmp[i++] = stats->tx_packets;
-                        BUG_ON(i != CAS_NUM_STAT_KEYS);
-                        i = copy_to_user(ep_user + sizeof(edata),
-                                         tmp, sizeof(u64)*edata.n_stats);
-                        kfree(tmp);
-                } else {
-                        return -ENOMEM;
-                }
-                if (i)
-                        return -EFAULT;
-                return 0;
-        }
-        }
-        return -EOPNOTSUPP;
+static void cas_get_ethtool_stats(struct net_device *dev,
+                                      struct ethtool_stats *estats, u64 *data)
+{
+        struct cas *cp = netdev_priv(dev);
+        struct net_device_stats *stats = cas_get_stats(cp->dev);
+        int i = 0;
+        data[i++] = stats->collisions;
+        data[i++] = stats->rx_bytes;
+        data[i++] = stats->rx_crc_errors;
+        data[i++] = stats->rx_dropped;
+        data[i++] = stats->rx_errors;
+        data[i++] = stats->rx_fifo_errors;
+        data[i++] = stats->rx_frame_errors;
+        data[i++] = stats->rx_length_errors;
+        data[i++] = stats->rx_over_errors;
+        data[i++] = stats->rx_packets;
+        data[i++] = stats->tx_aborted_errors;
+        data[i++] = stats->tx_bytes;
+        data[i++] = stats->tx_dropped;
+        data[i++] = stats->tx_errors;
+        data[i++] = stats->tx_fifo_errors;
+        data[i++] = stats->tx_packets;
+        BUG_ON(i != CAS_NUM_STAT_KEYS);
 }
+static struct ethtool_ops cas_ethtool_ops = {
+        .get_drvinfo            = cas_get_drvinfo,
+        .get_settings           = cas_get_settings,
+        .set_settings           = cas_set_settings,
+        .nway_reset             = cas_nway_reset,
+        .get_link               = cas_get_link,
+        .get_msglevel           = cas_get_msglevel,
+        .set_msglevel           = cas_set_msglevel,
+        .get_regs_len           = cas_get_regs_len,
+        .get_regs               = cas_get_regs,
+        .get_stats_count        = cas_get_stats_count,
+        .get_strings            = cas_get_strings,
+        .get_ethtool_stats      = cas_get_ethtool_stats,
+};
 static int cas_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
        struct cas *cp = netdev_priv(dev);
@@ -4883,10 +4812,6 @@ static int cas_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         */
        down(&cp->pm_sem);
        switch (cmd) {
-        case SIOCETHTOOL:
-                rc = cas_ethtool_ioctl(dev, ifr->ifr_data);
-                break;
        case SIOCGMIIPHY:               /* Get address of MII PHY in use. */
                data->phy_id = cp->phy_addr;
                /* Fallthrough... */
@@ -5112,6 +5037,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
        dev->get_stats = cas_get_stats;
        dev->set_multicast_list = cas_set_multicast;
        dev->do_ioctl = cas_ioctl;
+        dev->ethtool_ops = &cas_ethtool_ops;
        dev->tx_timeout = cas_tx_timeout;
        dev->watchdog_timeo = CAS_TX_TIMEOUT;
        dev->change_mtu = cas_change_mtu;
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index 0de3bb906174..14e9b6315f20 100644
--- a/drivers/net/ibm_emac/ibm_emac_core.c
+++ b/drivers/net/ibm_emac/ibm_emac_core.c
@@ -1875,6 +1875,9 @@ static int emac_init_device(struct ocp_device *ocpdev, struct ibm_ocp_mal *mal)
                rc = -ENODEV;
                goto bail;
        }
+        
+        /* Disable any PHY features not supported by the platform */
+        ep->phy_mii.def->features &= ~emacdata->phy_feat_exc;
        /* Setup initial PHY config & startup aneg */
        if (ep->phy_mii.def->ops->init)
@@ -1882,6 +1885,34 @@ static int emac_init_device(struct ocp_device *ocpdev, struct ibm_ocp_mal *mal)
        netif_carrier_off(ndev);
        if (ep->phy_mii.def->features & SUPPORTED_Autoneg)
                ep->want_autoneg = 1;
+        else {
+                ep->want_autoneg = 0;
+                
+                /* Select highest supported speed/duplex */
+                if (ep->phy_mii.def->features & SUPPORTED_1000baseT_Full) {
+                        ep->phy_mii.speed = SPEED_1000;
+                        ep->phy_mii.duplex = DUPLEX_FULL;
+                } else if (ep->phy_mii.def->features & 
+                           SUPPORTED_1000baseT_Half) {
+                        ep->phy_mii.speed = SPEED_1000;
+                        ep->phy_mii.duplex = DUPLEX_HALF;
+                } else if (ep->phy_mii.def->features & 
+                           SUPPORTED_100baseT_Full) {
+                        ep->phy_mii.speed = SPEED_100;
+                        ep->phy_mii.duplex = DUPLEX_FULL;
+                } else if (ep->phy_mii.def->features & 
+                           SUPPORTED_100baseT_Half) {
+                        ep->phy_mii.speed = SPEED_100;
+                        ep->phy_mii.duplex = DUPLEX_HALF;
+                } else if (ep->phy_mii.def->features & 
+                           SUPPORTED_10baseT_Full) {
+                        ep->phy_mii.speed = SPEED_10;
+                        ep->phy_mii.duplex = DUPLEX_FULL;
+                } else {
+                        ep->phy_mii.speed = SPEED_10;
+                        ep->phy_mii.duplex = DUPLEX_HALF;
+                }
+        }
        emac_start_link(ep, NULL);
        /* read the MAC Address */
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index e64df4d0800b..83334db2921c 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -584,7 +584,7 @@ static inline int ns83820_add_rx_skb(struct ns83820 *dev, struct sk_buff *skb)
        return 0;
 }
-static inline int rx_refill(struct net_device *ndev, int gfp)
+static inline int rx_refill(struct net_device *ndev, unsigned int __nocast gfp)
 {
        struct ns83820 *dev = PRIV(ndev);
        unsigned i;
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index d652e1eddb45..c7cca842e5ee 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -1832,7 +1832,7 @@ static void fill_multicast_tbl(int count, struct dev_mc_list *addrs,
 {
    struct dev_mc_list  *mc_addr;
-    for (mc_addr = addrs;  mc_addr && --count > 0;  mc_addr = mc_addr->next) {
+    for (mc_addr = addrs;  mc_addr && count-- > 0;  mc_addr = mc_addr->next) {
        u_int position = ether_crc(6, mc_addr->dmi_addr);
 #ifndef final_version           /* Verify multicast address. */
        if ((mc_addr->dmi_addr[0] & 1) == 0)
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index fd398da4993b..c2e6484ef138 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -2837,21 +2837,29 @@ static void skge_netpoll(struct net_device *dev)
 static int skge_set_mac_address(struct net_device *dev, void *p)
 {
        struct skge_port *skge = netdev_priv(dev);
-        struct sockaddr *addr = p;
+        struct skge_hw *hw = skge->hw;
-        int err = 0;
+        unsigned port = skge->port;
+        const struct sockaddr *addr = p;
        if (!is_valid_ether_addr(addr->sa_data))
                return -EADDRNOTAVAIL;
-        skge_down(dev);
+        spin_lock_bh(&hw->phy_lock);
        memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
-        memcpy_toio(skge->hw->regs + B2_MAC_1 + skge->port*8,
+        memcpy_toio(hw->regs + B2_MAC_1 + port*8,
                    dev->dev_addr, ETH_ALEN);
-        memcpy_toio(skge->hw->regs + B2_MAC_2 + skge->port*8,
+        memcpy_toio(hw->regs + B2_MAC_2 + port*8,
                    dev->dev_addr, ETH_ALEN);
-        if (dev->flags & IFF_UP)
-                err = skge_up(dev);
+        if (hw->chip_id == CHIP_ID_GENESIS)
-        return err;
+                xm_outaddr(hw, port, XM_SA, dev->dev_addr);
+        else {
+                gma_set_addr(hw, port, GM_SRC_ADDR_1L, dev->dev_addr);
+                gma_set_addr(hw, port, GM_SRC_ADDR_2L, dev->dev_addr);
+        }
+        spin_unlock_bh(&hw->phy_lock);
+        return 0;
 }
 static const struct {
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 88b89dc95c77..efdb179ecc8c 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -133,14 +133,18 @@
        - finally added firmware (GPL'ed by Adaptec)
        - removed compatibility code for 2.2.x
+        LK1.4.2.1 (Ion Badulescu)
+        - fixed 32/64 bit issues on i386 + CONFIG_HIGHMEM
+        - added 32-bit padding to outgoing skb's, removed previous workaround
 TODO:   - fix forced speed/duplexing code (broken a long time ago, when
        somebody converted the driver to use the generic MII code)
        - fix VLAN support
 */
 #define DRV_NAME        "starfire"
-#define DRV_VERSION     "1.03+LK1.4.2"
+#define DRV_VERSION     "1.03+LK1.4.2.1"
-#define DRV_RELDATE     "January 19, 2005"
+#define DRV_RELDATE     "October 3, 2005"
 #include <linux/config.h>
 #include <linux/version.h>
@@ -165,6 +169,14 @@ TODO:	- fix forced speed/duplexing code (broken a long time ago, when
 * of length 1. If and when this is fixed, the #define below can be removed.
 */
 #define HAS_BROKEN_FIRMWARE
+/*
+ * If using the broken firmware, data must be padded to the next 32-bit boundary.
+ */
+#ifdef HAS_BROKEN_FIRMWARE
+#define PADDING_MASK 3
+#endif
 /*
 * Define this if using the driver with the zero-copy patch
 */
@@ -257,9 +269,10 @@ static int full_duplex[MAX_UNITS] = {0, };
 * This SUCKS.
 * We need a much better method to determine if dma_addr_t is 64-bit.
 */
-#if (defined(__i386__) && defined(CONFIG_HIGHMEM) && (LINUX_VERSION_CODE > 0x20500 || defined(CONFIG_HIGHMEM64G))) || defined(__x86_64__) || defined (__ia64__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR))
+#if (defined(__i386__) && defined(CONFIG_HIGHMEM64G)) || defined(__x86_64__) || defined (__ia64__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR))
 /* 64-bit dma_addr_t */
 #define ADDR_64BITS     /* This chip uses 64 bit addresses. */
+#define netdrv_addr_t u64
 #define cpu_to_dma(x) cpu_to_le64(x)
 #define dma_to_cpu(x) le64_to_cpu(x)
 #define RX_DESC_Q_ADDR_SIZE RxDescQAddr64bit
@@ -268,6 +281,7 @@ static int full_duplex[MAX_UNITS] = {0, };
 #define TX_COMPL_Q_ADDR_SIZE TxComplQAddr64bit
 #define RX_DESC_ADDR_SIZE RxDescAddr64bit
 #else  /* 32-bit dma_addr_t */
+#define netdrv_addr_t u32
 #define cpu_to_dma(x) cpu_to_le32(x)
 #define dma_to_cpu(x) le32_to_cpu(x)
 #define RX_DESC_Q_ADDR_SIZE RxDescQAddr32bit
@@ -1333,21 +1347,10 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)
        }
 #if defined(ZEROCOPY) && defined(HAS_BROKEN_FIRMWARE)
-        {
+        if (skb->ip_summed == CHECKSUM_HW) {
-                int has_bad_length = 0;
+                skb = skb_padto(skb, (skb->len + PADDING_MASK) & ~PADDING_MASK);
+                if (skb == NULL)
-                if (skb_first_frag_len(skb) == 1)
+                        return NETDEV_TX_OK;
-                        has_bad_length = 1;
-                else {
-                        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
-                                if (skb_shinfo(skb)->frags[i].size == 1) {
-                                        has_bad_length = 1;
-                                        break;
-                                }
-                }
-                if (has_bad_length)
-                        skb_checksum_help(skb, 0);
        }
 #endif /* ZEROCOPY && HAS_BROKEN_FIRMWARE */
@@ -2127,13 +2130,12 @@ static int __init starfire_init (void)
 #endif
 #endif
-#ifndef ADDR_64BITS
        /* we can do this test only at run-time... sigh */
-        if (sizeof(dma_addr_t) == sizeof(u64)) {
+        if (sizeof(dma_addr_t) != sizeof(netdrv_addr_t)) {
-                printk("This driver has not been ported to this 64-bit architecture yet\n");
+                printk("This driver has dma_addr_t issues, please send email to maintainer\n");
                return -ENODEV;
        }
-#endif /* not ADDR_64BITS */
        return pci_module_init (&starfire_driver);
 }
diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h
index ff8ae5f79970..16edbb1a4a7a 100644
--- a/drivers/net/sungem.h
+++ b/drivers/net/sungem.h
@@ -1035,7 +1035,8 @@ struct gem {
                        
 #define ALIGNED_RX_SKB_ADDR(addr) \
        ((((unsigned long)(addr) + (64UL - 1UL)) & ~(64UL - 1UL)) - (unsigned long)(addr))
-static __inline__ struct sk_buff *gem_alloc_skb(int size, int gfp_flags)
+static __inline__ struct sk_buff *gem_alloc_skb(int size,
+                                                unsigned int __nocast gfp_flags)
 {
        struct sk_buff *skb = alloc_skb(size + 64, gfp_flags);
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 25f85fb9df46..1802c3b48799 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -67,8 +67,8 @@
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.41"
+#define DRV_MODULE_VERSION      "3.42"
-#define DRV_MODULE_RELDATE      "September 27, 2005"
+#define DRV_MODULE_RELDATE      "Oct 3, 2005"
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -9284,8 +9284,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
        static struct pci_device_id write_reorder_chipsets[] = {
                { PCI_DEVICE(PCI_VENDOR_ID_AMD,
                             PCI_DEVICE_ID_AMD_FE_GATE_700C) },
-                { PCI_DEVICE(PCI_VENDOR_ID_AMD,
+                { PCI_DEVICE(PCI_VENDOR_ID_VIA,
-                             PCI_DEVICE_ID_AMD_K8_NB) },
+                             PCI_DEVICE_ID_VIA_8385_0) },
                { },
        };
        u32 misc_ctrl_reg;
@@ -9300,15 +9300,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                tp->tg3_flags2 |= TG3_FLG2_SUN_570X;
 #endif
-        /* If we have an AMD 762 or K8 chipset, write
-         * reordering to the mailbox registers done by the host
-         * controller can cause major troubles.  We read back from
-         * every mailbox register write to force the writes to be
-         * posted to the chip in order.
-         */
-        if (pci_dev_present(write_reorder_chipsets))
-                tp->tg3_flags |= TG3_FLAG_MBOX_WRITE_REORDER;
        /* Force memory write invalidate off.  If we leave it on,
         * then on 5700_BX chips we have to enable a workaround.
         * The workaround is to set the TG3PCI_DMA_RW_CTRL boundary
@@ -9439,6 +9430,16 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
        if (pci_find_capability(tp->pdev, PCI_CAP_ID_EXP) != 0)
                tp->tg3_flags2 |= TG3_FLG2_PCI_EXPRESS;
+        /* If we have an AMD 762 or VIA K8T800 chipset, write
+         * reordering to the mailbox registers done by the host
+         * controller can cause major troubles.  We read back from
+         * every mailbox register write to force the writes to be
+         * posted to the chip in order.
+         */
+        if (pci_dev_present(write_reorder_chipsets) &&
+            !(tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS))
+                tp->tg3_flags |= TG3_FLAG_MBOX_WRITE_REORDER;
        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 &&
            tp->pci_lat_timer < 64) {
                tp->pci_lat_timer = 64;
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index e7b001017b9a..32057e65808b 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -531,7 +531,6 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
                        if (!time_after(jiffies, timeout)) continue;
                        DPRINTK( "Hardware timeout during initialization.\n");
                        iounmap(t_mmio);
-                        kfree(ti);
                        return -ENODEV;
                }
                ti->sram_phys =
@@ -645,7 +644,6 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
                        DPRINTK("Unknown shared ram paging info %01X\n",
                                                        ti->shared_ram_paging);
                        iounmap(t_mmio); 
-                        kfree(ti);
                        return -ENODEV;
                        break;
                } /*end switch shared_ram_paging */
@@ -675,7 +673,6 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
                        "driver limit (%05x), adapter not started.\n",
                        chk_base, ibmtr_mem_base + IBMTR_SHARED_RAM_SIZE);
                        iounmap(t_mmio);
-                        kfree(ti);
                        return -ENODEV;
                } else { /* seems cool, record what we have figured out */
                        ti->sram_base = new_base >> 12;
@@ -690,7 +687,6 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
                DPRINTK("Could not grab irq %d.  Halting Token Ring driver.\n",
                                        irq);
                iounmap(t_mmio);
-                kfree(ti);
                return -ENODEV;
        }
        /*?? Now, allocate some of the PIO PORTs for this driver.. */
@@ -699,7 +695,6 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
                DPRINTK("Could not grab PIO range. Halting driver.\n");
                free_irq(dev->irq, dev);
                iounmap(t_mmio);
-                kfree(ti);
                return -EBUSY;
        }
diff --git a/drivers/net/tulip/21142.c b/drivers/net/tulip/21142.c
index 5db694c4eb02..683f14b01c06 100644
--- a/drivers/net/tulip/21142.c
+++ b/drivers/net/tulip/21142.c
@@ -172,7 +172,7 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
                        int i;
                        for (i = 0; i < tp->mtable->leafcount; i++)
                                if (tp->mtable->mleaf[i].media == dev->if_port) {
-                                        int startup = ! ((tp->chip_id == DC21143 && tp->revision == 65));
+                                        int startup = ! ((tp->chip_id == DC21143 && (tp->revision == 48 || tp->revision == 65)));
                                        tp->cur_index = i;
                                        tulip_select_media(dev, startup);
                                        setup_done = 1;
diff --git a/drivers/net/wan/sdlamain.c b/drivers/net/wan/sdlamain.c
index 74e151acef3e..7a8b22a7ea31 100644
--- a/drivers/net/wan/sdlamain.c
+++ b/drivers/net/wan/sdlamain.c
@@ -57,6 +57,7 @@
 #include <linux/ioport.h>       /* request_region(), release_region() */
 #include <linux/wanrouter.h>    /* WAN router definitions */
 #include <linux/wanpipe.h>      /* WANPIPE common user API definitions */
+#include <linux/rcupdate.h>
 #include <linux/in.h>
 #include <asm/io.h>             /* phys_to_virt() */
@@ -1268,37 +1269,41 @@ unsigned long get_ip_address(struct net_device *dev, int option)
        
        struct in_ifaddr *ifaddr;
        struct in_device *in_dev;
+        unsigned long addr = 0;
-        if ((in_dev = __in_dev_get(dev)) == NULL){
+        rcu_read_lock();
-                return 0;
+        if ((in_dev = __in_dev_get_rcu(dev)) == NULL){
+                goto out;
        }
        if ((ifaddr = in_dev->ifa_list)== NULL ){
-                return 0;
+                goto out;
        }
        
        switch (option){
        case WAN_LOCAL_IP:
-                return ifaddr->ifa_local;
+                addr = ifaddr->ifa_local;
                break;
        
        case WAN_POINTOPOINT_IP:
-                return ifaddr->ifa_address;
+                addr = ifaddr->ifa_address;
                break;  
        case WAN_NETMASK_IP:
-                return ifaddr->ifa_mask;
+                addr = ifaddr->ifa_mask;
                break;
        case WAN_BROADCAST_IP:
-                return ifaddr->ifa_broadcast;
+                addr = ifaddr->ifa_broadcast;
                break;
        default:
-                return 0;
+                break;
        }
-        return 0;
+out:
+        rcu_read_unlock();
+        return addr;
 }       
 void add_gateway(sdla_t *card, struct net_device *dev)
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
index b56a7b516d24..a6d3b55013a5 100644
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
@@ -769,7 +769,7 @@ static void sppp_cisco_input (struct sppp *sp, struct sk_buff *skb)
                u32 addr = 0, mask = ~0; /* FIXME: is the mask correct? */
 #ifdef CONFIG_INET
                rcu_read_lock();
-                if ((in_dev = __in_dev_get(dev)) != NULL)
+                if ((in_dev = __in_dev_get_rcu(dev)) != NULL)
                {
                        for (ifa=in_dev->ifa_list; ifa != NULL;
                                ifa=ifa->ifa_next) {
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 6deb7cc810cc..cf3daaa1b369 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -503,9 +503,14 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
                return 0;
        }
-        /* Length of the packet body */
+        /* Check packet length, pad short packets, round up odd length */
-        /* FIXME: what if the skb is smaller than this? */
+        len = max_t(int, ALIGN(skb->len, 2), ETH_ZLEN);
-        len = max_t(int,skb->len - ETH_HLEN, ETH_ZLEN - ETH_HLEN);
+        if (skb->len < len) {
+                skb = skb_padto(skb, len);
+                if (skb == NULL)
+                        goto fail;
+        }
+        len -= ETH_HLEN;
        eh = (struct ethhdr *)skb->data;
@@ -557,8 +562,7 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
                p = skb->data;
        }
-        /* Round up for odd length packets */
+        err = hermes_bap_pwrite(hw, USER_BAP, p, data_len,
-        err = hermes_bap_pwrite(hw, USER_BAP, p, ALIGN(data_len, 2),
                                txfid, data_off);
        if (err) {
                printk(KERN_ERR "%s: Error %d writing packet to BAP\n",
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 4b0acae22b0d..7bc7fc823128 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -1352,7 +1352,7 @@ static unsigned char *strip_make_packet(unsigned char *buffer,
                struct in_device *in_dev;
                rcu_read_lock();
-                in_dev = __in_dev_get(strip_info->dev);
+                in_dev = __in_dev_get_rcu(strip_info->dev);
                if (in_dev == NULL) {
                        rcu_read_unlock();
                        return NULL;
@@ -1508,7 +1508,7 @@ static void strip_send(struct strip *strip_info, struct sk_buff *skb)
                brd = addr = 0;
                rcu_read_lock();
-                in_dev = __in_dev_get(strip_info->dev);
+                in_dev = __in_dev_get_rcu(strip_info->dev);
                if (in_dev) {
                        if (in_dev->ifa_list) {
                                brd = in_dev->ifa_list->ifa_broadcast;
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index e90fb72a6962..286902298e33 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -37,6 +37,7 @@
 #include <linux/proc_fs.h>
 #include <linux/ctype.h>
 #include <linux/blkdev.h>
+#include <linux/rcupdate.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/hardware.h>
@@ -358,9 +359,10 @@ static __inline__ int led_get_net_activity(void)
        /* we are running as tasklet, so locking dev_base 
         * for reading should be OK */
        read_lock(&dev_base_lock);
+        rcu_read_lock();
        for (dev = dev_base; dev; dev = dev->next) {
            struct net_device_stats *stats;
-            struct in_device *in_dev = __in_dev_get(dev);
+            struct in_device *in_dev = __in_dev_get_rcu(dev);
            if (!in_dev || !in_dev->ifa_list)
                continue;
            if (LOOPBACK(in_dev->ifa_list->ifa_local))
@@ -371,6 +373,7 @@ static __inline__ int led_get_net_activity(void)
            rx_total += stats->rx_packets;
            tx_total += stats->tx_packets;
        }
+        rcu_read_unlock();
        read_unlock(&dev_base_lock);
        retval = 0;
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index 2ad4797ce024..9963479ba89f 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -686,6 +686,7 @@ struct qeth_seqno {
        __u32 pdu_hdr;
        __u32 pdu_hdr_ack;
        __u16 ipa;
+        __u32 pkt_seqno;
 };
 struct qeth_reply {
@@ -848,6 +849,7 @@ qeth_realloc_headroom(struct qeth_card *card, struct sk_buff **skb, int size)
                                  "on interface %s", QETH_CARD_IFNAME(card));
                        return -ENOMEM;
                }
+                kfree_skb(*skb);
                *skb = new_skb;
        }
        return 0;
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 86582cf1e19e..bd28e2438d7f 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -511,7 +511,7 @@ static int
 __qeth_set_offline(struct ccwgroup_device *cgdev, int recovery_mode)
 {
        struct qeth_card *card = (struct qeth_card *) cgdev->dev.driver_data;
-        int rc = 0;
+        int rc = 0, rc2 = 0, rc3 = 0;
        enum qeth_card_states recover_flag;
        QETH_DBF_TEXT(setup, 3, "setoffl");
@@ -523,11 +523,13 @@ __qeth_set_offline(struct ccwgroup_device *cgdev, int recovery_mode)
                           CARD_BUS_ID(card));
                return -ERESTARTSYS;
        }
-        if ((rc = ccw_device_set_offline(CARD_DDEV(card))) ||
+        rc  = ccw_device_set_offline(CARD_DDEV(card));
-            (rc = ccw_device_set_offline(CARD_WDEV(card))) ||
+        rc2 = ccw_device_set_offline(CARD_WDEV(card));
-            (rc = ccw_device_set_offline(CARD_RDEV(card)))) {
+        rc3 = ccw_device_set_offline(CARD_RDEV(card));
+        if (!rc)
+                rc = (rc2) ? rc2 : rc3;
+        if (rc)
                QETH_DBF_TEXT_(setup, 2, "1err%d", rc);
-        }
        if (recover_flag == CARD_STATE_UP)
                card->state = CARD_STATE_RECOVER;
        qeth_notify_processes();
@@ -1046,6 +1048,7 @@ qeth_setup_card(struct qeth_card *card)
        spin_lock_init(&card->vlanlock);
        card->vlangrp = NULL;
 #endif
+        spin_lock_init(&card->lock);
        spin_lock_init(&card->ip_lock);
        spin_lock_init(&card->thread_mask_lock);
        card->thread_start_mask = 0;
@@ -1626,16 +1629,6 @@ qeth_cmd_timeout(unsigned long data)
        spin_unlock_irqrestore(&reply->card->lock, flags);
 }
-static void
-qeth_reset_ip_addresses(struct qeth_card *card)
-{
-        QETH_DBF_TEXT(trace, 2, "rstipadd");
-        qeth_clear_ip_list(card, 0, 1);
-        /* this function will also schedule the SET_IP_THREAD */
-        qeth_set_multicast_list(card->dev);
-}
 static struct qeth_ipa_cmd *
 qeth_check_ipa_data(struct qeth_card *card, struct qeth_cmd_buffer *iob)
 {
@@ -1664,9 +1657,8 @@ qeth_check_ipa_data(struct qeth_card *card, struct qeth_cmd_buffer *iob)
                                           "IP address reset.\n",
                                           QETH_CARD_IFNAME(card),
                                           card->info.chpid);
-                                card->lan_online = 1;
                                netif_carrier_on(card->dev);
-                                qeth_reset_ip_addresses(card);
+                                qeth_schedule_recovery(card);
                                return NULL;
                        case IPA_CMD_REGISTER_LOCAL_ADDR:
                                QETH_DBF_TEXT(trace,3, "irla");
@@ -2387,6 +2379,7 @@ qeth_layer2_rebuild_skb(struct qeth_card *card, struct sk_buff *skb,
                skb_pull(skb, VLAN_HLEN);
        }
 #endif
+        *((__u32 *)skb->cb) = ++card->seqno.pkt_seqno;
        return vlan_id;
 }
@@ -3014,7 +3007,7 @@ qeth_alloc_buffer_pool(struct qeth_card *card)
                        return -ENOMEM;
                }
                for(j = 0; j < QETH_MAX_BUFFER_ELEMENTS(card); ++j){
-                        ptr = (void *) __get_free_page(GFP_KERNEL);
+                        ptr = (void *) __get_free_page(GFP_KERNEL|GFP_DMA);
                        if (!ptr) {
                                while (j > 0)
                                        free_page((unsigned long)
@@ -3058,7 +3051,8 @@ qeth_alloc_qdio_buffers(struct qeth_card *card)
        if (card->qdio.state == QETH_QDIO_ALLOCATED)
                return 0;
-        card->qdio.in_q = kmalloc(sizeof(struct qeth_qdio_q), GFP_KERNEL);
+        card->qdio.in_q = kmalloc(sizeof(struct qeth_qdio_q), 
+                                  GFP_KERNEL|GFP_DMA);
        if (!card->qdio.in_q)
                return - ENOMEM;
        QETH_DBF_TEXT(setup, 2, "inq");
@@ -3083,7 +3077,7 @@ qeth_alloc_qdio_buffers(struct qeth_card *card)
        }
        for (i = 0; i < card->qdio.no_out_queues; ++i){
                card->qdio.out_qs[i] = kmalloc(sizeof(struct qeth_qdio_out_q),
-                                               GFP_KERNEL);
+                                               GFP_KERNEL|GFP_DMA);
                if (!card->qdio.out_qs[i]){
                        while (i > 0)
                                kfree(card->qdio.out_qs[--i]);
@@ -5200,7 +5194,7 @@ qeth_free_vlan_addresses4(struct qeth_card *card, unsigned short vid)
        if (!card->vlangrp)
                return;
        rcu_read_lock();
-        in_dev = __in_dev_get(card->vlangrp->vlan_devices[vid]);
+        in_dev = __in_dev_get_rcu(card->vlangrp->vlan_devices[vid]);
        if (!in_dev)
                goto out;
        for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
@@ -6470,6 +6464,9 @@ qeth_query_ipassists_cb(struct qeth_card *card, struct qeth_reply *reply,
        if (cmd->hdr.prot_version == QETH_PROT_IPV4) {
                card->options.ipa4.supported_funcs = cmd->hdr.ipa_supported;
                card->options.ipa4.enabled_funcs = cmd->hdr.ipa_enabled;
+                /* Disable IPV6 support hard coded for Hipersockets */
+                if(card->info.type == QETH_CARD_TYPE_IQD)
+                        card->options.ipa4.supported_funcs &= ~IPA_IPV6;
        } else {
 #ifdef CONFIG_QETH_IPV6
                card->options.ipa6.supported_funcs = cmd->hdr.ipa_supported;
@@ -7725,7 +7722,7 @@ qeth_arp_constructor(struct neighbour *neigh)
                goto out;
        rcu_read_lock();
-        in_dev = rcu_dereference(__in_dev_get(dev));
+        in_dev = __in_dev_get_rcu(dev);
        if (in_dev == NULL) {
                rcu_read_unlock();
                return -EINVAL;
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index a6ac61611f35..a748fbfb6692 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -60,6 +60,7 @@
                 Remove un-needed eh_abort handler.
                 Add support for embedded firmware error strings.
   2.26.02.003 - Correctly handle single sgl's with use_sg=1.
+   2.26.02.004 - Add support for 9550SX controllers.
 */
 #include <linux/module.h>
@@ -82,7 +83,7 @@
 #include "3w-9xxx.h"
 /* Globals */
-#define TW_DRIVER_VERSION "2.26.02.003"
+#define TW_DRIVER_VERSION "2.26.02.004"
 static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT];
 static unsigned int twa_device_extension_count;
 static int twa_major = -1;
@@ -892,11 +893,6 @@ static int twa_decode_bits(TW_Device_Extension *tw_dev, u32 status_reg_value)
                writel(TW_CONTROL_CLEAR_QUEUE_ERROR, TW_CONTROL_REG_ADDR(tw_dev));
        }
-        if (status_reg_value & TW_STATUS_SBUF_WRITE_ERROR) {
-                TW_PRINTK(tw_dev->host, TW_DRIVER, 0xf, "SBUF Write Error: clearing");
-                writel(TW_CONTROL_CLEAR_SBUF_WRITE_ERROR, TW_CONTROL_REG_ADDR(tw_dev));
-        }
        if (status_reg_value & TW_STATUS_MICROCONTROLLER_ERROR) {
                if (tw_dev->reset_print == 0) {
                        TW_PRINTK(tw_dev->host, TW_DRIVER, 0x10, "Microcontroller Error: clearing");
@@ -930,6 +926,36 @@ out:
        return retval;
 } /* End twa_empty_response_queue() */
+/* This function will clear the pchip/response queue on 9550SX */
+static int twa_empty_response_queue_large(TW_Device_Extension *tw_dev)
+{
+        u32 status_reg_value, response_que_value;
+        int count = 0, retval = 1;
+        if (tw_dev->tw_pci_dev->device == PCI_DEVICE_ID_3WARE_9550SX) {
+                status_reg_value = readl(TW_STATUS_REG_ADDR(tw_dev));
+                while (((status_reg_value & TW_STATUS_RESPONSE_QUEUE_EMPTY) == 0) && (count < TW_MAX_RESPONSE_DRAIN)) {
+                        response_que_value = readl(TW_RESPONSE_QUEUE_REG_ADDR_LARGE(tw_dev));
+                        if ((response_que_value & TW_9550SX_DRAIN_COMPLETED) == TW_9550SX_DRAIN_COMPLETED) {
+                                /* P-chip settle time */
+                                msleep(500);
+                                retval = 0;
+                                goto out;
+                        }
+                        status_reg_value = readl(TW_STATUS_REG_ADDR(tw_dev));
+                        count++;
+                }
+                if (count == TW_MAX_RESPONSE_DRAIN)
+                        goto out;
+                
+                retval = 0;
+        } else
+                retval = 0;
+out:
+        return retval;
+} /* End twa_empty_response_queue_large() */
 /* This function passes sense keys from firmware to scsi layer */
 static int twa_fill_sense(TW_Device_Extension *tw_dev, int request_id, int copy_sense, int print_host)
 {
@@ -1613,8 +1639,16 @@ static int twa_reset_sequence(TW_Device_Extension *tw_dev, int soft_reset)
        int tries = 0, retval = 1, flashed = 0, do_soft_reset = soft_reset;
        while (tries < TW_MAX_RESET_TRIES) {
-                if (do_soft_reset)
+                if (do_soft_reset) {
                        TW_SOFT_RESET(tw_dev);
+                        /* Clear pchip/response queue on 9550SX */
+                        if (twa_empty_response_queue_large(tw_dev)) {
+                                TW_PRINTK(tw_dev->host, TW_DRIVER, 0x36, "Response queue (large) empty failed during reset sequence");
+                                do_soft_reset = 1;
+                                tries++;
+                                continue;
+                        }
+                }
                /* Make sure controller is in a good state */
                if (twa_poll_status(tw_dev, TW_STATUS_MICROCONTROLLER_READY | (do_soft_reset == 1 ? TW_STATUS_ATTENTION_INTERRUPT : 0), 60)) {
@@ -2034,7 +2068,10 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
                goto out_free_device_extension;
        }
-        mem_addr = pci_resource_start(pdev, 1);
+        if (pdev->device == PCI_DEVICE_ID_3WARE_9000)
+                mem_addr = pci_resource_start(pdev, 1);
+        else
+                mem_addr = pci_resource_start(pdev, 2);
        /* Save base address */
        tw_dev->base_addr = ioremap(mem_addr, PAGE_SIZE);
@@ -2148,6 +2185,8 @@ static void twa_remove(struct pci_dev *pdev)
 static struct pci_device_id twa_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9000,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9550SX,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { }
 };
 MODULE_DEVICE_TABLE(pci, twa_pci_tbl);
diff --git a/drivers/scsi/3w-9xxx.h b/drivers/scsi/3w-9xxx.h
index 8c8ecbed3b58..46f22cdc8298 100644
--- a/drivers/scsi/3w-9xxx.h
+++ b/drivers/scsi/3w-9xxx.h
@@ -267,7 +267,6 @@ static twa_message_type twa_error_table[] = {
 #define TW_CONTROL_CLEAR_PARITY_ERROR          0x00800000
 #define TW_CONTROL_CLEAR_QUEUE_ERROR           0x00400000
 #define TW_CONTROL_CLEAR_PCI_ABORT             0x00100000
-#define TW_CONTROL_CLEAR_SBUF_WRITE_ERROR      0x00000008
 /* Status register bit definitions */
 #define TW_STATUS_MAJOR_VERSION_MASK           0xF0000000
@@ -285,9 +284,8 @@ static twa_message_type twa_error_table[] = {
 #define TW_STATUS_MICROCONTROLLER_READY        0x00002000
 #define TW_STATUS_COMMAND_QUEUE_EMPTY          0x00001000
 #define TW_STATUS_EXPECTED_BITS                0x00002000
-#define TW_STATUS_UNEXPECTED_BITS              0x00F00008
+#define TW_STATUS_UNEXPECTED_BITS              0x00F00000
-#define TW_STATUS_SBUF_WRITE_ERROR             0x00000008
+#define TW_STATUS_VALID_INTERRUPT              0x00DF0000
-#define TW_STATUS_VALID_INTERRUPT              0x00DF0008
 /* RESPONSE QUEUE BIT DEFINITIONS */
 #define TW_RESPONSE_ID_MASK                    0x00000FF0
@@ -324,9 +322,9 @@ static twa_message_type twa_error_table[] = {
 /* Compatibility defines */
 #define TW_9000_ARCH_ID 0x5
-#define TW_CURRENT_DRIVER_SRL 28
+#define TW_CURRENT_DRIVER_SRL 30
-#define TW_CURRENT_DRIVER_BUILD 9
+#define TW_CURRENT_DRIVER_BUILD 80
-#define TW_CURRENT_DRIVER_BRANCH 4
+#define TW_CURRENT_DRIVER_BRANCH 0
 /* Phase defines */
 #define TW_PHASE_INITIAL 0
@@ -334,6 +332,7 @@ static twa_message_type twa_error_table[] = {
 #define TW_PHASE_SGLIST  2
 /* Misc defines */
+#define TW_9550SX_DRAIN_COMPLETED             0xFFFF
 #define TW_SECTOR_SIZE                        512
 #define TW_ALIGNMENT_9000                     4  /* 4 bytes */
 #define TW_ALIGNMENT_9000_SGL                 0x3
@@ -417,6 +416,9 @@ static twa_message_type twa_error_table[] = {
 #ifndef PCI_DEVICE_ID_3WARE_9000
 #define PCI_DEVICE_ID_3WARE_9000 0x1002
 #endif
+#ifndef PCI_DEVICE_ID_3WARE_9550SX
+#define PCI_DEVICE_ID_3WARE_9550SX 0x1003
+#endif
 /* Bitmask macros to eliminate bitfields */
@@ -443,6 +445,7 @@ static twa_message_type twa_error_table[] = {
 #define TW_STATUS_REG_ADDR(x) ((unsigned char __iomem *)x->base_addr + 0x4)
 #define TW_COMMAND_QUEUE_REG_ADDR(x) (sizeof(dma_addr_t) > 4 ? ((unsigned char __iomem *)x->base_addr + 0x20) : ((unsigned char __iomem *)x->base_addr + 0x8))
 #define TW_RESPONSE_QUEUE_REG_ADDR(x) ((unsigned char __iomem *)x->base_addr + 0xC)
+#define TW_RESPONSE_QUEUE_REG_ADDR_LARGE(x) ((unsigned char __iomem *)x->base_addr + 0x30)
 #define TW_CLEAR_ALL_INTERRUPTS(x) (writel(TW_STATUS_VALID_INTERRUPT, TW_CONTROL_REG_ADDR(x)))
 #define TW_CLEAR_ATTENTION_INTERRUPT(x) (writel(TW_CONTROL_CLEAR_ATTENTION_INTERRUPT, TW_CONTROL_REG_ADDR(x)))
 #define TW_CLEAR_HOST_INTERRUPT(x) (writel(TW_CONTROL_CLEAR_HOST_INTERRUPT, TW_CONTROL_REG_ADDR(x)))
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 1e4edbdf2730..48529d180ca8 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -99,6 +99,7 @@ obj-$(CONFIG_SCSI_DC395x)	+= dc395x.o
 obj-$(CONFIG_SCSI_DC390T)       += tmscsim.o
 obj-$(CONFIG_MEGARAID_LEGACY)   += megaraid.o
 obj-$(CONFIG_MEGARAID_NEWGEN)   += megaraid/
+obj-$(CONFIG_MEGARAID_SAS)      += megaraid/
 obj-$(CONFIG_SCSI_ACARD)        += atp870u.o
 obj-$(CONFIG_SCSI_SUNESP)       += esp.o
 obj-$(CONFIG_SCSI_GDTH)         += gdth.o
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index a8e3dfcd0dc7..93416f760e5a 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -313,18 +313,37 @@ int aac_get_containers(struct aac_dev *dev)
                }
                dresp = (struct aac_mount *)fib_data(fibptr);
+                if ((le32_to_cpu(dresp->status) == ST_OK) &&
+                    (le32_to_cpu(dresp->mnt[0].vol) == CT_NONE)) {
+                        dinfo->command = cpu_to_le32(VM_NameServe64);
+                        dinfo->count = cpu_to_le32(index);
+                        dinfo->type = cpu_to_le32(FT_FILESYS);
+                        if (fib_send(ContainerCommand,
+                                    fibptr,
+                                    sizeof(struct aac_query_mount),
+                                    FsaNormal,
+                                    1, 1,
+                                    NULL, NULL) < 0)
+                                continue;
+                } else
+                        dresp->mnt[0].capacityhigh = 0;
                dprintk ((KERN_DEBUG
-                  "VM_NameServe cid=%d status=%d vol=%d state=%d cap=%u\n",
+                  "VM_NameServe cid=%d status=%d vol=%d state=%d cap=%llu\n",
                  (int)index, (int)le32_to_cpu(dresp->status),
                  (int)le32_to_cpu(dresp->mnt[0].vol),
                  (int)le32_to_cpu(dresp->mnt[0].state),
-                  (unsigned)le32_to_cpu(dresp->mnt[0].capacity)));
+                  ((u64)le32_to_cpu(dresp->mnt[0].capacity)) +
+                    (((u64)le32_to_cpu(dresp->mnt[0].capacityhigh)) << 32)));
                if ((le32_to_cpu(dresp->status) == ST_OK) &&
                    (le32_to_cpu(dresp->mnt[0].vol) != CT_NONE) &&
                    (le32_to_cpu(dresp->mnt[0].state) != FSCS_HIDDEN)) {
                        fsa_dev_ptr[index].valid = 1;
                        fsa_dev_ptr[index].type = le32_to_cpu(dresp->mnt[0].vol);
-                        fsa_dev_ptr[index].size = le32_to_cpu(dresp->mnt[0].capacity);
+                        fsa_dev_ptr[index].size
+                          = ((u64)le32_to_cpu(dresp->mnt[0].capacity)) +
+                            (((u64)le32_to_cpu(dresp->mnt[0].capacityhigh)) << 32);
                        if (le32_to_cpu(dresp->mnt[0].state) & FSCS_READONLY)
                                    fsa_dev_ptr[index].ro = 1;
                }
@@ -460,7 +479,7 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd, int cid)
 *      is updated in the struct fsa_dev_info structure rather than returned.
 */
 
-static int probe_container(struct aac_dev *dev, int cid)
+int probe_container(struct aac_dev *dev, int cid)
 {
        struct fsa_dev_info *fsa_dev_ptr;
        int status;
@@ -497,11 +516,29 @@ static int probe_container(struct aac_dev *dev, int cid)
        dresp = (struct aac_mount *) fib_data(fibptr);
        if ((le32_to_cpu(dresp->status) == ST_OK) &&
+            (le32_to_cpu(dresp->mnt[0].vol) == CT_NONE)) {
+                dinfo->command = cpu_to_le32(VM_NameServe64);
+                dinfo->count = cpu_to_le32(cid);
+                dinfo->type = cpu_to_le32(FT_FILESYS);
+                if (fib_send(ContainerCommand,
+                            fibptr,
+                            sizeof(struct aac_query_mount),
+                            FsaNormal,
+                            1, 1,
+                            NULL, NULL) < 0)
+                        goto error;
+        } else
+                dresp->mnt[0].capacityhigh = 0;
+        if ((le32_to_cpu(dresp->status) == ST_OK) &&
            (le32_to_cpu(dresp->mnt[0].vol) != CT_NONE) &&
            (le32_to_cpu(dresp->mnt[0].state) != FSCS_HIDDEN)) {
                fsa_dev_ptr[cid].valid = 1;
                fsa_dev_ptr[cid].type = le32_to_cpu(dresp->mnt[0].vol);
-                fsa_dev_ptr[cid].size = le32_to_cpu(dresp->mnt[0].capacity);
+                fsa_dev_ptr[cid].size
+                  = ((u64)le32_to_cpu(dresp->mnt[0].capacity)) +
+                    (((u64)le32_to_cpu(dresp->mnt[0].capacityhigh)) << 32);
                if (le32_to_cpu(dresp->mnt[0].state) & FSCS_READONLY)
                        fsa_dev_ptr[cid].ro = 1;
        }
@@ -655,7 +692,7 @@ int aac_get_adapter_info(struct aac_dev* dev)
                         fibptr, 
                         sizeof(*info),
                         FsaNormal, 
-                         1, 1, 
+                         -1, 1, /* First `interrupt' command uses special wait */
                         NULL, 
                         NULL);
@@ -806,8 +843,8 @@ int aac_get_adapter_info(struct aac_dev* dev)
        if (!(dev->raw_io_interface)) {
                dev->scsi_host_ptr->sg_tablesize = (dev->max_fib_size -
                        sizeof(struct aac_fibhdr) -
-                        sizeof(struct aac_write) + sizeof(struct sgmap)) /
+                        sizeof(struct aac_write) + sizeof(struct sgentry)) /
-                                sizeof(struct sgmap);
+                                sizeof(struct sgentry);
                if (dev->dac_support) {
                        /* 
                         * 38 scatter gather elements 
@@ -816,8 +853,8 @@ int aac_get_adapter_info(struct aac_dev* dev)
                                (dev->max_fib_size -
                                sizeof(struct aac_fibhdr) -
                                sizeof(struct aac_write64) +
-                                sizeof(struct sgmap64)) /
+                                sizeof(struct sgentry64)) /
-                                        sizeof(struct sgmap64);
+                                        sizeof(struct sgentry64);
                }
                dev->scsi_host_ptr->max_sectors = AAC_MAX_32BIT_SGBCOUNT;
                if(!(dev->adapter_info.options & AAC_OPT_NEW_COMM)) {
@@ -854,7 +891,40 @@ static void io_callback(void *context, struct fib * fibptr)
        dev = (struct aac_dev *)scsicmd->device->host->hostdata;
        cid = ID_LUN_TO_CONTAINER(scsicmd->device->id, scsicmd->device->lun);
-        dprintk((KERN_DEBUG "io_callback[cpu %d]: lba = %u, t = %ld.\n", smp_processor_id(), ((scsicmd->cmnd[1] & 0x1F) << 16) | (scsicmd->cmnd[2] << 8) | scsicmd->cmnd[3], jiffies));
+        if (nblank(dprintk(x))) {
+                u64 lba;
+                switch (scsicmd->cmnd[0]) {
+                case WRITE_6:
+                case READ_6:
+                        lba = ((scsicmd->cmnd[1] & 0x1F) << 16) |
+                            (scsicmd->cmnd[2] << 8) | scsicmd->cmnd[3];
+                        break;
+                case WRITE_16:
+                case READ_16:
+                        lba = ((u64)scsicmd->cmnd[2] << 56) |
+                              ((u64)scsicmd->cmnd[3] << 48) |
+                              ((u64)scsicmd->cmnd[4] << 40) |
+                              ((u64)scsicmd->cmnd[5] << 32) |
+                              ((u64)scsicmd->cmnd[6] << 24) |
+                              (scsicmd->cmnd[7] << 16) |
+                              (scsicmd->cmnd[8] << 8) | scsicmd->cmnd[9];
+                        break;
+                case WRITE_12:
+                case READ_12:
+                        lba = ((u64)scsicmd->cmnd[2] << 24) |
+                              (scsicmd->cmnd[3] << 16) |
+                              (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
+                        break;
+                default:
+                        lba = ((u64)scsicmd->cmnd[2] << 24) |
+                               (scsicmd->cmnd[3] << 16) |
+                               (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
+                        break;
+                }
+                printk(KERN_DEBUG
+                  "io_callback[cpu %d]: lba = %llu, t = %ld.\n",
+                  smp_processor_id(), (unsigned long long)lba, jiffies);
+        }
        if (fibptr == NULL)
                BUG();
@@ -895,7 +965,7 @@ static void io_callback(void *context, struct fib * fibptr)
 static int aac_read(struct scsi_cmnd * scsicmd, int cid)
 {
-        u32 lba;
+        u64 lba;
        u32 count;
        int status;
@@ -907,23 +977,69 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
        /*
         *      Get block address and transfer length
         */
-        if (scsicmd->cmnd[0] == READ_6) /* 6 byte command */
+        switch (scsicmd->cmnd[0]) {
-        {
+        case READ_6:
                dprintk((KERN_DEBUG "aachba: received a read(6) command on id %d.\n", cid));
-                lba = ((scsicmd->cmnd[1] & 0x1F) << 16) | (scsicmd->cmnd[2] << 8) | scsicmd->cmnd[3];
+                lba = ((scsicmd->cmnd[1] & 0x1F) << 16) | 
+                        (scsicmd->cmnd[2] << 8) | scsicmd->cmnd[3];
                count = scsicmd->cmnd[4];
                if (count == 0)
                        count = 256;
-        } else {
+                break;
+        case READ_16:
+                dprintk((KERN_DEBUG "aachba: received a read(16) command on id %d.\n", cid));
+                lba =   ((u64)scsicmd->cmnd[2] << 56) |
+                        ((u64)scsicmd->cmnd[3] << 48) |
+                        ((u64)scsicmd->cmnd[4] << 40) |
+                        ((u64)scsicmd->cmnd[5] << 32) |
+                        ((u64)scsicmd->cmnd[6] << 24) | 
+                        (scsicmd->cmnd[7] << 16) |
+                        (scsicmd->cmnd[8] << 8) | scsicmd->cmnd[9];
+                count = (scsicmd->cmnd[10] << 24) | 
+                        (scsicmd->cmnd[11] << 16) |
+                        (scsicmd->cmnd[12] << 8) | scsicmd->cmnd[13];
+                break;
+        case READ_12:
+                dprintk((KERN_DEBUG "aachba: received a read(12) command on id %d.\n", cid));
+                lba = ((u64)scsicmd->cmnd[2] << 24) | 
+                        (scsicmd->cmnd[3] << 16) |
+                        (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
+                count = (scsicmd->cmnd[6] << 24) | 
+                        (scsicmd->cmnd[7] << 16) |
+                        (scsicmd->cmnd[8] << 8) | scsicmd->cmnd[9];
+                break;
+        default:
                dprintk((KERN_DEBUG "aachba: received a read(10) command on id %d.\n", cid));
-                lba = (scsicmd->cmnd[2] << 24) | (scsicmd->cmnd[3] << 16) | (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
+                lba = ((u64)scsicmd->cmnd[2] << 24) | 
+                        (scsicmd->cmnd[3] << 16) | 
+                        (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
                count = (scsicmd->cmnd[7] << 8) | scsicmd->cmnd[8];
+                break;
        }
-        dprintk((KERN_DEBUG "aac_read[cpu %d]: lba = %u, t = %ld.\n",
+        dprintk((KERN_DEBUG "aac_read[cpu %d]: lba = %llu, t = %ld.\n",
          smp_processor_id(), (unsigned long long)lba, jiffies));
+        if ((!(dev->raw_io_interface) || !(dev->raw_io_64)) &&
+                (lba & 0xffffffff00000000LL)) {
+                dprintk((KERN_DEBUG "aac_read: Illegal lba\n"));
+                scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | 
+                        SAM_STAT_CHECK_CONDITION;
+                set_sense((u8 *) &dev->fsa_dev[cid].sense_data,
+                            HARDWARE_ERROR,
+                            SENCODE_INTERNAL_TARGET_FAILURE,
+                            ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0,
+                            0, 0);
+                memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
+                  (sizeof(dev->fsa_dev[cid].sense_data) > sizeof(scsicmd->sense_buffer))
+                    ? sizeof(scsicmd->sense_buffer)
+                    : sizeof(dev->fsa_dev[cid].sense_data));
+                scsicmd->scsi_done(scsicmd);
+                return 0;
+        }
        /*
         *      Alocate and initialize a Fib
         */
@@ -936,8 +1052,8 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
        if (dev->raw_io_interface) {
                struct aac_raw_io *readcmd;
                readcmd = (struct aac_raw_io *) fib_data(cmd_fibcontext);
-                readcmd->block[0] = cpu_to_le32(lba);
+                readcmd->block[0] = cpu_to_le32((u32)(lba&0xffffffff));
-                readcmd->block[1] = 0;
+                readcmd->block[1] = cpu_to_le32((u32)((lba&0xffffffff00000000LL)>>32));
                readcmd->count = cpu_to_le32(count<<9);
                readcmd->cid = cpu_to_le16(cid);
                readcmd->flags = cpu_to_le16(1);
@@ -964,7 +1080,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                readcmd->command = cpu_to_le32(VM_CtHostRead64);
                readcmd->cid = cpu_to_le16(cid);
                readcmd->sector_count = cpu_to_le16(count);
-                readcmd->block = cpu_to_le32(lba);
+                readcmd->block = cpu_to_le32((u32)(lba&0xffffffff));
                readcmd->pad   = 0;
                readcmd->flags = 0; 
@@ -989,7 +1105,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                readcmd = (struct aac_read *) fib_data(cmd_fibcontext);
                readcmd->command = cpu_to_le32(VM_CtBlockRead);
                readcmd->cid = cpu_to_le32(cid);
-                readcmd->block = cpu_to_le32(lba);
+                readcmd->block = cpu_to_le32((u32)(lba&0xffffffff));
                readcmd->count = cpu_to_le32(count * 512);
                aac_build_sg(scsicmd, &readcmd->sg);
@@ -1031,7 +1147,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
 static int aac_write(struct scsi_cmnd * scsicmd, int cid)
 {
-        u32 lba;
+        u64 lba;
        u32 count;
        int status;
        u16 fibsize;
@@ -1048,13 +1164,48 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                count = scsicmd->cmnd[4];
                if (count == 0)
                        count = 256;
+        } else if (scsicmd->cmnd[0] == WRITE_16) { /* 16 byte command */
+                dprintk((KERN_DEBUG "aachba: received a write(16) command on id %d.\n", cid));
+                lba =   ((u64)scsicmd->cmnd[2] << 56) |
+                        ((u64)scsicmd->cmnd[3] << 48) |
+                        ((u64)scsicmd->cmnd[4] << 40) |
+                        ((u64)scsicmd->cmnd[5] << 32) |
+                        ((u64)scsicmd->cmnd[6] << 24) | 
+                        (scsicmd->cmnd[7] << 16) |
+                        (scsicmd->cmnd[8] << 8) | scsicmd->cmnd[9];
+                count = (scsicmd->cmnd[10] << 24) | (scsicmd->cmnd[11] << 16) |
+                        (scsicmd->cmnd[12] << 8) | scsicmd->cmnd[13];
+        } else if (scsicmd->cmnd[0] == WRITE_12) { /* 12 byte command */
+                dprintk((KERN_DEBUG "aachba: received a write(12) command on id %d.\n", cid));
+                lba = ((u64)scsicmd->cmnd[2] << 24) | (scsicmd->cmnd[3] << 16)
+                    | (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
+                count = (scsicmd->cmnd[6] << 24) | (scsicmd->cmnd[7] << 16)
+                      | (scsicmd->cmnd[8] << 8) | scsicmd->cmnd[9];
        } else {
                dprintk((KERN_DEBUG "aachba: received a write(10) command on id %d.\n", cid));
-                lba = (scsicmd->cmnd[2] << 24) | (scsicmd->cmnd[3] << 16) | (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
+                lba = ((u64)scsicmd->cmnd[2] << 24) | (scsicmd->cmnd[3] << 16) | (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
                count = (scsicmd->cmnd[7] << 8) | scsicmd->cmnd[8];
        }
-        dprintk((KERN_DEBUG "aac_write[cpu %d]: lba = %u, t = %ld.\n",
+        dprintk((KERN_DEBUG "aac_write[cpu %d]: lba = %llu, t = %ld.\n",
          smp_processor_id(), (unsigned long long)lba, jiffies));
+        if ((!(dev->raw_io_interface) || !(dev->raw_io_64))
+         && (lba & 0xffffffff00000000LL)) {
+                dprintk((KERN_DEBUG "aac_write: Illegal lba\n"));
+                scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_CHECK_CONDITION;
+                set_sense((u8 *) &dev->fsa_dev[cid].sense_data,
+                            HARDWARE_ERROR,
+                            SENCODE_INTERNAL_TARGET_FAILURE,
+                            ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0,
+                            0, 0);
+                memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
+                  (sizeof(dev->fsa_dev[cid].sense_data) > sizeof(scsicmd->sense_buffer))
+                    ? sizeof(scsicmd->sense_buffer)
+                    : sizeof(dev->fsa_dev[cid].sense_data));
+                scsicmd->scsi_done(scsicmd);
+                return 0;
+        }
        /*
         *      Allocate and initialize a Fib then setup a BlockWrite command
         */
@@ -1068,8 +1219,8 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
        if (dev->raw_io_interface) {
                struct aac_raw_io *writecmd;
                writecmd = (struct aac_raw_io *) fib_data(cmd_fibcontext);
-                writecmd->block[0] = cpu_to_le32(lba);
+                writecmd->block[0] = cpu_to_le32((u32)(lba&0xffffffff));
-                writecmd->block[1] = 0;
+                writecmd->block[1] = cpu_to_le32((u32)((lba&0xffffffff00000000LL)>>32));
                writecmd->count = cpu_to_le32(count<<9);
                writecmd->cid = cpu_to_le16(cid);
                writecmd->flags = 0; 
@@ -1096,7 +1247,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                writecmd->command = cpu_to_le32(VM_CtHostWrite64);
                writecmd->cid = cpu_to_le16(cid);
                writecmd->sector_count = cpu_to_le16(count); 
-                writecmd->block = cpu_to_le32(lba);
+                writecmd->block = cpu_to_le32((u32)(lba&0xffffffff));
                writecmd->pad   = 0;
                writecmd->flags = 0;
@@ -1121,7 +1272,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                writecmd = (struct aac_write *) fib_data(cmd_fibcontext);
                writecmd->command = cpu_to_le32(VM_CtBlockWrite);
                writecmd->cid = cpu_to_le32(cid);
-                writecmd->block = cpu_to_le32(lba);
+                writecmd->block = cpu_to_le32((u32)(lba&0xffffffff));
                writecmd->count = cpu_to_le32(count * 512);
                writecmd->sg.count = cpu_to_le32(1);
                /* ->stable is not used - it did mean which type of write */
@@ -1310,11 +1461,18 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                         */
                        if ((fsa_dev_ptr[cid].valid & 1) == 0) {
                                switch (scsicmd->cmnd[0]) {
+                                case SERVICE_ACTION_IN:
+                                        if (!(dev->raw_io_interface) ||
+                                            !(dev->raw_io_64) ||
+                                            ((scsicmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))
+                                                break;
                                case INQUIRY:
                                case READ_CAPACITY:
                                case TEST_UNIT_READY:
                                        spin_unlock_irq(host->host_lock);
                                        probe_container(dev, cid);
+                                        if ((fsa_dev_ptr[cid].valid & 1) == 0)
+                                                fsa_dev_ptr[cid].valid = 0;
                                        spin_lock_irq(host->host_lock);
                                        if (fsa_dev_ptr[cid].valid == 0) {
                                                scsicmd->result = DID_NO_CONNECT << 16;
@@ -1375,7 +1533,6 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                memset(&inq_data, 0, sizeof (struct inquiry_data));
                inq_data.inqd_ver = 2;  /* claim compliance to SCSI-2 */
-                inq_data.inqd_dtq = 0x80;       /* set RMB bit to one indicating that the medium is removable */
                inq_data.inqd_rdf = 2;  /* A response data format value of two indicates that the data shall be in the format specified in SCSI-2 */
                inq_data.inqd_len = 31;
                /*Format for "pad2" is  RelAdr | WBus32 | WBus16 |  Sync  | Linked |Reserved| CmdQue | SftRe */
@@ -1397,13 +1554,55 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                aac_internal_transfer(scsicmd, &inq_data, 0, sizeof(inq_data));
                return aac_get_container_name(scsicmd, cid);
        }
+        case SERVICE_ACTION_IN:
+                if (!(dev->raw_io_interface) ||
+                    !(dev->raw_io_64) ||
+                    ((scsicmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))
+                        break;
+        {
+                u64 capacity;
+                char cp[12];
+                unsigned int offset = 0;
+                dprintk((KERN_DEBUG "READ CAPACITY_16 command.\n"));
+                capacity = fsa_dev_ptr[cid].size - 1;
+                if (scsicmd->cmnd[13] > 12) {
+                        offset = scsicmd->cmnd[13] - 12;
+                        if (offset > sizeof(cp))
+                                break;
+                        memset(cp, 0, offset);
+                        aac_internal_transfer(scsicmd, cp, 0, offset);
+                }
+                cp[0] = (capacity >> 56) & 0xff;
+                cp[1] = (capacity >> 48) & 0xff;
+                cp[2] = (capacity >> 40) & 0xff;
+                cp[3] = (capacity >> 32) & 0xff;
+                cp[4] = (capacity >> 24) & 0xff;
+                cp[5] = (capacity >> 16) & 0xff;
+                cp[6] = (capacity >> 8) & 0xff;
+                cp[7] = (capacity >> 0) & 0xff;
+                cp[8] = 0;
+                cp[9] = 0;
+                cp[10] = 2;
+                cp[11] = 0;
+                aac_internal_transfer(scsicmd, cp, offset, sizeof(cp));
+                /* Do not cache partition table for arrays */
+                scsicmd->device->removable = 1;
+                scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
+                scsicmd->scsi_done(scsicmd);
+                return 0;
+        }
        case READ_CAPACITY:
        {
                u32 capacity;
                char cp[8];
                dprintk((KERN_DEBUG "READ CAPACITY command.\n"));
-                if (fsa_dev_ptr[cid].size <= 0x100000000LL)
+                if (fsa_dev_ptr[cid].size <= 0x100000000ULL)
                        capacity = fsa_dev_ptr[cid].size - 1;
                else
                        capacity = (u32)-1;
@@ -1417,6 +1616,8 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                cp[6] = 2;
                cp[7] = 0;
                aac_internal_transfer(scsicmd, cp, 0, sizeof(cp));
+                /* Do not cache partition table for arrays */
+                scsicmd->device->removable = 1;
                scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
                scsicmd->scsi_done(scsicmd);
@@ -1497,6 +1698,8 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
        {
                case READ_6:
                case READ_10:
+                case READ_12:
+                case READ_16:
                        /*
                         *      Hack to keep track of ordinal number of the device that
                         *      corresponds to a container. Needed to convert
@@ -1504,17 +1707,19 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                         */
                         
                        spin_unlock_irq(host->host_lock);
-                        if  (scsicmd->request->rq_disk)
+                        if (scsicmd->request->rq_disk)
-                                memcpy(fsa_dev_ptr[cid].devname,
+                                strlcpy(fsa_dev_ptr[cid].devname,
-                                        scsicmd->request->rq_disk->disk_name,
+                                scsicmd->request->rq_disk->disk_name,
-                                        8);
+                                min(sizeof(fsa_dev_ptr[cid].devname),
+                                sizeof(scsicmd->request->rq_disk->disk_name) + 1));
                        ret = aac_read(scsicmd, cid);
                        spin_lock_irq(host->host_lock);
                        return ret;
                case WRITE_6:
                case WRITE_10:
+                case WRITE_12:
+                case WRITE_16:
                        spin_unlock_irq(host->host_lock);
                        ret = aac_write(scsicmd, cid);
                        spin_lock_irq(host->host_lock);
@@ -1745,6 +1950,8 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
                case  WRITE_10:
                case  READ_12:
                case  WRITE_12:
+                case  READ_16:
+                case  WRITE_16:
                        if(le32_to_cpu(srbreply->data_xfer_length) < scsicmd->underflow ) {
                                printk(KERN_WARNING"aacraid: SCSI CMD underflow\n");
                        } else {
@@ -1850,8 +2057,8 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
                                sizeof(scsicmd->sense_buffer) :
                                le32_to_cpu(srbreply->sense_data_size);
 #ifdef AAC_DETAILED_STATUS_INFO
-                dprintk((KERN_WARNING "aac_srb_callback: check condition, status = %d len=%d\n", 
+                printk(KERN_WARNING "aac_srb_callback: check condition, status = %d len=%d\n",
-                                        le32_to_cpu(srbreply->status), len));
+                                        le32_to_cpu(srbreply->status), len);
 #endif
                memcpy(scsicmd->sense_buffer, srbreply->sense_data, len);
                
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index e40528185d48..4a99d2f000f4 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -1,6 +1,10 @@
 #if (!defined(dprintk))
 # define dprintk(x)
 #endif
+/* eg: if (nblank(dprintk(x))) */
+#define _nblank(x) #x
+#define nblank(x) _nblank(x)[0]
 /*------------------------------------------------------------------------------
 *              D E F I N E S
@@ -302,7 +306,6 @@ enum aac_queue_types {
 */
 #define         FsaNormal       1
-#define         FsaHigh         2
 /*
 * Define the FIB. The FIB is the where all the requested data and
@@ -546,8 +549,6 @@ struct aac_queue {
                  /* This is only valid for adapter to host command queues. */ 
        spinlock_t              *lock;          /* Spinlock for this queue must take this lock before accessing the lock */
        spinlock_t              lockdata;       /* Actual lock (used only on one side of the lock) */
-        unsigned long           SavedIrql;      /* Previous IRQL when the spin lock is taken */
-        u32                     padding;        /* Padding - FIXME - can remove I believe */
        struct list_head        cmdq;           /* A queue of FIBs which need to be prcessed by the FS thread. This is */
                                                /* only valid for command queues which receive entries from the adapter. */
        struct list_head        pendingq;       /* A queue of outstanding fib's to the adapter. */
@@ -776,7 +777,9 @@ struct fsa_dev_info {
        u64             last;
        u64             size;
        u32             type;
+        u32             config_waiting_on;
        u16             queue_depth;
+        u8              config_needed;
        u8              valid;
        u8              ro;
        u8              locked;
@@ -1012,6 +1015,7 @@ struct aac_dev
        /* macro side-effects BEWARE */
 #       define                  raw_io_interface \
          init->InitStructRevision==cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION_4)
+        u8                      raw_io_64;
        u8                      printf_enabled;
 };
@@ -1362,8 +1366,10 @@ struct aac_srb_reply
 #define         VM_CtBlockVerify64      18
 #define         VM_CtHostRead64         19
 #define         VM_CtHostWrite64        20
+#define         VM_DrvErrTblLog         21
+#define         VM_NameServe64          22
-#define         MAX_VMCOMMAND_NUM       21      /* used for sizing stats array - leave last */
+#define         MAX_VMCOMMAND_NUM       23      /* used for sizing stats array - leave last */
 /*
 *      Descriptive information (eg, vital stats)
@@ -1472,6 +1478,7 @@ struct aac_mntent {
                                                   manager (eg, filesystem) */
        __le32                  altoid;         /* != oid <==> snapshot or 
                                                   broken mirror exists */
+        __le32                  capacityhigh;
 };
 #define FSCS_NOTCLEAN   0x0001  /* fsck is neccessary before mounting */
@@ -1707,6 +1714,7 @@ extern struct aac_common aac_config;
 #define         AifCmdJobProgress       2       /* Progress report */
 #define                 AifJobCtrZero   101     /* Array Zero progress */
 #define                 AifJobStsSuccess 1      /* Job completes */
+#define                 AifJobStsRunning 102    /* Job running */
 #define         AifCmdAPIReport         3       /* Report from other user of API */
 #define         AifCmdDriverNotify      4       /* Notify host driver of event */
 #define                 AifDenMorphComplete 200 /* A morph operation completed */
@@ -1777,6 +1785,7 @@ int fib_adapter_complete(struct fib * fibptr, unsigned short size);
 struct aac_driver_ident* aac_get_driver_ident(int devtype);
 int aac_get_adapter_info(struct aac_dev* dev);
 int aac_send_shutdown(struct aac_dev *dev);
+int probe_container(struct aac_dev *dev, int cid);
 extern int numacb;
 extern int acbsize;
 extern char aac_driver_version[];
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 75abd0453289..59a341b2aedc 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -195,7 +195,7 @@ int aac_send_shutdown(struct aac_dev * dev)
                          fibctx,
                          sizeof(struct aac_close),
                          FsaNormal,
-                          1, 1,
+                          -2 /* Timeout silently */, 1,
                          NULL, NULL);
        if (status == 0)
@@ -313,8 +313,15 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
        dev->max_fib_size = sizeof(struct hw_fib);
        dev->sg_tablesize = host->sg_tablesize = (dev->max_fib_size
                - sizeof(struct aac_fibhdr)
-                - sizeof(struct aac_write) + sizeof(struct sgmap))
+                - sizeof(struct aac_write) + sizeof(struct sgentry))
-                        / sizeof(struct sgmap);
+                        / sizeof(struct sgentry);
+        dev->raw_io_64 = 0;
+        if ((!aac_adapter_sync_cmd(dev, GET_ADAPTER_PROPERTIES,
+                0, 0, 0, 0, 0, 0, status+0, status+1, status+2, NULL, NULL)) &&
+                        (status[0] == 0x00000001)) {
+                if (status[1] & AAC_OPT_NEW_COMM_64)
+                        dev->raw_io_64 = 1;
+        }
        if ((!aac_adapter_sync_cmd(dev, GET_COMM_PREFERRED_SETTINGS,
          0, 0, 0, 0, 0, 0,
          status+0, status+1, status+2, status+3, status+4))
@@ -342,8 +349,8 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
                        dev->max_fib_size = 512;
                        dev->sg_tablesize = host->sg_tablesize
                          = (512 - sizeof(struct aac_fibhdr)
-                            - sizeof(struct aac_write) + sizeof(struct sgmap))
+                            - sizeof(struct aac_write) + sizeof(struct sgentry))
-                             / sizeof(struct sgmap);
+                             / sizeof(struct sgentry);
                        host->can_queue = AAC_NUM_IO_FIB;
                } else if (acbsize == 2048) {
                        host->max_sectors = 512;
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index a1d303f03480..e4d543a474ae 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -39,7 +39,9 @@
 #include <linux/completion.h>
 #include <linux/blkdev.h>
 #include <scsi/scsi_host.h>
+#include <scsi/scsi_device.h>
 #include <asm/semaphore.h>
+#include <asm/delay.h>
 #include "aacraid.h"
@@ -269,40 +271,22 @@ static int aac_get_entry (struct aac_dev * dev, u32 qid, struct aac_entry **entr
        /* Interrupt Moderation, only interrupt for first two entries */
        if (idx != le32_to_cpu(*(q->headers.consumer))) {
                if (--idx == 0) {
-                        if (qid == AdapHighCmdQueue)
+                        if (qid == AdapNormCmdQueue)
-                                idx = ADAP_HIGH_CMD_ENTRIES;
-                        else if (qid == AdapNormCmdQueue)
                                idx = ADAP_NORM_CMD_ENTRIES;
-                        else if (qid == AdapHighRespQueue) 
+                        else
-                                idx = ADAP_HIGH_RESP_ENTRIES;
-                        else if (qid == AdapNormRespQueue) 
                                idx = ADAP_NORM_RESP_ENTRIES;
                }
                if (idx != le32_to_cpu(*(q->headers.consumer)))
                        *nonotify = 1; 
        }
-        if (qid == AdapHighCmdQueue) {
+        if (qid == AdapNormCmdQueue) {
-                if (*index >= ADAP_HIGH_CMD_ENTRIES)
-                        *index = 0;
-        } else if (qid == AdapNormCmdQueue) {
                if (*index >= ADAP_NORM_CMD_ENTRIES) 
                        *index = 0; /* Wrap to front of the Producer Queue. */
-        }
+        } else {
-        else if (qid == AdapHighRespQueue) 
-        {
-                if (*index >= ADAP_HIGH_RESP_ENTRIES)
-                        *index = 0;
-        }
-        else if (qid == AdapNormRespQueue) 
-        {
                if (*index >= ADAP_NORM_RESP_ENTRIES) 
                        *index = 0; /* Wrap to front of the Producer Queue. */
        }
-        else {
-                printk("aacraid: invalid qid\n");
-                BUG();
-        }
        if ((*index + 1) == le32_to_cpu(*(q->headers.consumer))) { /* Queue is full */
                printk(KERN_WARNING "Queue %d full, %u outstanding.\n",
@@ -334,12 +318,8 @@ static int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_f
 {
        struct aac_entry * entry = NULL;
        int map = 0;
-        struct aac_queue * q = &dev->queues->queue[qid];
-                
-        spin_lock_irqsave(q->lock, q->SavedIrql);
            
-        if (qid == AdapHighCmdQueue || qid == AdapNormCmdQueue) 
+        if (qid == AdapNormCmdQueue) {
-        {
                /*  if no entries wait for some if caller wants to */
                while (!aac_get_entry(dev, qid, &entry, index, nonotify)) 
                {
@@ -350,9 +330,7 @@ static int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_f
                 */
                entry->size = cpu_to_le32(le16_to_cpu(hw_fib->header.Size));
                map = 1;
-        }
+        } else {
-        else if (qid == AdapHighRespQueue || qid == AdapNormRespQueue)
-        {
                while(!aac_get_entry(dev, qid, &entry, index, nonotify)) 
                {
                        /* if no entries wait for some if caller wants to */
@@ -375,42 +353,6 @@ static int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_f
        return 0;
 }
-/**
- *      aac_insert_entry        -       insert a queue entry
- *      @dev: Adapter
- *      @index: Index of entry to insert
- *      @qid: Queue number
- *      @nonotify: Suppress adapter notification
- *
- *      Gets the next free QE off the requested priorty adapter command
- *      queue and associates the Fib with the QE. The QE represented by
- *      index is ready to insert on the queue when this routine returns
- *      success.
- */
- 
-static int aac_insert_entry(struct aac_dev * dev, u32 index, u32 qid, unsigned long nonotify) 
-{
-        struct aac_queue * q = &dev->queues->queue[qid];
-        if(q == NULL)
-                BUG();
-        *(q->headers.producer) = cpu_to_le32(index + 1);
-        spin_unlock_irqrestore(q->lock, q->SavedIrql);
-        if (qid == AdapHighCmdQueue ||
-            qid == AdapNormCmdQueue ||
-            qid == AdapHighRespQueue ||
-            qid == AdapNormRespQueue)
-        {
-                if (!nonotify)
-                        aac_adapter_notify(dev, qid);
-        }
-        else
-                printk("Suprise insert!\n");
-        return 0;
-}
 /*
 *      Define the highest level of host to adapter communication routines. 
 *      These routines will support host to adapter FS commuication. These 
@@ -439,12 +381,13 @@ static int aac_insert_entry(struct aac_dev * dev, u32 index, u32 qid, unsigned l
 int fib_send(u16 command, struct fib * fibptr, unsigned long size,  int priority, int wait, int reply, fib_callback callback, void * callback_data)
 {
        u32 index;
-        u32 qid;
        struct aac_dev * dev = fibptr->dev;
        unsigned long nointr = 0;
        struct hw_fib * hw_fib = fibptr->hw_fib;
        struct aac_queue * q;
        unsigned long flags = 0;
+        unsigned long qflags;
        if (!(hw_fib->header.XferState & cpu_to_le32(HostOwned)))
                return -EBUSY;
        /*
@@ -497,26 +440,8 @@ int fib_send(u16 command, struct fib * fibptr, unsigned long size,  int priority
         *      Get a queue entry connect the FIB to it and send an notify
         *      the adapter a command is ready.
         */
-        if (priority == FsaHigh) {
+        hw_fib->header.XferState |= cpu_to_le32(NormalPriority);
-                hw_fib->header.XferState |= cpu_to_le32(HighPriority);
-                qid = AdapHighCmdQueue;
-        } else {
-                hw_fib->header.XferState |= cpu_to_le32(NormalPriority);
-                qid = AdapNormCmdQueue;
-        }
-        q = &dev->queues->queue[qid];
-        if(wait)
-                spin_lock_irqsave(&fibptr->event_lock, flags);
-        if(aac_queue_get( dev, &index, qid, hw_fib, 1, fibptr, &nointr)<0)
-                return -EWOULDBLOCK;
-        dprintk((KERN_DEBUG "fib_send: inserting a queue entry at index %d.\n",index));
-        dprintk((KERN_DEBUG "Fib contents:.\n"));
-        dprintk((KERN_DEBUG "  Command =               %d.\n", hw_fib->header.Command));
-        dprintk((KERN_DEBUG "  XferState  =            %x.\n", hw_fib->header.XferState));
-        dprintk((KERN_DEBUG "  hw_fib va being sent=%p\n",fibptr->hw_fib));
-        dprintk((KERN_DEBUG "  hw_fib pa being sent=%lx\n",(ulong)fibptr->hw_fib_pa));
-        dprintk((KERN_DEBUG "  fib being sent=%p\n",fibptr));
        /*
         *      Fill in the Callback and CallbackContext if we are not
         *      going to wait.
@@ -525,22 +450,67 @@ int fib_send(u16 command, struct fib * fibptr, unsigned long size,  int priority
                fibptr->callback = callback;
                fibptr->callback_data = callback_data;
        }
-        FIB_COUNTER_INCREMENT(aac_config.FibsSent);
-        list_add_tail(&fibptr->queue, &q->pendingq);
-        q->numpending++;
        fibptr->done = 0;
        fibptr->flags = 0;
-        if(aac_insert_entry(dev, index, qid, (nointr & aac_config.irq_mod)) < 0)
+        FIB_COUNTER_INCREMENT(aac_config.FibsSent);
-                return -EWOULDBLOCK;
+        dprintk((KERN_DEBUG "fib_send: inserting a queue entry at index %d.\n",index));
+        dprintk((KERN_DEBUG "Fib contents:.\n"));
+        dprintk((KERN_DEBUG "  Command =               %d.\n", hw_fib->header.Command));
+        dprintk((KERN_DEBUG "  XferState  =            %x.\n", hw_fib->header.XferState));
+        dprintk((KERN_DEBUG "  hw_fib va being sent=%p\n",fibptr->hw_fib));
+        dprintk((KERN_DEBUG "  hw_fib pa being sent=%lx\n",(ulong)fibptr->hw_fib_pa));
+        dprintk((KERN_DEBUG "  fib being sent=%p\n",fibptr));
+        q = &dev->queues->queue[AdapNormCmdQueue];
+        if(wait)
+                spin_lock_irqsave(&fibptr->event_lock, flags);
+        spin_lock_irqsave(q->lock, qflags);
+        aac_queue_get( dev, &index, AdapNormCmdQueue, hw_fib, 1, fibptr, &nointr);
+        list_add_tail(&fibptr->queue, &q->pendingq);
+        q->numpending++;
+        *(q->headers.producer) = cpu_to_le32(index + 1);
+        spin_unlock_irqrestore(q->lock, qflags);
+        if (!(nointr & aac_config.irq_mod))
+                aac_adapter_notify(dev, AdapNormCmdQueue);
        /*
         *      If the caller wanted us to wait for response wait now. 
         */
    
        if (wait) {
                spin_unlock_irqrestore(&fibptr->event_lock, flags);
-                down(&fibptr->event_wait);
+                /* Only set for first known interruptable command */
+                if (wait < 0) {
+                        /*
+                         * *VERY* Dangerous to time out a command, the
+                         * assumption is made that we have no hope of
+                         * functioning because an interrupt routing or other
+                         * hardware failure has occurred.
+                         */
+                        unsigned long count = 36000000L; /* 3 minutes */
+                        unsigned long qflags;
+                        while (down_trylock(&fibptr->event_wait)) {
+                                if (--count == 0) {
+                                        spin_lock_irqsave(q->lock, qflags);
+                                        q->numpending--;
+                                        list_del(&fibptr->queue);
+                                        spin_unlock_irqrestore(q->lock, qflags);
+                                        if (wait == -1) {
+                                                printk(KERN_ERR "aacraid: fib_send: first asynchronous command timed out.\n"
+                                                  "Usually a result of a PCI interrupt routing problem;\n"
+                                                  "update mother board BIOS or consider utilizing one of\n"
+                                                  "the SAFE mode kernel options (acpi, apic etc)\n");
+                                        }
+                                        return -ETIMEDOUT;
+                                }
+                                udelay(5);
+                        }
+                } else
+                        down(&fibptr->event_wait);
                if(fibptr->done == 0)
                        BUG();
                        
@@ -622,15 +592,9 @@ void aac_consumer_free(struct aac_dev * dev, struct aac_queue *q, u32 qid)
                case HostNormCmdQueue:
                        notify = HostNormCmdNotFull;
                        break;
-                case HostHighCmdQueue:
-                        notify = HostHighCmdNotFull;
-                        break;
                case HostNormRespQueue:
                        notify = HostNormRespNotFull;
                        break;
-                case HostHighRespQueue:
-                        notify = HostHighRespNotFull;
-                        break;
                default:
                        BUG();
                        return;
@@ -652,9 +616,13 @@ int fib_adapter_complete(struct fib * fibptr, unsigned short size)
 {
        struct hw_fib * hw_fib = fibptr->hw_fib;
        struct aac_dev * dev = fibptr->dev;
+        struct aac_queue * q;
        unsigned long nointr = 0;
-        if (hw_fib->header.XferState == 0)
+        unsigned long qflags;
+        if (hw_fib->header.XferState == 0) {
                return 0;
+        }
        /*
         *      If we plan to do anything check the structure type first.
         */ 
@@ -669,37 +637,21 @@ int fib_adapter_complete(struct fib * fibptr, unsigned short size)
         *      send the completed cdb to the adapter.
         */
        if (hw_fib->header.XferState & cpu_to_le32(SentFromAdapter)) {
+                u32 index;
                hw_fib->header.XferState |= cpu_to_le32(HostProcessed);
-                if (hw_fib->header.XferState & cpu_to_le32(HighPriority)) {
+                if (size) {
-                        u32 index;
+                        size += sizeof(struct aac_fibhdr);
-                        if (size) 
+                        if (size > le16_to_cpu(hw_fib->header.SenderSize)) 
-                        {
+                                return -EMSGSIZE;
-                                size += sizeof(struct aac_fibhdr);
+                        hw_fib->header.Size = cpu_to_le16(size);
-                                if (size > le16_to_cpu(hw_fib->header.SenderSize))
-                                        return -EMSGSIZE;
-                                hw_fib->header.Size = cpu_to_le16(size);
-                        }
-                        if(aac_queue_get(dev, &index, AdapHighRespQueue, hw_fib, 1, NULL, &nointr) < 0) {
-                                return -EWOULDBLOCK;
-                        }
-                        if (aac_insert_entry(dev, index, AdapHighRespQueue,  (nointr & (int)aac_config.irq_mod)) != 0) {
-                        }
-                } else if (hw_fib->header.XferState & 
-                                cpu_to_le32(NormalPriority)) {
-                        u32 index;
-                        if (size) {
-                                size += sizeof(struct aac_fibhdr);
-                                if (size > le16_to_cpu(hw_fib->header.SenderSize)) 
-                                        return -EMSGSIZE;
-                                hw_fib->header.Size = cpu_to_le16(size);
-                        }
-                        if (aac_queue_get(dev, &index, AdapNormRespQueue, hw_fib, 1, NULL, &nointr) < 0) 
-                                return -EWOULDBLOCK;
-                        if (aac_insert_entry(dev, index, AdapNormRespQueue, (nointr & (int)aac_config.irq_mod)) != 0) 
-                        {
-                        }
                }
+                q = &dev->queues->queue[AdapNormRespQueue];
+                spin_lock_irqsave(q->lock, qflags);
+                aac_queue_get(dev, &index, AdapNormRespQueue, hw_fib, 1, NULL, &nointr);
+                *(q->headers.producer) = cpu_to_le32(index + 1);
+                spin_unlock_irqrestore(q->lock, qflags);
+                if (!(nointr & (int)aac_config.irq_mod))
+                        aac_adapter_notify(dev, AdapNormRespQueue);
        }
        else 
        {
@@ -791,6 +743,268 @@ void aac_printf(struct aac_dev *dev, u32 val)
        memset(cp, 0,  256);
 }
+/**
+ *      aac_handle_aif          -       Handle a message from the firmware
+ *      @dev: Which adapter this fib is from
+ *      @fibptr: Pointer to fibptr from adapter
+ *
+ *      This routine handles a driver notify fib from the adapter and
+ *      dispatches it to the appropriate routine for handling.
+ */
+static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
+{
+        struct hw_fib * hw_fib = fibptr->hw_fib;
+        struct aac_aifcmd * aifcmd = (struct aac_aifcmd *)hw_fib->data;
+        int busy;
+        u32 container;
+        struct scsi_device *device;
+        enum {
+                NOTHING,
+                DELETE,
+                ADD,
+                CHANGE
+        } device_config_needed;
+        /* Sniff for container changes */
+        if (!dev)
+                return;
+        container = (u32)-1;
+        /*
+         *      We have set this up to try and minimize the number of
+         * re-configures that take place. As a result of this when
+         * certain AIF's come in we will set a flag waiting for another
+         * type of AIF before setting the re-config flag.
+         */
+        switch (le32_to_cpu(aifcmd->command)) {
+        case AifCmdDriverNotify:
+                switch (le32_to_cpu(((u32 *)aifcmd->data)[0])) {
+                /*
+                 *      Morph or Expand complete
+                 */
+                case AifDenMorphComplete:
+                case AifDenVolumeExtendComplete:
+                        container = le32_to_cpu(((u32 *)aifcmd->data)[1]);
+                        if (container >= dev->maximum_num_containers)
+                                break;
+                        /*
+                         *      Find the Scsi_Device associated with the SCSI
+                         * address. Make sure we have the right array, and if
+                         * so set the flag to initiate a new re-config once we
+                         * see an AifEnConfigChange AIF come through.
+                         */
+                        if ((dev != NULL) && (dev->scsi_host_ptr != NULL)) {
+                                device = scsi_device_lookup(dev->scsi_host_ptr, 
+                                        CONTAINER_TO_CHANNEL(container), 
+                                        CONTAINER_TO_ID(container), 
+                                        CONTAINER_TO_LUN(container));
+                                if (device) {
+                                        dev->fsa_dev[container].config_needed = CHANGE;
+                                        dev->fsa_dev[container].config_waiting_on = AifEnConfigChange;
+                                        scsi_device_put(device);
+                                }
+                        }
+                }
+                /*
+                 *      If we are waiting on something and this happens to be
+                 * that thing then set the re-configure flag.
+                 */
+                if (container != (u32)-1) {
+                        if (container >= dev->maximum_num_containers)
+                                break;
+                        if (dev->fsa_dev[container].config_waiting_on ==
+                            le32_to_cpu(*(u32 *)aifcmd->data))
+                                dev->fsa_dev[container].config_waiting_on = 0;
+                } else for (container = 0;
+                    container < dev->maximum_num_containers; ++container) {
+                        if (dev->fsa_dev[container].config_waiting_on ==
+                            le32_to_cpu(*(u32 *)aifcmd->data))
+                                dev->fsa_dev[container].config_waiting_on = 0;
+                }
+                break;
+        case AifCmdEventNotify:
+                switch (le32_to_cpu(((u32 *)aifcmd->data)[0])) {
+                /*
+                 *      Add an Array.
+                 */
+                case AifEnAddContainer:
+                        container = le32_to_cpu(((u32 *)aifcmd->data)[1]);
+                        if (container >= dev->maximum_num_containers)
+                                break;
+                        dev->fsa_dev[container].config_needed = ADD;
+                        dev->fsa_dev[container].config_waiting_on =
+                                AifEnConfigChange;
+                        break;
+                /*
+                 *      Delete an Array.
+                 */
+                case AifEnDeleteContainer:
+                        container = le32_to_cpu(((u32 *)aifcmd->data)[1]);
+                        if (container >= dev->maximum_num_containers)
+                                break;
+                        dev->fsa_dev[container].config_needed = DELETE;
+                        dev->fsa_dev[container].config_waiting_on =
+                                AifEnConfigChange;
+                        break;
+                /*
+                 *      Container change detected. If we currently are not
+                 * waiting on something else, setup to wait on a Config Change.
+                 */
+                case AifEnContainerChange:
+                        container = le32_to_cpu(((u32 *)aifcmd->data)[1]);
+                        if (container >= dev->maximum_num_containers)
+                                break;
+                        if (dev->fsa_dev[container].config_waiting_on)
+                                break;
+                        dev->fsa_dev[container].config_needed = CHANGE;
+                        dev->fsa_dev[container].config_waiting_on =
+                                AifEnConfigChange;
+                        break;
+                case AifEnConfigChange:
+                        break;
+                }
+                /*
+                 *      If we are waiting on something and this happens to be
+                 * that thing then set the re-configure flag.
+                 */
+                if (container != (u32)-1) {
+                        if (container >= dev->maximum_num_containers)
+                                break;
+                        if (dev->fsa_dev[container].config_waiting_on ==
+                            le32_to_cpu(*(u32 *)aifcmd->data))
+                                dev->fsa_dev[container].config_waiting_on = 0;
+                } else for (container = 0;
+                    container < dev->maximum_num_containers; ++container) {
+                        if (dev->fsa_dev[container].config_waiting_on ==
+                            le32_to_cpu(*(u32 *)aifcmd->data))
+                                dev->fsa_dev[container].config_waiting_on = 0;
+                }
+                break;
+        case AifCmdJobProgress:
+                /*
+                 *      These are job progress AIF's. When a Clear is being
+                 * done on a container it is initially created then hidden from
+                 * the OS. When the clear completes we don't get a config
+                 * change so we monitor the job status complete on a clear then
+                 * wait for a container change.
+                 */
+                if ((((u32 *)aifcmd->data)[1] == cpu_to_le32(AifJobCtrZero))
+                 && ((((u32 *)aifcmd->data)[6] == ((u32 *)aifcmd->data)[5])
+                  || (((u32 *)aifcmd->data)[4] == cpu_to_le32(AifJobStsSuccess)))) {
+                        for (container = 0;
+                            container < dev->maximum_num_containers;
+                            ++container) {
+                                /*
+                                 * Stomp on all config sequencing for all
+                                 * containers?
+                                 */
+                                dev->fsa_dev[container].config_waiting_on =
+                                        AifEnContainerChange;
+                                dev->fsa_dev[container].config_needed = ADD;
+                        }
+                }
+                if ((((u32 *)aifcmd->data)[1] == cpu_to_le32(AifJobCtrZero))
+                 && (((u32 *)aifcmd->data)[6] == 0)
+                 && (((u32 *)aifcmd->data)[4] == cpu_to_le32(AifJobStsRunning))) {
+                        for (container = 0;
+                            container < dev->maximum_num_containers;
+                            ++container) {
+                                /*
+                                 * Stomp on all config sequencing for all
+                                 * containers?
+                                 */
+                                dev->fsa_dev[container].config_waiting_on =
+                                        AifEnContainerChange;
+                                dev->fsa_dev[container].config_needed = DELETE;
+                        }
+                }
+                break;
+        }
+        device_config_needed = NOTHING;
+        for (container = 0; container < dev->maximum_num_containers;
+            ++container) {
+                if ((dev->fsa_dev[container].config_waiting_on == 0)
+                 && (dev->fsa_dev[container].config_needed != NOTHING)) {
+                        device_config_needed =
+                                dev->fsa_dev[container].config_needed;
+                        dev->fsa_dev[container].config_needed = NOTHING;
+                        break;
+                }
+        }
+        if (device_config_needed == NOTHING)
+                return;
+        /*
+         *      If we decided that a re-configuration needs to be done,
+         * schedule it here on the way out the door, please close the door
+         * behind you.
+         */
+        busy = 0;
+        /*
+         *      Find the Scsi_Device associated with the SCSI address,
+         * and mark it as changed, invalidating the cache. This deals
+         * with changes to existing device IDs.
+         */
+        if (!dev || !dev->scsi_host_ptr)
+                return;
+        /*
+         * force reload of disk info via probe_container
+         */
+        if ((device_config_needed == CHANGE)
+         && (dev->fsa_dev[container].valid == 1))
+                dev->fsa_dev[container].valid = 2;
+        if ((device_config_needed == CHANGE) ||
+                        (device_config_needed == ADD))
+                probe_container(dev, container);
+        device = scsi_device_lookup(dev->scsi_host_ptr, 
+                CONTAINER_TO_CHANNEL(container), 
+                CONTAINER_TO_ID(container), 
+                CONTAINER_TO_LUN(container));
+        if (device) {
+                switch (device_config_needed) {
+                case DELETE:
+                        scsi_remove_device(device);
+                        break;
+                case CHANGE:
+                        if (!dev->fsa_dev[container].valid) {
+                                scsi_remove_device(device);
+                                break;
+                        }
+                        scsi_rescan_device(&device->sdev_gendev);
+                default:
+                        break;
+                }
+                scsi_device_put(device);
+        }
+        if (device_config_needed == ADD) {
+                scsi_add_device(dev->scsi_host_ptr,
+                  CONTAINER_TO_CHANNEL(container),
+                  CONTAINER_TO_ID(container),
+                  CONTAINER_TO_LUN(container));
+        }
+}
 /**
 *      aac_command_thread      -       command processing thread
 *      @dev: Adapter to monitor
@@ -805,7 +1019,6 @@ int aac_command_thread(struct aac_dev * dev)
 {
        struct hw_fib *hw_fib, *hw_newfib;
        struct fib *fib, *newfib;
-        struct aac_queue_block *queues = dev->queues;
        struct aac_fib_context *fibctx;
        unsigned long flags;
        DECLARE_WAITQUEUE(wait, current);
@@ -825,21 +1038,22 @@ int aac_command_thread(struct aac_dev * dev)
         *      Let the DPC know it has a place to send the AIF's to.
         */
        dev->aif_thread = 1;
-        add_wait_queue(&queues->queue[HostNormCmdQueue].cmdready, &wait);
+        add_wait_queue(&dev->queues->queue[HostNormCmdQueue].cmdready, &wait);
        set_current_state(TASK_INTERRUPTIBLE);
+        dprintk ((KERN_INFO "aac_command_thread start\n"));
        while(1) 
        {
-                spin_lock_irqsave(queues->queue[HostNormCmdQueue].lock, flags);
+                spin_lock_irqsave(dev->queues->queue[HostNormCmdQueue].lock, flags);
-                while(!list_empty(&(queues->queue[HostNormCmdQueue].cmdq))) {
+                while(!list_empty(&(dev->queues->queue[HostNormCmdQueue].cmdq))) {
                        struct list_head *entry;
                        struct aac_aifcmd * aifcmd;
                        set_current_state(TASK_RUNNING);
-                
+        
-                        entry = queues->queue[HostNormCmdQueue].cmdq.next;
+                        entry = dev->queues->queue[HostNormCmdQueue].cmdq.next;
                        list_del(entry);
-                        
+                
-                        spin_unlock_irqrestore(queues->queue[HostNormCmdQueue].lock, flags);
+                        spin_unlock_irqrestore(dev->queues->queue[HostNormCmdQueue].lock, flags);
                        fib = list_entry(entry, struct fib, fiblink);
                        /*
                         *      We will process the FIB here or pass it to a 
@@ -860,6 +1074,7 @@ int aac_command_thread(struct aac_dev * dev)
                        aifcmd = (struct aac_aifcmd *) hw_fib->data;
                        if (aifcmd->command == cpu_to_le32(AifCmdDriverNotify)) {
                                /* Handle Driver Notify Events */
+                                aac_handle_aif(dev, fib);
                                *(__le32 *)hw_fib->data = cpu_to_le32(ST_OK);
                                fib_adapter_complete(fib, (u16)sizeof(u32));
                        } else {
@@ -869,9 +1084,62 @@ int aac_command_thread(struct aac_dev * dev)
                                   
                                u32 time_now, time_last;
                                unsigned long flagv;
-                                
+                                unsigned num;
+                                struct hw_fib ** hw_fib_pool, ** hw_fib_p;
+                                struct fib ** fib_pool, ** fib_p;
+                        
+                                /* Sniff events */
+                                if ((aifcmd->command == 
+                                     cpu_to_le32(AifCmdEventNotify)) ||
+                                    (aifcmd->command == 
+                                     cpu_to_le32(AifCmdJobProgress))) {
+                                        aac_handle_aif(dev, fib);
+                                }
+                                
                                time_now = jiffies/HZ;
+                                /*
+                                 * Warning: no sleep allowed while
+                                 * holding spinlock. We take the estimate
+                                 * and pre-allocate a set of fibs outside the
+                                 * lock.
+                                 */
+                                num = le32_to_cpu(dev->init->AdapterFibsSize)
+                                    / sizeof(struct hw_fib); /* some extra */
+                                spin_lock_irqsave(&dev->fib_lock, flagv);
+                                entry = dev->fib_list.next;
+                                while (entry != &dev->fib_list) {
+                                        entry = entry->next;
+                                        ++num;
+                                }
+                                spin_unlock_irqrestore(&dev->fib_lock, flagv);
+                                hw_fib_pool = NULL;
+                                fib_pool = NULL;
+                                if (num
+                                 && ((hw_fib_pool = kmalloc(sizeof(struct hw_fib *) * num, GFP_KERNEL)))
+                                 && ((fib_pool = kmalloc(sizeof(struct fib *) * num, GFP_KERNEL)))) {
+                                        hw_fib_p = hw_fib_pool;
+                                        fib_p = fib_pool;
+                                        while (hw_fib_p < &hw_fib_pool[num]) {
+                                                if (!(*(hw_fib_p++) = kmalloc(sizeof(struct hw_fib), GFP_KERNEL))) {
+                                                        --hw_fib_p;
+                                                        break;
+                                                }
+                                                if (!(*(fib_p++) = kmalloc(sizeof(struct fib), GFP_KERNEL))) {
+                                                        kfree(*(--hw_fib_p));
+                                                        break;
+                                                }
+                                        }
+                                        if ((num = hw_fib_p - hw_fib_pool) == 0) {
+                                                kfree(fib_pool);
+                                                fib_pool = NULL;
+                                                kfree(hw_fib_pool);
+                                                hw_fib_pool = NULL;
+                                        }
+                                } else if (hw_fib_pool) {
+                                        kfree(hw_fib_pool);
+                                        hw_fib_pool = NULL;
+                                }
                                spin_lock_irqsave(&dev->fib_lock, flagv);
                                entry = dev->fib_list.next;
                                /*
@@ -880,6 +1148,8 @@ int aac_command_thread(struct aac_dev * dev)
                                 * fib, and then set the event to wake up the
                                 * thread that is waiting for it.
                                 */
+                                hw_fib_p = hw_fib_pool;
+                                fib_p = fib_pool;
                                while (entry != &dev->fib_list) {
                                        /*
                                         * Extract the fibctx
@@ -912,9 +1182,11 @@ int aac_command_thread(struct aac_dev * dev)
                                         * Warning: no sleep allowed while
                                         * holding spinlock
                                         */
-                                        hw_newfib = kmalloc(sizeof(struct hw_fib), GFP_ATOMIC);
+                                        if (hw_fib_p < &hw_fib_pool[num]) {
-                                        newfib = kmalloc(sizeof(struct fib), GFP_ATOMIC);
+                                                hw_newfib = *hw_fib_p;
-                                        if (newfib && hw_newfib) {
+                                                *(hw_fib_p++) = NULL;
+                                                newfib = *fib_p;
+                                                *(fib_p++) = NULL;
                                                /*
                                                 * Make the copy of the FIB
                                                 */
@@ -929,15 +1201,11 @@ int aac_command_thread(struct aac_dev * dev)
                                                fibctx->count++;
                                                /* 
                                                 * Set the event to wake up the
-                                                 * thread that will waiting.
+                                                 * thread that is waiting.
                                                 */
                                                up(&fibctx->wait_sem);
                                        } else {
                                                printk(KERN_WARNING "aifd: didn't allocate NewFib.\n");
-                                                if(newfib)
-                                                        kfree(newfib);
-                                                if(hw_newfib)
-                                                        kfree(hw_newfib);
                                        }
                                        entry = entry->next;
                                }
@@ -947,21 +1215,38 @@ int aac_command_thread(struct aac_dev * dev)
                                *(__le32 *)hw_fib->data = cpu_to_le32(ST_OK);
                                fib_adapter_complete(fib, sizeof(u32));
                                spin_unlock_irqrestore(&dev->fib_lock, flagv);
+                                /* Free up the remaining resources */
+                                hw_fib_p = hw_fib_pool;
+                                fib_p = fib_pool;
+                                while (hw_fib_p < &hw_fib_pool[num]) {
+                                        if (*hw_fib_p)
+                                                kfree(*hw_fib_p);
+                                        if (*fib_p)
+                                                kfree(*fib_p);
+                                        ++fib_p;
+                                        ++hw_fib_p;
+                                }
+                                if (hw_fib_pool)
+                                        kfree(hw_fib_pool);
+                                if (fib_pool)
+                                        kfree(fib_pool);
                        }
-                        spin_lock_irqsave(queues->queue[HostNormCmdQueue].lock, flags);
                        kfree(fib);
+                        spin_lock_irqsave(dev->queues->queue[HostNormCmdQueue].lock, flags);
                }
                /*
                 *      There are no more AIF's
                 */
-                spin_unlock_irqrestore(queues->queue[HostNormCmdQueue].lock, flags);
+                spin_unlock_irqrestore(dev->queues->queue[HostNormCmdQueue].lock, flags);
                schedule();
                if(signal_pending(current))
                        break;
                set_current_state(TASK_INTERRUPTIBLE);
        }
-        remove_wait_queue(&queues->queue[HostNormCmdQueue].cmdready, &wait);
+        if (dev->queues)
+                remove_wait_queue(&dev->queues->queue[HostNormCmdQueue].cmdready, &wait);
        dev->aif_thread = 0;
        complete_and_exit(&dev->aif_completion, 0);
+        return 0;
 }
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 4ff29d7f5825..de8490a92831 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -748,7 +748,8 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
                unique_id++;
        }
-        if (pci_enable_device(pdev))
+        error = pci_enable_device(pdev);
+        if (error)
                goto out;
        if (pci_set_dma_mask(pdev, 0xFFFFFFFFULL) || 
@@ -772,6 +773,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
        shost->irq = pdev->irq;
        shost->base = pci_resource_start(pdev, 0);
        shost->unique_id = unique_id;
+        shost->max_cmd_len = 16;
        aac = (struct aac_dev *)shost->hostdata;
        aac->scsi_host_ptr = shost;     
@@ -799,7 +801,9 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
                        goto out_free_fibs;
        aac->maximum_num_channels = aac_drivers[index].channels;
-        aac_get_adapter_info(aac);
+        error = aac_get_adapter_info(aac);
+        if (error < 0)
+                goto out_deinit;
        /*
         * Lets override negotiations and drop the maximum SG limit to 34
@@ -927,8 +931,8 @@ static int __init aac_init(void)
        printk(KERN_INFO "Adaptec %s driver (%s)\n",
          AAC_DRIVERNAME, aac_driver_version);
-        error = pci_module_init(&aac_pci_driver);
+        error = pci_register_driver(&aac_pci_driver);
-        if (error)
+        if (error < 0)
                return error;
        aac_cfg_major = register_chrdev( 0, "aac", &aac_cfg_fops);
diff --git a/drivers/scsi/aic7xxx/aic7770_osm.c b/drivers/scsi/aic7xxx/aic7770_osm.c
index 70c5fb59c9ea..d754b3267863 100644
--- a/drivers/scsi/aic7xxx/aic7770_osm.c
+++ b/drivers/scsi/aic7xxx/aic7770_osm.c
@@ -112,6 +112,9 @@ aic7770_remove(struct device *dev)
        struct ahc_softc *ahc = dev_get_drvdata(dev);
        u_long s;
+        if (ahc->platform_data && ahc->platform_data->host)
+                        scsi_remove_host(ahc->platform_data->host);
        ahc_lock(ahc, &s);
        ahc_intr_enable(ahc, FALSE);
        ahc_unlock(ahc, &s);
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 6b6d4e287793..95c285cc83e4 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -1192,11 +1192,6 @@ ahd_platform_free(struct ahd_softc *ahd)
        int i, j;
        if (ahd->platform_data != NULL) {
-                if (ahd->platform_data->host != NULL) {
-                        scsi_remove_host(ahd->platform_data->host);
-                        scsi_host_put(ahd->platform_data->host);
-                }
                /* destroy all of the device and target objects */
                for (i = 0; i < AHD_NUM_TARGETS; i++) {
                        starget = ahd->platform_data->starget[i];
@@ -1226,6 +1221,9 @@ ahd_platform_free(struct ahd_softc *ahd)
                        release_mem_region(ahd->platform_data->mem_busaddr,
                                           0x1000);
                }
+                if (ahd->platform_data->host)
+                        scsi_host_put(ahd->platform_data->host);
                free(ahd->platform_data, M_DEVBUF);
        }
 }
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 390b53852d4b..bf360ae021ab 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -95,6 +95,9 @@ ahd_linux_pci_dev_remove(struct pci_dev *pdev)
        struct ahd_softc *ahd = pci_get_drvdata(pdev);
        u_long s;
+        if (ahd->platform_data && ahd->platform_data->host)
+                        scsi_remove_host(ahd->platform_data->host);
        ahd_lock(ahd, &s);
        ahd_intr_enable(ahd, FALSE);
        ahd_unlock(ahd, &s);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 876d1de8480d..6ee1435d37fa 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -1209,11 +1209,6 @@ ahc_platform_free(struct ahc_softc *ahc)
        int i, j;
        if (ahc->platform_data != NULL) {
-                if (ahc->platform_data->host != NULL) {
-                        scsi_remove_host(ahc->platform_data->host);
-                        scsi_host_put(ahc->platform_data->host);
-                }
                /* destroy all of the device and target objects */
                for (i = 0; i < AHC_NUM_TARGETS; i++) {
                        starget = ahc->platform_data->starget[i];
@@ -1242,6 +1237,9 @@ ahc_platform_free(struct ahc_softc *ahc)
                                           0x1000);
                }
+                if (ahc->platform_data->host)
+                        scsi_host_put(ahc->platform_data->host);
                free(ahc->platform_data, M_DEVBUF);
        }
 }
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index 3ce77ddc889e..cb30d9c1153d 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -143,6 +143,9 @@ ahc_linux_pci_dev_remove(struct pci_dev *pdev)
        struct ahc_softc *ahc = pci_get_drvdata(pdev);
        u_long s;
+        if (ahc->platform_data && ahc->platform_data->host)
+                        scsi_remove_host(ahc->platform_data->host);
        ahc_lock(ahc, &s);
        ahc_intr_enable(ahc, FALSE);
        ahc_unlock(ahc, &s);
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index f2a72d33132c..02fe371b0ab8 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -176,6 +176,7 @@ void scsi_remove_host(struct Scsi_Host *shost)
        transport_unregister_device(&shost->shost_gendev);
        class_device_unregister(&shost->shost_classdev);
        device_del(&shost->shost_gendev);
+        scsi_proc_hostdir_rm(shost->hostt);
 }
 EXPORT_SYMBOL(scsi_remove_host);
@@ -262,7 +263,6 @@ static void scsi_host_dev_release(struct device *dev)
        if (shost->work_q)
                destroy_workqueue(shost->work_q);
-        scsi_proc_hostdir_rm(shost->hostt);
        scsi_destroy_command_freelist(shost);
        kfree(shost->shost_data);
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 86eaf6d408d5..acae7c48ef7d 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -973,10 +973,10 @@ lpfc_get_host_fabric_name (struct Scsi_Host *shost)
        if ((phba->fc_flag & FC_FABRIC) ||
            ((phba->fc_topology == TOPOLOGY_LOOP) &&
             (phba->fc_flag & FC_PUBLIC_LOOP)))
-                node_name = wwn_to_u64(phba->fc_fabparam.nodeName.wwn);
+                node_name = wwn_to_u64(phba->fc_fabparam.nodeName.u.wwn);
        else
                /* fabric is local port if there is no F/FL_Port */
-                node_name = wwn_to_u64(phba->fc_nodename.wwn);
+                node_name = wwn_to_u64(phba->fc_nodename.u.wwn);
        spin_unlock_irq(shost->host_lock);
@@ -1110,7 +1110,7 @@ lpfc_get_starget_node_name(struct scsi_target *starget)
        /* Search the mapped list for this target ID */
        list_for_each_entry(ndlp, &phba->fc_nlpmap_list, nlp_listp) {
                if (starget->id == ndlp->nlp_sid) {
-                        node_name = wwn_to_u64(ndlp->nlp_nodename.wwn);
+                        node_name = wwn_to_u64(ndlp->nlp_nodename.u.wwn);
                        break;
                }
        }
@@ -1131,7 +1131,7 @@ lpfc_get_starget_port_name(struct scsi_target *starget)
        /* Search the mapped list for this target ID */
        list_for_each_entry(ndlp, &phba->fc_nlpmap_list, nlp_listp) {
                if (starget->id == ndlp->nlp_sid) {
-                        port_name = wwn_to_u64(ndlp->nlp_portname.wwn);
+                        port_name = wwn_to_u64(ndlp->nlp_portname.u.wwn);
                        break;
                }
        }
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 4fb8eb0c84cf..56052f4510c3 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -1019,8 +1019,8 @@ lpfc_register_remote_port(struct lpfc_hba * phba,
        struct fc_rport_identifiers rport_ids;
        /* Remote port has reappeared. Re-register w/ FC transport */
-        rport_ids.node_name = wwn_to_u64(ndlp->nlp_nodename.wwn);
+        rport_ids.node_name = wwn_to_u64(ndlp->nlp_nodename.u.wwn);
-        rport_ids.port_name = wwn_to_u64(ndlp->nlp_portname.wwn);
+        rport_ids.port_name = wwn_to_u64(ndlp->nlp_portname.u.wwn);
        rport_ids.port_id = ndlp->nlp_DID;
        rport_ids.roles = FC_RPORT_ROLE_UNKNOWN;
        if (ndlp->nlp_type & NLP_FCP_TARGET)
diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
index 047a87c26cc0..86c41981188b 100644
--- a/drivers/scsi/lpfc/lpfc_hw.h
+++ b/drivers/scsi/lpfc/lpfc_hw.h
@@ -280,9 +280,9 @@ struct lpfc_name {
 #define NAME_CCITT_GR_TYPE  0xE
                        uint8_t IEEEextLsb;     /* FC Word 0, bit 16:23, IEEE extended Lsb */
                        uint8_t IEEE[6];        /* FC IEEE address */
-                };
+                } s;
                uint8_t wwn[8];
-        };
+        } u;
 };
 struct csp {
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 454058f655db..0856ff7d3b33 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -285,7 +285,7 @@ lpfc_config_port_post(struct lpfc_hba * phba)
        if (phba->SerialNumber[0] == 0) {
                uint8_t *outptr;
-                outptr = (uint8_t *) & phba->fc_nodename.IEEE[0];
+                outptr = &phba->fc_nodename.u.s.IEEE[0];
                for (i = 0; i < 12; i++) {
                        status = *outptr++;
                        j = ((status & 0xf0) >> 4);
@@ -1523,8 +1523,8 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
         * Must done after lpfc_sli_hba_setup()
         */
-        fc_host_node_name(host) = wwn_to_u64(phba->fc_nodename.wwn);
+        fc_host_node_name(host) = wwn_to_u64(phba->fc_nodename.u.wwn);
-        fc_host_port_name(host) = wwn_to_u64(phba->fc_portname.wwn);
+        fc_host_port_name(host) = wwn_to_u64(phba->fc_portname.u.wwn);
        fc_host_supported_classes(host) = FC_COS_CLASS3;
        memset(fc_host_supported_fc4s(host), 0,
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 6f308ebe3e79..61a6fd810bb4 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -621,8 +621,6 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy)
        if(islogical) {
                switch (cmd->cmnd[0]) {
                case TEST_UNIT_READY:
-                        memset(cmd->request_buffer, 0, cmd->request_bufflen);
 #if MEGA_HAVE_CLUSTERING
                        /*
                         * Do we support clustering and is the support enabled
@@ -652,11 +650,28 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy)
                        return NULL;
 #endif
-                case MODE_SENSE:
+                case MODE_SENSE: {
+                        char *buf;
+                        if (cmd->use_sg) {
+                                struct scatterlist *sg;
+                                sg = (struct scatterlist *)cmd->request_buffer;
+                                buf = kmap_atomic(sg->page, KM_IRQ0) +
+                                        sg->offset;
+                        } else
+                                buf = cmd->request_buffer;
                        memset(cmd->request_buffer, 0, cmd->cmnd[4]);
+                        if (cmd->use_sg) {
+                                struct scatterlist *sg;
+                                sg = (struct scatterlist *)cmd->request_buffer;
+                                kunmap_atomic(buf - sg->offset, KM_IRQ0);
+                        }
                        cmd->result = (DID_OK << 16);
                        cmd->scsi_done(cmd);
                        return NULL;
+                }
                case READ_CAPACITY:
                case INQUIRY:
@@ -1685,14 +1700,23 @@ mega_rundoneq (adapter_t *adapter)
 static void
 mega_free_scb(adapter_t *adapter, scb_t *scb)
 {
+        unsigned long length;
        switch( scb->dma_type ) {
        case MEGA_DMA_TYPE_NONE:
                break;
        case MEGA_BULK_DATA:
+                if (scb->cmd->use_sg == 0)
+                        length = scb->cmd->request_bufflen;
+                else {
+                        struct scatterlist *sgl =
+                                (struct scatterlist *)scb->cmd->request_buffer;
+                        length = sgl->length;
+                }
                pci_unmap_page(adapter->dev, scb->dma_h_bulkdata,
-                        scb->cmd->request_bufflen, scb->dma_direction);
+                               length, scb->dma_direction);
                break;
        case MEGA_SGLIST:
@@ -1741,6 +1765,7 @@ mega_build_sglist(adapter_t *adapter, scb_t *scb, u32 *buf, u32 *len)
        struct scatterlist      *sgl;
        struct page     *page;
        unsigned long   offset;
+        unsigned int    length;
        Scsi_Cmnd       *cmd;
        int     sgcnt;
        int     idx;
@@ -1748,14 +1773,23 @@ mega_build_sglist(adapter_t *adapter, scb_t *scb, u32 *buf, u32 *len)
        cmd = scb->cmd;
        /* Scatter-gather not used */
-        if( !cmd->use_sg ) {
+        if( cmd->use_sg == 0 || (cmd->use_sg == 1 && 
+                                 !adapter->has_64bit_addr)) {
-                page = virt_to_page(cmd->request_buffer);
-                offset = offset_in_page(cmd->request_buffer);
+                if (cmd->use_sg == 0) {
+                        page = virt_to_page(cmd->request_buffer);
+                        offset = offset_in_page(cmd->request_buffer);
+                        length = cmd->request_bufflen;
+                } else {
+                        sgl = (struct scatterlist *)cmd->request_buffer;
+                        page = sgl->page;
+                        offset = sgl->offset;
+                        length = sgl->length;
+                }
                scb->dma_h_bulkdata = pci_map_page(adapter->dev,
                                                  page, offset,
-                                                  cmd->request_bufflen,
+                                                  length,
                                                  scb->dma_direction);
                scb->dma_type = MEGA_BULK_DATA;
@@ -1765,14 +1799,14 @@ mega_build_sglist(adapter_t *adapter, scb_t *scb, u32 *buf, u32 *len)
                 */
                if( adapter->has_64bit_addr ) {
                        scb->sgl64[0].address = scb->dma_h_bulkdata;
-                        scb->sgl64[0].length = cmd->request_bufflen;
+                        scb->sgl64[0].length = length;
                        *buf = (u32)scb->sgl_dma_addr;
-                        *len = (u32)cmd->request_bufflen;
+                        *len = (u32)length;
                        return 1;
                }
                else {
                        *buf = (u32)scb->dma_h_bulkdata;
-                        *len = (u32)cmd->request_bufflen;
+                        *len = (u32)length;
                }
                return 0;
        }
@@ -1791,27 +1825,23 @@ mega_build_sglist(adapter_t *adapter, scb_t *scb, u32 *buf, u32 *len)
        if( sgcnt > adapter->sglen ) BUG();
+        *len = 0;
        for( idx = 0; idx < sgcnt; idx++, sgl++ ) {
                if( adapter->has_64bit_addr ) {
                        scb->sgl64[idx].address = sg_dma_address(sgl);
-                        scb->sgl64[idx].length = sg_dma_len(sgl);
+                        *len += scb->sgl64[idx].length = sg_dma_len(sgl);
                }
                else {
                        scb->sgl[idx].address = sg_dma_address(sgl);
-                        scb->sgl[idx].length = sg_dma_len(sgl);
+                        *len += scb->sgl[idx].length = sg_dma_len(sgl);
                }
        }
        /* Reset pointer and length fields */
        *buf = scb->sgl_dma_addr;
-        /*
-         * For passthru command, dataxferlen must be set, even for commands
-         * with a sg list
-         */
-        *len = (u32)cmd->request_bufflen;
        /* Return count of SG requests */
        return sgcnt;
 }
diff --git a/drivers/scsi/megaraid/Kconfig.megaraid b/drivers/scsi/megaraid/Kconfig.megaraid
index 917d591d90b2..7363e12663ac 100644
--- a/drivers/scsi/megaraid/Kconfig.megaraid
+++ b/drivers/scsi/megaraid/Kconfig.megaraid
@@ -76,3 +76,12 @@ config MEGARAID_LEGACY
        To compile this driver as a module, choose M here: the
        module will be called megaraid
 endif
+config MEGARAID_SAS
+        tristate "LSI Logic MegaRAID SAS RAID Module"
+        depends on PCI && SCSI
+        help
+        Module for LSI Logic's SAS based RAID controllers.
+        To compile this driver as a module, choose 'm' here.
+        Module will be called megaraid_sas
diff --git a/drivers/scsi/megaraid/Makefile b/drivers/scsi/megaraid/Makefile
index 6dd99f275722..f469915b97c3 100644
--- a/drivers/scsi/megaraid/Makefile
+++ b/drivers/scsi/megaraid/Makefile
@@ -1,2 +1,3 @@
 obj-$(CONFIG_MEGARAID_MM)       += megaraid_mm.o
 obj-$(CONFIG_MEGARAID_MAILBOX)  += megaraid_mbox.o
+obj-$(CONFIG_MEGARAID_SAS)      += megaraid_sas.o
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
new file mode 100644
index 000000000000..c3f637395734
--- /dev/null
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -0,0 +1,2806 @@
+/*
+ *
+ *              Linux MegaRAID driver for SAS based RAID controllers
+ *
+ * Copyright (c) 2003-2005  LSI Logic Corporation.
+ *
+ *         This program is free software; you can redistribute it and/or
+ *         modify it under the terms of the GNU General Public License
+ *         as published by the Free Software Foundation; either version
+ *         2 of the License, or (at your option) any later version.
+ *
+ * FILE         : megaraid_sas.c
+ * Version      : v00.00.02.00-rc4
+ *
+ * Authors:
+ *      Sreenivas Bagalkote     <Sreenivas.Bagalkote@lsil.com>
+ *      Sumant Patro            <Sumant.Patro@lsil.com>
+ *
+ * List of supported controllers
+ *
+ * OEM  Product Name                    VID     DID     SSVID   SSID
+ * ---  ------------                    ---     ---     ----    ----
+ */
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/list.h>
+#include <linux/version.h>
+#include <linux/moduleparam.h>
+#include <linux/module.h>
+#include <linux/spinlock.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/uio.h>
+#include <asm/uaccess.h>
+#include <linux/fs.h>
+#include <linux/compat.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
+#include "megaraid_sas.h"
+MODULE_LICENSE("GPL");
+MODULE_VERSION(MEGASAS_VERSION);
+MODULE_AUTHOR("sreenivas.bagalkote@lsil.com");
+MODULE_DESCRIPTION("LSI Logic MegaRAID SAS Driver");
+/*
+ * PCI ID table for all supported controllers
+ */
+static struct pci_device_id megasas_pci_table[] = {
+        {
+         PCI_VENDOR_ID_LSI_LOGIC,
+         PCI_DEVICE_ID_LSI_SAS1064R,
+         PCI_ANY_ID,
+         PCI_ANY_ID,
+         },
+        {
+         PCI_VENDOR_ID_DELL,
+         PCI_DEVICE_ID_DELL_PERC5,
+         PCI_ANY_ID,
+         PCI_ANY_ID,
+         },
+        {0}                     /* Terminating entry */
+};
+MODULE_DEVICE_TABLE(pci, megasas_pci_table);
+static int megasas_mgmt_majorno;
+static struct megasas_mgmt_info megasas_mgmt_info;
+static struct fasync_struct *megasas_async_queue;
+static DECLARE_MUTEX(megasas_async_queue_mutex);
+/**
+ * megasas_get_cmd -    Get a command from the free pool
+ * @instance:           Adapter soft state
+ *
+ * Returns a free command from the pool
+ */
+static inline struct megasas_cmd *megasas_get_cmd(struct megasas_instance
+                                                  *instance)
+{
+        unsigned long flags;
+        struct megasas_cmd *cmd = NULL;
+        spin_lock_irqsave(&instance->cmd_pool_lock, flags);
+        if (!list_empty(&instance->cmd_pool)) {
+                cmd = list_entry((&instance->cmd_pool)->next,
+                                 struct megasas_cmd, list);
+                list_del_init(&cmd->list);
+        } else {
+                printk(KERN_ERR "megasas: Command pool empty!\n");
+        }
+        spin_unlock_irqrestore(&instance->cmd_pool_lock, flags);
+        return cmd;
+}
+/**
+ * megasas_return_cmd - Return a cmd to free command pool
+ * @instance:           Adapter soft state
+ * @cmd:                Command packet to be returned to free command pool
+ */
+static inline void
+megasas_return_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&instance->cmd_pool_lock, flags);
+        cmd->scmd = NULL;
+        list_add_tail(&cmd->list, &instance->cmd_pool);
+        spin_unlock_irqrestore(&instance->cmd_pool_lock, flags);
+}
+/**
+ * megasas_enable_intr -        Enables interrupts
+ * @regs:                       MFI register set
+ */
+static inline void
+megasas_enable_intr(struct megasas_register_set __iomem * regs)
+{
+        writel(1, &(regs)->outbound_intr_mask);
+        /* Dummy readl to force pci flush */
+        readl(&regs->outbound_intr_mask);
+}
+/**
+ * megasas_disable_intr -       Disables interrupts
+ * @regs:                       MFI register set
+ */
+static inline void
+megasas_disable_intr(struct megasas_register_set __iomem * regs)
+{
+        u32 mask = readl(&regs->outbound_intr_mask) & (~0x00000001);
+        writel(mask, &regs->outbound_intr_mask);
+        /* Dummy readl to force pci flush */
+        readl(&regs->outbound_intr_mask);
+}
+/**
+ * megasas_issue_polled -       Issues a polling command
+ * @instance:                   Adapter soft state
+ * @cmd:                        Command packet to be issued 
+ *
+ * For polling, MFI requires the cmd_status to be set to 0xFF before posting.
+ */
+static int
+megasas_issue_polled(struct megasas_instance *instance, struct megasas_cmd *cmd)
+{
+        int i;
+        u32 msecs = MFI_POLL_TIMEOUT_SECS * 1000;
+        struct megasas_header *frame_hdr = &cmd->frame->hdr;
+        frame_hdr->cmd_status = 0xFF;
+        frame_hdr->flags |= MFI_FRAME_DONT_POST_IN_REPLY_QUEUE;
+        /*
+         * Issue the frame using inbound queue port
+         */
+        writel(cmd->frame_phys_addr >> 3,
+               &instance->reg_set->inbound_queue_port);
+        /*
+         * Wait for cmd_status to change
+         */
+        for (i = 0; (i < msecs) && (frame_hdr->cmd_status == 0xff); i++) {
+                rmb();
+                msleep(1);
+        }
+        if (frame_hdr->cmd_status == 0xff)
+                return -ETIME;
+        return 0;
+}
+/**
+ * megasas_issue_blocked_cmd -  Synchronous wrapper around regular FW cmds
+ * @instance:                   Adapter soft state
+ * @cmd:                        Command to be issued
+ *
+ * This function waits on an event for the command to be returned from ISR.
+ * Used to issue ioctl commands.
+ */
+static int
+megasas_issue_blocked_cmd(struct megasas_instance *instance,
+                          struct megasas_cmd *cmd)
+{
+        cmd->cmd_status = ENODATA;
+        writel(cmd->frame_phys_addr >> 3,
+               &instance->reg_set->inbound_queue_port);
+        wait_event(instance->int_cmd_wait_q, (cmd->cmd_status != ENODATA));
+        return 0;
+}
+/**
+ * megasas_issue_blocked_abort_cmd -    Aborts previously issued cmd
+ * @instance:                           Adapter soft state
+ * @cmd_to_abort:                       Previously issued cmd to be aborted
+ *
+ * MFI firmware can abort previously issued AEN comamnd (automatic event
+ * notification). The megasas_issue_blocked_abort_cmd() issues such abort
+ * cmd and blocks till it is completed.
+ */
+static int
+megasas_issue_blocked_abort_cmd(struct megasas_instance *instance,
+                                struct megasas_cmd *cmd_to_abort)
+{
+        struct megasas_cmd *cmd;
+        struct megasas_abort_frame *abort_fr;
+        cmd = megasas_get_cmd(instance);
+        if (!cmd)
+                return -1;
+        abort_fr = &cmd->frame->abort;
+        /*
+         * Prepare and issue the abort frame
+         */
+        abort_fr->cmd = MFI_CMD_ABORT;
+        abort_fr->cmd_status = 0xFF;
+        abort_fr->flags = 0;
+        abort_fr->abort_context = cmd_to_abort->index;
+        abort_fr->abort_mfi_phys_addr_lo = cmd_to_abort->frame_phys_addr;
+        abort_fr->abort_mfi_phys_addr_hi = 0;
+        cmd->sync_cmd = 1;
+        cmd->cmd_status = 0xFF;
+        writel(cmd->frame_phys_addr >> 3,
+               &instance->reg_set->inbound_queue_port);
+        /*
+         * Wait for this cmd to complete
+         */
+        wait_event(instance->abort_cmd_wait_q, (cmd->cmd_status != 0xFF));
+        megasas_return_cmd(instance, cmd);
+        return 0;
+}
+/**
+ * megasas_make_sgl32 - Prepares 32-bit SGL
+ * @instance:           Adapter soft state
+ * @scp:                SCSI command from the mid-layer
+ * @mfi_sgl:            SGL to be filled in
+ *
+ * If successful, this function returns the number of SG elements. Otherwise,
+ * it returnes -1.
+ */
+static inline int
+megasas_make_sgl32(struct megasas_instance *instance, struct scsi_cmnd *scp,
+                   union megasas_sgl *mfi_sgl)
+{
+        int i;
+        int sge_count;
+        struct scatterlist *os_sgl;
+        /*
+         * Return 0 if there is no data transfer
+         */
+        if (!scp->request_buffer || !scp->request_bufflen)
+                return 0;
+        if (!scp->use_sg) {
+                mfi_sgl->sge32[0].phys_addr = pci_map_single(instance->pdev,
+                                                             scp->
+                                                             request_buffer,
+                                                             scp->
+                                                             request_bufflen,
+                                                             scp->
+                                                             sc_data_direction);
+                mfi_sgl->sge32[0].length = scp->request_bufflen;
+                return 1;
+        }
+        os_sgl = (struct scatterlist *)scp->request_buffer;
+        sge_count = pci_map_sg(instance->pdev, os_sgl, scp->use_sg,
+                               scp->sc_data_direction);
+        for (i = 0; i < sge_count; i++, os_sgl++) {
+                mfi_sgl->sge32[i].length = sg_dma_len(os_sgl);
+                mfi_sgl->sge32[i].phys_addr = sg_dma_address(os_sgl);
+        }
+        return sge_count;
+}
+/**
+ * megasas_make_sgl64 - Prepares 64-bit SGL
+ * @instance:           Adapter soft state
+ * @scp:                SCSI command from the mid-layer
+ * @mfi_sgl:            SGL to be filled in
+ *
+ * If successful, this function returns the number of SG elements. Otherwise,
+ * it returnes -1.
+ */
+static inline int
+megasas_make_sgl64(struct megasas_instance *instance, struct scsi_cmnd *scp,
+                   union megasas_sgl *mfi_sgl)
+{
+        int i;
+        int sge_count;
+        struct scatterlist *os_sgl;
+        /*
+         * Return 0 if there is no data transfer
+         */
+        if (!scp->request_buffer || !scp->request_bufflen)
+                return 0;
+        if (!scp->use_sg) {
+                mfi_sgl->sge64[0].phys_addr = pci_map_single(instance->pdev,
+                                                             scp->
+                                                             request_buffer,
+                                                             scp->
+                                                             request_bufflen,
+                                                             scp->
+                                                             sc_data_direction);
+                mfi_sgl->sge64[0].length = scp->request_bufflen;
+                return 1;
+        }
+        os_sgl = (struct scatterlist *)scp->request_buffer;
+        sge_count = pci_map_sg(instance->pdev, os_sgl, scp->use_sg,
+                               scp->sc_data_direction);
+        for (i = 0; i < sge_count; i++, os_sgl++) {
+                mfi_sgl->sge64[i].length = sg_dma_len(os_sgl);
+                mfi_sgl->sge64[i].phys_addr = sg_dma_address(os_sgl);
+        }
+        return sge_count;
+}
+/**
+ * megasas_build_dcdb - Prepares a direct cdb (DCDB) command
+ * @instance:           Adapter soft state
+ * @scp:                SCSI command
+ * @cmd:                Command to be prepared in
+ *
+ * This function prepares CDB commands. These are typcially pass-through
+ * commands to the devices.
+ */
+static inline int
+megasas_build_dcdb(struct megasas_instance *instance, struct scsi_cmnd *scp,
+                   struct megasas_cmd *cmd)
+{
+        u32 sge_sz;
+        int sge_bytes;
+        u32 is_logical;
+        u32 device_id;
+        u16 flags = 0;
+        struct megasas_pthru_frame *pthru;
+        is_logical = MEGASAS_IS_LOGICAL(scp);
+        device_id = MEGASAS_DEV_INDEX(instance, scp);
+        pthru = (struct megasas_pthru_frame *)cmd->frame;
+        if (scp->sc_data_direction == PCI_DMA_TODEVICE)
+                flags = MFI_FRAME_DIR_WRITE;
+        else if (scp->sc_data_direction == PCI_DMA_FROMDEVICE)
+                flags = MFI_FRAME_DIR_READ;
+        else if (scp->sc_data_direction == PCI_DMA_NONE)
+                flags = MFI_FRAME_DIR_NONE;
+        /*
+         * Prepare the DCDB frame
+         */
+        pthru->cmd = (is_logical) ? MFI_CMD_LD_SCSI_IO : MFI_CMD_PD_SCSI_IO;
+        pthru->cmd_status = 0x0;
+        pthru->scsi_status = 0x0;
+        pthru->target_id = device_id;
+        pthru->lun = scp->device->lun;
+        pthru->cdb_len = scp->cmd_len;
+        pthru->timeout = 0;
+        pthru->flags = flags;
+        pthru->data_xfer_len = scp->request_bufflen;
+        memcpy(pthru->cdb, scp->cmnd, scp->cmd_len);
+        /*
+         * Construct SGL
+         */
+        sge_sz = (IS_DMA64) ? sizeof(struct megasas_sge64) :
+            sizeof(struct megasas_sge32);
+        if (IS_DMA64) {
+                pthru->flags |= MFI_FRAME_SGL64;
+                pthru->sge_count = megasas_make_sgl64(instance, scp,
+                                                      &pthru->sgl);
+        } else
+                pthru->sge_count = megasas_make_sgl32(instance, scp,
+                                                      &pthru->sgl);
+        /*
+         * Sense info specific
+         */
+        pthru->sense_len = SCSI_SENSE_BUFFERSIZE;
+        pthru->sense_buf_phys_addr_hi = 0;
+        pthru->sense_buf_phys_addr_lo = cmd->sense_phys_addr;
+        sge_bytes = sge_sz * pthru->sge_count;
+        /*
+         * Compute the total number of frames this command consumes. FW uses
+         * this number to pull sufficient number of frames from host memory.
+         */
+        cmd->frame_count = (sge_bytes / MEGAMFI_FRAME_SIZE) +
+            ((sge_bytes % MEGAMFI_FRAME_SIZE) ? 1 : 0) + 1;
+        if (cmd->frame_count > 7)
+                cmd->frame_count = 8;
+        return cmd->frame_count;
+}
+/**
+ * megasas_build_ldio - Prepares IOs to logical devices
+ * @instance:           Adapter soft state
+ * @scp:                SCSI command
+ * @cmd:                Command to to be prepared
+ *
+ * Frames (and accompanying SGLs) for regular SCSI IOs use this function.
+ */
+static inline int
+megasas_build_ldio(struct megasas_instance *instance, struct scsi_cmnd *scp,
+                   struct megasas_cmd *cmd)
+{
+        u32 sge_sz;
+        int sge_bytes;
+        u32 device_id;
+        u8 sc = scp->cmnd[0];
+        u16 flags = 0;
+        struct megasas_io_frame *ldio;
+        device_id = MEGASAS_DEV_INDEX(instance, scp);
+        ldio = (struct megasas_io_frame *)cmd->frame;
+        if (scp->sc_data_direction == PCI_DMA_TODEVICE)
+                flags = MFI_FRAME_DIR_WRITE;
+        else if (scp->sc_data_direction == PCI_DMA_FROMDEVICE)
+                flags = MFI_FRAME_DIR_READ;
+        /*
+         * Preare the Logical IO frame: 2nd bit is zero for all read cmds
+         */
+        ldio->cmd = (sc & 0x02) ? MFI_CMD_LD_WRITE : MFI_CMD_LD_READ;
+        ldio->cmd_status = 0x0;
+        ldio->scsi_status = 0x0;
+        ldio->target_id = device_id;
+        ldio->timeout = 0;
+        ldio->reserved_0 = 0;
+        ldio->pad_0 = 0;
+        ldio->flags = flags;
+        ldio->start_lba_hi = 0;
+        ldio->access_byte = (scp->cmd_len != 6) ? scp->cmnd[1] : 0;
+        /*
+         * 6-byte READ(0x08) or WRITE(0x0A) cdb
+         */
+        if (scp->cmd_len == 6) {
+                ldio->lba_count = (u32) scp->cmnd[4];
+                ldio->start_lba_lo = ((u32) scp->cmnd[1] << 16) |
+                    ((u32) scp->cmnd[2] << 8) | (u32) scp->cmnd[3];
+                ldio->start_lba_lo &= 0x1FFFFF;
+        }
+        /*
+         * 10-byte READ(0x28) or WRITE(0x2A) cdb
+         */
+        else if (scp->cmd_len == 10) {
+                ldio->lba_count = (u32) scp->cmnd[8] |
+                    ((u32) scp->cmnd[7] << 8);
+                ldio->start_lba_lo = ((u32) scp->cmnd[2] << 24) |
+                    ((u32) scp->cmnd[3] << 16) |
+                    ((u32) scp->cmnd[4] << 8) | (u32) scp->cmnd[5];
+        }
+        /*
+         * 12-byte READ(0xA8) or WRITE(0xAA) cdb
+         */
+        else if (scp->cmd_len == 12) {
+                ldio->lba_count = ((u32) scp->cmnd[6] << 24) |
+                    ((u32) scp->cmnd[7] << 16) |
+                    ((u32) scp->cmnd[8] << 8) | (u32) scp->cmnd[9];
+                ldio->start_lba_lo = ((u32) scp->cmnd[2] << 24) |
+                    ((u32) scp->cmnd[3] << 16) |
+                    ((u32) scp->cmnd[4] << 8) | (u32) scp->cmnd[5];
+        }
+        /*
+         * 16-byte READ(0x88) or WRITE(0x8A) cdb
+         */
+        else if (scp->cmd_len == 16) {
+                ldio->lba_count = ((u32) scp->cmnd[10] << 24) |
+                    ((u32) scp->cmnd[11] << 16) |
+                    ((u32) scp->cmnd[12] << 8) | (u32) scp->cmnd[13];
+                ldio->start_lba_lo = ((u32) scp->cmnd[6] << 24) |
+                    ((u32) scp->cmnd[7] << 16) |
+                    ((u32) scp->cmnd[8] << 8) | (u32) scp->cmnd[9];
+                ldio->start_lba_hi = ((u32) scp->cmnd[2] << 24) |
+                    ((u32) scp->cmnd[3] << 16) |
+                    ((u32) scp->cmnd[4] << 8) | (u32) scp->cmnd[5];
+        }
+        /*
+         * Construct SGL
+         */
+        sge_sz = (IS_DMA64) ? sizeof(struct megasas_sge64) :
+            sizeof(struct megasas_sge32);
+        if (IS_DMA64) {
+                ldio->flags |= MFI_FRAME_SGL64;
+                ldio->sge_count = megasas_make_sgl64(instance, scp, &ldio->sgl);
+        } else
+                ldio->sge_count = megasas_make_sgl32(instance, scp, &ldio->sgl);
+        /*
+         * Sense info specific
+         */
+        ldio->sense_len = SCSI_SENSE_BUFFERSIZE;
+        ldio->sense_buf_phys_addr_hi = 0;
+        ldio->sense_buf_phys_addr_lo = cmd->sense_phys_addr;
+        sge_bytes = sge_sz * ldio->sge_count;
+        cmd->frame_count = (sge_bytes / MEGAMFI_FRAME_SIZE) +
+            ((sge_bytes % MEGAMFI_FRAME_SIZE) ? 1 : 0) + 1;
+        if (cmd->frame_count > 7)
+                cmd->frame_count = 8;
+        return cmd->frame_count;
+}
+/**
+ * megasas_build_cmd -  Prepares a command packet
+ * @instance:           Adapter soft state
+ * @scp:                SCSI command
+ * @frame_count:        [OUT] Number of frames used to prepare this command
+ */
+static inline struct megasas_cmd *megasas_build_cmd(struct megasas_instance
+                                                    *instance,
+                                                    struct scsi_cmnd *scp,
+                                                    int *frame_count)
+{
+        u32 logical_cmd;
+        struct megasas_cmd *cmd;
+        /*
+         * Find out if this is logical or physical drive command.
+         */
+        logical_cmd = MEGASAS_IS_LOGICAL(scp);
+        /*
+         * Logical drive command
+         */
+        if (logical_cmd) {
+                if (scp->device->id >= MEGASAS_MAX_LD) {
+                        scp->result = DID_BAD_TARGET << 16;
+                        return NULL;
+                }
+                switch (scp->cmnd[0]) {
+                case READ_10:
+                case WRITE_10:
+                case READ_12:
+                case WRITE_12:
+                case READ_6:
+                case WRITE_6:
+                case READ_16:
+                case WRITE_16:
+                        /*
+                         * Fail for LUN > 0
+                         */
+                        if (scp->device->lun) {
+                                scp->result = DID_BAD_TARGET << 16;
+                                return NULL;
+                        }
+                        cmd = megasas_get_cmd(instance);
+                        if (!cmd) {
+                                scp->result = DID_IMM_RETRY << 16;
+                                return NULL;
+                        }
+                        *frame_count = megasas_build_ldio(instance, scp, cmd);
+                        if (!(*frame_count)) {
+                                megasas_return_cmd(instance, cmd);
+                                return NULL;
+                        }
+                        return cmd;
+                default:
+                        /*
+                         * Fail for LUN > 0
+                         */
+                        if (scp->device->lun) {
+                                scp->result = DID_BAD_TARGET << 16;
+                                return NULL;
+                        }
+                        cmd = megasas_get_cmd(instance);
+                        if (!cmd) {
+                                scp->result = DID_IMM_RETRY << 16;
+                                return NULL;
+                        }
+                        *frame_count = megasas_build_dcdb(instance, scp, cmd);
+                        if (!(*frame_count)) {
+                                megasas_return_cmd(instance, cmd);
+                                return NULL;
+                        }
+                        return cmd;
+                }
+        } else {
+                cmd = megasas_get_cmd(instance);
+                if (!cmd) {
+                        scp->result = DID_IMM_RETRY << 16;
+                        return NULL;
+                }
+                *frame_count = megasas_build_dcdb(instance, scp, cmd);
+                if (!(*frame_count)) {
+                        megasas_return_cmd(instance, cmd);
+                        return NULL;
+                }
+                return cmd;
+        }
+        return NULL;
+}
+/**
+ * megasas_queue_command -      Queue entry point
+ * @scmd:                       SCSI command to be queued
+ * @done:                       Callback entry point
+ */
+static int
+megasas_queue_command(struct scsi_cmnd *scmd, void (*done) (struct scsi_cmnd *))
+{
+        u32 frame_count;
+        unsigned long flags;
+        struct megasas_cmd *cmd;
+        struct megasas_instance *instance;
+        instance = (struct megasas_instance *)
+            scmd->device->host->hostdata;
+        scmd->scsi_done = done;
+        scmd->result = 0;
+        cmd = megasas_build_cmd(instance, scmd, &frame_count);
+        if (!cmd) {
+                done(scmd);
+                return 0;
+        }
+        cmd->scmd = scmd;
+        scmd->SCp.ptr = (char *)cmd;
+        scmd->SCp.sent_command = jiffies;
+        /*
+         * Issue the command to the FW
+         */
+        spin_lock_irqsave(&instance->instance_lock, flags);
+        instance->fw_outstanding++;
+        spin_unlock_irqrestore(&instance->instance_lock, flags);
+        writel(((cmd->frame_phys_addr >> 3) | (cmd->frame_count - 1)),
+               &instance->reg_set->inbound_queue_port);
+        return 0;
+}
+/**
+ * megasas_wait_for_outstanding -       Wait for all outstanding cmds
+ * @instance:                           Adapter soft state
+ *
+ * This function waits for upto MEGASAS_RESET_WAIT_TIME seconds for FW to
+ * complete all its outstanding commands. Returns error if one or more IOs
+ * are pending after this time period. It also marks the controller dead.
+ */
+static int megasas_wait_for_outstanding(struct megasas_instance *instance)
+{
+        int i;
+        u32 wait_time = MEGASAS_RESET_WAIT_TIME;
+        for (i = 0; i < wait_time; i++) {
+                if (!instance->fw_outstanding)
+                        break;
+                if (!(i % MEGASAS_RESET_NOTICE_INTERVAL)) {
+                        printk(KERN_NOTICE "megasas: [%2d]waiting for %d "
+                               "commands to complete\n", i,
+                               instance->fw_outstanding);
+                }
+                msleep(1000);
+        }
+        if (instance->fw_outstanding) {
+                instance->hw_crit_error = 1;
+                return FAILED;
+        }
+        return SUCCESS;
+}
+/**
+ * megasas_generic_reset -      Generic reset routine
+ * @scmd:                       Mid-layer SCSI command
+ *
+ * This routine implements a generic reset handler for device, bus and host
+ * reset requests. Device, bus and host specific reset handlers can use this
+ * function after they do their specific tasks.
+ */
+static int megasas_generic_reset(struct scsi_cmnd *scmd)
+{
+        int ret_val;
+        struct megasas_instance *instance;
+        instance = (struct megasas_instance *)scmd->device->host->hostdata;
+        printk(KERN_NOTICE "megasas: RESET -%ld cmd=%x <c=%d t=%d l=%d>\n",
+               scmd->serial_number, scmd->cmnd[0], scmd->device->channel,
+               scmd->device->id, scmd->device->lun);
+        if (instance->hw_crit_error) {
+                printk(KERN_ERR "megasas: cannot recover from previous reset "
+                       "failures\n");
+                return FAILED;
+        }
+        spin_unlock(scmd->device->host->host_lock);
+        ret_val = megasas_wait_for_outstanding(instance);
+        if (ret_val == SUCCESS)
+                printk(KERN_NOTICE "megasas: reset successful \n");
+        else
+                printk(KERN_ERR "megasas: failed to do reset\n");
+        spin_lock(scmd->device->host->host_lock);
+        return ret_val;
+}
+static enum scsi_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd)
+{
+        unsigned long seconds;
+        if (scmd->SCp.ptr) {
+                seconds = (jiffies - scmd->SCp.sent_command) / HZ;
+                if (seconds < 90) {
+                        return EH_RESET_TIMER;
+                } else {
+                        return EH_NOT_HANDLED;
+                }
+        }
+        return EH_HANDLED;
+}
+/**
+ * megasas_reset_device -       Device reset handler entry point
+ */
+static int megasas_reset_device(struct scsi_cmnd *scmd)
+{
+        int ret;
+        /*
+         * First wait for all commands to complete
+         */
+        ret = megasas_generic_reset(scmd);
+        return ret;
+}
+/**
+ * megasas_reset_bus_host -     Bus & host reset handler entry point
+ */
+static int megasas_reset_bus_host(struct scsi_cmnd *scmd)
+{
+        int ret;
+        /*
+         * Frist wait for all commands to complete
+         */
+        ret = megasas_generic_reset(scmd);
+        return ret;
+}
+/**
+ * megasas_service_aen -        Processes an event notification
+ * @instance:                   Adapter soft state
+ * @cmd:                        AEN command completed by the ISR
+ *
+ * For AEN, driver sends a command down to FW that is held by the FW till an
+ * event occurs. When an event of interest occurs, FW completes the command
+ * that it was previously holding.
+ *
+ * This routines sends SIGIO signal to processes that have registered with the
+ * driver for AEN.
+ */
+static void
+megasas_service_aen(struct megasas_instance *instance, struct megasas_cmd *cmd)
+{
+        /*
+         * Don't signal app if it is just an aborted previously registered aen
+         */
+        if (!cmd->abort_aen)
+                kill_fasync(&megasas_async_queue, SIGIO, POLL_IN);
+        else
+                cmd->abort_aen = 0;
+        instance->aen_cmd = NULL;
+        megasas_return_cmd(instance, cmd);
+}
+/*
+ * Scsi host template for megaraid_sas driver
+ */
+static struct scsi_host_template megasas_template = {
+        .module = THIS_MODULE,
+        .name = "LSI Logic SAS based MegaRAID driver",
+        .proc_name = "megaraid_sas",
+        .queuecommand = megasas_queue_command,
+        .eh_device_reset_handler = megasas_reset_device,
+        .eh_bus_reset_handler = megasas_reset_bus_host,
+        .eh_host_reset_handler = megasas_reset_bus_host,
+        .eh_timed_out = megasas_reset_timer,
+        .use_clustering = ENABLE_CLUSTERING,
+};
+/**
+ * megasas_complete_int_cmd -   Completes an internal command
+ * @instance:                   Adapter soft state
+ * @cmd:                        Command to be completed
+ *
+ * The megasas_issue_blocked_cmd() function waits for a command to complete
+ * after it issues a command. This function wakes up that waiting routine by
+ * calling wake_up() on the wait queue.
+ */
+static void
+megasas_complete_int_cmd(struct megasas_instance *instance,
+                         struct megasas_cmd *cmd)
+{
+        cmd->cmd_status = cmd->frame->io.cmd_status;
+        if (cmd->cmd_status == ENODATA) {
+                cmd->cmd_status = 0;
+        }
+        wake_up(&instance->int_cmd_wait_q);
+}
+/**
+ * megasas_complete_abort -     Completes aborting a command
+ * @instance:                   Adapter soft state
+ * @cmd:                        Cmd that was issued to abort another cmd
+ *
+ * The megasas_issue_blocked_abort_cmd() function waits on abort_cmd_wait_q 
+ * after it issues an abort on a previously issued command. This function 
+ * wakes up all functions waiting on the same wait queue.
+ */
+static void
+megasas_complete_abort(struct megasas_instance *instance,
+                       struct megasas_cmd *cmd)
+{
+        if (cmd->sync_cmd) {
+                cmd->sync_cmd = 0;
+                cmd->cmd_status = 0;
+                wake_up(&instance->abort_cmd_wait_q);
+        }
+        return;
+}
+/**
+ * megasas_unmap_sgbuf -        Unmap SG buffers
+ * @instance:                   Adapter soft state
+ * @cmd:                        Completed command
+ */
+static inline void
+megasas_unmap_sgbuf(struct megasas_instance *instance, struct megasas_cmd *cmd)
+{
+        dma_addr_t buf_h;
+        u8 opcode;
+        if (cmd->scmd->use_sg) {
+                pci_unmap_sg(instance->pdev, cmd->scmd->request_buffer,
+                             cmd->scmd->use_sg, cmd->scmd->sc_data_direction);
+                return;
+        }
+        if (!cmd->scmd->request_bufflen)
+                return;
+        opcode = cmd->frame->hdr.cmd;
+        if ((opcode == MFI_CMD_LD_READ) || (opcode == MFI_CMD_LD_WRITE)) {
+                if (IS_DMA64)
+                        buf_h = cmd->frame->io.sgl.sge64[0].phys_addr;
+                else
+                        buf_h = cmd->frame->io.sgl.sge32[0].phys_addr;
+        } else {
+                if (IS_DMA64)
+                        buf_h = cmd->frame->pthru.sgl.sge64[0].phys_addr;
+                else
+                        buf_h = cmd->frame->pthru.sgl.sge32[0].phys_addr;
+        }
+        pci_unmap_single(instance->pdev, buf_h, cmd->scmd->request_bufflen,
+                         cmd->scmd->sc_data_direction);
+        return;
+}
+/**
+ * megasas_complete_cmd -       Completes a command
+ * @instance:                   Adapter soft state
+ * @cmd:                        Command to be completed
+ * @alt_status:                 If non-zero, use this value as status to 
+ *                              SCSI mid-layer instead of the value returned
+ *                              by the FW. This should be used if caller wants
+ *                              an alternate status (as in the case of aborted
+ *                              commands)
+ */
+static inline void
+megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd,
+                     u8 alt_status)
+{
+        int exception = 0;
+        struct megasas_header *hdr = &cmd->frame->hdr;
+        unsigned long flags;
+        if (cmd->scmd) {
+                cmd->scmd->SCp.ptr = (char *)0;
+        }
+        switch (hdr->cmd) {
+        case MFI_CMD_PD_SCSI_IO:
+        case MFI_CMD_LD_SCSI_IO:
+                /*
+                 * MFI_CMD_PD_SCSI_IO and MFI_CMD_LD_SCSI_IO could have been
+                 * issued either through an IO path or an IOCTL path. If it
+                 * was via IOCTL, we will send it to internal completion.
+                 */
+                if (cmd->sync_cmd) {
+                        cmd->sync_cmd = 0;
+                        megasas_complete_int_cmd(instance, cmd);
+                        break;
+                }
+                /*
+                 * Don't export physical disk devices to mid-layer.
+                 */
+                if (!MEGASAS_IS_LOGICAL(cmd->scmd) &&
+                    (hdr->cmd_status == MFI_STAT_OK) &&
+                    (cmd->scmd->cmnd[0] == INQUIRY)) {
+                        if (((*(u8 *) cmd->scmd->request_buffer) & 0x1F) ==
+                            TYPE_DISK) {
+                                cmd->scmd->result = DID_BAD_TARGET << 16;
+                                exception = 1;
+                        }
+                }
+        case MFI_CMD_LD_READ:
+        case MFI_CMD_LD_WRITE:
+                if (alt_status) {
+                        cmd->scmd->result = alt_status << 16;
+                        exception = 1;
+                }
+                if (exception) {
+                        spin_lock_irqsave(&instance->instance_lock, flags);
+                        instance->fw_outstanding--;
+                        spin_unlock_irqrestore(&instance->instance_lock, flags);
+                        megasas_unmap_sgbuf(instance, cmd);
+                        cmd->scmd->scsi_done(cmd->scmd);
+                        megasas_return_cmd(instance, cmd);
+                        break;
+                }
+                switch (hdr->cmd_status) {
+                case MFI_STAT_OK:
+                        cmd->scmd->result = DID_OK << 16;
+                        break;
+                case MFI_STAT_SCSI_IO_FAILED:
+                case MFI_STAT_LD_INIT_IN_PROGRESS:
+                        cmd->scmd->result =
+                            (DID_ERROR << 16) | hdr->scsi_status;
+                        break;
+                case MFI_STAT_SCSI_DONE_WITH_ERROR:
+                        cmd->scmd->result = (DID_OK << 16) | hdr->scsi_status;
+                        if (hdr->scsi_status == SAM_STAT_CHECK_CONDITION) {
+                                memset(cmd->scmd->sense_buffer, 0,
+                                       SCSI_SENSE_BUFFERSIZE);
+                                memcpy(cmd->scmd->sense_buffer, cmd->sense,
+                                       hdr->sense_len);
+                                cmd->scmd->result |= DRIVER_SENSE << 24;
+                        }
+                        break;
+                case MFI_STAT_LD_OFFLINE:
+                case MFI_STAT_DEVICE_NOT_FOUND:
+                        cmd->scmd->result = DID_BAD_TARGET << 16;
+                        break;
+                default:
+                        printk(KERN_DEBUG "megasas: MFI FW status %#x\n",
+                               hdr->cmd_status);
+                        cmd->scmd->result = DID_ERROR << 16;
+                        break;
+                }
+                spin_lock_irqsave(&instance->instance_lock, flags);
+                instance->fw_outstanding--;
+                spin_unlock_irqrestore(&instance->instance_lock, flags);
+                megasas_unmap_sgbuf(instance, cmd);
+                cmd->scmd->scsi_done(cmd->scmd);
+                megasas_return_cmd(instance, cmd);
+                break;
+        case MFI_CMD_SMP:
+        case MFI_CMD_STP:
+        case MFI_CMD_DCMD:
+                /*
+                 * See if got an event notification
+                 */
+                if (cmd->frame->dcmd.opcode == MR_DCMD_CTRL_EVENT_WAIT)
+                        megasas_service_aen(instance, cmd);
+                else
+                        megasas_complete_int_cmd(instance, cmd);
+                break;
+        case MFI_CMD_ABORT:
+                /*
+                 * Cmd issued to abort another cmd returned
+                 */
+                megasas_complete_abort(instance, cmd);
+                break;
+        default:
+                printk("megasas: Unknown command completed! [0x%X]\n",
+                       hdr->cmd);
+                break;
+        }
+}
+/**
+ * megasas_deplete_reply_queue -        Processes all completed commands
+ * @instance:                           Adapter soft state
+ * @alt_status:                         Alternate status to be returned to
+ *                                      SCSI mid-layer instead of the status
+ *                                      returned by the FW
+ */
+static inline int
+megasas_deplete_reply_queue(struct megasas_instance *instance, u8 alt_status)
+{
+        u32 status;
+        u32 producer;
+        u32 consumer;
+        u32 context;
+        struct megasas_cmd *cmd;
+        /*
+         * Check if it is our interrupt
+         */
+        status = readl(&instance->reg_set->outbound_intr_status);
+        if (!(status & MFI_OB_INTR_STATUS_MASK)) {
+                return IRQ_NONE;
+        }
+        /*
+         * Clear the interrupt by writing back the same value
+         */
+        writel(status, &instance->reg_set->outbound_intr_status);
+        producer = *instance->producer;
+        consumer = *instance->consumer;
+        while (consumer != producer) {
+                context = instance->reply_queue[consumer];
+                cmd = instance->cmd_list[context];
+                megasas_complete_cmd(instance, cmd, alt_status);
+                consumer++;
+                if (consumer == (instance->max_fw_cmds + 1)) {
+                        consumer = 0;
+                }
+        }
+        *instance->consumer = producer;
+        return IRQ_HANDLED;
+}
+/**
+ * megasas_isr - isr entry point
+ */
+static irqreturn_t megasas_isr(int irq, void *devp, struct pt_regs *regs)
+{
+        return megasas_deplete_reply_queue((struct megasas_instance *)devp,
+                                           DID_OK);
+}
+/**
+ * megasas_transition_to_ready -        Move the FW to READY state
+ * @reg_set:                            MFI register set
+ *
+ * During the initialization, FW passes can potentially be in any one of
+ * several possible states. If the FW in operational, waiting-for-handshake
+ * states, driver must take steps to bring it to ready state. Otherwise, it
+ * has to wait for the ready state.
+ */
+static int
+megasas_transition_to_ready(struct megasas_register_set __iomem * reg_set)
+{
+        int i;
+        u8 max_wait;
+        u32 fw_state;
+        u32 cur_state;
+        fw_state = readl(&reg_set->outbound_msg_0) & MFI_STATE_MASK;
+        while (fw_state != MFI_STATE_READY) {
+                printk(KERN_INFO "megasas: Waiting for FW to come to ready"
+                       " state\n");
+                switch (fw_state) {
+                case MFI_STATE_FAULT:
+                        printk(KERN_DEBUG "megasas: FW in FAULT state!!\n");
+                        return -ENODEV;
+                case MFI_STATE_WAIT_HANDSHAKE:
+                        /*
+                         * Set the CLR bit in inbound doorbell
+                         */
+                        writel(MFI_INIT_CLEAR_HANDSHAKE,
+                               &reg_set->inbound_doorbell);
+                        max_wait = 2;
+                        cur_state = MFI_STATE_WAIT_HANDSHAKE;
+                        break;
+                case MFI_STATE_OPERATIONAL:
+                        /*
+                         * Bring it to READY state; assuming max wait 2 secs
+                         */
+                        megasas_disable_intr(reg_set);
+                        writel(MFI_INIT_READY, &reg_set->inbound_doorbell);
+                        max_wait = 10;
+                        cur_state = MFI_STATE_OPERATIONAL;
+                        break;
+                case MFI_STATE_UNDEFINED:
+                        /*
+                         * This state should not last for more than 2 seconds
+                         */
+                        max_wait = 2;
+                        cur_state = MFI_STATE_UNDEFINED;
+                        break;
+                case MFI_STATE_BB_INIT:
+                        max_wait = 2;
+                        cur_state = MFI_STATE_BB_INIT;
+                        break;
+                case MFI_STATE_FW_INIT:
+                        max_wait = 20;
+                        cur_state = MFI_STATE_FW_INIT;
+                        break;
+                case MFI_STATE_FW_INIT_2:
+                        max_wait = 20;
+                        cur_state = MFI_STATE_FW_INIT_2;
+                        break;
+                case MFI_STATE_DEVICE_SCAN:
+                        max_wait = 20;
+                        cur_state = MFI_STATE_DEVICE_SCAN;
+                        break;
+                case MFI_STATE_FLUSH_CACHE:
+                        max_wait = 20;
+                        cur_state = MFI_STATE_FLUSH_CACHE;
+                        break;
+                default:
+                        printk(KERN_DEBUG "megasas: Unknown state 0x%x\n",
+                               fw_state);
+                        return -ENODEV;
+                }
+                /*
+                 * The cur_state should not last for more than max_wait secs
+                 */
+                for (i = 0; i < (max_wait * 1000); i++) {
+                        fw_state = MFI_STATE_MASK &
+                            readl(&reg_set->outbound_msg_0);
+                        if (fw_state == cur_state) {
+                                msleep(1);
+                        } else
+                                break;
+                }
+                /*
+                 * Return error if fw_state hasn't changed after max_wait
+                 */
+                if (fw_state == cur_state) {
+                        printk(KERN_DEBUG "FW state [%d] hasn't changed "
+                               "in %d secs\n", fw_state, max_wait);
+                        return -ENODEV;
+                }
+        };
+        return 0;
+}
+/**
+ * megasas_teardown_frame_pool -        Destroy the cmd frame DMA pool
+ * @instance:                           Adapter soft state
+ */
+static void megasas_teardown_frame_pool(struct megasas_instance *instance)
+{
+        int i;
+        u32 max_cmd = instance->max_fw_cmds;
+        struct megasas_cmd *cmd;
+        if (!instance->frame_dma_pool)
+                return;
+        /*
+         * Return all frames to pool
+         */
+        for (i = 0; i < max_cmd; i++) {
+                cmd = instance->cmd_list[i];
+                if (cmd->frame)
+                        pci_pool_free(instance->frame_dma_pool, cmd->frame,
+                                      cmd->frame_phys_addr);
+                if (cmd->sense)
+                        pci_pool_free(instance->sense_dma_pool, cmd->frame,
+                                      cmd->sense_phys_addr);
+        }
+        /*
+         * Now destroy the pool itself
+         */
+        pci_pool_destroy(instance->frame_dma_pool);
+        pci_pool_destroy(instance->sense_dma_pool);
+        instance->frame_dma_pool = NULL;
+        instance->sense_dma_pool = NULL;
+}
+/**
+ * megasas_create_frame_pool -  Creates DMA pool for cmd frames
+ * @instance:                   Adapter soft state
+ *
+ * Each command packet has an embedded DMA memory buffer that is used for
+ * filling MFI frame and the SG list that immediately follows the frame. This
+ * function creates those DMA memory buffers for each command packet by using
+ * PCI pool facility.
+ */
+static int megasas_create_frame_pool(struct megasas_instance *instance)
+{
+        int i;
+        u32 max_cmd;
+        u32 sge_sz;
+        u32 sgl_sz;
+        u32 total_sz;
+        u32 frame_count;
+        struct megasas_cmd *cmd;
+        max_cmd = instance->max_fw_cmds;
+        /*
+         * Size of our frame is 64 bytes for MFI frame, followed by max SG
+         * elements and finally SCSI_SENSE_BUFFERSIZE bytes for sense buffer
+         */
+        sge_sz = (IS_DMA64) ? sizeof(struct megasas_sge64) :
+            sizeof(struct megasas_sge32);
+        /*
+         * Calculated the number of 64byte frames required for SGL
+         */
+        sgl_sz = sge_sz * instance->max_num_sge;
+        frame_count = (sgl_sz + MEGAMFI_FRAME_SIZE - 1) / MEGAMFI_FRAME_SIZE;
+        /*
+         * We need one extra frame for the MFI command
+         */
+        frame_count++;
+        total_sz = MEGAMFI_FRAME_SIZE * frame_count;
+        /*
+         * Use DMA pool facility provided by PCI layer
+         */
+        instance->frame_dma_pool = pci_pool_create("megasas frame pool",
+                                                   instance->pdev, total_sz, 64,
+                                                   0);
+        if (!instance->frame_dma_pool) {
+                printk(KERN_DEBUG "megasas: failed to setup frame pool\n");
+                return -ENOMEM;
+        }
+        instance->sense_dma_pool = pci_pool_create("megasas sense pool",
+                                                   instance->pdev, 128, 4, 0);
+        if (!instance->sense_dma_pool) {
+                printk(KERN_DEBUG "megasas: failed to setup sense pool\n");
+                pci_pool_destroy(instance->frame_dma_pool);
+                instance->frame_dma_pool = NULL;
+                return -ENOMEM;
+        }
+        /*
+         * Allocate and attach a frame to each of the commands in cmd_list.
+         * By making cmd->index as the context instead of the &cmd, we can
+         * always use 32bit context regardless of the architecture
+         */
+        for (i = 0; i < max_cmd; i++) {
+                cmd = instance->cmd_list[i];
+                cmd->frame = pci_pool_alloc(instance->frame_dma_pool,
+                                            GFP_KERNEL, &cmd->frame_phys_addr);
+                cmd->sense = pci_pool_alloc(instance->sense_dma_pool,
+                                            GFP_KERNEL, &cmd->sense_phys_addr);
+                /*
+                 * megasas_teardown_frame_pool() takes care of freeing
+                 * whatever has been allocated
+                 */
+                if (!cmd->frame || !cmd->sense) {
+                        printk(KERN_DEBUG "megasas: pci_pool_alloc failed \n");
+                        megasas_teardown_frame_pool(instance);
+                        return -ENOMEM;
+                }
+                cmd->frame->io.context = cmd->index;
+        }
+        return 0;
+}
+/**
+ * megasas_free_cmds -  Free all the cmds in the free cmd pool
+ * @instance:           Adapter soft state
+ */
+static void megasas_free_cmds(struct megasas_instance *instance)
+{
+        int i;
+        /* First free the MFI frame pool */
+        megasas_teardown_frame_pool(instance);
+        /* Free all the commands in the cmd_list */
+        for (i = 0; i < instance->max_fw_cmds; i++)
+                kfree(instance->cmd_list[i]);
+        /* Free the cmd_list buffer itself */
+        kfree(instance->cmd_list);
+        instance->cmd_list = NULL;
+        INIT_LIST_HEAD(&instance->cmd_pool);
+}
+/**
+ * megasas_alloc_cmds - Allocates the command packets
+ * @instance:           Adapter soft state
+ *
+ * Each command that is issued to the FW, whether IO commands from the OS or
+ * internal commands like IOCTLs, are wrapped in local data structure called
+ * megasas_cmd. The frame embedded in this megasas_cmd is actually issued to
+ * the FW.
+ *
+ * Each frame has a 32-bit field called context (tag). This context is used
+ * to get back the megasas_cmd from the frame when a frame gets completed in
+ * the ISR. Typically the address of the megasas_cmd itself would be used as
+ * the context. But we wanted to keep the differences between 32 and 64 bit
+ * systems to the mininum. We always use 32 bit integers for the context. In
+ * this driver, the 32 bit values are the indices into an array cmd_list.
+ * This array is used only to look up the megasas_cmd given the context. The
+ * free commands themselves are maintained in a linked list called cmd_pool.
+ */
+static int megasas_alloc_cmds(struct megasas_instance *instance)
+{
+        int i;
+        int j;
+        u32 max_cmd;
+        struct megasas_cmd *cmd;
+        max_cmd = instance->max_fw_cmds;
+        /*
+         * instance->cmd_list is an array of struct megasas_cmd pointers.
+         * Allocate the dynamic array first and then allocate individual
+         * commands.
+         */
+        instance->cmd_list = kmalloc(sizeof(struct megasas_cmd *) * max_cmd,
+                                     GFP_KERNEL);
+        if (!instance->cmd_list) {
+                printk(KERN_DEBUG "megasas: out of memory\n");
+                return -ENOMEM;
+        }
+        memset(instance->cmd_list, 0, sizeof(struct megasas_cmd *) * max_cmd);
+        for (i = 0; i < max_cmd; i++) {
+                instance->cmd_list[i] = kmalloc(sizeof(struct megasas_cmd),
+                                                GFP_KERNEL);
+                if (!instance->cmd_list[i]) {
+                        for (j = 0; j < i; j++)
+                                kfree(instance->cmd_list[j]);
+                        kfree(instance->cmd_list);
+                        instance->cmd_list = NULL;
+                        return -ENOMEM;
+                }
+        }
+        /*
+         * Add all the commands to command pool (instance->cmd_pool)
+         */
+        for (i = 0; i < max_cmd; i++) {
+                cmd = instance->cmd_list[i];
+                memset(cmd, 0, sizeof(struct megasas_cmd));
+                cmd->index = i;
+                cmd->instance = instance;
+                list_add_tail(&cmd->list, &instance->cmd_pool);
+        }
+        /*
+         * Create a frame pool and assign one frame to each cmd
+         */
+        if (megasas_create_frame_pool(instance)) {
+                printk(KERN_DEBUG "megasas: Error creating frame DMA pool\n");
+                megasas_free_cmds(instance);
+        }
+        return 0;
+}
+/**
+ * megasas_get_controller_info -        Returns FW's controller structure
+ * @instance:                           Adapter soft state
+ * @ctrl_info:                          Controller information structure
+ *
+ * Issues an internal command (DCMD) to get the FW's controller structure.
+ * This information is mainly used to find out the maximum IO transfer per
+ * command supported by the FW.
+ */
+static int
+megasas_get_ctrl_info(struct megasas_instance *instance,
+                      struct megasas_ctrl_info *ctrl_info)
+{
+        int ret = 0;
+        struct megasas_cmd *cmd;
+        struct megasas_dcmd_frame *dcmd;
+        struct megasas_ctrl_info *ci;
+        dma_addr_t ci_h = 0;
+        cmd = megasas_get_cmd(instance);
+        if (!cmd) {
+                printk(KERN_DEBUG "megasas: Failed to get a free cmd\n");
+                return -ENOMEM;
+        }
+        dcmd = &cmd->frame->dcmd;
+        ci = pci_alloc_consistent(instance->pdev,
+                                  sizeof(struct megasas_ctrl_info), &ci_h);
+        if (!ci) {
+                printk(KERN_DEBUG "Failed to alloc mem for ctrl info\n");
+                megasas_return_cmd(instance, cmd);
+                return -ENOMEM;
+        }
+        memset(ci, 0, sizeof(*ci));
+        memset(dcmd->mbox.b, 0, MFI_MBOX_SIZE);
+        dcmd->cmd = MFI_CMD_DCMD;
+        dcmd->cmd_status = 0xFF;
+        dcmd->sge_count = 1;
+        dcmd->flags = MFI_FRAME_DIR_READ;
+        dcmd->timeout = 0;
+        dcmd->data_xfer_len = sizeof(struct megasas_ctrl_info);
+        dcmd->opcode = MR_DCMD_CTRL_GET_INFO;
+        dcmd->sgl.sge32[0].phys_addr = ci_h;
+        dcmd->sgl.sge32[0].length = sizeof(struct megasas_ctrl_info);
+        if (!megasas_issue_polled(instance, cmd)) {
+                ret = 0;
+                memcpy(ctrl_info, ci, sizeof(struct megasas_ctrl_info));
+        } else {
+                ret = -1;
+        }
+        pci_free_consistent(instance->pdev, sizeof(struct megasas_ctrl_info),
+                            ci, ci_h);
+        megasas_return_cmd(instance, cmd);
+        return ret;
+}
+/**
+ * megasas_init_mfi -   Initializes the FW
+ * @instance:           Adapter soft state
+ *
+ * This is the main function for initializing MFI firmware.
+ */
+static int megasas_init_mfi(struct megasas_instance *instance)
+{
+        u32 context_sz;
+        u32 reply_q_sz;
+        u32 max_sectors_1;
+        u32 max_sectors_2;
+        struct megasas_register_set __iomem *reg_set;
+        struct megasas_cmd *cmd;
+        struct megasas_ctrl_info *ctrl_info;
+        struct megasas_init_frame *init_frame;
+        struct megasas_init_queue_info *initq_info;
+        dma_addr_t init_frame_h;
+        dma_addr_t initq_info_h;
+        /*
+         * Map the message registers
+         */
+        instance->base_addr = pci_resource_start(instance->pdev, 0);
+        if (pci_request_regions(instance->pdev, "megasas: LSI Logic")) {
+                printk(KERN_DEBUG "megasas: IO memory region busy!\n");
+                return -EBUSY;
+        }
+        instance->reg_set = ioremap_nocache(instance->base_addr, 8192);
+        if (!instance->reg_set) {
+                printk(KERN_DEBUG "megasas: Failed to map IO mem\n");
+                goto fail_ioremap;
+        }
+        reg_set = instance->reg_set;
+        /*
+         * We expect the FW state to be READY
+         */
+        if (megasas_transition_to_ready(instance->reg_set))
+                goto fail_ready_state;
+        /*
+         * Get various operational parameters from status register
+         */
+        instance->max_fw_cmds = readl(&reg_set->outbound_msg_0) & 0x00FFFF;
+        instance->max_num_sge = (readl(&reg_set->outbound_msg_0) & 0xFF0000) >>
+            0x10;
+        /*
+         * Create a pool of commands
+         */
+        if (megasas_alloc_cmds(instance))
+                goto fail_alloc_cmds;
+        /*
+         * Allocate memory for reply queue. Length of reply queue should
+         * be _one_ more than the maximum commands handled by the firmware.
+         *
+         * Note: When FW completes commands, it places corresponding contex
+         * values in this circular reply queue. This circular queue is a fairly
+         * typical producer-consumer queue. FW is the producer (of completed
+         * commands) and the driver is the consumer.
+         */
+        context_sz = sizeof(u32);
+        reply_q_sz = context_sz * (instance->max_fw_cmds + 1);
+        instance->reply_queue = pci_alloc_consistent(instance->pdev,
+                                                     reply_q_sz,
+                                                     &instance->reply_queue_h);
+        if (!instance->reply_queue) {
+                printk(KERN_DEBUG "megasas: Out of DMA mem for reply queue\n");
+                goto fail_reply_queue;
+        }
+        /*
+         * Prepare a init frame. Note the init frame points to queue info
+         * structure. Each frame has SGL allocated after first 64 bytes. For
+         * this frame - since we don't need any SGL - we use SGL's space as
+         * queue info structure
+         *
+         * We will not get a NULL command below. We just created the pool.
+         */
+        cmd = megasas_get_cmd(instance);
+        init_frame = (struct megasas_init_frame *)cmd->frame;
+        initq_info = (struct megasas_init_queue_info *)
+            ((unsigned long)init_frame + 64);
+        init_frame_h = cmd->frame_phys_addr;
+        initq_info_h = init_frame_h + 64;
+        memset(init_frame, 0, MEGAMFI_FRAME_SIZE);
+        memset(initq_info, 0, sizeof(struct megasas_init_queue_info));
+        initq_info->reply_queue_entries = instance->max_fw_cmds + 1;
+        initq_info->reply_queue_start_phys_addr_lo = instance->reply_queue_h;
+        initq_info->producer_index_phys_addr_lo = instance->producer_h;
+        initq_info->consumer_index_phys_addr_lo = instance->consumer_h;
+        init_frame->cmd = MFI_CMD_INIT;
+        init_frame->cmd_status = 0xFF;
+        init_frame->queue_info_new_phys_addr_lo = initq_info_h;
+        init_frame->data_xfer_len = sizeof(struct megasas_init_queue_info);
+        /*
+         * Issue the init frame in polled mode
+         */
+        if (megasas_issue_polled(instance, cmd)) {
+                printk(KERN_DEBUG "megasas: Failed to init firmware\n");
+                goto fail_fw_init;
+        }
+        megasas_return_cmd(instance, cmd);
+        ctrl_info = kmalloc(sizeof(struct megasas_ctrl_info), GFP_KERNEL);
+        /*
+         * Compute the max allowed sectors per IO: The controller info has two
+         * limits on max sectors. Driver should use the minimum of these two.
+         *
+         * 1 << stripe_sz_ops.min = max sectors per strip
+         *
+         * Note that older firmwares ( < FW ver 30) didn't report information
+         * to calculate max_sectors_1. So the number ended up as zero always.
+         */
+        if (ctrl_info && !megasas_get_ctrl_info(instance, ctrl_info)) {
+                max_sectors_1 = (1 << ctrl_info->stripe_sz_ops.min) *
+                    ctrl_info->max_strips_per_io;
+                max_sectors_2 = ctrl_info->max_request_size;
+                instance->max_sectors_per_req = (max_sectors_1 < max_sectors_2)
+                    ? max_sectors_1 : max_sectors_2;
+        } else
+                instance->max_sectors_per_req = instance->max_num_sge *
+                    PAGE_SIZE / 512;
+        kfree(ctrl_info);
+        return 0;
+      fail_fw_init:
+        megasas_return_cmd(instance, cmd);
+        pci_free_consistent(instance->pdev, reply_q_sz,
+                            instance->reply_queue, instance->reply_queue_h);
+      fail_reply_queue:
+        megasas_free_cmds(instance);
+      fail_alloc_cmds:
+      fail_ready_state:
+        iounmap(instance->reg_set);
+      fail_ioremap:
+        pci_release_regions(instance->pdev);
+        return -EINVAL;
+}
+/**
+ * megasas_release_mfi -        Reverses the FW initialization
+ * @intance:                    Adapter soft state
+ */
+static void megasas_release_mfi(struct megasas_instance *instance)
+{
+        u32 reply_q_sz = sizeof(u32) * (instance->max_fw_cmds + 1);
+        pci_free_consistent(instance->pdev, reply_q_sz,
+                            instance->reply_queue, instance->reply_queue_h);
+        megasas_free_cmds(instance);
+        iounmap(instance->reg_set);
+        pci_release_regions(instance->pdev);
+}
+/**
+ * megasas_get_seq_num -        Gets latest event sequence numbers
+ * @instance:                   Adapter soft state
+ * @eli:                        FW event log sequence numbers information
+ *
+ * FW maintains a log of all events in a non-volatile area. Upper layers would
+ * usually find out the latest sequence number of the events, the seq number at
+ * the boot etc. They would "read" all the events below the latest seq number
+ * by issuing a direct fw cmd (DCMD). For the future events (beyond latest seq
+ * number), they would subsribe to AEN (asynchronous event notification) and
+ * wait for the events to happen.
+ */
+static int
+megasas_get_seq_num(struct megasas_instance *instance,
+                    struct megasas_evt_log_info *eli)
+{
+        struct megasas_cmd *cmd;
+        struct megasas_dcmd_frame *dcmd;
+        struct megasas_evt_log_info *el_info;
+        dma_addr_t el_info_h = 0;
+        cmd = megasas_get_cmd(instance);
+        if (!cmd) {
+                return -ENOMEM;
+        }
+        dcmd = &cmd->frame->dcmd;
+        el_info = pci_alloc_consistent(instance->pdev,
+                                       sizeof(struct megasas_evt_log_info),
+                                       &el_info_h);
+        if (!el_info) {
+                megasas_return_cmd(instance, cmd);
+                return -ENOMEM;
+        }
+        memset(el_info, 0, sizeof(*el_info));
+        memset(dcmd->mbox.b, 0, MFI_MBOX_SIZE);
+        dcmd->cmd = MFI_CMD_DCMD;
+        dcmd->cmd_status = 0x0;
+        dcmd->sge_count = 1;
+        dcmd->flags = MFI_FRAME_DIR_READ;
+        dcmd->timeout = 0;
+        dcmd->data_xfer_len = sizeof(struct megasas_evt_log_info);
+        dcmd->opcode = MR_DCMD_CTRL_EVENT_GET_INFO;
+        dcmd->sgl.sge32[0].phys_addr = el_info_h;
+        dcmd->sgl.sge32[0].length = sizeof(struct megasas_evt_log_info);
+        megasas_issue_blocked_cmd(instance, cmd);
+        /*
+         * Copy the data back into callers buffer
+         */
+        memcpy(eli, el_info, sizeof(struct megasas_evt_log_info));
+        pci_free_consistent(instance->pdev, sizeof(struct megasas_evt_log_info),
+                            el_info, el_info_h);
+        megasas_return_cmd(instance, cmd);
+        return 0;
+}
+/**
+ * megasas_register_aen -       Registers for asynchronous event notification
+ * @instance:                   Adapter soft state
+ * @seq_num:                    The starting sequence number
+ * @class_locale:               Class of the event
+ *
+ * This function subscribes for AEN for events beyond the @seq_num. It requests
+ * to be notified if and only if the event is of type @class_locale
+ */
+static int
+megasas_register_aen(struct megasas_instance *instance, u32 seq_num,
+                     u32 class_locale_word)
+{
+        int ret_val;
+        struct megasas_cmd *cmd;
+        struct megasas_dcmd_frame *dcmd;
+        union megasas_evt_class_locale curr_aen;
+        union megasas_evt_class_locale prev_aen;
+        /*
+         * If there an AEN pending already (aen_cmd), check if the
+         * class_locale of that pending AEN is inclusive of the new
+         * AEN request we currently have. If it is, then we don't have
+         * to do anything. In other words, whichever events the current
+         * AEN request is subscribing to, have already been subscribed
+         * to.
+         *
+         * If the old_cmd is _not_ inclusive, then we have to abort
+         * that command, form a class_locale that is superset of both
+         * old and current and re-issue to the FW
+         */
+        curr_aen.word = class_locale_word;
+        if (instance->aen_cmd) {
+                prev_aen.word = instance->aen_cmd->frame->dcmd.mbox.w[1];
+                /*
+                 * A class whose enum value is smaller is inclusive of all
+                 * higher values. If a PROGRESS (= -1) was previously
+                 * registered, then a new registration requests for higher
+                 * classes need not be sent to FW. They are automatically
+                 * included.
+                 *
+                 * Locale numbers don't have such hierarchy. They are bitmap
+                 * values
+                 */
+                if ((prev_aen.members.class <= curr_aen.members.class) &&
+                    !((prev_aen.members.locale & curr_aen.members.locale) ^
+                      curr_aen.members.locale)) {
+                        /*
+                         * Previously issued event registration includes
+                         * current request. Nothing to do.
+                         */
+                        return 0;
+                } else {
+                        curr_aen.members.locale |= prev_aen.members.locale;
+                        if (prev_aen.members.class < curr_aen.members.class)
+                                curr_aen.members.class = prev_aen.members.class;
+                        instance->aen_cmd->abort_aen = 1;
+                        ret_val = megasas_issue_blocked_abort_cmd(instance,
+                                                                  instance->
+                                                                  aen_cmd);
+                        if (ret_val) {
+                                printk(KERN_DEBUG "megasas: Failed to abort "
+                                       "previous AEN command\n");
+                                return ret_val;
+                        }
+                }
+        }
+        cmd = megasas_get_cmd(instance);
+        if (!cmd)
+                return -ENOMEM;
+        dcmd = &cmd->frame->dcmd;
+        memset(instance->evt_detail, 0, sizeof(struct megasas_evt_detail));
+        /*
+         * Prepare DCMD for aen registration
+         */
+        memset(dcmd->mbox.b, 0, MFI_MBOX_SIZE);
+        dcmd->cmd = MFI_CMD_DCMD;
+        dcmd->cmd_status = 0x0;
+        dcmd->sge_count = 1;
+        dcmd->flags = MFI_FRAME_DIR_READ;
+        dcmd->timeout = 0;
+        dcmd->data_xfer_len = sizeof(struct megasas_evt_detail);
+        dcmd->opcode = MR_DCMD_CTRL_EVENT_WAIT;
+        dcmd->mbox.w[0] = seq_num;
+        dcmd->mbox.w[1] = curr_aen.word;
+        dcmd->sgl.sge32[0].phys_addr = (u32) instance->evt_detail_h;
+        dcmd->sgl.sge32[0].length = sizeof(struct megasas_evt_detail);
+        /*
+         * Store reference to the cmd used to register for AEN. When an
+         * application wants us to register for AEN, we have to abort this
+         * cmd and re-register with a new EVENT LOCALE supplied by that app
+         */
+        instance->aen_cmd = cmd;
+        /*
+         * Issue the aen registration frame
+         */
+        writel(cmd->frame_phys_addr >> 3,
+               &instance->reg_set->inbound_queue_port);
+        return 0;
+}
+/**
+ * megasas_start_aen -  Subscribes to AEN during driver load time
+ * @instance:           Adapter soft state
+ */
+static int megasas_start_aen(struct megasas_instance *instance)
+{
+        struct megasas_evt_log_info eli;
+        union megasas_evt_class_locale class_locale;
+        /*
+         * Get the latest sequence number from FW
+         */
+        memset(&eli, 0, sizeof(eli));
+        if (megasas_get_seq_num(instance, &eli))
+                return -1;
+        /*
+         * Register AEN with FW for latest sequence number plus 1
+         */
+        class_locale.members.reserved = 0;
+        class_locale.members.locale = MR_EVT_LOCALE_ALL;
+        class_locale.members.class = MR_EVT_CLASS_DEBUG;
+        return megasas_register_aen(instance, eli.newest_seq_num + 1,
+                                    class_locale.word);
+}
+/**
+ * megasas_io_attach -  Attaches this driver to SCSI mid-layer
+ * @instance:           Adapter soft state
+ */
+static int megasas_io_attach(struct megasas_instance *instance)
+{
+        struct Scsi_Host *host = instance->host;
+        /*
+         * Export parameters required by SCSI mid-layer
+         */
+        host->irq = instance->pdev->irq;
+        host->unique_id = instance->unique_id;
+        host->can_queue = instance->max_fw_cmds - MEGASAS_INT_CMDS;
+        host->this_id = instance->init_id;
+        host->sg_tablesize = instance->max_num_sge;
+        host->max_sectors = instance->max_sectors_per_req;
+        host->cmd_per_lun = 128;
+        host->max_channel = MEGASAS_MAX_CHANNELS - 1;
+        host->max_id = MEGASAS_MAX_DEV_PER_CHANNEL;
+        host->max_lun = MEGASAS_MAX_LUN;
+        /*
+         * Notify the mid-layer about the new controller
+         */
+        if (scsi_add_host(host, &instance->pdev->dev)) {
+                printk(KERN_DEBUG "megasas: scsi_add_host failed\n");
+                return -ENODEV;
+        }
+        /*
+         * Trigger SCSI to scan our drives
+         */
+        scsi_scan_host(host);
+        return 0;
+}
+/**
+ * megasas_probe_one -  PCI hotplug entry point
+ * @pdev:               PCI device structure
+ * @id:                 PCI ids of supported hotplugged adapter 
+ */
+static int __devinit
+megasas_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
+{
+        int rval;
+        struct Scsi_Host *host;
+        struct megasas_instance *instance;
+        /*
+         * Announce PCI information
+         */
+        printk(KERN_INFO "megasas: %#4.04x:%#4.04x:%#4.04x:%#4.04x: ",
+               pdev->vendor, pdev->device, pdev->subsystem_vendor,
+               pdev->subsystem_device);
+        printk("bus %d:slot %d:func %d\n",
+               pdev->bus->number, PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
+        /*
+         * PCI prepping: enable device set bus mastering and dma mask
+         */
+        rval = pci_enable_device(pdev);
+        if (rval) {
+                return rval;
+        }
+        pci_set_master(pdev);
+        /*
+         * All our contollers are capable of performing 64-bit DMA
+         */
+        if (IS_DMA64) {
+                if (pci_set_dma_mask(pdev, DMA_64BIT_MASK) != 0) {
+                        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0)
+                                goto fail_set_dma_mask;
+                }
+        } else {
+                if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0)
+                        goto fail_set_dma_mask;
+        }
+        host = scsi_host_alloc(&megasas_template,
+                               sizeof(struct megasas_instance));
+        if (!host) {
+                printk(KERN_DEBUG "megasas: scsi_host_alloc failed\n");
+                goto fail_alloc_instance;
+        }
+        instance = (struct megasas_instance *)host->hostdata;
+        memset(instance, 0, sizeof(*instance));
+        instance->producer = pci_alloc_consistent(pdev, sizeof(u32),
+                                                  &instance->producer_h);
+        instance->consumer = pci_alloc_consistent(pdev, sizeof(u32),
+                                                  &instance->consumer_h);
+        if (!instance->producer || !instance->consumer) {
+                printk(KERN_DEBUG "megasas: Failed to allocate memory for "
+                       "producer, consumer\n");
+                goto fail_alloc_dma_buf;
+        }
+        *instance->producer = 0;
+        *instance->consumer = 0;
+        instance->evt_detail = pci_alloc_consistent(pdev,
+                                                    sizeof(struct
+                                                           megasas_evt_detail),
+                                                    &instance->evt_detail_h);
+        if (!instance->evt_detail) {
+                printk(KERN_DEBUG "megasas: Failed to allocate memory for "
+                       "event detail structure\n");
+                goto fail_alloc_dma_buf;
+        }
+        /*
+         * Initialize locks and queues
+         */
+        INIT_LIST_HEAD(&instance->cmd_pool);
+        init_waitqueue_head(&instance->int_cmd_wait_q);
+        init_waitqueue_head(&instance->abort_cmd_wait_q);
+        spin_lock_init(&instance->cmd_pool_lock);
+        spin_lock_init(&instance->instance_lock);
+        sema_init(&instance->aen_mutex, 1);
+        sema_init(&instance->ioctl_sem, MEGASAS_INT_CMDS);
+        /*
+         * Initialize PCI related and misc parameters
+         */
+        instance->pdev = pdev;
+        instance->host = host;
+        instance->unique_id = pdev->bus->number << 8 | pdev->devfn;
+        instance->init_id = MEGASAS_DEFAULT_INIT_ID;
+        /*
+         * Initialize MFI Firmware
+         */
+        if (megasas_init_mfi(instance))
+                goto fail_init_mfi;
+        /*
+         * Register IRQ
+         */
+        if (request_irq(pdev->irq, megasas_isr, SA_SHIRQ, "megasas", instance)) {
+                printk(KERN_DEBUG "megasas: Failed to register IRQ\n");
+                goto fail_irq;
+        }
+        megasas_enable_intr(instance->reg_set);
+        /*
+         * Store instance in PCI softstate
+         */
+        pci_set_drvdata(pdev, instance);
+        /*
+         * Add this controller to megasas_mgmt_info structure so that it
+         * can be exported to management applications
+         */
+        megasas_mgmt_info.count++;
+        megasas_mgmt_info.instance[megasas_mgmt_info.max_index] = instance;
+        megasas_mgmt_info.max_index++;
+        /*
+         * Initiate AEN (Asynchronous Event Notification)
+         */
+        if (megasas_start_aen(instance)) {
+                printk(KERN_DEBUG "megasas: start aen failed\n");
+                goto fail_start_aen;
+        }
+        /*
+         * Register with SCSI mid-layer
+         */
+        if (megasas_io_attach(instance))
+                goto fail_io_attach;
+        return 0;
+      fail_start_aen:
+      fail_io_attach:
+        megasas_mgmt_info.count--;
+        megasas_mgmt_info.instance[megasas_mgmt_info.max_index] = NULL;
+        megasas_mgmt_info.max_index--;
+        pci_set_drvdata(pdev, NULL);
+        megasas_disable_intr(instance->reg_set);
+        free_irq(instance->pdev->irq, instance);
+        megasas_release_mfi(instance);
+      fail_irq:
+      fail_init_mfi:
+      fail_alloc_dma_buf:
+        if (instance->evt_detail)
+                pci_free_consistent(pdev, sizeof(struct megasas_evt_detail),
+                                    instance->evt_detail,
+                                    instance->evt_detail_h);
+        if (instance->producer)
+                pci_free_consistent(pdev, sizeof(u32), instance->producer,
+                                    instance->producer_h);
+        if (instance->consumer)
+                pci_free_consistent(pdev, sizeof(u32), instance->consumer,
+                                    instance->consumer_h);
+        scsi_host_put(host);
+      fail_alloc_instance:
+      fail_set_dma_mask:
+        pci_disable_device(pdev);
+        return -ENODEV;
+}
+/**
+ * megasas_flush_cache -        Requests FW to flush all its caches
+ * @instance:                   Adapter soft state
+ */
+static void megasas_flush_cache(struct megasas_instance *instance)
+{
+        struct megasas_cmd *cmd;
+        struct megasas_dcmd_frame *dcmd;
+        cmd = megasas_get_cmd(instance);
+        if (!cmd)
+                return;
+        dcmd = &cmd->frame->dcmd;
+        memset(dcmd->mbox.b, 0, MFI_MBOX_SIZE);
+        dcmd->cmd = MFI_CMD_DCMD;
+        dcmd->cmd_status = 0x0;
+        dcmd->sge_count = 0;
+        dcmd->flags = MFI_FRAME_DIR_NONE;
+        dcmd->timeout = 0;
+        dcmd->data_xfer_len = 0;
+        dcmd->opcode = MR_DCMD_CTRL_CACHE_FLUSH;
+        dcmd->mbox.b[0] = MR_FLUSH_CTRL_CACHE | MR_FLUSH_DISK_CACHE;
+        megasas_issue_blocked_cmd(instance, cmd);
+        megasas_return_cmd(instance, cmd);
+        return;
+}
+/**
+ * megasas_shutdown_controller -        Instructs FW to shutdown the controller
+ * @instance:                           Adapter soft state
+ */
+static void megasas_shutdown_controller(struct megasas_instance *instance)
+{
+        struct megasas_cmd *cmd;
+        struct megasas_dcmd_frame *dcmd;
+        cmd = megasas_get_cmd(instance);
+        if (!cmd)
+                return;
+        if (instance->aen_cmd)
+                megasas_issue_blocked_abort_cmd(instance, instance->aen_cmd);
+        dcmd = &cmd->frame->dcmd;
+        memset(dcmd->mbox.b, 0, MFI_MBOX_SIZE);
+        dcmd->cmd = MFI_CMD_DCMD;
+        dcmd->cmd_status = 0x0;
+        dcmd->sge_count = 0;
+        dcmd->flags = MFI_FRAME_DIR_NONE;
+        dcmd->timeout = 0;
+        dcmd->data_xfer_len = 0;
+        dcmd->opcode = MR_DCMD_CTRL_SHUTDOWN;
+        megasas_issue_blocked_cmd(instance, cmd);
+        megasas_return_cmd(instance, cmd);
+        return;
+}
+/**
+ * megasas_detach_one - PCI hot"un"plug entry point
+ * @pdev:               PCI device structure
+ */
+static void megasas_detach_one(struct pci_dev *pdev)
+{
+        int i;
+        struct Scsi_Host *host;
+        struct megasas_instance *instance;
+        instance = pci_get_drvdata(pdev);
+        host = instance->host;
+        scsi_remove_host(instance->host);
+        megasas_flush_cache(instance);
+        megasas_shutdown_controller(instance);
+        /*
+         * Take the instance off the instance array. Note that we will not
+         * decrement the max_index. We let this array be sparse array
+         */
+        for (i = 0; i < megasas_mgmt_info.max_index; i++) {
+                if (megasas_mgmt_info.instance[i] == instance) {
+                        megasas_mgmt_info.count--;
+                        megasas_mgmt_info.instance[i] = NULL;
+                        break;
+                }
+        }
+        pci_set_drvdata(instance->pdev, NULL);
+        megasas_disable_intr(instance->reg_set);
+        free_irq(instance->pdev->irq, instance);
+        megasas_release_mfi(instance);
+        pci_free_consistent(pdev, sizeof(struct megasas_evt_detail),
+                            instance->evt_detail, instance->evt_detail_h);
+        pci_free_consistent(pdev, sizeof(u32), instance->producer,
+                            instance->producer_h);
+        pci_free_consistent(pdev, sizeof(u32), instance->consumer,
+                            instance->consumer_h);
+        scsi_host_put(host);
+        pci_set_drvdata(pdev, NULL);
+        pci_disable_device(pdev);
+        return;
+}
+/**
+ * megasas_shutdown -   Shutdown entry point
+ * @device:             Generic device structure
+ */
+static void megasas_shutdown(struct pci_dev *pdev)
+{
+        struct megasas_instance *instance = pci_get_drvdata(pdev);
+        megasas_flush_cache(instance);
+}
+/**
+ * megasas_mgmt_open -  char node "open" entry point
+ */
+static int megasas_mgmt_open(struct inode *inode, struct file *filep)
+{
+        /*
+         * Allow only those users with admin rights
+         */
+        if (!capable(CAP_SYS_ADMIN))
+                return -EACCES;
+        return 0;
+}
+/**
+ * megasas_mgmt_release - char node "release" entry point
+ */
+static int megasas_mgmt_release(struct inode *inode, struct file *filep)
+{
+        filep->private_data = NULL;
+        fasync_helper(-1, filep, 0, &megasas_async_queue);
+        return 0;
+}
+/**
+ * megasas_mgmt_fasync -        Async notifier registration from applications
+ *
+ * This function adds the calling process to a driver global queue. When an
+ * event occurs, SIGIO will be sent to all processes in this queue.
+ */
+static int megasas_mgmt_fasync(int fd, struct file *filep, int mode)
+{
+        int rc;
+        down(&megasas_async_queue_mutex);
+        rc = fasync_helper(fd, filep, mode, &megasas_async_queue);
+        up(&megasas_async_queue_mutex);
+        if (rc >= 0) {
+                /* For sanity check when we get ioctl */
+                filep->private_data = filep;
+                return 0;
+        }
+        printk(KERN_DEBUG "megasas: fasync_helper failed [%d]\n", rc);
+        return rc;
+}
+/**
+ * megasas_mgmt_fw_ioctl -      Issues management ioctls to FW
+ * @instance:                   Adapter soft state
+ * @argp:                       User's ioctl packet
+ */
+static int
+megasas_mgmt_fw_ioctl(struct megasas_instance *instance,
+                      struct megasas_iocpacket __user * user_ioc,
+                      struct megasas_iocpacket *ioc)
+{
+        struct megasas_sge32 *kern_sge32;
+        struct megasas_cmd *cmd;
+        void *kbuff_arr[MAX_IOCTL_SGE];
+        dma_addr_t buf_handle = 0;
+        int error = 0, i;
+        void *sense = NULL;
+        dma_addr_t sense_handle;
+        u32 *sense_ptr;
+        memset(kbuff_arr, 0, sizeof(kbuff_arr));
+        if (ioc->sge_count > MAX_IOCTL_SGE) {
+                printk(KERN_DEBUG "megasas: SGE count [%d] >  max limit [%d]\n",
+                       ioc->sge_count, MAX_IOCTL_SGE);
+                return -EINVAL;
+        }
+        cmd = megasas_get_cmd(instance);
+        if (!cmd) {
+                printk(KERN_DEBUG "megasas: Failed to get a cmd packet\n");
+                return -ENOMEM;
+        }
+        /*
+         * User's IOCTL packet has 2 frames (maximum). Copy those two
+         * frames into our cmd's frames. cmd->frame's context will get
+         * overwritten when we copy from user's frames. So set that value
+         * alone separately
+         */
+        memcpy(cmd->frame, ioc->frame.raw, 2 * MEGAMFI_FRAME_SIZE);
+        cmd->frame->hdr.context = cmd->index;
+        /*
+         * The management interface between applications and the fw uses
+         * MFI frames. E.g, RAID configuration changes, LD property changes
+         * etc are accomplishes through different kinds of MFI frames. The
+         * driver needs to care only about substituting user buffers with
+         * kernel buffers in SGLs. The location of SGL is embedded in the
+         * struct iocpacket itself.
+         */
+        kern_sge32 = (struct megasas_sge32 *)
+            ((unsigned long)cmd->frame + ioc->sgl_off);
+        /*
+         * For each user buffer, create a mirror buffer and copy in
+         */
+        for (i = 0; i < ioc->sge_count; i++) {
+                kbuff_arr[i] = pci_alloc_consistent(instance->pdev,
+                                                    ioc->sgl[i].iov_len,
+                                                    &buf_handle);
+                if (!kbuff_arr[i]) {
+                        printk(KERN_DEBUG "megasas: Failed to alloc "
+                               "kernel SGL buffer for IOCTL \n");
+                        error = -ENOMEM;
+                        goto out;
+                }
+                /*
+                 * We don't change the dma_coherent_mask, so
+                 * pci_alloc_consistent only returns 32bit addresses
+                 */
+                kern_sge32[i].phys_addr = (u32) buf_handle;
+                kern_sge32[i].length = ioc->sgl[i].iov_len;
+                /*
+                 * We created a kernel buffer corresponding to the
+                 * user buffer. Now copy in from the user buffer
+                 */
+                if (copy_from_user(kbuff_arr[i], ioc->sgl[i].iov_base,
+                                   (u32) (ioc->sgl[i].iov_len))) {
+                        error = -EFAULT;
+                        goto out;
+                }
+        }
+        if (ioc->sense_len) {
+                sense = pci_alloc_consistent(instance->pdev, ioc->sense_len,
+                                             &sense_handle);
+                if (!sense) {
+                        error = -ENOMEM;
+                        goto out;
+                }
+                sense_ptr =
+                    (u32 *) ((unsigned long)cmd->frame + ioc->sense_off);
+                *sense_ptr = sense_handle;
+        }
+        /*
+         * Set the sync_cmd flag so that the ISR knows not to complete this
+         * cmd to the SCSI mid-layer
+         */
+        cmd->sync_cmd = 1;
+        megasas_issue_blocked_cmd(instance, cmd);
+        cmd->sync_cmd = 0;
+        /*
+         * copy out the kernel buffers to user buffers
+         */
+        for (i = 0; i < ioc->sge_count; i++) {
+                if (copy_to_user(ioc->sgl[i].iov_base, kbuff_arr[i],
+                                 ioc->sgl[i].iov_len)) {
+                        error = -EFAULT;
+                        goto out;
+                }
+        }
+        /*
+         * copy out the sense
+         */
+        if (ioc->sense_len) {
+                /*
+                 * sense_ptr points to the location that has the user
+                 * sense buffer address
+                 */
+                sense_ptr = (u32 *) ((unsigned long)ioc->frame.raw +
+                                     ioc->sense_off);
+                if (copy_to_user((void __user *)((unsigned long)(*sense_ptr)),
+                                 sense, ioc->sense_len)) {
+                        error = -EFAULT;
+                        goto out;
+                }
+        }
+        /*
+         * copy the status codes returned by the fw
+         */
+        if (copy_to_user(&user_ioc->frame.hdr.cmd_status,
+                         &cmd->frame->hdr.cmd_status, sizeof(u8))) {
+                printk(KERN_DEBUG "megasas: Error copying out cmd_status\n");
+                error = -EFAULT;
+        }
+      out:
+        if (sense) {
+                pci_free_consistent(instance->pdev, ioc->sense_len,
+                                    sense, sense_handle);
+        }
+        for (i = 0; i < ioc->sge_count && kbuff_arr[i]; i++) {
+                pci_free_consistent(instance->pdev,
+                                    kern_sge32[i].length,
+                                    kbuff_arr[i], kern_sge32[i].phys_addr);
+        }
+        megasas_return_cmd(instance, cmd);
+        return error;
+}
+static struct megasas_instance *megasas_lookup_instance(u16 host_no)
+{
+        int i;
+        for (i = 0; i < megasas_mgmt_info.max_index; i++) {
+                if ((megasas_mgmt_info.instance[i]) &&
+                    (megasas_mgmt_info.instance[i]->host->host_no == host_no))
+                        return megasas_mgmt_info.instance[i];
+        }
+        return NULL;
+}
+static int megasas_mgmt_ioctl_fw(struct file *file, unsigned long arg)
+{
+        struct megasas_iocpacket __user *user_ioc =
+            (struct megasas_iocpacket __user *)arg;
+        struct megasas_iocpacket *ioc;
+        struct megasas_instance *instance;
+        int error;
+        ioc = kmalloc(sizeof(*ioc), GFP_KERNEL);
+        if (!ioc)
+                return -ENOMEM;
+        if (copy_from_user(ioc, user_ioc, sizeof(*ioc))) {
+                error = -EFAULT;
+                goto out_kfree_ioc;
+        }
+        instance = megasas_lookup_instance(ioc->host_no);
+        if (!instance) {
+                error = -ENODEV;
+                goto out_kfree_ioc;
+        }
+        /*
+         * We will allow only MEGASAS_INT_CMDS number of parallel ioctl cmds
+         */
+        if (down_interruptible(&instance->ioctl_sem)) {
+                error = -ERESTARTSYS;
+                goto out_kfree_ioc;
+        }
+        error = megasas_mgmt_fw_ioctl(instance, user_ioc, ioc);
+        up(&instance->ioctl_sem);
+      out_kfree_ioc:
+        kfree(ioc);
+        return error;
+}
+static int megasas_mgmt_ioctl_aen(struct file *file, unsigned long arg)
+{
+        struct megasas_instance *instance;
+        struct megasas_aen aen;
+        int error;
+        if (file->private_data != file) {
+                printk(KERN_DEBUG "megasas: fasync_helper was not "
+                       "called first\n");
+                return -EINVAL;
+        }
+        if (copy_from_user(&aen, (void __user *)arg, sizeof(aen)))
+                return -EFAULT;
+        instance = megasas_lookup_instance(aen.host_no);
+        if (!instance)
+                return -ENODEV;
+        down(&instance->aen_mutex);
+        error = megasas_register_aen(instance, aen.seq_num,
+                                     aen.class_locale_word);
+        up(&instance->aen_mutex);
+        return error;
+}
+/**
+ * megasas_mgmt_ioctl - char node ioctl entry point
+ */
+static long
+megasas_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        switch (cmd) {
+        case MEGASAS_IOC_FIRMWARE:
+                return megasas_mgmt_ioctl_fw(file, arg);
+        case MEGASAS_IOC_GET_AEN:
+                return megasas_mgmt_ioctl_aen(file, arg);
+        }
+        return -ENOTTY;
+}
+#ifdef CONFIG_COMPAT
+static int megasas_mgmt_compat_ioctl_fw(struct file *file, unsigned long arg)
+{
+        struct compat_megasas_iocpacket __user *cioc =
+            (struct compat_megasas_iocpacket __user *)arg;
+        struct megasas_iocpacket __user *ioc =
+            compat_alloc_user_space(sizeof(struct megasas_iocpacket));
+        int i;
+        int error = 0;
+        clear_user(ioc, sizeof(*ioc));
+        if (copy_in_user(&ioc->host_no, &cioc->host_no, sizeof(u16)) ||
+            copy_in_user(&ioc->sgl_off, &cioc->sgl_off, sizeof(u32)) ||
+            copy_in_user(&ioc->sense_off, &cioc->sense_off, sizeof(u32)) ||
+            copy_in_user(&ioc->sense_len, &cioc->sense_len, sizeof(u32)) ||
+            copy_in_user(ioc->frame.raw, cioc->frame.raw, 128) ||
+            copy_in_user(&ioc->sge_count, &cioc->sge_count, sizeof(u32)))
+                return -EFAULT;
+        for (i = 0; i < MAX_IOCTL_SGE; i++) {
+                compat_uptr_t ptr;
+                if (get_user(ptr, &cioc->sgl[i].iov_base) ||
+                    put_user(compat_ptr(ptr), &ioc->sgl[i].iov_base) ||
+                    copy_in_user(&ioc->sgl[i].iov_len,
+                                 &cioc->sgl[i].iov_len, sizeof(compat_size_t)))
+                        return -EFAULT;
+        }
+        error = megasas_mgmt_ioctl_fw(file, (unsigned long)ioc);
+        if (copy_in_user(&cioc->frame.hdr.cmd_status,
+                         &ioc->frame.hdr.cmd_status, sizeof(u8))) {
+                printk(KERN_DEBUG "megasas: error copy_in_user cmd_status\n");
+                return -EFAULT;
+        }
+        return error;
+}
+static long
+megasas_mgmt_compat_ioctl(struct file *file, unsigned int cmd,
+                          unsigned long arg)
+{
+        switch (cmd) {
+        case MEGASAS_IOC_FIRMWARE:{
+                        return megasas_mgmt_compat_ioctl_fw(file, arg);
+                }
+        case MEGASAS_IOC_GET_AEN:
+                return megasas_mgmt_ioctl_aen(file, arg);
+        }
+        return -ENOTTY;
+}
+#endif
+/*
+ * File operations structure for management interface
+ */
+static struct file_operations megasas_mgmt_fops = {
+        .owner = THIS_MODULE,
+        .open = megasas_mgmt_open,
+        .release = megasas_mgmt_release,
+        .fasync = megasas_mgmt_fasync,
+        .unlocked_ioctl = megasas_mgmt_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl = megasas_mgmt_compat_ioctl,
+#endif
+};
+/*
+ * PCI hotplug support registration structure
+ */
+static struct pci_driver megasas_pci_driver = {
+        .name = "megaraid_sas",
+        .id_table = megasas_pci_table,
+        .probe = megasas_probe_one,
+        .remove = __devexit_p(megasas_detach_one),
+        .shutdown = megasas_shutdown,
+};
+/*
+ * Sysfs driver attributes
+ */
+static ssize_t megasas_sysfs_show_version(struct device_driver *dd, char *buf)
+{
+        return snprintf(buf, strlen(MEGASAS_VERSION) + 2, "%s\n",
+                        MEGASAS_VERSION);
+}
+static DRIVER_ATTR(version, S_IRUGO, megasas_sysfs_show_version, NULL);
+static ssize_t
+megasas_sysfs_show_release_date(struct device_driver *dd, char *buf)
+{
+        return snprintf(buf, strlen(MEGASAS_RELDATE) + 2, "%s\n",
+                        MEGASAS_RELDATE);
+}
+static DRIVER_ATTR(release_date, S_IRUGO, megasas_sysfs_show_release_date,
+                   NULL);
+/**
+ * megasas_init - Driver load entry point
+ */
+static int __init megasas_init(void)
+{
+        int rval;
+        /*
+         * Announce driver version and other information
+         */
+        printk(KERN_INFO "megasas: %s %s\n", MEGASAS_VERSION,
+               MEGASAS_EXT_VERSION);
+        memset(&megasas_mgmt_info, 0, sizeof(megasas_mgmt_info));
+        /*
+         * Register character device node
+         */
+        rval = register_chrdev(0, "megaraid_sas_ioctl", &megasas_mgmt_fops);
+        if (rval < 0) {
+                printk(KERN_DEBUG "megasas: failed to open device node\n");
+                return rval;
+        }
+        megasas_mgmt_majorno = rval;
+        /*
+         * Register ourselves as PCI hotplug module
+         */
+        rval = pci_module_init(&megasas_pci_driver);
+        if (rval) {
+                printk(KERN_DEBUG "megasas: PCI hotplug regisration failed \n");
+                unregister_chrdev(megasas_mgmt_majorno, "megaraid_sas_ioctl");
+        }
+        driver_create_file(&megasas_pci_driver.driver, &driver_attr_version);
+        driver_create_file(&megasas_pci_driver.driver,
+                           &driver_attr_release_date);
+        return rval;
+}
+/**
+ * megasas_exit - Driver unload entry point
+ */
+static void __exit megasas_exit(void)
+{
+        driver_remove_file(&megasas_pci_driver.driver, &driver_attr_version);
+        driver_remove_file(&megasas_pci_driver.driver,
+                           &driver_attr_release_date);
+        pci_unregister_driver(&megasas_pci_driver);
+        unregister_chrdev(megasas_mgmt_majorno, "megaraid_sas_ioctl");
+}
+module_init(megasas_init);
+module_exit(megasas_exit);
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
new file mode 100644
index 000000000000..eaec9d531424
--- /dev/null
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -0,0 +1,1142 @@
+/*
+ *
+ *              Linux MegaRAID driver for SAS based RAID controllers
+ *
+ * Copyright (c) 2003-2005  LSI Logic Corporation.
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ *
+ * FILE         : megaraid_sas.h
+ */
+#ifndef LSI_MEGARAID_SAS_H
+#define LSI_MEGARAID_SAS_H
+/**
+ * MegaRAID SAS Driver meta data
+ */
+#define MEGASAS_VERSION                         "00.00.02.00-rc4"
+#define MEGASAS_RELDATE                         "Sep 16, 2005"
+#define MEGASAS_EXT_VERSION                     "Fri Sep 16 12:37:08 EDT 2005"
+/*
+ * =====================================
+ * MegaRAID SAS MFI firmware definitions
+ * =====================================
+ */
+/*
+ * MFI stands for  MegaRAID SAS FW Interface. This is just a moniker for 
+ * protocol between the software and firmware. Commands are issued using
+ * "message frames"
+ */
+/**
+ * FW posts its state in upper 4 bits of outbound_msg_0 register
+ */
+#define MFI_STATE_MASK                          0xF0000000
+#define MFI_STATE_UNDEFINED                     0x00000000
+#define MFI_STATE_BB_INIT                       0x10000000
+#define MFI_STATE_FW_INIT                       0x40000000
+#define MFI_STATE_WAIT_HANDSHAKE                0x60000000
+#define MFI_STATE_FW_INIT_2                     0x70000000
+#define MFI_STATE_DEVICE_SCAN                   0x80000000
+#define MFI_STATE_FLUSH_CACHE                   0xA0000000
+#define MFI_STATE_READY                         0xB0000000
+#define MFI_STATE_OPERATIONAL                   0xC0000000
+#define MFI_STATE_FAULT                         0xF0000000
+#define MEGAMFI_FRAME_SIZE                      64
+/**
+ * During FW init, clear pending cmds & reset state using inbound_msg_0
+ *
+ * ABORT        : Abort all pending cmds
+ * READY        : Move from OPERATIONAL to READY state; discard queue info
+ * MFIMODE      : Discard (possible) low MFA posted in 64-bit mode (??)
+ * CLR_HANDSHAKE: FW is waiting for HANDSHAKE from BIOS or Driver
+ */
+#define MFI_INIT_ABORT                          0x00000000
+#define MFI_INIT_READY                          0x00000002
+#define MFI_INIT_MFIMODE                        0x00000004
+#define MFI_INIT_CLEAR_HANDSHAKE                0x00000008
+#define MFI_RESET_FLAGS                         MFI_INIT_READY|MFI_INIT_MFIMODE
+/**
+ * MFI frame flags
+ */
+#define MFI_FRAME_POST_IN_REPLY_QUEUE           0x0000
+#define MFI_FRAME_DONT_POST_IN_REPLY_QUEUE      0x0001
+#define MFI_FRAME_SGL32                         0x0000
+#define MFI_FRAME_SGL64                         0x0002
+#define MFI_FRAME_SENSE32                       0x0000
+#define MFI_FRAME_SENSE64                       0x0004
+#define MFI_FRAME_DIR_NONE                      0x0000
+#define MFI_FRAME_DIR_WRITE                     0x0008
+#define MFI_FRAME_DIR_READ                      0x0010
+#define MFI_FRAME_DIR_BOTH                      0x0018
+/**
+ * Definition for cmd_status
+ */
+#define MFI_CMD_STATUS_POLL_MODE                0xFF
+/**
+ * MFI command opcodes
+ */
+#define MFI_CMD_INIT                            0x00
+#define MFI_CMD_LD_READ                         0x01
+#define MFI_CMD_LD_WRITE                        0x02
+#define MFI_CMD_LD_SCSI_IO                      0x03
+#define MFI_CMD_PD_SCSI_IO                      0x04
+#define MFI_CMD_DCMD                            0x05
+#define MFI_CMD_ABORT                           0x06
+#define MFI_CMD_SMP                             0x07
+#define MFI_CMD_STP                             0x08
+#define MR_DCMD_CTRL_GET_INFO                   0x01010000
+#define MR_DCMD_CTRL_CACHE_FLUSH                0x01101000
+#define MR_FLUSH_CTRL_CACHE                     0x01
+#define MR_FLUSH_DISK_CACHE                     0x02
+#define MR_DCMD_CTRL_SHUTDOWN                   0x01050000
+#define MR_ENABLE_DRIVE_SPINDOWN                0x01
+#define MR_DCMD_CTRL_EVENT_GET_INFO             0x01040100
+#define MR_DCMD_CTRL_EVENT_GET                  0x01040300
+#define MR_DCMD_CTRL_EVENT_WAIT                 0x01040500
+#define MR_DCMD_LD_GET_PROPERTIES               0x03030000
+#define MR_DCMD_CLUSTER                         0x08000000
+#define MR_DCMD_CLUSTER_RESET_ALL               0x08010100
+#define MR_DCMD_CLUSTER_RESET_LD                0x08010200
+/**
+ * MFI command completion codes
+ */
+enum MFI_STAT {
+        MFI_STAT_OK = 0x00,
+        MFI_STAT_INVALID_CMD = 0x01,
+        MFI_STAT_INVALID_DCMD = 0x02,
+        MFI_STAT_INVALID_PARAMETER = 0x03,
+        MFI_STAT_INVALID_SEQUENCE_NUMBER = 0x04,
+        MFI_STAT_ABORT_NOT_POSSIBLE = 0x05,
+        MFI_STAT_APP_HOST_CODE_NOT_FOUND = 0x06,
+        MFI_STAT_APP_IN_USE = 0x07,
+        MFI_STAT_APP_NOT_INITIALIZED = 0x08,
+        MFI_STAT_ARRAY_INDEX_INVALID = 0x09,
+        MFI_STAT_ARRAY_ROW_NOT_EMPTY = 0x0a,
+        MFI_STAT_CONFIG_RESOURCE_CONFLICT = 0x0b,
+        MFI_STAT_DEVICE_NOT_FOUND = 0x0c,
+        MFI_STAT_DRIVE_TOO_SMALL = 0x0d,
+        MFI_STAT_FLASH_ALLOC_FAIL = 0x0e,
+        MFI_STAT_FLASH_BUSY = 0x0f,
+        MFI_STAT_FLASH_ERROR = 0x10,
+        MFI_STAT_FLASH_IMAGE_BAD = 0x11,
+        MFI_STAT_FLASH_IMAGE_INCOMPLETE = 0x12,
+        MFI_STAT_FLASH_NOT_OPEN = 0x13,
+        MFI_STAT_FLASH_NOT_STARTED = 0x14,
+        MFI_STAT_FLUSH_FAILED = 0x15,
+        MFI_STAT_HOST_CODE_NOT_FOUNT = 0x16,
+        MFI_STAT_LD_CC_IN_PROGRESS = 0x17,
+        MFI_STAT_LD_INIT_IN_PROGRESS = 0x18,
+        MFI_STAT_LD_LBA_OUT_OF_RANGE = 0x19,
+        MFI_STAT_LD_MAX_CONFIGURED = 0x1a,
+        MFI_STAT_LD_NOT_OPTIMAL = 0x1b,
+        MFI_STAT_LD_RBLD_IN_PROGRESS = 0x1c,
+        MFI_STAT_LD_RECON_IN_PROGRESS = 0x1d,
+        MFI_STAT_LD_WRONG_RAID_LEVEL = 0x1e,
+        MFI_STAT_MAX_SPARES_EXCEEDED = 0x1f,
+        MFI_STAT_MEMORY_NOT_AVAILABLE = 0x20,
+        MFI_STAT_MFC_HW_ERROR = 0x21,
+        MFI_STAT_NO_HW_PRESENT = 0x22,
+        MFI_STAT_NOT_FOUND = 0x23,
+        MFI_STAT_NOT_IN_ENCL = 0x24,
+        MFI_STAT_PD_CLEAR_IN_PROGRESS = 0x25,
+        MFI_STAT_PD_TYPE_WRONG = 0x26,
+        MFI_STAT_PR_DISABLED = 0x27,
+        MFI_STAT_ROW_INDEX_INVALID = 0x28,
+        MFI_STAT_SAS_CONFIG_INVALID_ACTION = 0x29,
+        MFI_STAT_SAS_CONFIG_INVALID_DATA = 0x2a,
+        MFI_STAT_SAS_CONFIG_INVALID_PAGE = 0x2b,
+        MFI_STAT_SAS_CONFIG_INVALID_TYPE = 0x2c,
+        MFI_STAT_SCSI_DONE_WITH_ERROR = 0x2d,
+        MFI_STAT_SCSI_IO_FAILED = 0x2e,
+        MFI_STAT_SCSI_RESERVATION_CONFLICT = 0x2f,
+        MFI_STAT_SHUTDOWN_FAILED = 0x30,
+        MFI_STAT_TIME_NOT_SET = 0x31,
+        MFI_STAT_WRONG_STATE = 0x32,
+        MFI_STAT_LD_OFFLINE = 0x33,
+        MFI_STAT_PEER_NOTIFICATION_REJECTED = 0x34,
+        MFI_STAT_PEER_NOTIFICATION_FAILED = 0x35,
+        MFI_STAT_RESERVATION_IN_PROGRESS = 0x36,
+        MFI_STAT_I2C_ERRORS_DETECTED = 0x37,
+        MFI_STAT_PCI_ERRORS_DETECTED = 0x38,
+        MFI_STAT_INVALID_STATUS = 0xFF
+};
+/*
+ * Number of mailbox bytes in DCMD message frame
+ */
+#define MFI_MBOX_SIZE                           12
+enum MR_EVT_CLASS {
+        MR_EVT_CLASS_DEBUG = -2,
+        MR_EVT_CLASS_PROGRESS = -1,
+        MR_EVT_CLASS_INFO = 0,
+        MR_EVT_CLASS_WARNING = 1,
+        MR_EVT_CLASS_CRITICAL = 2,
+        MR_EVT_CLASS_FATAL = 3,
+        MR_EVT_CLASS_DEAD = 4,
+};
+enum MR_EVT_LOCALE {
+        MR_EVT_LOCALE_LD = 0x0001,
+        MR_EVT_LOCALE_PD = 0x0002,
+        MR_EVT_LOCALE_ENCL = 0x0004,
+        MR_EVT_LOCALE_BBU = 0x0008,
+        MR_EVT_LOCALE_SAS = 0x0010,
+        MR_EVT_LOCALE_CTRL = 0x0020,
+        MR_EVT_LOCALE_CONFIG = 0x0040,
+        MR_EVT_LOCALE_CLUSTER = 0x0080,
+        MR_EVT_LOCALE_ALL = 0xffff,
+};
+enum MR_EVT_ARGS {
+        MR_EVT_ARGS_NONE,
+        MR_EVT_ARGS_CDB_SENSE,
+        MR_EVT_ARGS_LD,
+        MR_EVT_ARGS_LD_COUNT,
+        MR_EVT_ARGS_LD_LBA,
+        MR_EVT_ARGS_LD_OWNER,
+        MR_EVT_ARGS_LD_LBA_PD_LBA,
+        MR_EVT_ARGS_LD_PROG,
+        MR_EVT_ARGS_LD_STATE,
+        MR_EVT_ARGS_LD_STRIP,
+        MR_EVT_ARGS_PD,
+        MR_EVT_ARGS_PD_ERR,
+        MR_EVT_ARGS_PD_LBA,
+        MR_EVT_ARGS_PD_LBA_LD,
+        MR_EVT_ARGS_PD_PROG,
+        MR_EVT_ARGS_PD_STATE,
+        MR_EVT_ARGS_PCI,
+        MR_EVT_ARGS_RATE,
+        MR_EVT_ARGS_STR,
+        MR_EVT_ARGS_TIME,
+        MR_EVT_ARGS_ECC,
+};
+/*
+ * SAS controller properties
+ */
+struct megasas_ctrl_prop {
+        u16 seq_num;
+        u16 pred_fail_poll_interval;
+        u16 intr_throttle_count;
+        u16 intr_throttle_timeouts;
+        u8 rebuild_rate;
+        u8 patrol_read_rate;
+        u8 bgi_rate;
+        u8 cc_rate;
+        u8 recon_rate;
+        u8 cache_flush_interval;
+        u8 spinup_drv_count;
+        u8 spinup_delay;
+        u8 cluster_enable;
+        u8 coercion_mode;
+        u8 alarm_enable;
+        u8 disable_auto_rebuild;
+        u8 disable_battery_warn;
+        u8 ecc_bucket_size;
+        u16 ecc_bucket_leak_rate;
+        u8 restore_hotspare_on_insertion;
+        u8 expose_encl_devices;
+        u8 reserved[38];
+} __attribute__ ((packed));
+/*
+ * SAS controller information
+ */
+struct megasas_ctrl_info {
+        /*
+         * PCI device information
+         */
+        struct {
+                u16 vendor_id;
+                u16 device_id;
+                u16 sub_vendor_id;
+                u16 sub_device_id;
+                u8 reserved[24];
+        } __attribute__ ((packed)) pci;
+        /*
+         * Host interface information
+         */
+        struct {
+                u8 PCIX:1;
+                u8 PCIE:1;
+                u8 iSCSI:1;
+                u8 SAS_3G:1;
+                u8 reserved_0:4;
+                u8 reserved_1[6];
+                u8 port_count;
+                u64 port_addr[8];
+        } __attribute__ ((packed)) host_interface;
+        /*
+         * Device (backend) interface information
+         */
+        struct {
+                u8 SPI:1;
+                u8 SAS_3G:1;
+                u8 SATA_1_5G:1;
+                u8 SATA_3G:1;
+                u8 reserved_0:4;
+                u8 reserved_1[6];
+                u8 port_count;
+                u64 port_addr[8];
+        } __attribute__ ((packed)) device_interface;
+        /*
+         * List of components residing in flash. All str are null terminated
+         */
+        u32 image_check_word;
+        u32 image_component_count;
+        struct {
+                char name[8];
+                char version[32];
+                char build_date[16];
+                char built_time[16];
+        } __attribute__ ((packed)) image_component[8];
+        /*
+         * List of flash components that have been flashed on the card, but
+         * are not in use, pending reset of the adapter. This list will be
+         * empty if a flash operation has not occurred. All stings are null
+         * terminated
+         */
+        u32 pending_image_component_count;
+        struct {
+                char name[8];
+                char version[32];
+                char build_date[16];
+                char build_time[16];
+        } __attribute__ ((packed)) pending_image_component[8];
+        u8 max_arms;
+        u8 max_spans;
+        u8 max_arrays;
+        u8 max_lds;
+        char product_name[80];
+        char serial_no[32];
+        /*
+         * Other physical/controller/operation information. Indicates the
+         * presence of the hardware
+         */
+        struct {
+                u32 bbu:1;
+                u32 alarm:1;
+                u32 nvram:1;
+                u32 uart:1;
+                u32 reserved:28;
+        } __attribute__ ((packed)) hw_present;
+        u32 current_fw_time;
+        /*
+         * Maximum data transfer sizes
+         */
+        u16 max_concurrent_cmds;
+        u16 max_sge_count;
+        u32 max_request_size;
+        /*
+         * Logical and physical device counts
+         */
+        u16 ld_present_count;
+        u16 ld_degraded_count;
+        u16 ld_offline_count;
+        u16 pd_present_count;
+        u16 pd_disk_present_count;
+        u16 pd_disk_pred_failure_count;
+        u16 pd_disk_failed_count;
+        /*
+         * Memory size information
+         */
+        u16 nvram_size;
+        u16 memory_size;
+        u16 flash_size;
+        /*
+         * Error counters
+         */
+        u16 mem_correctable_error_count;
+        u16 mem_uncorrectable_error_count;
+        /*
+         * Cluster information
+         */
+        u8 cluster_permitted;
+        u8 cluster_active;
+        /*
+         * Additional max data transfer sizes
+         */
+        u16 max_strips_per_io;
+        /*
+         * Controller capabilities structures
+         */
+        struct {
+                u32 raid_level_0:1;
+                u32 raid_level_1:1;
+                u32 raid_level_5:1;
+                u32 raid_level_1E:1;
+                u32 raid_level_6:1;
+                u32 reserved:27;
+        } __attribute__ ((packed)) raid_levels;
+        struct {
+                u32 rbld_rate:1;
+                u32 cc_rate:1;
+                u32 bgi_rate:1;
+                u32 recon_rate:1;
+                u32 patrol_rate:1;
+                u32 alarm_control:1;
+                u32 cluster_supported:1;
+                u32 bbu:1;
+                u32 spanning_allowed:1;
+                u32 dedicated_hotspares:1;
+                u32 revertible_hotspares:1;
+                u32 foreign_config_import:1;
+                u32 self_diagnostic:1;
+                u32 mixed_redundancy_arr:1;
+                u32 global_hot_spares:1;
+                u32 reserved:17;
+        } __attribute__ ((packed)) adapter_operations;
+        struct {
+                u32 read_policy:1;
+                u32 write_policy:1;
+                u32 io_policy:1;
+                u32 access_policy:1;
+                u32 disk_cache_policy:1;
+                u32 reserved:27;
+        } __attribute__ ((packed)) ld_operations;
+        struct {
+                u8 min;
+                u8 max;
+                u8 reserved[2];
+        } __attribute__ ((packed)) stripe_sz_ops;
+        struct {
+                u32 force_online:1;
+                u32 force_offline:1;
+                u32 force_rebuild:1;
+                u32 reserved:29;
+        } __attribute__ ((packed)) pd_operations;
+        struct {
+                u32 ctrl_supports_sas:1;
+                u32 ctrl_supports_sata:1;
+                u32 allow_mix_in_encl:1;
+                u32 allow_mix_in_ld:1;
+                u32 allow_sata_in_cluster:1;
+                u32 reserved:27;
+        } __attribute__ ((packed)) pd_mix_support;
+        /*
+         * Define ECC single-bit-error bucket information
+         */
+        u8 ecc_bucket_count;
+        u8 reserved_2[11];
+        /*
+         * Include the controller properties (changeable items)
+         */
+        struct megasas_ctrl_prop properties;
+        /*
+         * Define FW pkg version (set in envt v'bles on OEM basis)
+         */
+        char package_version[0x60];
+        u8 pad[0x800 - 0x6a0];
+} __attribute__ ((packed));
+/*
+ * ===============================
+ * MegaRAID SAS driver definitions
+ * ===============================
+ */
+#define MEGASAS_MAX_PD_CHANNELS                 2
+#define MEGASAS_MAX_LD_CHANNELS                 2
+#define MEGASAS_MAX_CHANNELS                    (MEGASAS_MAX_PD_CHANNELS + \
+                                                MEGASAS_MAX_LD_CHANNELS)
+#define MEGASAS_MAX_DEV_PER_CHANNEL             128
+#define MEGASAS_DEFAULT_INIT_ID                 -1
+#define MEGASAS_MAX_LUN                         8
+#define MEGASAS_MAX_LD                          64
+/*
+ * When SCSI mid-layer calls driver's reset routine, driver waits for
+ * MEGASAS_RESET_WAIT_TIME seconds for all outstanding IO to complete. Note
+ * that the driver cannot _actually_ abort or reset pending commands. While
+ * it is waiting for the commands to complete, it prints a diagnostic message
+ * every MEGASAS_RESET_NOTICE_INTERVAL seconds
+ */
+#define MEGASAS_RESET_WAIT_TIME                 180
+#define MEGASAS_RESET_NOTICE_INTERVAL           5
+#define MEGASAS_IOCTL_CMD                       0
+/*
+ * FW reports the maximum of number of commands that it can accept (maximum
+ * commands that can be outstanding) at any time. The driver must report a
+ * lower number to the mid layer because it can issue a few internal commands
+ * itself (E.g, AEN, abort cmd, IOCTLs etc). The number of commands it needs
+ * is shown below
+ */
+#define MEGASAS_INT_CMDS                        32
+/*
+ * FW can accept both 32 and 64 bit SGLs. We want to allocate 32/64 bit
+ * SGLs based on the size of dma_addr_t
+ */
+#define IS_DMA64                                (sizeof(dma_addr_t) == 8)
+#define MFI_OB_INTR_STATUS_MASK                 0x00000002
+#define MFI_POLL_TIMEOUT_SECS                   10
+struct megasas_register_set {
+        u32 reserved_0[4];      /*0000h */
+        u32 inbound_msg_0;      /*0010h */
+        u32 inbound_msg_1;      /*0014h */
+        u32 outbound_msg_0;     /*0018h */
+        u32 outbound_msg_1;     /*001Ch */
+        u32 inbound_doorbell;   /*0020h */
+        u32 inbound_intr_status;        /*0024h */
+        u32 inbound_intr_mask;  /*0028h */
+        u32 outbound_doorbell;  /*002Ch */
+        u32 outbound_intr_status;       /*0030h */
+        u32 outbound_intr_mask; /*0034h */
+        u32 reserved_1[2];      /*0038h */
+        u32 inbound_queue_port; /*0040h */
+        u32 outbound_queue_port;        /*0044h */
+        u32 reserved_2;         /*004Ch */
+        u32 index_registers[1004];      /*0050h */
+} __attribute__ ((packed));
+struct megasas_sge32 {
+        u32 phys_addr;
+        u32 length;
+} __attribute__ ((packed));
+struct megasas_sge64 {
+        u64 phys_addr;
+        u32 length;
+} __attribute__ ((packed));
+union megasas_sgl {
+        struct megasas_sge32 sge32[1];
+        struct megasas_sge64 sge64[1];
+} __attribute__ ((packed));
+struct megasas_header {
+        u8 cmd;                 /*00h */
+        u8 sense_len;           /*01h */
+        u8 cmd_status;          /*02h */
+        u8 scsi_status;         /*03h */
+        u8 target_id;           /*04h */
+        u8 lun;                 /*05h */
+        u8 cdb_len;             /*06h */
+        u8 sge_count;           /*07h */
+        u32 context;            /*08h */
+        u32 pad_0;              /*0Ch */
+        u16 flags;              /*10h */
+        u16 timeout;            /*12h */
+        u32 data_xferlen;       /*14h */
+} __attribute__ ((packed));
+union megasas_sgl_frame {
+        struct megasas_sge32 sge32[8];
+        struct megasas_sge64 sge64[5];
+} __attribute__ ((packed));
+struct megasas_init_frame {
+        u8 cmd;                 /*00h */
+        u8 reserved_0;          /*01h */
+        u8 cmd_status;          /*02h */
+        u8 reserved_1;          /*03h */
+        u32 reserved_2;         /*04h */
+        u32 context;            /*08h */
+        u32 pad_0;              /*0Ch */
+        u16 flags;              /*10h */
+        u16 reserved_3;         /*12h */
+        u32 data_xfer_len;      /*14h */
+        u32 queue_info_new_phys_addr_lo;        /*18h */
+        u32 queue_info_new_phys_addr_hi;        /*1Ch */
+        u32 queue_info_old_phys_addr_lo;        /*20h */
+        u32 queue_info_old_phys_addr_hi;        /*24h */
+        u32 reserved_4[6];      /*28h */
+} __attribute__ ((packed));
+struct megasas_init_queue_info {
+        u32 init_flags;         /*00h */
+        u32 reply_queue_entries;        /*04h */
+        u32 reply_queue_start_phys_addr_lo;     /*08h */
+        u32 reply_queue_start_phys_addr_hi;     /*0Ch */
+        u32 producer_index_phys_addr_lo;        /*10h */
+        u32 producer_index_phys_addr_hi;        /*14h */
+        u32 consumer_index_phys_addr_lo;        /*18h */
+        u32 consumer_index_phys_addr_hi;        /*1Ch */
+} __attribute__ ((packed));
+struct megasas_io_frame {
+        u8 cmd;                 /*00h */
+        u8 sense_len;           /*01h */
+        u8 cmd_status;          /*02h */
+        u8 scsi_status;         /*03h */
+        u8 target_id;           /*04h */
+        u8 access_byte;         /*05h */
+        u8 reserved_0;          /*06h */
+        u8 sge_count;           /*07h */
+        u32 context;            /*08h */
+        u32 pad_0;              /*0Ch */
+        u16 flags;              /*10h */
+        u16 timeout;            /*12h */
+        u32 lba_count;          /*14h */
+        u32 sense_buf_phys_addr_lo;     /*18h */
+        u32 sense_buf_phys_addr_hi;     /*1Ch */
+        u32 start_lba_lo;       /*20h */
+        u32 start_lba_hi;       /*24h */
+        union megasas_sgl sgl;  /*28h */
+} __attribute__ ((packed));
+struct megasas_pthru_frame {
+        u8 cmd;                 /*00h */
+        u8 sense_len;           /*01h */
+        u8 cmd_status;          /*02h */
+        u8 scsi_status;         /*03h */
+        u8 target_id;           /*04h */
+        u8 lun;                 /*05h */
+        u8 cdb_len;             /*06h */
+        u8 sge_count;           /*07h */
+        u32 context;            /*08h */
+        u32 pad_0;              /*0Ch */
+        u16 flags;              /*10h */
+        u16 timeout;            /*12h */
+        u32 data_xfer_len;      /*14h */
+        u32 sense_buf_phys_addr_lo;     /*18h */
+        u32 sense_buf_phys_addr_hi;     /*1Ch */
+        u8 cdb[16];             /*20h */
+        union megasas_sgl sgl;  /*30h */
+} __attribute__ ((packed));
+struct megasas_dcmd_frame {
+        u8 cmd;                 /*00h */
+        u8 reserved_0;          /*01h */
+        u8 cmd_status;          /*02h */
+        u8 reserved_1[4];       /*03h */
+        u8 sge_count;           /*07h */
+        u32 context;            /*08h */
+        u32 pad_0;              /*0Ch */
+        u16 flags;              /*10h */
+        u16 timeout;            /*12h */
+        u32 data_xfer_len;      /*14h */
+        u32 opcode;             /*18h */
+        union {                 /*1Ch */
+                u8 b[12];
+                u16 s[6];
+                u32 w[3];
+        } mbox;
+        union megasas_sgl sgl;  /*28h */
+} __attribute__ ((packed));
+struct megasas_abort_frame {
+        u8 cmd;                 /*00h */
+        u8 reserved_0;          /*01h */
+        u8 cmd_status;          /*02h */
+        u8 reserved_1;          /*03h */
+        u32 reserved_2;         /*04h */
+        u32 context;            /*08h */
+        u32 pad_0;              /*0Ch */
+        u16 flags;              /*10h */
+        u16 reserved_3;         /*12h */
+        u32 reserved_4;         /*14h */
+        u32 abort_context;      /*18h */
+        u32 pad_1;              /*1Ch */
+        u32 abort_mfi_phys_addr_lo;     /*20h */
+        u32 abort_mfi_phys_addr_hi;     /*24h */
+        u32 reserved_5[6];      /*28h */
+} __attribute__ ((packed));
+struct megasas_smp_frame {
+        u8 cmd;                 /*00h */
+        u8 reserved_1;          /*01h */
+        u8 cmd_status;          /*02h */
+        u8 connection_status;   /*03h */
+        u8 reserved_2[3];       /*04h */
+        u8 sge_count;           /*07h */
+        u32 context;            /*08h */
+        u32 pad_0;              /*0Ch */
+        u16 flags;              /*10h */
+        u16 timeout;            /*12h */
+        u32 data_xfer_len;      /*14h */
+        u64 sas_addr;           /*18h */
+        union {
+                struct megasas_sge32 sge32[2];  /* [0]: resp [1]: req */
+                struct megasas_sge64 sge64[2];  /* [0]: resp [1]: req */
+        } sgl;
+} __attribute__ ((packed));
+struct megasas_stp_frame {
+        u8 cmd;                 /*00h */
+        u8 reserved_1;          /*01h */
+        u8 cmd_status;          /*02h */
+        u8 reserved_2;          /*03h */
+        u8 target_id;           /*04h */
+        u8 reserved_3[2];       /*05h */
+        u8 sge_count;           /*07h */
+        u32 context;            /*08h */
+        u32 pad_0;              /*0Ch */
+        u16 flags;              /*10h */
+        u16 timeout;            /*12h */
+        u32 data_xfer_len;      /*14h */
+        u16 fis[10];            /*18h */
+        u32 stp_flags;
+        union {
+                struct megasas_sge32 sge32[2];  /* [0]: resp [1]: data */
+                struct megasas_sge64 sge64[2];  /* [0]: resp [1]: data */
+        } sgl;
+} __attribute__ ((packed));
+union megasas_frame {
+        struct megasas_header hdr;
+        struct megasas_init_frame init;
+        struct megasas_io_frame io;
+        struct megasas_pthru_frame pthru;
+        struct megasas_dcmd_frame dcmd;
+        struct megasas_abort_frame abort;
+        struct megasas_smp_frame smp;
+        struct megasas_stp_frame stp;
+        u8 raw_bytes[64];
+};
+struct megasas_cmd;
+union megasas_evt_class_locale {
+        struct {
+                u16 locale;
+                u8 reserved;
+                s8 class;
+        } __attribute__ ((packed)) members;
+        u32 word;
+} __attribute__ ((packed));
+struct megasas_evt_log_info {
+        u32 newest_seq_num;
+        u32 oldest_seq_num;
+        u32 clear_seq_num;
+        u32 shutdown_seq_num;
+        u32 boot_seq_num;
+} __attribute__ ((packed));
+struct megasas_progress {
+        u16 progress;
+        u16 elapsed_seconds;
+} __attribute__ ((packed));
+struct megasas_evtarg_ld {
+        u16 target_id;
+        u8 ld_index;
+        u8 reserved;
+} __attribute__ ((packed));
+struct megasas_evtarg_pd {
+        u16 device_id;
+        u8 encl_index;
+        u8 slot_number;
+} __attribute__ ((packed));
+struct megasas_evt_detail {
+        u32 seq_num;
+        u32 time_stamp;
+        u32 code;
+        union megasas_evt_class_locale cl;
+        u8 arg_type;
+        u8 reserved1[15];
+        union {
+                struct {
+                        struct megasas_evtarg_pd pd;
+                        u8 cdb_length;
+                        u8 sense_length;
+                        u8 reserved[2];
+                        u8 cdb[16];
+                        u8 sense[64];
+                } __attribute__ ((packed)) cdbSense;
+                struct megasas_evtarg_ld ld;
+                struct {
+                        struct megasas_evtarg_ld ld;
+                        u64 count;
+                } __attribute__ ((packed)) ld_count;
+                struct {
+                        u64 lba;
+                        struct megasas_evtarg_ld ld;
+                } __attribute__ ((packed)) ld_lba;
+                struct {
+                        struct megasas_evtarg_ld ld;
+                        u32 prevOwner;
+                        u32 newOwner;
+                } __attribute__ ((packed)) ld_owner;
+                struct {
+                        u64 ld_lba;
+                        u64 pd_lba;
+                        struct megasas_evtarg_ld ld;
+                        struct megasas_evtarg_pd pd;
+                } __attribute__ ((packed)) ld_lba_pd_lba;
+                struct {
+                        struct megasas_evtarg_ld ld;
+                        struct megasas_progress prog;
+                } __attribute__ ((packed)) ld_prog;
+                struct {
+                        struct megasas_evtarg_ld ld;
+                        u32 prev_state;
+                        u32 new_state;
+                } __attribute__ ((packed)) ld_state;
+                struct {
+                        u64 strip;
+                        struct megasas_evtarg_ld ld;
+                } __attribute__ ((packed)) ld_strip;
+                struct megasas_evtarg_pd pd;
+                struct {
+                        struct megasas_evtarg_pd pd;
+                        u32 err;
+                } __attribute__ ((packed)) pd_err;
+                struct {
+                        u64 lba;
+                        struct megasas_evtarg_pd pd;
+                } __attribute__ ((packed)) pd_lba;
+                struct {
+                        u64 lba;
+                        struct megasas_evtarg_pd pd;
+                        struct megasas_evtarg_ld ld;
+                } __attribute__ ((packed)) pd_lba_ld;
+                struct {
+                        struct megasas_evtarg_pd pd;
+                        struct megasas_progress prog;
+                } __attribute__ ((packed)) pd_prog;
+                struct {
+                        struct megasas_evtarg_pd pd;
+                        u32 prevState;
+                        u32 newState;
+                } __attribute__ ((packed)) pd_state;
+                struct {
+                        u16 vendorId;
+                        u16 deviceId;
+                        u16 subVendorId;
+                        u16 subDeviceId;
+                } __attribute__ ((packed)) pci;
+                u32 rate;
+                char str[96];
+                struct {
+                        u32 rtc;
+                        u32 elapsedSeconds;
+                } __attribute__ ((packed)) time;
+                struct {
+                        u32 ecar;
+                        u32 elog;
+                        char str[64];
+                } __attribute__ ((packed)) ecc;
+                u8 b[96];
+                u16 s[48];
+                u32 w[24];
+                u64 d[12];
+        } args;
+        char description[128];
+} __attribute__ ((packed));
+struct megasas_instance {
+        u32 *producer;
+        dma_addr_t producer_h;
+        u32 *consumer;
+        dma_addr_t consumer_h;
+        u32 *reply_queue;
+        dma_addr_t reply_queue_h;
+        unsigned long base_addr;
+        struct megasas_register_set __iomem *reg_set;
+        s8 init_id;
+        u8 reserved[3];
+        u16 max_num_sge;
+        u16 max_fw_cmds;
+        u32 max_sectors_per_req;
+        struct megasas_cmd **cmd_list;
+        struct list_head cmd_pool;
+        spinlock_t cmd_pool_lock;
+        struct dma_pool *frame_dma_pool;
+        struct dma_pool *sense_dma_pool;
+        struct megasas_evt_detail *evt_detail;
+        dma_addr_t evt_detail_h;
+        struct megasas_cmd *aen_cmd;
+        struct semaphore aen_mutex;
+        struct semaphore ioctl_sem;
+        struct Scsi_Host *host;
+        wait_queue_head_t int_cmd_wait_q;
+        wait_queue_head_t abort_cmd_wait_q;
+        struct pci_dev *pdev;
+        u32 unique_id;
+        u32 fw_outstanding;
+        u32 hw_crit_error;
+        spinlock_t instance_lock;
+};
+#define MEGASAS_IS_LOGICAL(scp)                                         \
+        (scp->device->channel < MEGASAS_MAX_PD_CHANNELS) ? 0 : 1
+#define MEGASAS_DEV_INDEX(inst, scp)                                    \
+        ((scp->device->channel % 2) * MEGASAS_MAX_DEV_PER_CHANNEL) +    \
+        scp->device->id
+struct megasas_cmd {
+        union megasas_frame *frame;
+        dma_addr_t frame_phys_addr;
+        u8 *sense;
+        dma_addr_t sense_phys_addr;
+        u32 index;
+        u8 sync_cmd;
+        u8 cmd_status;
+        u16 abort_aen;
+        struct list_head list;
+        struct scsi_cmnd *scmd;
+        struct megasas_instance *instance;
+        u32 frame_count;
+};
+#define MAX_MGMT_ADAPTERS               1024
+#define MAX_IOCTL_SGE                   16
+struct megasas_iocpacket {
+        u16 host_no;
+        u16 __pad1;
+        u32 sgl_off;
+        u32 sge_count;
+        u32 sense_off;
+        u32 sense_len;
+        union {
+                u8 raw[128];
+                struct megasas_header hdr;
+        } frame;
+        struct iovec sgl[MAX_IOCTL_SGE];
+} __attribute__ ((packed));
+struct megasas_aen {
+        u16 host_no;
+        u16 __pad1;
+        u32 seq_num;
+        u32 class_locale_word;
+} __attribute__ ((packed));
+#ifdef CONFIG_COMPAT
+struct compat_megasas_iocpacket {
+        u16 host_no;
+        u16 __pad1;
+        u32 sgl_off;
+        u32 sge_count;
+        u32 sense_off;
+        u32 sense_len;
+        union {
+                u8 raw[128];
+                struct megasas_header hdr;
+        } frame;
+        struct compat_iovec sgl[MAX_IOCTL_SGE];
+} __attribute__ ((packed));
+#define MEGASAS_IOC_FIRMWARE    _IOWR('M', 1, struct compat_megasas_iocpacket)
+#else
+#define MEGASAS_IOC_FIRMWARE    _IOWR('M', 1, struct megasas_iocpacket)
+#endif
+#define MEGASAS_IOC_GET_AEN     _IOW('M', 3, struct megasas_aen)
+struct megasas_mgmt_info {
+        u16 count;
+        struct megasas_instance *instance[MAX_MGMT_ADAPTERS];
+        int max_index;
+};
+#endif                          /*LSI_MEGARAID_SAS_H */
diff --git a/drivers/scsi/qla2xxx/qla_rscn.c b/drivers/scsi/qla2xxx/qla_rscn.c
index bdc3bc74bbe1..1eba98828636 100644
--- a/drivers/scsi/qla2xxx/qla_rscn.c
+++ b/drivers/scsi/qla2xxx/qla_rscn.c
@@ -330,6 +330,8 @@ qla2x00_update_login_fcport(scsi_qla_host_t *ha, struct mbx_entry *mbxstat,
        fcport->flags &= ~FCF_FAILOVER_NEEDED;
        fcport->iodesc_idx_sent = IODESC_INVALID_INDEX;
        atomic_set(&fcport->state, FCS_ONLINE);
+        if (fcport->rport)
+                fc_remote_port_unblock(fcport->rport);
 }
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index fcf9f6cbb142..327c5d7e5bd2 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -587,6 +587,7 @@ static int scsi_probe_lun(struct scsi_device *sdev, char *inq_result,
        if (sdev->scsi_level >= 2 ||
            (sdev->scsi_level == 1 && (inq_result[3] & 0x0f) == 1))
                sdev->scsi_level++;
+        sdev->sdev_target->scsi_level = sdev->scsi_level;
        return 0;
 }
@@ -771,6 +772,15 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)
        return SCSI_SCAN_LUN_PRESENT;
 }
+static inline void scsi_destroy_sdev(struct scsi_device *sdev)
+{
+        if (sdev->host->hostt->slave_destroy)
+                sdev->host->hostt->slave_destroy(sdev);
+        transport_destroy_device(&sdev->sdev_gendev);
+        put_device(&sdev->sdev_gendev);
+}
 /**
 * scsi_probe_and_add_lun - probe a LUN, if a LUN is found add it
 * @starget:    pointer to target device structure
@@ -803,9 +813,9 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
         * The rescan flag is used as an optimization, the first scan of a
         * host adapter calls into here with rescan == 0.
         */
-        if (rescan) {
+        sdev = scsi_device_lookup_by_target(starget, lun);
-                sdev = scsi_device_lookup_by_target(starget, lun);
+        if (sdev) {
-                if (sdev) {
+                if (rescan || sdev->sdev_state != SDEV_CREATED) {
                        SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO
                                "scsi scan: device exists on %s\n",
                                sdev->sdev_gendev.bus_id));
@@ -820,9 +830,9 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
                                                                 sdev->model);
                        return SCSI_SCAN_LUN_PRESENT;
                }
-        }
+                scsi_device_put(sdev);
+        } else
-        sdev = scsi_alloc_sdev(starget, lun, hostdata);
+                sdev = scsi_alloc_sdev(starget, lun, hostdata);
        if (!sdev)
                goto out;
@@ -877,12 +887,8 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
                                res = SCSI_SCAN_NO_RESPONSE;
                        }
                }
-        } else {
+        } else
-                if (sdev->host->hostt->slave_destroy)
+                scsi_destroy_sdev(sdev);
-                        sdev->host->hostt->slave_destroy(sdev);
-                transport_destroy_device(&sdev->sdev_gendev);
-                put_device(&sdev->sdev_gendev);
-        }
 out:
        return res;
 }
@@ -1054,7 +1060,7 @@ EXPORT_SYMBOL(int_to_scsilun);
 *     0: scan completed (or no memory, so further scanning is futile)
 *     1: no report lun scan, or not configured
 **/
-static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
+static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
                                int rescan)
 {
        char devname[64];
@@ -1067,7 +1073,8 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
        struct scsi_lun *lunp, *lun_data;
        u8 *data;
        struct scsi_sense_hdr sshdr;
-        struct scsi_target *starget = scsi_target(sdev);
+        struct scsi_device *sdev;
+        struct Scsi_Host *shost = dev_to_shost(&starget->dev);
        /*
         * Only support SCSI-3 and up devices if BLIST_NOREPORTLUN is not set.
@@ -1075,15 +1082,23 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
         * support more than 8 LUNs.
         */
        if ((bflags & BLIST_NOREPORTLUN) || 
-             sdev->scsi_level < SCSI_2 ||
+             starget->scsi_level < SCSI_2 ||
-            (sdev->scsi_level < SCSI_3 && 
+            (starget->scsi_level < SCSI_3 && 
-             (!(bflags & BLIST_REPORTLUN2) || sdev->host->max_lun <= 8)) )
+             (!(bflags & BLIST_REPORTLUN2) || shost->max_lun <= 8)) )
                return 1;
        if (bflags & BLIST_NOLUN)
                return 0;
+        if (!(sdev = scsi_device_lookup_by_target(starget, 0))) {
+                sdev = scsi_alloc_sdev(starget, 0, NULL);
+                if (!sdev)
+                        return 0;
+                if (scsi_device_get(sdev))
+                        return 0;
+        }
        sprintf(devname, "host %d channel %d id %d",
-                sdev->host->host_no, sdev->channel, sdev->id);
+                shost->host_no, sdev->channel, sdev->id);
        /*
         * Allocate enough to hold the header (the same size as one scsi_lun)
@@ -1098,8 +1113,10 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
        length = (max_scsi_report_luns + 1) * sizeof(struct scsi_lun);
        lun_data = kmalloc(length, GFP_ATOMIC |
                           (sdev->host->unchecked_isa_dma ? __GFP_DMA : 0));
-        if (!lun_data)
+        if (!lun_data) {
+                printk(ALLOC_FAILURE_MSG, __FUNCTION__);
                goto out;
+        }
        scsi_cmd[0] = REPORT_LUNS;
@@ -1201,10 +1218,6 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
                        for (i = 0; i < sizeof(struct scsi_lun); i++)
                                printk("%02x", data[i]);
                        printk(" has a LUN larger than currently supported.\n");
-                } else if (lun == 0) {
-                        /*
-                         * LUN 0 has already been scanned.
-                         */
                } else if (lun > sdev->host->max_lun) {
                        printk(KERN_WARNING "scsi: %s lun%d has a LUN larger"
                               " than allowed by the host adapter\n",
@@ -1227,13 +1240,13 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
        }
        kfree(lun_data);
-        return 0;
 out:
-        /*
+        scsi_device_put(sdev);
-         * We are out of memory, don't try scanning any further.
+        if (sdev->sdev_state == SDEV_CREATED)
-         */
+                /*
-        printk(ALLOC_FAILURE_MSG, __FUNCTION__);
+                 * the sdev we used didn't appear in the report luns scan
+                 */
+                scsi_destroy_sdev(sdev);
        return 0;
 }
@@ -1299,7 +1312,6 @@ static void __scsi_scan_target(struct device *parent, unsigned int channel,
        struct Scsi_Host *shost = dev_to_shost(parent);
        int bflags = 0;
        int res;
-        struct scsi_device *sdev = NULL;
        struct scsi_target *starget;
        if (shost->this_id == id)
@@ -1325,27 +1337,16 @@ static void __scsi_scan_target(struct device *parent, unsigned int channel,
         * Scan LUN 0, if there is some response, scan further. Ideally, we
         * would not configure LUN 0 until all LUNs are scanned.
         */
-        res = scsi_probe_and_add_lun(starget, 0, &bflags, &sdev, rescan, NULL);
+        res = scsi_probe_and_add_lun(starget, 0, &bflags, NULL, rescan, NULL);
-        if (res == SCSI_SCAN_LUN_PRESENT) {
+        if (res == SCSI_SCAN_LUN_PRESENT || res == SCSI_SCAN_TARGET_PRESENT) {
-                if (scsi_report_lun_scan(sdev, bflags, rescan) != 0)
+                if (scsi_report_lun_scan(starget, bflags, rescan) != 0)
                        /*
                         * The REPORT LUN did not scan the target,
                         * do a sequential scan.
                         */
                        scsi_sequential_lun_scan(starget, bflags,
-                                        res, sdev->scsi_level, rescan);
+                                        res, starget->scsi_level, rescan);
-        } else if (res == SCSI_SCAN_TARGET_PRESENT) {
-                /*
-                 * There's a target here, but lun 0 is offline so we
-                 * can't use the report_lun scan.  Fall back to a
-                 * sequential lun scan with a bflags of SPARSELUN and
-                 * a default scsi level of SCSI_2
-                 */
-                scsi_sequential_lun_scan(starget, BLIST_SPARSELUN,
-                                SCSI_SCAN_TARGET_PRESENT, SCSI_2, rescan);
        }
-        if (sdev)
-                scsi_device_put(sdev);
 out_reap:
        /* now determine if the target has any children at all
@@ -1542,10 +1543,7 @@ void scsi_free_host_dev(struct scsi_device *sdev)
 {
        BUG_ON(sdev->id != sdev->host->this_id);
-        if (sdev->host->hostt->slave_destroy)
+        scsi_destroy_sdev(sdev);
-                sdev->host->hostt->slave_destroy(sdev);
-        transport_destroy_device(&sdev->sdev_gendev);
-        put_device(&sdev->sdev_gendev);
 }
 EXPORT_SYMBOL(scsi_free_host_dev);
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index ff724bbe6611..1d145d2f9a38 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -628,17 +628,16 @@ sas_rphy_delete(struct sas_rphy *rphy)
        struct Scsi_Host *shost = dev_to_shost(parent->dev.parent);
        struct sas_host_attrs *sas_host = to_sas_host_attrs(shost);
-        transport_destroy_device(&rphy->dev);
+        scsi_remove_target(dev);
-        scsi_remove_target(&rphy->dev);
+        transport_remove_device(dev);
+        device_del(dev);
+        transport_destroy_device(dev);
        spin_lock(&sas_host->lock);
        list_del(&rphy->list);
        spin_unlock(&sas_host->lock);
-        transport_remove_device(dev);
-        device_del(dev);
-        transport_destroy_device(dev);
        put_device(&parent->dev);
 }
 EXPORT_SYMBOL(sas_rphy_delete);
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 5959e6755a81..656c0e8d160e 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -518,11 +518,7 @@ static void sunsu_change_mouse_baud(struct uart_sunsu_port *up)
        quot = up->port.uartclk / (16 * new_baud);
-        spin_unlock(&up->port.lock);
        sunsu_change_speed(&up->port, up->cflag, 0, quot);
-        spin_lock(&up->port.lock);
 }
 static void receive_kbd_ms_chars(struct uart_sunsu_port *up, struct pt_regs *regs, int is_break)
diff --git a/fs/bfs/dir.c b/fs/bfs/dir.c
index e240c335eb23..5af928fa0449 100644
--- a/fs/bfs/dir.c
+++ b/fs/bfs/dir.c
@@ -108,7 +108,7 @@ static int bfs_create(struct inode * dir, struct dentry * dentry, int mode,
        inode->i_mapping->a_ops = &bfs_aops;
        inode->i_mode = mode;
        inode->i_ino = ino;
-        BFS_I(inode)->i_dsk_ino = cpu_to_le16(ino);
+        BFS_I(inode)->i_dsk_ino = ino;
        BFS_I(inode)->i_sblock = 0;
        BFS_I(inode)->i_eblock = 0;
        insert_inode_hash(inode);
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
index c7b39aa279d7..3af6c73c5b5a 100644
--- a/fs/bfs/inode.c
+++ b/fs/bfs/inode.c
@@ -357,28 +357,46 @@ static int bfs_fill_super(struct super_block *s, void *data, int silent)
        }
        info->si_blocks = (le32_to_cpu(bfs_sb->s_end) + 1)>>BFS_BSIZE_BITS; /* for statfs(2) */
-        info->si_freeb = (le32_to_cpu(bfs_sb->s_end) + 1 -  cpu_to_le32(bfs_sb->s_start))>>BFS_BSIZE_BITS;
+        info->si_freeb = (le32_to_cpu(bfs_sb->s_end) + 1 -  le32_to_cpu(bfs_sb->s_start))>>BFS_BSIZE_BITS;
        info->si_freei = 0;
        info->si_lf_eblk = 0;
        info->si_lf_sblk = 0;
        info->si_lf_ioff = 0;
+        bh = NULL;
        for (i=BFS_ROOT_INO; i<=info->si_lasti; i++) {
-                inode = iget(s,i);
+                struct bfs_inode *di;
-                if (BFS_I(inode)->i_dsk_ino == 0)
+                int block = (i - BFS_ROOT_INO)/BFS_INODES_PER_BLOCK + 1;
+                int off = (i - BFS_ROOT_INO) % BFS_INODES_PER_BLOCK;
+                unsigned long sblock, eblock;
+                if (!off) {
+                        brelse(bh);
+                        bh = sb_bread(s, block);
+                }
+                if (!bh)
+                        continue;
+                di = (struct bfs_inode *)bh->b_data + off;
+                if (!di->i_ino) {
                        info->si_freei++;
-                else {
+                        continue;
-                        set_bit(i, info->si_imap);
+                }
-                        info->si_freeb -= inode->i_blocks;
+                set_bit(i, info->si_imap);
-                        if (BFS_I(inode)->i_eblock > info->si_lf_eblk) {
+                info->si_freeb -= BFS_FILEBLOCKS(di);
-                                info->si_lf_eblk = BFS_I(inode)->i_eblock;
-                                info->si_lf_sblk = BFS_I(inode)->i_sblock;
+                sblock =  le32_to_cpu(di->i_sblock);
-                                info->si_lf_ioff = BFS_INO2OFF(i);
+                eblock =  le32_to_cpu(di->i_eblock);
-                        }
+                if (eblock > info->si_lf_eblk) {
+                        info->si_lf_eblk = eblock;
+                        info->si_lf_sblk = sblock;
+                        info->si_lf_ioff = BFS_INO2OFF(i);
                }
-                iput(inode);
        }
+        brelse(bh);
        if (!(s->s_flags & MS_RDONLY)) {
-                mark_buffer_dirty(bh);
+                mark_buffer_dirty(info->si_sbh);
                s->s_dirt = 1;
        } 
        dump_imap("read_super", s);
diff --git a/fs/namei.c b/fs/namei.c
index 043d587216b5..aa62dbda93ac 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1551,19 +1551,19 @@ do_link:
        if (nd->last_type != LAST_NORM)
                goto exit;
        if (nd->last.name[nd->last.len]) {
-                putname(nd->last.name);
+                __putname(nd->last.name);
                goto exit;
        }
        error = -ELOOP;
        if (count++==32) {
-                putname(nd->last.name);
+                __putname(nd->last.name);
                goto exit;
        }
        dir = nd->dentry;
        down(&dir->d_inode->i_sem);
        path.dentry = __lookup_hash(&nd->last, nd->dentry, nd);
        path.mnt = nd->mnt;
-        putname(nd->last.name);
+        __putname(nd->last.name);
        goto do_last;
 }
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index 83f3322765cd..de58579a1d0e 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -102,6 +102,9 @@ ToDo/Notes:
          inode instead of a vfs inode as parameter.
        - Fix the definition of the CHKD ntfs record magic.  It had an off by
          two error causing it to be CHKB instead of CHKD.
+        - Fix a stupid bug in __ntfs_bitmap_set_bits_in_run() which caused the
+          count to become negative and hence we had a wild memset() scribbling
+          all over the system's ram.
 2.1.23 - Implement extension of resident files and make writing safe as well as
         many bug fixes, cleanups, and enhancements...
diff --git a/fs/ntfs/bitmap.c b/fs/ntfs/bitmap.c
index 12cf2e30c7dd..7a190cdc60e2 100644
--- a/fs/ntfs/bitmap.c
+++ b/fs/ntfs/bitmap.c
@@ -1,7 +1,7 @@
 /*
 * bitmap.c - NTFS kernel bitmap handling.  Part of the Linux-NTFS project.
 *
- * Copyright (c) 2004 Anton Altaparmakov
+ * Copyright (c) 2004-2005 Anton Altaparmakov
 *
 * This program/include file is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as published
@@ -90,7 +90,8 @@ int __ntfs_bitmap_set_bits_in_run(struct inode *vi, const s64 start_bit,
        /* If the first byte is partial, modify the appropriate bits in it. */
        if (bit) {
                u8 *byte = kaddr + pos;
-                while ((bit & 7) && cnt--) {
+                while ((bit & 7) && cnt) {
+                        cnt--;
                        if (value)
                                *byte |= 1 << bit++;
                        else
diff --git a/fs/ntfs/layout.h b/fs/ntfs/layout.h
index 01f2dfa39cec..5c248d404f05 100644
--- a/fs/ntfs/layout.h
+++ b/fs/ntfs/layout.h
@@ -309,7 +309,7 @@ typedef le16 MFT_RECORD_FLAGS;
 * Note: The _LE versions will return a CPU endian formatted value!
 */
 #define MFT_REF_MASK_CPU 0x0000ffffffffffffULL
-#define MFT_REF_MASK_LE const_cpu_to_le64(0x0000ffffffffffffULL)
+#define MFT_REF_MASK_LE const_cpu_to_le64(MFT_REF_MASK_CPU)
 typedef u64 MFT_REF;
 typedef le64 leMFT_REF;
diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
index 247586d1d5dc..b011369b5956 100644
--- a/fs/ntfs/mft.c
+++ b/fs/ntfs/mft.c
@@ -58,7 +58,8 @@ static inline MFT_RECORD *map_mft_record_page(ntfs_inode *ni)
         * overflowing the unsigned long, but I don't think we would ever get
         * here if the volume was that big...
         */
-        index = ni->mft_no << vol->mft_record_size_bits >> PAGE_CACHE_SHIFT;
+        index = (u64)ni->mft_no << vol->mft_record_size_bits >>
+                        PAGE_CACHE_SHIFT;
        ofs = (ni->mft_no << vol->mft_record_size_bits) & ~PAGE_CACHE_MASK;
        i_size = i_size_read(mft_vi);
diff --git a/fs/ntfs/unistr.c b/fs/ntfs/unistr.c
index a389a5a16c84..0ea887fc859c 100644
--- a/fs/ntfs/unistr.c
+++ b/fs/ntfs/unistr.c
@@ -1,7 +1,7 @@
 /*
 * unistr.c - NTFS Unicode string handling. Part of the Linux-NTFS project.
 *
- * Copyright (c) 2001-2004 Anton Altaparmakov
+ * Copyright (c) 2001-2005 Anton Altaparmakov
 *
 * This program/include file is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as published
diff --git a/include/asm-arm/arch-h720x/system.h b/include/asm-arm/arch-h720x/system.h
index 0b025e227ec2..09eda84592ff 100644
--- a/include/asm-arm/arch-h720x/system.h
+++ b/include/asm-arm/arch-h720x/system.h
@@ -17,9 +17,11 @@
 static void arch_idle(void)
 {
        CPU_REG (PMU_BASE, PMU_MODE) = PMU_MODE_IDLE;
-        __asm__ __volatile__(
+        nop();
-        "mov    r0, r0\n\t"
+        nop();
-        "mov    r0, r0");
+        CPU_REG (PMU_BASE, PMU_MODE) = PMU_MODE_RUN;
+        nop();
+        nop();
 }
diff --git a/include/asm-arm/arch-imx/imx-regs.h b/include/asm-arm/arch-imx/imx-regs.h
index 93b840e8fa60..229f7008d74f 100644
--- a/include/asm-arm/arch-imx/imx-regs.h
+++ b/include/asm-arm/arch-imx/imx-regs.h
@@ -76,6 +76,7 @@
 #define GPIO_PIN_MASK 0x1f
 #define GPIO_PORT_MASK (0x3 << 5)
+#define GPIO_PORT_SHIFT 5
 #define GPIO_PORTA (0<<5)
 #define GPIO_PORTB (1<<5)
 #define GPIO_PORTC (2<<5)
@@ -88,24 +89,37 @@
 #define GPIO_PF    (0<<9)
 #define GPIO_AF    (1<<9)
+#define GPIO_OCR_SHIFT 10
 #define GPIO_OCR_MASK (3<<10)
 #define GPIO_AIN   (0<<10)
 #define GPIO_BIN   (1<<10)
 #define GPIO_CIN   (2<<10)
-#define GPIO_GPIO  (3<<10)
+#define GPIO_DR    (3<<10)
-#define GPIO_AOUT  (1<<12)
+#define GPIO_AOUT_SHIFT 12
-#define GPIO_BOUT  (1<<13)
+#define GPIO_AOUT_MASK (3<<12)
+#define GPIO_AOUT     (0<<12)
+#define GPIO_AOUT_ISR (1<<12)
+#define GPIO_AOUT_0   (2<<12)
+#define GPIO_AOUT_1   (3<<12)
+#define GPIO_BOUT_SHIFT 14
+#define GPIO_BOUT_MASK (3<<14)
+#define GPIO_BOUT      (0<<14)
+#define GPIO_BOUT_ISR  (1<<14)
+#define GPIO_BOUT_0    (2<<14)
+#define GPIO_BOUT_1    (3<<14)
+#define GPIO_GIUS      (1<<16)
 /* assignements for GPIO alternate/primary functions */
 /* FIXME: This list is not completed. The correct directions are
 * missing on some (many) pins
 */
-#define PA0_PF_A24           ( GPIO_PORTA | GPIO_PF | 0 )
+#define PA0_AIN_SPI2_CLK     ( GPIO_GIUS | GPIO_PORTA | GPIO_OUT | 0 )
-#define PA0_AIN_SPI2_CLK     ( GPIO_PORTA | GPIO_OUT | GPIO_AIN | 0 )
 #define PA0_AF_ETMTRACESYNC  ( GPIO_PORTA | GPIO_AF | 0 )
-#define PA1_AOUT_SPI2_RXD    ( GPIO_PORTA | GPIO_IN | GPIO_AOUT | 1 )
+#define PA1_AOUT_SPI2_RXD    ( GPIO_GIUS | GPIO_PORTA | GPIO_IN | 1 )
 #define PA1_PF_TIN           ( GPIO_PORTA | GPIO_PF | 1 )
 #define PA2_PF_PWM0          ( GPIO_PORTA | GPIO_OUT | GPIO_PF | 2 )
 #define PA3_PF_CSI_MCLK      ( GPIO_PORTA | GPIO_PF | 3 )
@@ -123,7 +137,7 @@
 #define PA15_PF_I2C_SDA      ( GPIO_PORTA | GPIO_OUT | GPIO_PF | 15 )
 #define PA16_PF_I2C_SCL      ( GPIO_PORTA | GPIO_OUT | GPIO_PF | 16 )
 #define PA17_AF_ETMTRACEPKT4 ( GPIO_PORTA | GPIO_AF | 17 )
-#define PA17_AIN_SPI2_SS     ( GPIO_PORTA | GPIO_AIN | 17 )
+#define PA17_AIN_SPI2_SS     ( GPIO_GIUS | GPIO_PORTA | GPIO_OUT | 17 )
 #define PA18_AF_ETMTRACEPKT5 ( GPIO_PORTA | GPIO_AF | 18 )
 #define PA19_AF_ETMTRACEPKT6 ( GPIO_PORTA | GPIO_AF | 19 )
 #define PA20_AF_ETMTRACEPKT7 ( GPIO_PORTA | GPIO_AF | 20 )
@@ -191,19 +205,27 @@
 #define PC15_PF_SPI1_SS      ( GPIO_PORTC | GPIO_PF | 15 )
 #define PC16_PF_SPI1_MISO    ( GPIO_PORTC | GPIO_PF | 16 )
 #define PC17_PF_SPI1_MOSI    ( GPIO_PORTC | GPIO_PF | 17 )
+#define PC24_BIN_UART3_RI    ( GPIO_GIUS | GPIO_PORTC | GPIO_OUT | GPIO_BIN | 24 )
+#define PC25_BIN_UART3_DSR   ( GPIO_GIUS | GPIO_PORTC | GPIO_OUT | GPIO_BIN | 25 )
+#define PC26_AOUT_UART3_DTR  ( GPIO_GIUS | GPIO_PORTC | GPIO_IN | 26 )
+#define PC27_BIN_UART3_DCD   ( GPIO_GIUS | GPIO_PORTC | GPIO_OUT | GPIO_BIN | 27 )
+#define PC28_BIN_UART3_CTS   ( GPIO_GIUS | GPIO_PORTC | GPIO_OUT | GPIO_BIN | 28 )
+#define PC29_AOUT_UART3_RTS  ( GPIO_GIUS | GPIO_PORTC | GPIO_IN | 29 )
+#define PC30_BIN_UART3_TX    ( GPIO_GIUS | GPIO_PORTC | GPIO_BIN | 30 )
+#define PC31_AOUT_UART3_RX   ( GPIO_GIUS | GPIO_PORTC | GPIO_IN | 31)
 #define PD6_PF_LSCLK         ( GPIO_PORTD | GPIO_OUT | GPIO_PF | 6 )
 #define PD7_PF_REV           ( GPIO_PORTD | GPIO_PF | 7 )
 #define PD7_AF_UART2_DTR     ( GPIO_PORTD | GPIO_IN | GPIO_AF | 7 )
-#define PD7_AIN_SPI2_SCLK    ( GPIO_PORTD | GPIO_AIN | 7 )
+#define PD7_AIN_SPI2_SCLK    ( GPIO_GIUS | GPIO_PORTD | GPIO_AIN | 7 )
 #define PD8_PF_CLS           ( GPIO_PORTD | GPIO_PF | 8 )
 #define PD8_AF_UART2_DCD     ( GPIO_PORTD | GPIO_OUT | GPIO_AF | 8 )
-#define PD8_AIN_SPI2_SS      ( GPIO_PORTD | GPIO_AIN | 8 )
+#define PD8_AIN_SPI2_SS      ( GPIO_GIUS | GPIO_PORTD | GPIO_AIN | 8 )
 #define PD9_PF_PS            ( GPIO_PORTD | GPIO_PF | 9 )
 #define PD9_AF_UART2_RI      ( GPIO_PORTD | GPIO_OUT | GPIO_AF | 9 )
-#define PD9_AOUT_SPI2_RXD    ( GPIO_PORTD | GPIO_IN | GPIO_AOUT | 9 )
+#define PD9_AOUT_SPI2_RXD    ( GPIO_GIUS | GPIO_PORTD | GPIO_IN | 9 )
 #define PD10_PF_SPL_SPR      ( GPIO_PORTD | GPIO_OUT | GPIO_PF | 10 )
 #define PD10_AF_UART2_DSR    ( GPIO_PORTD | GPIO_OUT | GPIO_AF | 10 )
-#define PD10_AIN_SPI2_TXD    ( GPIO_PORTD | GPIO_OUT | GPIO_AIN | 10 )
+#define PD10_AIN_SPI2_TXD    ( GPIO_GIUS | GPIO_PORTD | GPIO_OUT | 10 )
 #define PD11_PF_CONTRAST     ( GPIO_PORTD | GPIO_OUT | GPIO_PF | 11 )
 #define PD12_PF_ACD_OE       ( GPIO_PORTD | GPIO_OUT | GPIO_PF | 12 )
 #define PD13_PF_LP_HSYNC     ( GPIO_PORTD | GPIO_OUT | GPIO_PF | 13 )
@@ -225,7 +247,7 @@
 #define PD29_PF_LD14         ( GPIO_PORTD | GPIO_OUT | GPIO_PF | 29 )
 #define PD30_PF_LD15         ( GPIO_PORTD | GPIO_OUT | GPIO_PF | 30 )
 #define PD31_PF_TMR2OUT      ( GPIO_PORTD | GPIO_PF | 31 )
-#define PD31_BIN_SPI2_TXD    ( GPIO_PORTD | GPIO_BIN | 31 )
+#define PD31_BIN_SPI2_TXD    ( GPIO_GIUS | GPIO_PORTD | GPIO_BIN | 31 )
 /*
 * PWM controller
diff --git a/include/asm-arm/arch-ixp4xx/platform.h b/include/asm-arm/arch-ixp4xx/platform.h
index d13ee7f78c70..f14ed63590c3 100644
--- a/include/asm-arm/arch-ixp4xx/platform.h
+++ b/include/asm-arm/arch-ixp4xx/platform.h
@@ -93,7 +93,7 @@ extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys);
 static inline void gpio_line_config(u8 line, u32 direction)
 {
-        if (direction == IXP4XX_GPIO_OUT)
+        if (direction == IXP4XX_GPIO_IN)
                *IXP4XX_GPIO_GPOER |= (1 << line);
        else
                *IXP4XX_GPIO_GPOER &= ~(1 << line);
diff --git a/include/asm-sparc/btfixup.h b/include/asm-sparc/btfixup.h
index b84c96c89581..c2868d0f60b6 100644
--- a/include/asm-sparc/btfixup.h
+++ b/include/asm-sparc/btfixup.h
@@ -49,17 +49,17 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void);
 /* Put bottom 13bits into some register variable */
 #define BTFIXUPDEF_SIMM13(__name)                                                       \
-        extern unsigned int ___sf_##__name(void) __attribute_const__;           \
+        static inline unsigned int ___sf_##__name(void) __attribute_const__;            \
        extern unsigned ___ss_##__name[2];                                              \
-        extern __inline__ unsigned int ___sf_##__name(void) {                           \
+        static inline unsigned int ___sf_##__name(void) {                               \
                unsigned int ret;                                                       \
                __asm__ ("or %%g0, ___s_" #__name ", %0" : "=r"(ret));                  \
                return ret;                                                             \
        }
 #define BTFIXUPDEF_SIMM13_INIT(__name,__val)                                            \
-        extern unsigned int ___sf_##__name(void) __attribute_const__;           \
+        static inline unsigned int ___sf_##__name(void) __attribute_const__;            \
        extern unsigned ___ss_##__name[2];                                              \
-        extern __inline__ unsigned int ___sf_##__name(void) {                           \
+        static inline unsigned int ___sf_##__name(void) {                               \
                unsigned int ret;                                                       \
                __asm__ ("or %%g0, ___s_" #__name "__btset_" #__val ", %0" : "=r"(ret));\
                return ret;                                                             \
@@ -71,17 +71,17 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void);
 */
 #define BTFIXUPDEF_HALF(__name)                                                         \
-        extern unsigned int ___af_##__name(void) __attribute_const__;           \
+        static inline unsigned int ___af_##__name(void) __attribute_const__;            \
        extern unsigned ___as_##__name[2];                                              \
-        extern __inline__ unsigned int ___af_##__name(void) {                           \
+        static inline unsigned int ___af_##__name(void) {                               \
                unsigned int ret;                                                       \
                __asm__ ("or %%g0, ___a_" #__name ", %0" : "=r"(ret));                  \
                return ret;                                                             \
        }
 #define BTFIXUPDEF_HALF_INIT(__name,__val)                                              \
-        extern unsigned int ___af_##__name(void) __attribute_const__;           \
+        static inline unsigned int ___af_##__name(void) __attribute_const__;            \
        extern unsigned ___as_##__name[2];                                              \
-        extern __inline__ unsigned int ___af_##__name(void) {                           \
+        static inline unsigned int ___af_##__name(void) {                               \
                unsigned int ret;                                                       \
                __asm__ ("or %%g0, ___a_" #__name "__btset_" #__val ", %0" : "=r"(ret));\
                return ret;                                                             \
@@ -90,17 +90,17 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void);
 /* Put upper 22 bits into some register variable */
 #define BTFIXUPDEF_SETHI(__name)                                                        \
-        extern unsigned int ___hf_##__name(void) __attribute_const__;           \
+        static inline unsigned int ___hf_##__name(void) __attribute_const__;            \
        extern unsigned ___hs_##__name[2];                                              \
-        extern __inline__ unsigned int ___hf_##__name(void) {                           \
+        static inline unsigned int ___hf_##__name(void) {                               \
                unsigned int ret;                                                       \
                __asm__ ("sethi %%hi(___h_" #__name "), %0" : "=r"(ret));               \
                return ret;                                                             \
        }
 #define BTFIXUPDEF_SETHI_INIT(__name,__val)                                             \
-        extern unsigned int ___hf_##__name(void) __attribute_const__;           \
+        static inline unsigned int ___hf_##__name(void) __attribute_const__;            \
        extern unsigned ___hs_##__name[2];                                              \
-        extern __inline__ unsigned int ___hf_##__name(void) {                           \
+        static inline unsigned int ___hf_##__name(void) {                               \
                unsigned int ret;                                                       \
                __asm__ ("sethi %%hi(___h_" #__name "__btset_" #__val "), %0" :         \
                         "=r"(ret));                                                    \
diff --git a/include/asm-sparc/cache.h b/include/asm-sparc/cache.h
index e6316fd7e1a4..a10522cb21b7 100644
--- a/include/asm-sparc/cache.h
+++ b/include/asm-sparc/cache.h
@@ -27,7 +27,7 @@
 */
 /* First, cache-tag access. */
-extern __inline__ unsigned int get_icache_tag(int setnum, int tagnum)
+static inline unsigned int get_icache_tag(int setnum, int tagnum)
 {
        unsigned int vaddr, retval;
@@ -38,7 +38,7 @@ extern __inline__ unsigned int get_icache_tag(int setnum, int tagnum)
        return retval;
 }
-extern __inline__ void put_icache_tag(int setnum, int tagnum, unsigned int entry)
+static inline void put_icache_tag(int setnum, int tagnum, unsigned int entry)
 {
        unsigned int vaddr;
@@ -51,7 +51,7 @@ extern __inline__ void put_icache_tag(int setnum, int tagnum, unsigned int entry
 /* Second cache-data access.  The data is returned two-32bit quantities
 * at a time.
 */
-extern __inline__ void get_icache_data(int setnum, int tagnum, int subblock,
+static inline void get_icache_data(int setnum, int tagnum, int subblock,
                                       unsigned int *data)
 {
        unsigned int value1, value2, vaddr;
@@ -67,7 +67,7 @@ extern __inline__ void get_icache_data(int setnum, int tagnum, int subblock,
        data[0] = value1; data[1] = value2;
 }
-extern __inline__ void put_icache_data(int setnum, int tagnum, int subblock,
+static inline void put_icache_data(int setnum, int tagnum, int subblock,
                                       unsigned int *data)
 {
        unsigned int value1, value2, vaddr;
@@ -92,35 +92,35 @@ extern __inline__ void put_icache_data(int setnum, int tagnum, int subblock,
 */
 /* Flushes which clear out both the on-chip and external caches */
-extern __inline__ void flush_ei_page(unsigned int addr)
+static inline void flush_ei_page(unsigned int addr)
 {
        __asm__ __volatile__("sta %%g0, [%0] %1\n\t" : :
                             "r" (addr), "i" (ASI_M_FLUSH_PAGE) :
                             "memory");
 }
-extern __inline__ void flush_ei_seg(unsigned int addr)
+static inline void flush_ei_seg(unsigned int addr)
 {
        __asm__ __volatile__("sta %%g0, [%0] %1\n\t" : :
                             "r" (addr), "i" (ASI_M_FLUSH_SEG) :
                             "memory");
 }
-extern __inline__ void flush_ei_region(unsigned int addr)
+static inline void flush_ei_region(unsigned int addr)
 {
        __asm__ __volatile__("sta %%g0, [%0] %1\n\t" : :
                             "r" (addr), "i" (ASI_M_FLUSH_REGION) :
                             "memory");
 }
-extern __inline__ void flush_ei_ctx(unsigned int addr)
+static inline void flush_ei_ctx(unsigned int addr)
 {
        __asm__ __volatile__("sta %%g0, [%0] %1\n\t" : :
                             "r" (addr), "i" (ASI_M_FLUSH_CTX) :
                             "memory");
 }
-extern __inline__ void flush_ei_user(unsigned int addr)
+static inline void flush_ei_user(unsigned int addr)
 {
        __asm__ __volatile__("sta %%g0, [%0] %1\n\t" : :
                             "r" (addr), "i" (ASI_M_FLUSH_USER) :
diff --git a/include/asm-sparc/cypress.h b/include/asm-sparc/cypress.h
index fc92fc839c3f..99599533efbc 100644
--- a/include/asm-sparc/cypress.h
+++ b/include/asm-sparc/cypress.h
@@ -48,25 +48,25 @@
 #define CYPRESS_NFAULT    0x00000002
 #define CYPRESS_MENABLE   0x00000001
-extern __inline__ void cypress_flush_page(unsigned long page)
+static inline void cypress_flush_page(unsigned long page)
 {
        __asm__ __volatile__("sta %%g0, [%0] %1\n\t" : :
                             "r" (page), "i" (ASI_M_FLUSH_PAGE));
 }
-extern __inline__ void cypress_flush_segment(unsigned long addr)
+static inline void cypress_flush_segment(unsigned long addr)
 {
        __asm__ __volatile__("sta %%g0, [%0] %1\n\t" : :
                             "r" (addr), "i" (ASI_M_FLUSH_SEG));
 }
-extern __inline__ void cypress_flush_region(unsigned long addr)
+static inline void cypress_flush_region(unsigned long addr)
 {
        __asm__ __volatile__("sta %%g0, [%0] %1\n\t" : :
                             "r" (addr), "i" (ASI_M_FLUSH_REGION));
 }
-extern __inline__ void cypress_flush_context(void)
+static inline void cypress_flush_context(void)
 {
        __asm__ __volatile__("sta %%g0, [%%g0] %0\n\t" : :
                             "i" (ASI_M_FLUSH_CTX));
diff --git a/include/asm-sparc/delay.h b/include/asm-sparc/delay.h
index 6edf2cbb246b..7ec8e9f7ad4f 100644
--- a/include/asm-sparc/delay.h
+++ b/include/asm-sparc/delay.h
@@ -10,7 +10,7 @@
 #include <linux/config.h>
 #include <asm/cpudata.h>
-extern __inline__ void __delay(unsigned long loops)
+static inline void __delay(unsigned long loops)
 {
        __asm__ __volatile__("cmp %0, 0\n\t"
                             "1: bne 1b\n\t"
diff --git a/include/asm-sparc/dma.h b/include/asm-sparc/dma.h
index 07e6368a2521..8ec206aa5f2e 100644
--- a/include/asm-sparc/dma.h
+++ b/include/asm-sparc/dma.h
@@ -198,7 +198,7 @@ extern void dvma_init(struct sbus_bus *);
 /* Pause until counter runs out or BIT isn't set in the DMA condition
 * register.
 */
-extern __inline__ void sparc_dma_pause(struct sparc_dma_registers *regs,
+static inline void sparc_dma_pause(struct sparc_dma_registers *regs,
                                       unsigned long bit)
 {
        int ctr = 50000;   /* Let's find some bugs ;) */
diff --git a/include/asm-sparc/iommu.h b/include/asm-sparc/iommu.h
index 8171362d56b9..70c589c05a10 100644
--- a/include/asm-sparc/iommu.h
+++ b/include/asm-sparc/iommu.h
@@ -108,12 +108,12 @@ struct iommu_struct {
        struct bit_map usemap;
 };
-extern __inline__ void iommu_invalidate(struct iommu_regs *regs)
+static inline void iommu_invalidate(struct iommu_regs *regs)
 {
        regs->tlbflush = 0;
 }
-extern __inline__ void iommu_invalidate_page(struct iommu_regs *regs, unsigned long ba)
+static inline void iommu_invalidate_page(struct iommu_regs *regs, unsigned long ba)
 {
        regs->pageflush = (ba & PAGE_MASK);
 }
diff --git a/include/asm-sparc/kdebug.h b/include/asm-sparc/kdebug.h
index 3ea4916635ee..fba92485fdba 100644
--- a/include/asm-sparc/kdebug.h
+++ b/include/asm-sparc/kdebug.h
@@ -46,7 +46,7 @@ struct kernel_debug {
 extern struct kernel_debug *linux_dbvec;
 /* Use this macro in C-code to enter the debugger. */
-extern __inline__ void sp_enter_debugger(void)
+static inline void sp_enter_debugger(void)
 {
        __asm__ __volatile__("jmpl %0, %%o7\n\t"
                             "nop\n\t" : :
diff --git a/include/asm-sparc/mbus.h b/include/asm-sparc/mbus.h
index 5f2749015342..ecacdf4075d7 100644
--- a/include/asm-sparc/mbus.h
+++ b/include/asm-sparc/mbus.h
@@ -83,7 +83,7 @@ extern unsigned int hwbug_bitmask;
 */
 #define TBR_ID_SHIFT            20
-extern __inline__ int get_cpuid(void)
+static inline int get_cpuid(void)
 {
        register int retval;
        __asm__ __volatile__("rd %%tbr, %0\n\t"
@@ -93,7 +93,7 @@ extern __inline__ int get_cpuid(void)
        return (retval & 3);
 }
-extern __inline__ int get_modid(void)
+static inline int get_modid(void)
 {
        return (get_cpuid() | 0x8);
 }
diff --git a/include/asm-sparc/msi.h b/include/asm-sparc/msi.h
index b69543dd3b46..ff72cbd946a4 100644
--- a/include/asm-sparc/msi.h
+++ b/include/asm-sparc/msi.h
@@ -19,7 +19,7 @@
 #define MSI_ASYNC_MODE  0x80000000      /* Operate the MSI asynchronously */
-extern __inline__ void msi_set_sync(void)
+static inline void msi_set_sync(void)
 {
        __asm__ __volatile__ ("lda [%0] %1, %%g3\n\t"
                              "andn %%g3, %2, %%g3\n\t"
diff --git a/include/asm-sparc/mxcc.h b/include/asm-sparc/mxcc.h
index 60ef9d6fe7bc..128fe9708135 100644
--- a/include/asm-sparc/mxcc.h
+++ b/include/asm-sparc/mxcc.h
@@ -85,7 +85,7 @@
 #ifndef __ASSEMBLY__
-extern __inline__ void mxcc_set_stream_src(unsigned long *paddr)
+static inline void mxcc_set_stream_src(unsigned long *paddr)
 {
        unsigned long data0 = paddr[0];
        unsigned long data1 = paddr[1];
@@ -98,7 +98,7 @@ extern __inline__ void mxcc_set_stream_src(unsigned long *paddr)
                              "i" (ASI_M_MXCC) : "g2", "g3");
 }
-extern __inline__ void mxcc_set_stream_dst(unsigned long *paddr)
+static inline void mxcc_set_stream_dst(unsigned long *paddr)
 {
        unsigned long data0 = paddr[0];
        unsigned long data1 = paddr[1];
@@ -111,7 +111,7 @@ extern __inline__ void mxcc_set_stream_dst(unsigned long *paddr)
                              "i" (ASI_M_MXCC) : "g2", "g3");
 }
-extern __inline__ unsigned long mxcc_get_creg(void)
+static inline unsigned long mxcc_get_creg(void)
 {
        unsigned long mxcc_control;
@@ -125,7 +125,7 @@ extern __inline__ unsigned long mxcc_get_creg(void)
        return mxcc_control;
 }
-extern __inline__ void mxcc_set_creg(unsigned long mxcc_control)
+static inline void mxcc_set_creg(unsigned long mxcc_control)
 {
        __asm__ __volatile__("sta %0, [%1] %2\n\t" : :
                             "r" (mxcc_control), "r" (MXCC_CREG),
diff --git a/include/asm-sparc/obio.h b/include/asm-sparc/obio.h
index 62e1d77965f3..47854a2a12cf 100644
--- a/include/asm-sparc/obio.h
+++ b/include/asm-sparc/obio.h
@@ -98,7 +98,7 @@
 #ifndef __ASSEMBLY__
-extern __inline__ int bw_get_intr_mask(int sbus_level)
+static inline int bw_get_intr_mask(int sbus_level)
 {
        int mask;
        
@@ -109,7 +109,7 @@ extern __inline__ int bw_get_intr_mask(int sbus_level)
        return mask;
 }
-extern __inline__ void bw_clear_intr_mask(int sbus_level, int mask)
+static inline void bw_clear_intr_mask(int sbus_level, int mask)
 {
        __asm__ __volatile__ ("stha %0, [%1] %2" : :
                              "r" (mask),
@@ -117,7 +117,7 @@ extern __inline__ void bw_clear_intr_mask(int sbus_level, int mask)
                              "i" (ASI_M_CTL));
 }
-extern __inline__ unsigned bw_get_prof_limit(int cpu)
+static inline unsigned bw_get_prof_limit(int cpu)
 {
        unsigned limit;
        
@@ -128,7 +128,7 @@ extern __inline__ unsigned bw_get_prof_limit(int cpu)
        return limit;
 }
-extern __inline__ void bw_set_prof_limit(int cpu, unsigned limit)
+static inline void bw_set_prof_limit(int cpu, unsigned limit)
 {
        __asm__ __volatile__ ("sta %0, [%1] %2" : :
                              "r" (limit),
@@ -136,7 +136,7 @@ extern __inline__ void bw_set_prof_limit(int cpu, unsigned limit)
                              "i" (ASI_M_CTL));
 }
-extern __inline__ unsigned bw_get_ctrl(int cpu)
+static inline unsigned bw_get_ctrl(int cpu)
 {
        unsigned ctrl;
        
@@ -147,7 +147,7 @@ extern __inline__ unsigned bw_get_ctrl(int cpu)
        return ctrl;
 }
-extern __inline__ void bw_set_ctrl(int cpu, unsigned ctrl)
+static inline void bw_set_ctrl(int cpu, unsigned ctrl)
 {
        __asm__ __volatile__ ("sta %0, [%1] %2" : :
                              "r" (ctrl),
@@ -157,7 +157,7 @@ extern __inline__ void bw_set_ctrl(int cpu, unsigned ctrl)
 extern unsigned char cpu_leds[32];
-extern __inline__ void show_leds(int cpuid)
+static inline void show_leds(int cpuid)
 {
        cpuid &= 0x1e;
        __asm__ __volatile__ ("stba %0, [%1] %2" : :
@@ -166,7 +166,7 @@ extern __inline__ void show_leds(int cpuid)
                              "i" (ASI_M_CTL));
 }
-extern __inline__ unsigned cc_get_ipen(void)
+static inline unsigned cc_get_ipen(void)
 {
        unsigned pending;
        
@@ -177,7 +177,7 @@ extern __inline__ unsigned cc_get_ipen(void)
        return pending;
 }
-extern __inline__ void cc_set_iclr(unsigned clear)
+static inline void cc_set_iclr(unsigned clear)
 {
        __asm__ __volatile__ ("stha %0, [%1] %2" : :
                              "r" (clear),
@@ -185,7 +185,7 @@ extern __inline__ void cc_set_iclr(unsigned clear)
                              "i" (ASI_M_MXCC));
 }
-extern __inline__ unsigned cc_get_imsk(void)
+static inline unsigned cc_get_imsk(void)
 {
        unsigned mask;
        
@@ -196,7 +196,7 @@ extern __inline__ unsigned cc_get_imsk(void)
        return mask;
 }
-extern __inline__ void cc_set_imsk(unsigned mask)
+static inline void cc_set_imsk(unsigned mask)
 {
        __asm__ __volatile__ ("stha %0, [%1] %2" : :
                              "r" (mask),
@@ -204,7 +204,7 @@ extern __inline__ void cc_set_imsk(unsigned mask)
                              "i" (ASI_M_MXCC));
 }
-extern __inline__ unsigned cc_get_imsk_other(int cpuid)
+static inline unsigned cc_get_imsk_other(int cpuid)
 {
        unsigned mask;
        
@@ -215,7 +215,7 @@ extern __inline__ unsigned cc_get_imsk_other(int cpuid)
        return mask;
 }
-extern __inline__ void cc_set_imsk_other(int cpuid, unsigned mask)
+static inline void cc_set_imsk_other(int cpuid, unsigned mask)
 {
        __asm__ __volatile__ ("stha %0, [%1] %2" : :
                              "r" (mask),
@@ -223,7 +223,7 @@ extern __inline__ void cc_set_imsk_other(int cpuid, unsigned mask)
                              "i" (ASI_M_CTL));
 }
-extern __inline__ void cc_set_igen(unsigned gen)
+static inline void cc_set_igen(unsigned gen)
 {
        __asm__ __volatile__ ("sta %0, [%1] %2" : :
                              "r" (gen),
@@ -239,7 +239,7 @@ extern __inline__ void cc_set_igen(unsigned gen)
 #define IGEN_MESSAGE(bcast, devid, sid, levels) \
        (((bcast) << 31) | ((devid) << 23) | ((sid) << 15) | (levels))
            
-extern __inline__ void sun4d_send_ipi(int cpu, int level)
+static inline void sun4d_send_ipi(int cpu, int level)
 {
        cc_set_igen(IGEN_MESSAGE(0, cpu << 3, 6 + ((level >> 1) & 7), 1 << (level - 1)));
 }
diff --git a/include/asm-sparc/pci.h b/include/asm-sparc/pci.h
index 97052baf90c1..38644742f011 100644
--- a/include/asm-sparc/pci.h
+++ b/include/asm-sparc/pci.h
@@ -15,12 +15,12 @@
 #define PCI_IRQ_NONE            0xffffffff
-extern inline void pcibios_set_master(struct pci_dev *dev)
+static inline void pcibios_set_master(struct pci_dev *dev)
 {
        /* No special bus mastering setup handling */
 }
-extern inline void pcibios_penalize_isa_irq(int irq, int active)
+static inline void pcibios_penalize_isa_irq(int irq, int active)
 {
        /* We don't do dynamic PCI IRQ allocation */
 }
@@ -137,7 +137,7 @@ extern void pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist
 * only drive the low 24-bits during PCI bus mastering, then
 * you would pass 0x00ffffff as the mask to this function.
 */
-extern inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask)
+static inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask)
 {
        return 1;
 }
diff --git a/include/asm-sparc/pgtable.h b/include/asm-sparc/pgtable.h
index 8395ad2f1c09..a14e98677500 100644
--- a/include/asm-sparc/pgtable.h
+++ b/include/asm-sparc/pgtable.h
@@ -154,7 +154,7 @@ BTFIXUPDEF_CALL_CONST(int, pte_present, pte_t)
 BTFIXUPDEF_CALL(void, pte_clear, pte_t *)
 BTFIXUPDEF_CALL(int, pte_read, pte_t)
-extern __inline__ int pte_none(pte_t pte)
+static inline int pte_none(pte_t pte)
 {
        return !(pte_val(pte) & ~BTFIXUP_SETHI(none_mask));
 }
@@ -167,7 +167,7 @@ BTFIXUPDEF_CALL_CONST(int, pmd_bad, pmd_t)
 BTFIXUPDEF_CALL_CONST(int, pmd_present, pmd_t)
 BTFIXUPDEF_CALL(void, pmd_clear, pmd_t *)
-extern __inline__ int pmd_none(pmd_t pmd)
+static inline int pmd_none(pmd_t pmd)
 {
        return !(pmd_val(pmd) & ~BTFIXUP_SETHI(none_mask));
 }
@@ -194,20 +194,20 @@ BTFIXUPDEF_HALF(pte_writei)
 BTFIXUPDEF_HALF(pte_dirtyi)
 BTFIXUPDEF_HALF(pte_youngi)
-extern int pte_write(pte_t pte) __attribute_const__;
+static int pte_write(pte_t pte) __attribute_const__;
-extern __inline__ int pte_write(pte_t pte)
+static inline int pte_write(pte_t pte)
 {
        return pte_val(pte) & BTFIXUP_HALF(pte_writei);
 }
-extern int pte_dirty(pte_t pte) __attribute_const__;
+static int pte_dirty(pte_t pte) __attribute_const__;
-extern __inline__ int pte_dirty(pte_t pte)
+static inline int pte_dirty(pte_t pte)
 {
        return pte_val(pte) & BTFIXUP_HALF(pte_dirtyi);
 }
-extern int pte_young(pte_t pte) __attribute_const__;
+static int pte_young(pte_t pte) __attribute_const__;
-extern __inline__ int pte_young(pte_t pte)
+static inline int pte_young(pte_t pte)
 {
        return pte_val(pte) & BTFIXUP_HALF(pte_youngi);
 }
@@ -217,8 +217,8 @@ extern __inline__ int pte_young(pte_t pte)
 */
 BTFIXUPDEF_HALF(pte_filei)
-extern int pte_file(pte_t pte) __attribute_const__;
+static int pte_file(pte_t pte) __attribute_const__;
-extern __inline__ int pte_file(pte_t pte)
+static inline int pte_file(pte_t pte)
 {
        return pte_val(pte) & BTFIXUP_HALF(pte_filei);
 }
@@ -229,20 +229,20 @@ BTFIXUPDEF_HALF(pte_wrprotecti)
 BTFIXUPDEF_HALF(pte_mkcleani)
 BTFIXUPDEF_HALF(pte_mkoldi)
-extern pte_t pte_wrprotect(pte_t pte) __attribute_const__;
+static pte_t pte_wrprotect(pte_t pte) __attribute_const__;
-extern __inline__ pte_t pte_wrprotect(pte_t pte)
+static inline pte_t pte_wrprotect(pte_t pte)
 {
        return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_wrprotecti));
 }
-extern pte_t pte_mkclean(pte_t pte) __attribute_const__;
+static pte_t pte_mkclean(pte_t pte) __attribute_const__;
-extern __inline__ pte_t pte_mkclean(pte_t pte)
+static inline pte_t pte_mkclean(pte_t pte)
 {
        return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_mkcleani));
 }
-extern pte_t pte_mkold(pte_t pte) __attribute_const__;
+static pte_t pte_mkold(pte_t pte) __attribute_const__;
-extern __inline__ pte_t pte_mkold(pte_t pte)
+static inline pte_t pte_mkold(pte_t pte)
 {
        return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_mkoldi));
 }
@@ -278,8 +278,8 @@ BTFIXUPDEF_CALL_CONST(pte_t, mk_pte_io, unsigned long, pgprot_t, int)
 BTFIXUPDEF_INT(pte_modify_mask)
-extern pte_t pte_modify(pte_t pte, pgprot_t newprot) __attribute_const__;
+static pte_t pte_modify(pte_t pte, pgprot_t newprot) __attribute_const__;
-extern __inline__ pte_t pte_modify(pte_t pte, pgprot_t newprot)
+static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 {
        return __pte((pte_val(pte) & BTFIXUP_INT(pte_modify_mask)) |
                pgprot_val(newprot));
@@ -386,13 +386,13 @@ extern struct ctx_list ctx_used;        /* Head of used contexts list */
 #define NO_CONTEXT     -1
-extern __inline__ void remove_from_ctx_list(struct ctx_list *entry)
+static inline void remove_from_ctx_list(struct ctx_list *entry)
 {
        entry->next->prev = entry->prev;
        entry->prev->next = entry->next;
 }
-extern __inline__ void add_to_ctx_list(struct ctx_list *head, struct ctx_list *entry)
+static inline void add_to_ctx_list(struct ctx_list *head, struct ctx_list *entry)
 {
        entry->next = head;
        (entry->prev = head->prev)->next = entry;
@@ -401,7 +401,7 @@ extern __inline__ void add_to_ctx_list(struct ctx_list *head, struct ctx_list *e
 #define add_to_free_ctxlist(entry) add_to_ctx_list(&ctx_free, entry)
 #define add_to_used_ctxlist(entry) add_to_ctx_list(&ctx_used, entry)
-extern __inline__ unsigned long
+static inline unsigned long
 __get_phys (unsigned long addr)
 {
        switch (sparc_cpu_model){
@@ -416,7 +416,7 @@ __get_phys (unsigned long addr)
        }
 }
-extern __inline__ int
+static inline int
 __get_iospace (unsigned long addr)
 {
        switch (sparc_cpu_model){
diff --git a/include/asm-sparc/pgtsrmmu.h b/include/asm-sparc/pgtsrmmu.h
index ee3b9d93187c..edeb9811e728 100644
--- a/include/asm-sparc/pgtsrmmu.h
+++ b/include/asm-sparc/pgtsrmmu.h
@@ -148,7 +148,7 @@ extern void *srmmu_nocache_pool;
 #define __nocache_fix(VADDR) __va(__nocache_pa(VADDR))
 /* Accessing the MMU control register. */
-extern __inline__ unsigned int srmmu_get_mmureg(void)
+static inline unsigned int srmmu_get_mmureg(void)
 {
        unsigned int retval;
        __asm__ __volatile__("lda [%%g0] %1, %0\n\t" :
@@ -157,14 +157,14 @@ extern __inline__ unsigned int srmmu_get_mmureg(void)
        return retval;
 }
-extern __inline__ void srmmu_set_mmureg(unsigned long regval)
+static inline void srmmu_set_mmureg(unsigned long regval)
 {
        __asm__ __volatile__("sta %0, [%%g0] %1\n\t" : :
                             "r" (regval), "i" (ASI_M_MMUREGS) : "memory");
 }
-extern __inline__ void srmmu_set_ctable_ptr(unsigned long paddr)
+static inline void srmmu_set_ctable_ptr(unsigned long paddr)
 {
        paddr = ((paddr >> 4) & SRMMU_CTX_PMASK);
        __asm__ __volatile__("sta %0, [%1] %2\n\t" : :
@@ -173,7 +173,7 @@ extern __inline__ void srmmu_set_ctable_ptr(unsigned long paddr)
                             "memory");
 }
-extern __inline__ unsigned long srmmu_get_ctable_ptr(void)
+static inline unsigned long srmmu_get_ctable_ptr(void)
 {
        unsigned int retval;
@@ -184,14 +184,14 @@ extern __inline__ unsigned long srmmu_get_ctable_ptr(void)
        return (retval & SRMMU_CTX_PMASK) << 4;
 }
-extern __inline__ void srmmu_set_context(int context)
+static inline void srmmu_set_context(int context)
 {
        __asm__ __volatile__("sta %0, [%1] %2\n\t" : :
                             "r" (context), "r" (SRMMU_CTX_REG),
                             "i" (ASI_M_MMUREGS) : "memory");
 }
-extern __inline__ int srmmu_get_context(void)
+static inline int srmmu_get_context(void)
 {
        register int retval;
        __asm__ __volatile__("lda [%1] %2, %0\n\t" :
@@ -201,7 +201,7 @@ extern __inline__ int srmmu_get_context(void)
        return retval;
 }
-extern __inline__ unsigned int srmmu_get_fstatus(void)
+static inline unsigned int srmmu_get_fstatus(void)
 {
        unsigned int retval;
@@ -211,7 +211,7 @@ extern __inline__ unsigned int srmmu_get_fstatus(void)
        return retval;
 }
-extern __inline__ unsigned int srmmu_get_faddr(void)
+static inline unsigned int srmmu_get_faddr(void)
 {
        unsigned int retval;
@@ -222,7 +222,7 @@ extern __inline__ unsigned int srmmu_get_faddr(void)
 }
 /* This is guaranteed on all SRMMU's. */
-extern __inline__ void srmmu_flush_whole_tlb(void)
+static inline void srmmu_flush_whole_tlb(void)
 {
        __asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
                             "r" (0x400),        /* Flush entire TLB!! */
@@ -231,7 +231,7 @@ extern __inline__ void srmmu_flush_whole_tlb(void)
 }
 /* These flush types are not available on all chips... */
-extern __inline__ void srmmu_flush_tlb_ctx(void)
+static inline void srmmu_flush_tlb_ctx(void)
 {
        __asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
                             "r" (0x300),        /* Flush TLB ctx.. */
@@ -239,7 +239,7 @@ extern __inline__ void srmmu_flush_tlb_ctx(void)
 }
-extern __inline__ void srmmu_flush_tlb_region(unsigned long addr)
+static inline void srmmu_flush_tlb_region(unsigned long addr)
 {
        addr &= SRMMU_PGDIR_MASK;
        __asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
@@ -249,7 +249,7 @@ extern __inline__ void srmmu_flush_tlb_region(unsigned long addr)
 }
-extern __inline__ void srmmu_flush_tlb_segment(unsigned long addr)
+static inline void srmmu_flush_tlb_segment(unsigned long addr)
 {
        addr &= SRMMU_REAL_PMD_MASK;
        __asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
@@ -258,7 +258,7 @@ extern __inline__ void srmmu_flush_tlb_segment(unsigned long addr)
 }
-extern __inline__ void srmmu_flush_tlb_page(unsigned long page)
+static inline void srmmu_flush_tlb_page(unsigned long page)
 {
        page &= PAGE_MASK;
        __asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
@@ -267,7 +267,7 @@ extern __inline__ void srmmu_flush_tlb_page(unsigned long page)
 }
-extern __inline__ unsigned long srmmu_hwprobe(unsigned long vaddr)
+static inline unsigned long srmmu_hwprobe(unsigned long vaddr)
 {
        unsigned long retval;
@@ -279,7 +279,7 @@ extern __inline__ unsigned long srmmu_hwprobe(unsigned long vaddr)
        return retval;
 }
-extern __inline__ int
+static inline int
 srmmu_get_pte (unsigned long addr)
 {
        register unsigned long entry;
diff --git a/include/asm-sparc/processor.h b/include/asm-sparc/processor.h
index 5a7a1a8d29ac..6fbb3f0af8d8 100644
--- a/include/asm-sparc/processor.h
+++ b/include/asm-sparc/processor.h
@@ -79,7 +79,7 @@ struct thread_struct {
 extern unsigned long thread_saved_pc(struct task_struct *t);
 /* Do necessary setup to start up a newly executed thread. */
-extern __inline__ void start_thread(struct pt_regs * regs, unsigned long pc,
+static inline void start_thread(struct pt_regs * regs, unsigned long pc,
                                    unsigned long sp)
 {
        register unsigned long zero asm("g1");
diff --git a/include/asm-sparc/psr.h b/include/asm-sparc/psr.h
index 9778b8c8b15b..19c978051118 100644
--- a/include/asm-sparc/psr.h
+++ b/include/asm-sparc/psr.h
@@ -38,7 +38,7 @@
 #ifndef __ASSEMBLY__
 /* Get the %psr register. */
-extern __inline__ unsigned int get_psr(void)
+static inline unsigned int get_psr(void)
 {
        unsigned int psr;
        __asm__ __volatile__(
@@ -53,7 +53,7 @@ extern __inline__ unsigned int get_psr(void)
        return psr;
 }
-extern __inline__ void put_psr(unsigned int new_psr)
+static inline void put_psr(unsigned int new_psr)
 {
        __asm__ __volatile__(
                "wr     %0, 0x0, %%psr\n\t"
@@ -72,7 +72,7 @@ extern __inline__ void put_psr(unsigned int new_psr)
 extern unsigned int fsr_storage;
-extern __inline__ unsigned int get_fsr(void)
+static inline unsigned int get_fsr(void)
 {
        unsigned int fsr = 0;
diff --git a/include/asm-sparc/sbi.h b/include/asm-sparc/sbi.h
index 739ccac5dcf2..86a603ac7b20 100644
--- a/include/asm-sparc/sbi.h
+++ b/include/asm-sparc/sbi.h
@@ -65,7 +65,7 @@ struct sbi_regs {
 #ifndef __ASSEMBLY__
-extern __inline__ int acquire_sbi(int devid, int mask)
+static inline int acquire_sbi(int devid, int mask)
 {
        __asm__ __volatile__ ("swapa [%2] %3, %0" :
                              "=r" (mask) :
@@ -75,7 +75,7 @@ extern __inline__ int acquire_sbi(int devid, int mask)
        return mask;
 }
-extern __inline__ void release_sbi(int devid, int mask)
+static inline void release_sbi(int devid, int mask)
 {
        __asm__ __volatile__ ("sta %0, [%1] %2" : :
                              "r" (mask),
@@ -83,7 +83,7 @@ extern __inline__ void release_sbi(int devid, int mask)
                              "i" (ASI_M_CTL));
 }
-extern __inline__ void set_sbi_tid(int devid, int targetid)
+static inline void set_sbi_tid(int devid, int targetid)
 {
        __asm__ __volatile__ ("sta %0, [%1] %2" : :
                              "r" (targetid),
@@ -91,7 +91,7 @@ extern __inline__ void set_sbi_tid(int devid, int targetid)
                              "i" (ASI_M_CTL));
 }
-extern __inline__ int get_sbi_ctl(int devid, int cfgno)
+static inline int get_sbi_ctl(int devid, int cfgno)
 {
        int cfg;
        
@@ -102,7 +102,7 @@ extern __inline__ int get_sbi_ctl(int devid, int cfgno)
        return cfg;
 }
-extern __inline__ void set_sbi_ctl(int devid, int cfgno, int cfg)
+static inline void set_sbi_ctl(int devid, int cfgno, int cfg)
 {
        __asm__ __volatile__ ("sta %0, [%1] %2" : :
                              "r" (cfg),
diff --git a/include/asm-sparc/sbus.h b/include/asm-sparc/sbus.h
index 3a8b3908728a..a13cddcecec5 100644
--- a/include/asm-sparc/sbus.h
+++ b/include/asm-sparc/sbus.h
@@ -28,12 +28,12 @@
 * numbers + offsets, and vice versa.
 */
-extern __inline__ unsigned long sbus_devaddr(int slotnum, unsigned long offset)
+static inline unsigned long sbus_devaddr(int slotnum, unsigned long offset)
 {
  return (unsigned long) (SUN_SBUS_BVADDR+((slotnum)<<25)+(offset));
 }
-extern __inline__ int sbus_dev_slot(unsigned long dev_addr)
+static inline int sbus_dev_slot(unsigned long dev_addr)
 {
  return (int) (((dev_addr)-SUN_SBUS_BVADDR)>>25);
 }
@@ -80,7 +80,7 @@ struct sbus_bus {
 extern struct sbus_bus *sbus_root;
-extern __inline__ int
+static inline int
 sbus_is_slave(struct sbus_dev *dev)
 {
        /* XXX Have to write this for sun4c's */
diff --git a/include/asm-sparc/smp.h b/include/asm-sparc/smp.h
index 4f96d8333a12..580c51d011df 100644
--- a/include/asm-sparc/smp.h
+++ b/include/asm-sparc/smp.h
@@ -60,22 +60,22 @@ BTFIXUPDEF_BLACKBOX(load_current)
 #define smp_cross_call(func,arg1,arg2,arg3,arg4,arg5) BTFIXUP_CALL(smp_cross_call)(func,arg1,arg2,arg3,arg4,arg5)
 #define smp_message_pass(target,msg,data,wait) BTFIXUP_CALL(smp_message_pass)(target,msg,data,wait)
-extern __inline__ void xc0(smpfunc_t func) { smp_cross_call(func, 0, 0, 0, 0, 0); }
+static inline void xc0(smpfunc_t func) { smp_cross_call(func, 0, 0, 0, 0, 0); }
-extern __inline__ void xc1(smpfunc_t func, unsigned long arg1)
+static inline void xc1(smpfunc_t func, unsigned long arg1)
 { smp_cross_call(func, arg1, 0, 0, 0, 0); }
-extern __inline__ void xc2(smpfunc_t func, unsigned long arg1, unsigned long arg2)
+static inline void xc2(smpfunc_t func, unsigned long arg1, unsigned long arg2)
 { smp_cross_call(func, arg1, arg2, 0, 0, 0); }
-extern __inline__ void xc3(smpfunc_t func, unsigned long arg1, unsigned long arg2,
+static inline void xc3(smpfunc_t func, unsigned long arg1, unsigned long arg2,
                           unsigned long arg3)
 { smp_cross_call(func, arg1, arg2, arg3, 0, 0); }
-extern __inline__ void xc4(smpfunc_t func, unsigned long arg1, unsigned long arg2,
+static inline void xc4(smpfunc_t func, unsigned long arg1, unsigned long arg2,
                           unsigned long arg3, unsigned long arg4)
 { smp_cross_call(func, arg1, arg2, arg3, arg4, 0); }
-extern __inline__ void xc5(smpfunc_t func, unsigned long arg1, unsigned long arg2,
+static inline void xc5(smpfunc_t func, unsigned long arg1, unsigned long arg2,
                           unsigned long arg3, unsigned long arg4, unsigned long arg5)
 { smp_cross_call(func, arg1, arg2, arg3, arg4, arg5); }
-extern __inline__ int smp_call_function(void (*func)(void *info), void *info, int nonatomic, int wait)
+static inline int smp_call_function(void (*func)(void *info), void *info, int nonatomic, int wait)
 {
        xc1((smpfunc_t)func, (unsigned long)info);
        return 0;
@@ -84,16 +84,16 @@ extern __inline__ int smp_call_function(void (*func)(void *info), void *info, in
 extern __volatile__ int __cpu_number_map[NR_CPUS];
 extern __volatile__ int __cpu_logical_map[NR_CPUS];
-extern __inline__ int cpu_logical_map(int cpu)
+static inline int cpu_logical_map(int cpu)
 {
        return __cpu_logical_map[cpu];
 }
-extern __inline__ int cpu_number_map(int cpu)
+static inline int cpu_number_map(int cpu)
 {
        return __cpu_number_map[cpu];
 }
-extern __inline__ int hard_smp4m_processor_id(void)
+static inline int hard_smp4m_processor_id(void)
 {
        int cpuid;
@@ -104,7 +104,7 @@ extern __inline__ int hard_smp4m_processor_id(void)
        return cpuid;
 }
-extern __inline__ int hard_smp4d_processor_id(void)
+static inline int hard_smp4d_processor_id(void)
 {
        int cpuid;
@@ -114,7 +114,7 @@ extern __inline__ int hard_smp4d_processor_id(void)
 }
 #ifndef MODULE
-extern __inline__ int hard_smp_processor_id(void)
+static inline int hard_smp_processor_id(void)
 {
        int cpuid;
@@ -136,7 +136,7 @@ extern __inline__ int hard_smp_processor_id(void)
        return cpuid;
 }
 #else
-extern __inline__ int hard_smp_processor_id(void)
+static inline int hard_smp_processor_id(void)
 {
        int cpuid;
        
diff --git a/include/asm-sparc/smpprim.h b/include/asm-sparc/smpprim.h
index 9b9c28ed748e..e7b6d346ae10 100644
--- a/include/asm-sparc/smpprim.h
+++ b/include/asm-sparc/smpprim.h
@@ -15,7 +15,7 @@
 * atomic.
 */
-extern __inline__ __volatile__ char test_and_set(void *addr)
+static inline __volatile__ char test_and_set(void *addr)
 {
        char state = 0;
@@ -27,7 +27,7 @@ extern __inline__ __volatile__ char test_and_set(void *addr)
 }
 /* Initialize a spin-lock. */
-extern __inline__ __volatile__ smp_initlock(void *spinlock)
+static inline __volatile__ smp_initlock(void *spinlock)
 {
        /* Unset the lock. */
        *((unsigned char *) spinlock) = 0;
@@ -36,7 +36,7 @@ extern __inline__ __volatile__ smp_initlock(void *spinlock)
 }
 /* This routine spins until it acquires the lock at ADDR. */
-extern __inline__ __volatile__ smp_lock(void *addr)
+static inline __volatile__ smp_lock(void *addr)
 {
        while(test_and_set(addr) == 0xff)
                ;
@@ -46,7 +46,7 @@ extern __inline__ __volatile__ smp_lock(void *addr)
 }
 /* This routine releases the lock at ADDR. */
-extern __inline__ __volatile__ smp_unlock(void *addr)
+static inline __volatile__ smp_unlock(void *addr)
 {
        *((unsigned char *) addr) = 0;
 }
diff --git a/include/asm-sparc/spinlock.h b/include/asm-sparc/spinlock.h
index 111727a2bb4e..e344c98a6f5f 100644
--- a/include/asm-sparc/spinlock.h
+++ b/include/asm-sparc/spinlock.h
@@ -17,7 +17,7 @@
 #define __raw_spin_unlock_wait(lock) \
        do { while (__raw_spin_is_locked(lock)) cpu_relax(); } while (0)
-extern __inline__ void __raw_spin_lock(raw_spinlock_t *lock)
+static inline void __raw_spin_lock(raw_spinlock_t *lock)
 {
        __asm__ __volatile__(
        "\n1:\n\t"
@@ -37,7 +37,7 @@ extern __inline__ void __raw_spin_lock(raw_spinlock_t *lock)
        : "g2", "memory", "cc");
 }
-extern __inline__ int __raw_spin_trylock(raw_spinlock_t *lock)
+static inline int __raw_spin_trylock(raw_spinlock_t *lock)
 {
        unsigned int result;
        __asm__ __volatile__("ldstub [%1], %0"
@@ -47,7 +47,7 @@ extern __inline__ int __raw_spin_trylock(raw_spinlock_t *lock)
        return (result == 0);
 }
-extern __inline__ void __raw_spin_unlock(raw_spinlock_t *lock)
+static inline void __raw_spin_unlock(raw_spinlock_t *lock)
 {
        __asm__ __volatile__("stb %%g0, [%0]" : : "r" (lock) : "memory");
 }
@@ -78,7 +78,7 @@ extern __inline__ void __raw_spin_unlock(raw_spinlock_t *lock)
 *
 * Unfortunately this scheme limits us to ~16,000,000 cpus.
 */
-extern __inline__ void __read_lock(raw_rwlock_t *rw)
+static inline void __read_lock(raw_rwlock_t *rw)
 {
        register raw_rwlock_t *lp asm("g1");
        lp = rw;
@@ -98,7 +98,7 @@ do {	unsigned long flags; \
        local_irq_restore(flags); \
 } while(0)
-extern __inline__ void __read_unlock(raw_rwlock_t *rw)
+static inline void __read_unlock(raw_rwlock_t *rw)
 {
        register raw_rwlock_t *lp asm("g1");
        lp = rw;
diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h
index 3557781a4bfd..1f6b71f9e1b6 100644
--- a/include/asm-sparc/system.h
+++ b/include/asm-sparc/system.h
@@ -204,7 +204,7 @@ static inline unsigned long getipl(void)
 BTFIXUPDEF_CALL(void, ___xchg32, void)
 #endif
-extern __inline__ unsigned long xchg_u32(__volatile__ unsigned long *m, unsigned long val)
+static inline unsigned long xchg_u32(__volatile__ unsigned long *m, unsigned long val)
 {
 #ifdef CONFIG_SMP
        __asm__ __volatile__("swap [%2], %0"
diff --git a/include/asm-sparc/traps.h b/include/asm-sparc/traps.h
index 6690ab956ea6..f62c7f878ee1 100644
--- a/include/asm-sparc/traps.h
+++ b/include/asm-sparc/traps.h
@@ -22,7 +22,7 @@ struct tt_entry {
 /* We set this to _start in system setup. */
 extern struct tt_entry *sparc_ttable;
-extern __inline__ unsigned long get_tbr(void)
+static inline unsigned long get_tbr(void)
 {
        unsigned long tbr;
diff --git a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h
index 2d242360c3d6..075771c371f6 100644
--- a/include/asm-um/processor-generic.h
+++ b/include/asm-um/processor-generic.h
@@ -13,6 +13,7 @@ struct task_struct;
 #include "linux/config.h"
 #include "asm/ptrace.h"
 #include "choose-mode.h"
+#include "registers.h"
 struct mm_struct;
@@ -136,19 +137,15 @@ extern struct cpuinfo_um cpu_data[];
 #define current_cpu_data boot_cpu_data
 #endif
-#define KSTK_EIP(tsk) (PT_REGS_IP(&tsk->thread.regs))
-#define KSTK_ESP(tsk) (PT_REGS_SP(&tsk->thread.regs))
-#define get_wchan(p) (0)
+#ifdef CONFIG_MODE_SKAS
+#define KSTK_REG(tsk, reg) \
+        ({ union uml_pt_regs regs; \
+           get_thread_regs(&regs, tsk->thread.mode.skas.switch_buf); \
+           UPT_REG(&regs, reg); })
+#else
+#define KSTK_REG(tsk, reg) (0xbadbabe)
 #endif
+#define get_wchan(p) (0)
-/*
+#endif
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/include/asm-um/processor-i386.h b/include/asm-um/processor-i386.h
index 431bad3ae9d7..4108a579eb92 100644
--- a/include/asm-um/processor-i386.h
+++ b/include/asm-um/processor-i386.h
@@ -43,17 +43,10 @@ static inline void rep_nop(void)
 #define ARCH_IS_STACKGROW(address) \
       (address + 32 >= UPT_SP(&current->thread.regs.regs))
+#define KSTK_EIP(tsk) KSTK_REG(tsk, EIP)
+#define KSTK_ESP(tsk) KSTK_REG(tsk, UESP)
+#define KSTK_EBP(tsk) KSTK_REG(tsk, EBP)
 #include "asm/processor-generic.h"
 #endif
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/include/asm-um/processor-x86_64.h b/include/asm-um/processor-x86_64.h
index 0beb9a42ae05..e1e1255a1d36 100644
--- a/include/asm-um/processor-x86_64.h
+++ b/include/asm-um/processor-x86_64.h
@@ -36,17 +36,9 @@ extern inline void rep_nop(void)
 #define ARCH_IS_STACKGROW(address) \
        (address + 128 >= UPT_SP(&current->thread.regs.regs))
+#define KSTK_EIP(tsk) KSTK_REG(tsk, RIP)
+#define KSTK_ESP(tsk) KSTK_REG(tsk, RSP)
 #include "asm/processor-generic.h"
 #endif
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
index 9f374cfa1b05..f1fd849e5535 100644
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -457,7 +457,7 @@ static inline void atm_dev_put(struct atm_dev *dev)
 int atm_charge(struct atm_vcc *vcc,int truesize);
 struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size,
-    int gfp_flags);
+    unsigned int __nocast gfp_flags);
 int atm_pcr_goal(struct atm_trafprm *tp);
 void vcc_release_async(struct atm_vcc *vcc, int reply);
diff --git a/include/linux/bfs_fs.h b/include/linux/bfs_fs.h
index c1237aa92e38..8ed6dfdcd783 100644
--- a/include/linux/bfs_fs.h
+++ b/include/linux/bfs_fs.h
@@ -20,19 +20,19 @@
 /* BFS inode layout on disk */
 struct bfs_inode {
-        __u16 i_ino;
+        __le16 i_ino;
        __u16 i_unused;
-        __u32 i_sblock;
+        __le32 i_sblock;
-        __u32 i_eblock;
+        __le32 i_eblock;
-        __u32 i_eoffset;
+        __le32 i_eoffset;
-        __u32 i_vtype;
+        __le32 i_vtype;
-        __u32 i_mode;
+        __le32 i_mode;
-        __s32 i_uid;
+        __le32 i_uid;
-        __s32 i_gid;
+        __le32 i_gid;
-        __u32 i_nlink;
+        __le32 i_nlink;
-        __u32 i_atime;
+        __le32 i_atime;
-        __u32 i_mtime;
+        __le32 i_mtime;
-        __u32 i_ctime;
+        __le32 i_ctime;
        __u32 i_padding[4];
 };
@@ -41,17 +41,17 @@ struct bfs_inode {
 #define BFS_DIRS_PER_BLOCK      32
 struct bfs_dirent {
-        __u16 ino;
+        __le16 ino;
        char name[BFS_NAMELEN];
 };
 /* BFS superblock layout on disk */
 struct bfs_super_block {
-        __u32 s_magic;
+        __le32 s_magic;
-        __u32 s_start;
+        __le32 s_start;
-        __u32 s_end;
+        __le32 s_end;
-        __s32 s_from;
+        __le32 s_from;
-        __s32 s_to;
+        __le32 s_to;
        __s32 s_bfrom;
        __s32 s_bto;
        char  s_fsname[6];
@@ -66,15 +66,15 @@ struct bfs_super_block {
 #define BFS_INO2OFF(ino) \
        ((__u32)(((ino) - BFS_ROOT_INO) * sizeof(struct bfs_inode)) + BFS_BSIZE)
 #define BFS_NZFILESIZE(ip) \
-        ((cpu_to_le32((ip)->i_eoffset) + 1) -  cpu_to_le32((ip)->i_sblock) * BFS_BSIZE)
+        ((le32_to_cpu((ip)->i_eoffset) + 1) -  le32_to_cpu((ip)->i_sblock) * BFS_BSIZE)
 #define BFS_FILESIZE(ip) \
        ((ip)->i_sblock == 0 ? 0 : BFS_NZFILESIZE(ip))
 #define BFS_FILEBLOCKS(ip) \
-        ((ip)->i_sblock == 0 ? 0 : (cpu_to_le32((ip)->i_eblock) + 1) -  cpu_to_le32((ip)->i_sblock))
+        ((ip)->i_sblock == 0 ? 0 : (le32_to_cpu((ip)->i_eblock) + 1) -  le32_to_cpu((ip)->i_sblock))
 #define BFS_UNCLEAN(bfs_sb, sb) \
-        ((cpu_to_le32(bfs_sb->s_from) != -1) && (cpu_to_le32(bfs_sb->s_to) != -1) && !(sb->s_flags & MS_RDONLY))
+        ((le32_to_cpu(bfs_sb->s_from) != -1) && (le32_to_cpu(bfs_sb->s_to) != -1) && !(sb->s_flags & MS_RDONLY))
 #endif  /* _LINUX_BFS_FS_H */
diff --git a/include/linux/connector.h b/include/linux/connector.h
index 86d4b0a81713..96582c9911ac 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -149,7 +149,7 @@ struct cn_dev {
 int cn_add_callback(struct cb_id *, char *, void (*callback) (void *));
 void cn_del_callback(struct cb_id *);
-int cn_netlink_send(struct cn_msg *, u32, int);
+int cn_netlink_send(struct cn_msg *, u32, unsigned int __nocast);
 int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, void (*callback)(void *));
 void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id);
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index 7e1e15f934f3..fd7af86151b1 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -142,13 +142,21 @@ static __inline__ int bad_mask(u32 mask, u32 addr)
 #define endfor_ifa(in_dev) }
+static inline struct in_device *__in_dev_get_rcu(const struct net_device *dev)
+{
+        struct in_device *in_dev = dev->ip_ptr;
+        if (in_dev)
+                in_dev = rcu_dereference(in_dev);
+        return in_dev;
+}
 static __inline__ struct in_device *
 in_dev_get(const struct net_device *dev)
 {
        struct in_device *in_dev;
        rcu_read_lock();
-        in_dev = dev->ip_ptr;
+        in_dev = __in_dev_get_rcu(dev);
        if (in_dev)
                atomic_inc(&in_dev->refcnt);
        rcu_read_unlock();
@@ -156,7 +164,7 @@ in_dev_get(const struct net_device *dev)
 }
 static __inline__ struct in_device *
-__in_dev_get(const struct net_device *dev)
+__in_dev_get_rtnl(const struct net_device *dev)
 {
        return (struct in_device*)dev->ip_ptr;
 }
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index bb6f88e14061..e0b922785d98 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -372,8 +372,9 @@ static inline struct raw6_sock *raw6_sk(const struct sock *sk)
 #define inet_v6_ipv6only(__sk)          0
 #endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */
-#define INET6_MATCH(__sk, __saddr, __daddr, __ports, __dif)        \
+#define INET6_MATCH(__sk, __hash, __saddr, __daddr, __ports, __dif)\
-        (((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports))   && \
+        (((__sk)->sk_hash == (__hash))                          && \
+         ((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports))   && \
         ((__sk)->sk_family             == AF_INET6)            && \
         ipv6_addr_equal(&inet6_sk(__sk)->daddr, (__saddr))     && \
         ipv6_addr_equal(&inet6_sk(__sk)->rcv_saddr, (__daddr)) && \
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index eb36fd293b41..f74ed9462475 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -185,6 +185,7 @@
 #define PCI_DEVICE_ID_LSI_61C102        0x0901
 #define PCI_DEVICE_ID_LSI_63C815        0x1000
 #define PCI_DEVICE_ID_LSI_SAS1064       0x0050
+#define PCI_DEVICE_ID_LSI_SAS1064R      0x0411
 #define PCI_DEVICE_ID_LSI_SAS1066       0x005E
 #define PCI_DEVICE_ID_LSI_SAS1068       0x0054
 #define PCI_DEVICE_ID_LSI_SAS1064A      0x005C
@@ -560,6 +561,7 @@
 #define PCI_VENDOR_ID_DELL              0x1028
 #define PCI_DEVICE_ID_DELL_RACIII       0x0008
 #define PCI_DEVICE_ID_DELL_RAC4         0x0012
+#define PCI_DEVICE_ID_DELL_PERC5        0x0015
 #define PCI_VENDOR_ID_MATROX            0x102B
 #define PCI_DEVICE_ID_MATROX_MGA_2      0x0518
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 2741c0c55e83..466c879f82b8 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -155,8 +155,6 @@ struct skb_shared_info {
 #define SKB_DATAREF_SHIFT 16
 #define SKB_DATAREF_MASK ((1 << SKB_DATAREF_SHIFT) - 1)
-extern struct timeval skb_tv_base;
 struct skb_timeval {
        u32     off_sec;
        u32     off_usec;
@@ -175,7 +173,7 @@ enum {
 *      @prev: Previous buffer in list
 *      @list: List we are on
 *      @sk: Socket we are owned by
- *      @tstamp: Time we arrived stored as offset to skb_tv_base
+ *      @tstamp: Time we arrived
 *      @dev: Device we arrived on/are leaving by
 *      @input_dev: Device we arrived on
 *      @h: Transport layer header
@@ -1255,10 +1253,6 @@ static inline void skb_get_timestamp(const struct sk_buff *skb, struct timeval *
 {
        stamp->tv_sec  = skb->tstamp.off_sec;
        stamp->tv_usec = skb->tstamp.off_usec;
-        if (skb->tstamp.off_sec) {
-                stamp->tv_sec  += skb_tv_base.tv_sec;
-                stamp->tv_usec += skb_tv_base.tv_usec;
-        }
 }
 /**
@@ -1272,8 +1266,8 @@ static inline void skb_get_timestamp(const struct sk_buff *skb, struct timeval *
 */
 static inline void skb_set_timestamp(struct sk_buff *skb, const struct timeval *stamp)
 {
-        skb->tstamp.off_sec  = stamp->tv_sec - skb_tv_base.tv_sec;
+        skb->tstamp.off_sec  = stamp->tv_sec;
-        skb->tstamp.off_usec = stamp->tv_usec - skb_tv_base.tv_usec;
+        skb->tstamp.off_usec = stamp->tv_usec;
 }
 extern void __net_timestamp(struct sk_buff *skb);
diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h
index 081b1ee8516e..e21937cf91d0 100644
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ b/include/linux/tc_ematch/tc_em_meta.h
@@ -71,7 +71,7 @@ enum
        TCF_META_ID_SK_SNDBUF,
        TCF_META_ID_SK_ALLOCS,
        TCF_META_ID_SK_ROUTE_CAPS,
-        TCF_META_ID_SK_HASHENT,
+        TCF_META_ID_SK_HASH,
        TCF_META_ID_SK_LINGERTIME,
        TCF_META_ID_SK_ACK_BACKLOG,
        TCF_META_ID_SK_MAX_ACK_BACKLOG,
diff --git a/include/linux/textsearch.h b/include/linux/textsearch.h
index 941f45ac117a..1a4990e448e9 100644
--- a/include/linux/textsearch.h
+++ b/include/linux/textsearch.h
@@ -158,7 +158,8 @@ extern unsigned int textsearch_find_continuous(struct ts_config *,
 #define TS_PRIV_ALIGNTO 8
 #define TS_PRIV_ALIGN(len) (((len) + TS_PRIV_ALIGNTO-1) & ~(TS_PRIV_ALIGNTO-1))
-static inline struct ts_config *alloc_ts_config(size_t payload, int gfp_mask)
+static inline struct ts_config *alloc_ts_config(size_t payload,
+                                                unsigned int __nocast gfp_mask)
 {
        struct ts_config *conf;
diff --git a/include/net/dn_nsp.h b/include/net/dn_nsp.h
index 6bbeafa73e8b..8a0891e2e888 100644
--- a/include/net/dn_nsp.h
+++ b/include/net/dn_nsp.h
@@ -19,9 +19,9 @@ extern void dn_nsp_send_data_ack(struct sock *sk);
 extern void dn_nsp_send_oth_ack(struct sock *sk);
 extern void dn_nsp_delayed_ack(struct sock *sk);
 extern void dn_send_conn_ack(struct sock *sk);
-extern void dn_send_conn_conf(struct sock *sk, int gfp);
+extern void dn_send_conn_conf(struct sock *sk, unsigned int __nocast gfp);
 extern void dn_nsp_send_disc(struct sock *sk, unsigned char type, 
-                                unsigned short reason, int gfp);
+                        unsigned short reason, unsigned int __nocast gfp);
 extern void dn_nsp_return_disc(struct sk_buff *skb, unsigned char type,
                                unsigned short reason);
 extern void dn_nsp_send_link(struct sock *sk, unsigned char lsflags, char fcval);
@@ -29,14 +29,14 @@ extern void dn_nsp_send_conninit(struct sock *sk, unsigned char flags);
 extern void dn_nsp_output(struct sock *sk);
 extern int dn_nsp_check_xmit_queue(struct sock *sk, struct sk_buff *skb, struct sk_buff_head *q, unsigned short acknum);
-extern void dn_nsp_queue_xmit(struct sock *sk, struct sk_buff *skb, int gfp, int oob);
+extern void dn_nsp_queue_xmit(struct sock *sk, struct sk_buff *skb, unsigned int __nocast gfp, int oob);
 extern unsigned long dn_nsp_persist(struct sock *sk);
 extern int dn_nsp_xmit_timeout(struct sock *sk);
 extern int dn_nsp_rx(struct sk_buff *);
 extern int dn_nsp_backlog_rcv(struct sock *sk, struct sk_buff *skb);
-extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, int pri);
+extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, unsigned int __nocast pri);
 extern struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int noblock, long timeo, int *err);
 #define NSP_REASON_OK 0         /* No error */
diff --git a/include/net/dn_route.h b/include/net/dn_route.h
index d084721db198..11fe973cf383 100644
--- a/include/net/dn_route.h
+++ b/include/net/dn_route.h
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 *******************************************************************************/
-extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, int pri);
+extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, unsigned int __nocast pri);
 extern int dn_route_output_sock(struct dst_entry **pprt, struct flowi *, struct sock *sk, int flags);
 extern int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb);
 extern int dn_cache_getroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg);
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
index 03df3b157960..5a2beed5a770 100644
--- a/include/net/inet6_hashtables.h
+++ b/include/net/inet6_hashtables.h
@@ -26,19 +26,18 @@
 struct inet_hashinfo;
 /* I have no idea if this is a good hash for v6 or not. -DaveM */
-static inline int inet6_ehashfn(const struct in6_addr *laddr, const u16 lport,
+static inline unsigned int inet6_ehashfn(const struct in6_addr *laddr, const u16 lport,
-                                const struct in6_addr *faddr, const u16 fport,
+                                const struct in6_addr *faddr, const u16 fport)
-                                const int ehash_size)
 {
-        int hashent = (lport ^ fport);
+        unsigned int hashent = (lport ^ fport);
        hashent ^= (laddr->s6_addr32[3] ^ faddr->s6_addr32[3]);
        hashent ^= hashent >> 16;
        hashent ^= hashent >> 8;
-        return (hashent & (ehash_size - 1));
+        return hashent;
 }
-static inline int inet6_sk_ehashfn(const struct sock *sk, const int ehash_size)
+static inline int inet6_sk_ehashfn(const struct sock *sk)
 {
        const struct inet_sock *inet = inet_sk(sk);
        const struct ipv6_pinfo *np = inet6_sk(sk);
@@ -46,7 +45,7 @@ static inline int inet6_sk_ehashfn(const struct sock *sk, const int ehash_size)
        const struct in6_addr *faddr = &np->daddr;
        const __u16 lport = inet->num;
        const __u16 fport = inet->dport;
-        return inet6_ehashfn(laddr, lport, faddr, fport, ehash_size);
+        return inet6_ehashfn(laddr, lport, faddr, fport);
 }
 /*
@@ -69,14 +68,14 @@ static inline struct sock *
        /* Optimize here for direct hit, only listening connections can
         * have wildcards anyways.
         */
-        const int hash = inet6_ehashfn(daddr, hnum, saddr, sport,
+        unsigned int hash = inet6_ehashfn(daddr, hnum, saddr, sport);
-                                       hashinfo->ehash_size);
+        struct inet_ehash_bucket *head = inet_ehash_bucket(hashinfo, hash);
-        struct inet_ehash_bucket *head = &hashinfo->ehash[hash];
+        prefetch(head->chain.first);
        read_lock(&head->lock);
        sk_for_each(sk, node, &head->chain) {
                /* For IPV6 do the cheaper port and family tests first. */
-                if (INET6_MATCH(sk, saddr, daddr, ports, dif))
+                if (INET6_MATCH(sk, hash, saddr, daddr, ports, dif))
                        goto hit; /* You sunk my battleship! */
        }
        /* Must check for a TIME_WAIT'er before going to listener hash. */
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 646b6ea7fe26..f50f95968340 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -40,7 +40,7 @@
 struct inet_ehash_bucket {
        rwlock_t          lock;
        struct hlist_head chain;
-} __attribute__((__aligned__(8)));
+};
 /* There are a few simple rules, which allow for local port reuse by
 * an application.  In essence:
@@ -108,7 +108,7 @@ struct inet_hashinfo {
        struct inet_bind_hashbucket     *bhash;
        int                             bhash_size;
-        int                             ehash_size;
+        unsigned int                    ehash_size;
        /* All sockets in TCP_LISTEN state will be in here.  This is the only
         * table where wildcard'd TCP sockets can exist.  Hash function here
@@ -130,17 +130,16 @@ struct inet_hashinfo {
        int                             port_rover;
 };
-static inline int inet_ehashfn(const __u32 laddr, const __u16 lport,
+static inline unsigned int inet_ehashfn(const __u32 laddr, const __u16 lport,
-                               const __u32 faddr, const __u16 fport,
+                               const __u32 faddr, const __u16 fport)
-                               const int ehash_size)
 {
-        int h = (laddr ^ lport) ^ (faddr ^ fport);
+        unsigned int h = (laddr ^ lport) ^ (faddr ^ fport);
        h ^= h >> 16;
        h ^= h >> 8;
-        return h & (ehash_size - 1);
+        return h;
 }
-static inline int inet_sk_ehashfn(const struct sock *sk, const int ehash_size)
+static inline int inet_sk_ehashfn(const struct sock *sk)
 {
        const struct inet_sock *inet = inet_sk(sk);
        const __u32 laddr = inet->rcv_saddr;
@@ -148,7 +147,14 @@ static inline int inet_sk_ehashfn(const struct sock *sk, const int ehash_size)
        const __u32 faddr = inet->daddr;
        const __u16 fport = inet->dport;
-        return inet_ehashfn(laddr, lport, faddr, fport, ehash_size);
+        return inet_ehashfn(laddr, lport, faddr, fport);
+}
+static inline struct inet_ehash_bucket *inet_ehash_bucket(
+        struct inet_hashinfo *hashinfo,
+        unsigned int hash)
+{
+        return &hashinfo->ehash[hash & (hashinfo->ehash_size - 1)];
 }
 extern struct inet_bind_bucket *
@@ -235,9 +241,11 @@ static inline void __inet_hash(struct inet_hashinfo *hashinfo,
                lock = &hashinfo->lhash_lock;
                inet_listen_wlock(hashinfo);
        } else {
-                sk->sk_hashent = inet_sk_ehashfn(sk, hashinfo->ehash_size);
+                struct inet_ehash_bucket *head;
-                list = &hashinfo->ehash[sk->sk_hashent].chain;
+                sk->sk_hash = inet_sk_ehashfn(sk);
-                lock = &hashinfo->ehash[sk->sk_hashent].lock;
+                head = inet_ehash_bucket(hashinfo, sk->sk_hash);
+                list = &head->chain;
+                lock = &head->lock;
                write_lock(lock);
        }
        __sk_add_node(sk, list);
@@ -268,9 +276,8 @@ static inline void inet_unhash(struct inet_hashinfo *hashinfo, struct sock *sk)
                inet_listen_wlock(hashinfo);
                lock = &hashinfo->lhash_lock;
        } else {
-                struct inet_ehash_bucket *head = &hashinfo->ehash[sk->sk_hashent];
+                lock = &inet_ehash_bucket(hashinfo, sk->sk_hash)->lock;
-                lock = &head->lock;
+                write_lock_bh(lock);
-                write_lock_bh(&head->lock);
        }
        if (__sk_del_node_init(sk))
@@ -337,23 +344,27 @@ sherry_cache:
 #define INET_ADDR_COOKIE(__name, __saddr, __daddr) \
        const __u64 __name = (((__u64)(__daddr)) << 32) | ((__u64)(__saddr));
 #endif /* __BIG_ENDIAN */
-#define INET_MATCH(__sk, __cookie, __saddr, __daddr, __ports, __dif)\
+#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
-        (((*((__u64 *)&(inet_sk(__sk)->daddr))) == (__cookie))  &&      \
+        (((__sk)->sk_hash == (__hash))                          &&      \
+         ((*((__u64 *)&(inet_sk(__sk)->daddr))) == (__cookie))  &&      \
         ((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports))   &&      \
         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
-#define INET_TW_MATCH(__sk, __cookie, __saddr, __daddr, __ports, __dif)\
+#define INET_TW_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
-        (((*((__u64 *)&(inet_twsk(__sk)->tw_daddr))) == (__cookie)) &&  \
+        (((__sk)->sk_hash == (__hash))                          &&      \
+         ((*((__u64 *)&(inet_twsk(__sk)->tw_daddr))) == (__cookie)) &&  \
         ((*((__u32 *)&(inet_twsk(__sk)->tw_dport))) == (__ports)) &&   \
         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
 #else /* 32-bit arch */
 #define INET_ADDR_COOKIE(__name, __saddr, __daddr)
-#define INET_MATCH(__sk, __cookie, __saddr, __daddr, __ports, __dif)    \
+#define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)    \
-        ((inet_sk(__sk)->daddr          == (__saddr))           &&      \
+        (((__sk)->sk_hash == (__hash))                          &&      \
+         (inet_sk(__sk)->daddr          == (__saddr))           &&      \
         (inet_sk(__sk)->rcv_saddr      == (__daddr))           &&      \
         ((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports))   &&      \
         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
-#define INET_TW_MATCH(__sk, __cookie, __saddr, __daddr, __ports, __dif) \
+#define INET_TW_MATCH(__sk, __hash,__cookie, __saddr, __daddr, __ports, __dif)  \
-        ((inet_twsk(__sk)->tw_daddr     == (__saddr))           &&      \
+        (((__sk)->sk_hash == (__hash))                          &&      \
+         (inet_twsk(__sk)->tw_daddr     == (__saddr))           &&      \
         (inet_twsk(__sk)->tw_rcv_saddr == (__daddr))           &&      \
         ((*((__u32 *)&(inet_twsk(__sk)->tw_dport))) == (__ports)) &&   \
         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
@@ -378,18 +389,19 @@ static inline struct sock *
        /* Optimize here for direct hit, only listening connections can
         * have wildcards anyways.
         */
-        const int hash = inet_ehashfn(daddr, hnum, saddr, sport, hashinfo->ehash_size);
+        unsigned int hash = inet_ehashfn(daddr, hnum, saddr, sport);
-        struct inet_ehash_bucket *head = &hashinfo->ehash[hash];
+        struct inet_ehash_bucket *head = inet_ehash_bucket(hashinfo, hash);
+        prefetch(head->chain.first);
        read_lock(&head->lock);
        sk_for_each(sk, node, &head->chain) {
-                if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif))
+                if (INET_MATCH(sk, hash, acookie, saddr, daddr, ports, dif))
                        goto hit; /* You sunk my battleship! */
        }
        /* Must check for a TIME_WAIT'er before going to listener hash. */
        sk_for_each(sk, node, &(head + hashinfo->ehash_size)->chain) {
-                if (INET_TW_MATCH(sk, acookie, saddr, daddr, ports, dif))
+                if (INET_TW_MATCH(sk, hash, acookie, saddr, daddr, ports, dif))
                        goto hit;
        }
        sk = NULL;
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 3b070352e869..4ade56ef3a4d 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -112,6 +112,7 @@ struct inet_timewait_sock {
 #define tw_node                 __tw_common.skc_node
 #define tw_bind_node            __tw_common.skc_bind_node
 #define tw_refcnt               __tw_common.skc_refcnt
+#define tw_hash                 __tw_common.skc_hash
 #define tw_prot                 __tw_common.skc_prot
        volatile unsigned char  tw_substate;
        /* 3 bits hole, try to pack */
@@ -126,7 +127,6 @@ struct inet_timewait_sock {
        /* And these are ours. */
        __u8                    tw_ipv6only:1;
        /* 31 bits hole, try to pack */
-        int                     tw_hashent;
        int                     tw_timeout;
        unsigned long           tw_ttd;
        struct inet_bind_bucket *tw_tb;
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 06b4235aa016..ecb2b061f597 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -832,7 +832,7 @@ extern void ip_vs_app_inc_put(struct ip_vs_app *inc);
 extern int ip_vs_app_pkt_out(struct ip_vs_conn *, struct sk_buff **pskb);
 extern int ip_vs_app_pkt_in(struct ip_vs_conn *, struct sk_buff **pskb);
-extern int ip_vs_skb_replace(struct sk_buff *skb, int pri,
+extern int ip_vs_skb_replace(struct sk_buff *skb, unsigned int __nocast pri,
                             char *o_buf, int o_len, char *n_buf, int n_len);
 extern int ip_vs_app_init(void);
 extern void ip_vs_app_cleanup(void);
diff --git a/include/net/sock.h b/include/net/sock.h
index 8c48fbecb7cf..b6440805c420 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -99,6 +99,7 @@ struct proto;
 *      @skc_node: main hash linkage for various protocol lookup tables
 *      @skc_bind_node: bind hash linkage for various protocol lookup tables
 *      @skc_refcnt: reference count
+ *      @skc_hash: hash value used with various protocol lookup tables
 *      @skc_prot: protocol handlers inside a network family
 *
 *      This is the minimal network layer representation of sockets, the header
@@ -112,6 +113,7 @@ struct sock_common {
        struct hlist_node       skc_node;
        struct hlist_node       skc_bind_node;
        atomic_t                skc_refcnt;
+        unsigned int            skc_hash;
        struct proto            *skc_prot;
 };
@@ -139,7 +141,6 @@ struct sock_common {
  *     @sk_no_check: %SO_NO_CHECK setting, wether or not checkup packets
  *     @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO)
  *     @sk_lingertime: %SO_LINGER l_linger setting
-  *     @sk_hashent: hash entry in several tables (e.g. inet_hashinfo.ehash)
  *     @sk_backlog: always used with the per-socket spinlock held
  *     @sk_callback_lock: used with the callbacks in the end of this struct
  *     @sk_error_queue: rarely used
@@ -186,6 +187,7 @@ struct sock {
 #define sk_node                 __sk_common.skc_node
 #define sk_bind_node            __sk_common.skc_bind_node
 #define sk_refcnt               __sk_common.skc_refcnt
+#define sk_hash                 __sk_common.skc_hash
 #define sk_prot                 __sk_common.skc_prot
        unsigned char           sk_shutdown : 2,
                                sk_no_check : 2,
@@ -208,7 +210,6 @@ struct sock {
        unsigned int            sk_allocation;
        int                     sk_sndbuf;
        int                     sk_route_caps;
-        int                     sk_hashent;
        unsigned long           sk_flags;
        unsigned long           sk_lingertime;
        /*
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index a9d0d8c5dfbf..b6e72f890c6c 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -875,7 +875,7 @@ static inline int xfrm_dst_lookup(struct xfrm_dst **dst, struct flowi *fl, unsig
 } 
 #endif
-struct xfrm_policy *xfrm_policy_alloc(int gfp);
+struct xfrm_policy *xfrm_policy_alloc(unsigned int __nocast gfp);
 extern int xfrm_policy_walk(int (*func)(struct xfrm_policy *, int, int, void*), void *);
 int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl);
 struct xfrm_policy *xfrm_policy_bysel(int dir, struct xfrm_selector *sel,
@@ -931,4 +931,9 @@ static inline int xfrm_addr_cmp(xfrm_address_t *a, xfrm_address_t *b,
        }
 }
+static inline int xfrm_policy_id2dir(u32 index)
+{
+        return index & 7;
+}
 #endif  /* _NET_XFRM_H */
diff --git a/include/rxrpc/call.h b/include/rxrpc/call.h
index f48f27e9e0ab..8118731e7d96 100644
--- a/include/rxrpc/call.h
+++ b/include/rxrpc/call.h
@@ -203,7 +203,7 @@ extern int rxrpc_call_write_data(struct rxrpc_call *call,
                                 size_t sioc,
                                 struct kvec *siov,
                                 uint8_t rxhdr_flags,
-                                 int alloc_flags,
+                                 unsigned int __nocast alloc_flags,
                                 int dup_data,
                                 size_t *size_sent);
diff --git a/include/rxrpc/message.h b/include/rxrpc/message.h
index 3a59df6870b2..983d9f9eee1a 100644
--- a/include/rxrpc/message.h
+++ b/include/rxrpc/message.h
@@ -63,7 +63,7 @@ extern int rxrpc_conn_newmsg(struct rxrpc_connection *conn,
                             uint8_t type,
                             int count,
                             struct kvec *diov,
-                             int alloc_flags,
+                             unsigned int __nocast alloc_flags,
                             struct rxrpc_message **_msg);
 extern int rxrpc_conn_sendmsg(struct rxrpc_connection *conn, struct rxrpc_message *msg);
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index c0e4c67d836f..7ece05666feb 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -163,6 +163,7 @@ struct scsi_target {
        unsigned int            id; /* target id ... replace
                                     * scsi_device.id eventually */
        unsigned long           create:1; /* signal that it needs to be added */
+        char                    scsi_level;
        void                    *hostdata; /* available to low-level driver */
        unsigned long           starget_data[0]; /* for the transport */
        /* starget_data must be the last element!!!! */
diff --git a/lib/ts_bm.c b/lib/ts_bm.c
index 2cc79112ecc3..1b61fceef777 100644
--- a/lib/ts_bm.c
+++ b/lib/ts_bm.c
@@ -127,7 +127,7 @@ static void compute_prefix_tbl(struct ts_bm *bm, const u8 *pattern,
 }
 static struct ts_config *bm_init(const void *pattern, unsigned int len,
-                                 int gfp_mask)
+                                 unsigned int __nocast gfp_mask)
 {
        struct ts_config *conf;
        struct ts_bm *bm;
diff --git a/lib/ts_fsm.c b/lib/ts_fsm.c
index d27c0a072940..ef9779e00506 100644
--- a/lib/ts_fsm.c
+++ b/lib/ts_fsm.c
@@ -258,7 +258,7 @@ found_match:
 }
 static struct ts_config *fsm_init(const void *pattern, unsigned int len,
-                                     int gfp_mask)
+                                     unsigned int __nocast gfp_mask)
 {
        int i, err = -EINVAL;
        struct ts_config *conf;
diff --git a/lib/ts_kmp.c b/lib/ts_kmp.c
index 73266b975585..e45f0f0c2379 100644
--- a/lib/ts_kmp.c
+++ b/lib/ts_kmp.c
@@ -87,7 +87,7 @@ static inline void compute_prefix_tbl(const u8 *pattern, unsigned int len,
 }
 static struct ts_config *kmp_init(const void *pattern, unsigned int len,
-                                  int gfp_mask)
+                                  unsigned int __nocast gfp_mask)
 {
        struct ts_config *conf;
        struct ts_kmp *kmp;
diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
index b2113c3454ae..71abc99ec815 100644
--- a/net/atm/atm_misc.c
+++ b/net/atm/atm_misc.c
@@ -25,7 +25,7 @@ int atm_charge(struct atm_vcc *vcc,int truesize)
 struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size,
-    int gfp_flags)
+    unsigned int __nocast gfp_flags)
 {
        struct sock *sk = sk_atm(vcc);
        int guess = atm_guess_pdu2truesize(pdu_size);
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 28dab55a4387..4f54c9a5e84a 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -310,7 +310,7 @@ static int clip_constructor(struct neighbour *neigh)
        if (neigh->type != RTN_UNICAST) return -EINVAL;
        rcu_read_lock();
-        in_dev = rcu_dereference(__in_dev_get(dev));
+        in_dev = __in_dev_get_rcu(dev);
        if (!in_dev) {
                rcu_read_unlock();
                return -EINVAL;
diff --git a/net/atm/common.c b/net/atm/common.c
index 801a5813ec60..63feea49fb13 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -46,7 +46,7 @@ static void __vcc_insert_socket(struct sock *sk)
        struct atm_vcc *vcc = atm_sk(sk);
        struct hlist_head *head = &vcc_hash[vcc->vci &
                                        (VCC_HTABLE_SIZE - 1)];
-        sk->sk_hashent = vcc->vci & (VCC_HTABLE_SIZE - 1);
+        sk->sk_hash = vcc->vci & (VCC_HTABLE_SIZE - 1);
        sk_add_node(sk, head);
 }
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c
index 810c9c76c2e0..73cfc3411c46 100644
--- a/net/ax25/ax25_in.c
+++ b/net/ax25/ax25_in.c
@@ -123,7 +123,7 @@ int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb)
                }
                skb_pull(skb, 1);       /* Remove PID */
-                skb->h.raw    = skb->data;
+                skb->mac.raw  = skb->nh.raw;
                skb->nh.raw   = skb->data;
                skb->dev      = ax25->ax25_dev->dev;
                skb->pkt_type = PACKET_HOST;
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 5265dfd69928..802fe11efad0 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -703,7 +703,7 @@ int netpoll_setup(struct netpoll *np)
        if (!np->local_ip) {
                rcu_read_lock();
-                in_dev = __in_dev_get(ndev);
+                in_dev = __in_dev_get_rcu(ndev);
                if (!in_dev || !in_dev->ifa_list) {
                        rcu_read_unlock();
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index b7f2d65a614f..5f043d346694 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -1667,13 +1667,12 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
                        struct in_device *in_dev; 
                        rcu_read_lock();
-                        in_dev = __in_dev_get(pkt_dev->odev);
+                        in_dev = __in_dev_get_rcu(pkt_dev->odev);
                        if (in_dev) {
                                if (in_dev->ifa_list) {
                                        pkt_dev->saddr_min = in_dev->ifa_list->ifa_address;
                                        pkt_dev->saddr_max = pkt_dev->saddr_min;
                                }
-                                __in_dev_put(in_dev);   
                        }
                        rcu_read_unlock();
                }
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index f80a28785610..0e9431b59fb2 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -71,8 +71,6 @@
 static kmem_cache_t *skbuff_head_cache __read_mostly;
 static kmem_cache_t *skbuff_fclone_cache __read_mostly;
-struct timeval __read_mostly skb_tv_base;
 /*
 *      Keep out-of-line to prevent kernel bloat.
 *      __builtin_return_address is not used because it is not always
@@ -1708,8 +1706,6 @@ void __init skb_init(void)
                                                NULL, NULL);
        if (!skbuff_fclone_cache)
                panic("cannot create skbuff cache");
-        do_gettimeofday(&skb_tv_base);
 }
 EXPORT_SYMBOL(___pskb_trim);
@@ -1743,4 +1739,3 @@ EXPORT_SYMBOL(skb_prepare_seq_read);
 EXPORT_SYMBOL(skb_seq_read);
 EXPORT_SYMBOL(skb_abort_seq_read);
 EXPORT_SYMBOL(skb_find_text);
-EXPORT_SYMBOL(skb_tv_base);
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 40fe6afacde6..ae088d1347af 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -62,27 +62,27 @@ static int __dccp_v4_check_established(struct sock *sk, const __u16 lport,
        const int dif = sk->sk_bound_dev_if;
        INET_ADDR_COOKIE(acookie, saddr, daddr)
        const __u32 ports = INET_COMBINED_PORTS(inet->dport, lport);
-        const int hash = inet_ehashfn(daddr, lport, saddr, inet->dport,
+        unsigned int hash = inet_ehashfn(daddr, lport, saddr, inet->dport);
-                                      dccp_hashinfo.ehash_size);
+        struct inet_ehash_bucket *head = inet_ehash_bucket(&dccp_hashinfo, hash);
-        struct inet_ehash_bucket *head = &dccp_hashinfo.ehash[hash];
        const struct sock *sk2;
        const struct hlist_node *node;
        struct inet_timewait_sock *tw;
+        prefetch(head->chain.first);
        write_lock(&head->lock);
        /* Check TIME-WAIT sockets first. */
        sk_for_each(sk2, node, &(head + dccp_hashinfo.ehash_size)->chain) {
                tw = inet_twsk(sk2);
-                if (INET_TW_MATCH(sk2, acookie, saddr, daddr, ports, dif))
+                if (INET_TW_MATCH(sk2, hash, acookie, saddr, daddr, ports, dif))
                        goto not_unique;
        }
        tw = NULL;
        /* And established part... */
        sk_for_each(sk2, node, &head->chain) {
-                if (INET_MATCH(sk2, acookie, saddr, daddr, ports, dif))
+                if (INET_MATCH(sk2, hash, acookie, saddr, daddr, ports, dif))
                        goto not_unique;
        }
@@ -90,7 +90,7 @@ static int __dccp_v4_check_established(struct sock *sk, const __u16 lport,
         * in hash table socket with a funny identity. */
        inet->num = lport;
        inet->sport = htons(lport);
-        sk->sk_hashent = hash;
+        sk->sk_hash = hash;
        BUG_TRAP(sk_unhashed(sk));
        __sk_add_node(sk, &head->chain);
        sock_prot_inc_use(sk->sk_prot);
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 348f36b529f7..34d4128d56d5 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -452,7 +452,8 @@ static struct proto dn_proto = {
        .obj_size = sizeof(struct dn_sock),
 };
-static struct sock *dn_alloc_sock(struct socket *sock, int gfp)
+static struct sock *dn_alloc_sock(struct socket *sock,
+                                  unsigned int __nocast gfp)
 {
        struct dn_scp *scp;
        struct sock *sk = sk_alloc(PF_DECnet, gfp, &dn_proto, 1);
@@ -804,7 +805,8 @@ static int dn_auto_bind(struct socket *sock)
        return rv;
 }
-static int dn_confirm_accept(struct sock *sk, long *timeo, int allocation)
+static int dn_confirm_accept(struct sock *sk, long *timeo,
+                                unsigned int __nocast allocation)
 {
        struct dn_scp *scp = DN_SK(sk);
        DEFINE_WAIT(wait);
diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c
index 53633d352868..cd08244aa10c 100644
--- a/net/decnet/dn_nsp_out.c
+++ b/net/decnet/dn_nsp_out.c
@@ -117,7 +117,8 @@ try_again:
 * The eventual aim is for each socket to have a cached header size
 * for its outgoing packets, and to set hdr from this when sk != NULL.
 */
-struct sk_buff *dn_alloc_skb(struct sock *sk, int size, int pri)
+struct sk_buff *dn_alloc_skb(struct sock *sk, int size,
+                             unsigned int __nocast pri)
 {
        struct sk_buff *skb;
        int hdr = 64;
@@ -210,7 +211,8 @@ static void dn_nsp_rtt(struct sock *sk, long rtt)
 *
 * Returns: The number of times the packet has been sent previously
 */
-static inline unsigned dn_nsp_clone_and_send(struct sk_buff *skb, int gfp)
+static inline unsigned dn_nsp_clone_and_send(struct sk_buff *skb,
+                                             unsigned int __nocast gfp)
 {
        struct dn_skb_cb *cb = DN_SKB_CB(skb);
        struct sk_buff *skb2;
@@ -350,7 +352,8 @@ static unsigned short *dn_nsp_mk_data_header(struct sock *sk, struct sk_buff *sk
        return ptr;
 }
-void dn_nsp_queue_xmit(struct sock *sk, struct sk_buff *skb, int gfp, int oth)
+void dn_nsp_queue_xmit(struct sock *sk, struct sk_buff *skb,
+                        unsigned int __nocast gfp, int oth)
 {
        struct dn_scp *scp = DN_SK(sk);
        struct dn_skb_cb *cb = DN_SKB_CB(skb);
@@ -517,7 +520,7 @@ static int dn_nsp_retrans_conn_conf(struct sock *sk)
        return 0;
 }
-void dn_send_conn_conf(struct sock *sk, int gfp)
+void dn_send_conn_conf(struct sock *sk, unsigned int __nocast gfp)
 {
        struct dn_scp *scp = DN_SK(sk);
        struct sk_buff *skb = NULL;
@@ -549,7 +552,8 @@ void dn_send_conn_conf(struct sock *sk, int gfp)
 static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg, 
-                        unsigned short reason, int gfp, struct dst_entry *dst,
+                        unsigned short reason, unsigned int __nocast gfp,
+                        struct dst_entry *dst,
                        int ddl, unsigned char *dd, __u16 rem, __u16 loc)
 {
        struct sk_buff *skb = NULL;
@@ -591,7 +595,7 @@ static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg,
 void dn_nsp_send_disc(struct sock *sk, unsigned char msgflg, 
-                        unsigned short reason, int gfp)
+                        unsigned short reason, unsigned int __nocast gfp)
 {
        struct dn_scp *scp = DN_SK(sk);
        int ddl = 0;
@@ -612,7 +616,7 @@ void dn_nsp_return_disc(struct sk_buff *skb, unsigned char msgflg,
 {
        struct dn_skb_cb *cb = DN_SKB_CB(skb);
        int ddl = 0;
-        int gfp = GFP_ATOMIC;
+        unsigned int __nocast gfp = GFP_ATOMIC;
        dn_nsp_do_disc(NULL, msgflg, reason, gfp, skb->dst, ddl, 
                        NULL, cb->src_port, cb->dst_port);
@@ -624,7 +628,7 @@ void dn_nsp_send_link(struct sock *sk, unsigned char lsflags, char fcval)
        struct dn_scp *scp = DN_SK(sk);
        struct sk_buff *skb;
        unsigned char *ptr;
-        int gfp = GFP_ATOMIC;
+        unsigned int __nocast gfp = GFP_ATOMIC;
        if ((skb = dn_alloc_skb(sk, DN_MAX_NSP_DATA_HEADER + 2, gfp)) == NULL)
                return;
@@ -659,7 +663,8 @@ void dn_nsp_send_conninit(struct sock *sk, unsigned char msgflg)
        unsigned char menuver;
        struct dn_skb_cb *cb;
        unsigned char type = 1;
-        int allocation = (msgflg == NSP_CI) ? sk->sk_allocation : GFP_ATOMIC;
+        unsigned int __nocast allocation =
+                        (msgflg == NSP_CI) ? sk->sk_allocation : GFP_ATOMIC;
        struct sk_buff *skb = dn_alloc_skb(sk, 200, allocation);
        if (!skb)
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 4a62093eb343..34fdac51df96 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -406,7 +406,7 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
                unsigned long network = 0;
                rcu_read_lock();
-                idev = __in_dev_get(dev);
+                idev = __in_dev_get_rcu(dev);
                if (idev) {
                        if (idev->ifa_list)
                                network = ntohl(idev->ifa_list->ifa_address) & 
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index c9aaff3fea1e..ecdf9f7a538f 100644
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -207,7 +207,7 @@ void ieee80211_txb_free(struct ieee80211_txb *txb)
 }
 static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
-                                                 int gfp_mask)
+                                                 unsigned int __nocast gfp_mask)
 {
        struct ieee80211_txb *txb;
        int i;
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 8bf312bdea13..b425748f02d7 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -241,7 +241,7 @@ static int arp_constructor(struct neighbour *neigh)
        neigh->type = inet_addr_type(addr);
        rcu_read_lock();
-        in_dev = rcu_dereference(__in_dev_get(dev));
+        in_dev = __in_dev_get_rcu(dev);
        if (in_dev == NULL) {
                rcu_read_unlock();
                return -EINVAL;
@@ -697,12 +697,6 @@ void arp_send(int type, int ptype, u32 dest_ip,
        arp_xmit(skb);
 }
-static void parp_redo(struct sk_buff *skb)
-{
-        nf_reset(skb);
-        arp_rcv(skb, skb->dev, NULL, skb->dev);
-}
 /*
 *      Process an arp request.
 */
@@ -922,6 +916,11 @@ out:
        return 0;
 }
+static void parp_redo(struct sk_buff *skb)
+{
+        arp_process(skb);
+}
 /*
 *      Receive an arp request from the device layer.
@@ -990,8 +989,8 @@ static int arp_req_set(struct arpreq *r, struct net_device * dev)
                        ipv4_devconf.proxy_arp = 1;
                        return 0;
                }
-                if (__in_dev_get(dev)) {
+                if (__in_dev_get_rtnl(dev)) {
-                        __in_dev_get(dev)->cnf.proxy_arp = 1;
+                        __in_dev_get_rtnl(dev)->cnf.proxy_arp = 1;
                        return 0;
                }
                return -ENXIO;
@@ -1096,8 +1095,8 @@ static int arp_req_delete(struct arpreq *r, struct net_device * dev)
                                ipv4_devconf.proxy_arp = 0;
                                return 0;
                        }
-                        if (__in_dev_get(dev)) {
+                        if (__in_dev_get_rtnl(dev)) {
-                                __in_dev_get(dev)->cnf.proxy_arp = 0;
+                                __in_dev_get_rtnl(dev)->cnf.proxy_arp = 0;
                                return 0;
                        }
                        return -ENXIO;
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index ba2895ae8151..74f2207e131a 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -351,7 +351,7 @@ static int inet_insert_ifa(struct in_ifaddr *ifa)
 static int inet_set_ifa(struct net_device *dev, struct in_ifaddr *ifa)
 {
-        struct in_device *in_dev = __in_dev_get(dev);
+        struct in_device *in_dev = __in_dev_get_rtnl(dev);
        ASSERT_RTNL();
@@ -449,7 +449,7 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg
                goto out;
        rc = -ENOBUFS;
-        if ((in_dev = __in_dev_get(dev)) == NULL) {
+        if ((in_dev = __in_dev_get_rtnl(dev)) == NULL) {
                in_dev = inetdev_init(dev);
                if (!in_dev)
                        goto out;
@@ -584,7 +584,7 @@ int devinet_ioctl(unsigned int cmd, void __user *arg)
        if (colon)
                *colon = ':';
-        if ((in_dev = __in_dev_get(dev)) != NULL) {
+        if ((in_dev = __in_dev_get_rtnl(dev)) != NULL) {
                if (tryaddrmatch) {
                        /* Matthias Andree */
                        /* compare label and address (4.4BSD style) */
@@ -748,7 +748,7 @@ rarok:
 static int inet_gifconf(struct net_device *dev, char __user *buf, int len)
 {
-        struct in_device *in_dev = __in_dev_get(dev);
+        struct in_device *in_dev = __in_dev_get_rtnl(dev);
        struct in_ifaddr *ifa;
        struct ifreq ifr;
        int done = 0;
@@ -791,7 +791,7 @@ u32 inet_select_addr(const struct net_device *dev, u32 dst, int scope)
        struct in_device *in_dev;
        rcu_read_lock();
-        in_dev = __in_dev_get(dev);
+        in_dev = __in_dev_get_rcu(dev);
        if (!in_dev)
                goto no_in_dev;
@@ -818,7 +818,7 @@ no_in_dev:
        read_lock(&dev_base_lock);
        rcu_read_lock();
        for (dev = dev_base; dev; dev = dev->next) {
-                if ((in_dev = __in_dev_get(dev)) == NULL)
+                if ((in_dev = __in_dev_get_rcu(dev)) == NULL)
                        continue;
                for_primary_ifa(in_dev) {
@@ -887,7 +887,7 @@ u32 inet_confirm_addr(const struct net_device *dev, u32 dst, u32 local, int scop
        if (dev) {
                rcu_read_lock();
-                if ((in_dev = __in_dev_get(dev)))
+                if ((in_dev = __in_dev_get_rcu(dev)))
                        addr = confirm_addr_indev(in_dev, dst, local, scope);
                rcu_read_unlock();
@@ -897,7 +897,7 @@ u32 inet_confirm_addr(const struct net_device *dev, u32 dst, u32 local, int scop
        read_lock(&dev_base_lock);
        rcu_read_lock();
        for (dev = dev_base; dev; dev = dev->next) {
-                if ((in_dev = __in_dev_get(dev))) {
+                if ((in_dev = __in_dev_get_rcu(dev))) {
                        addr = confirm_addr_indev(in_dev, dst, local, scope);
                        if (addr)
                                break;
@@ -957,7 +957,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,
                         void *ptr)
 {
        struct net_device *dev = ptr;
-        struct in_device *in_dev = __in_dev_get(dev);
+        struct in_device *in_dev = __in_dev_get_rtnl(dev);
        ASSERT_RTNL();
@@ -1078,7 +1078,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
                if (idx > s_idx)
                        s_ip_idx = 0;
                rcu_read_lock();
-                if ((in_dev = __in_dev_get(dev)) == NULL) {
+                if ((in_dev = __in_dev_get_rcu(dev)) == NULL) {
                        rcu_read_unlock();
                        continue;
                }
@@ -1149,7 +1149,7 @@ void inet_forward_change(void)
        for (dev = dev_base; dev; dev = dev->next) {
                struct in_device *in_dev;
                rcu_read_lock();
-                in_dev = __in_dev_get(dev);
+                in_dev = __in_dev_get_rcu(dev);
                if (in_dev)
                        in_dev->cnf.forwarding = on;
                rcu_read_unlock();
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 4e1379f71269..e61bc7177eb1 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -173,7 +173,7 @@ int fib_validate_source(u32 src, u32 dst, u8 tos, int oif,
        no_addr = rpf = 0;
        rcu_read_lock();
-        in_dev = __in_dev_get(dev);
+        in_dev = __in_dev_get_rcu(dev);
        if (in_dev) {
                no_addr = in_dev->ifa_list == NULL;
                rpf = IN_DEV_RPFILTER(in_dev);
@@ -607,7 +607,7 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
 static int fib_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)
 {
        struct net_device *dev = ptr;
-        struct in_device *in_dev = __in_dev_get(dev);
+        struct in_device *in_dev = __in_dev_get_rtnl(dev);
        if (event == NETDEV_UNREGISTER) {
                fib_disable_ip(dev, 2);
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index d41219e8037c..186f20c4a45e 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -1087,7 +1087,7 @@ fib_convert_rtentry(int cmd, struct nlmsghdr *nl, struct rtmsg *rtm,
                rta->rta_oif = &dev->ifindex;
                if (colon) {
                        struct in_ifaddr *ifa;
-                        struct in_device *in_dev = __in_dev_get(dev);
+                        struct in_device *in_dev = __in_dev_get_rtnl(dev);
                        if (!in_dev)
                                return -ENODEV;
                        *colon = ':';
@@ -1268,7 +1268,7 @@ int fib_sync_up(struct net_device *dev)
                        }
                        if (nh->nh_dev == NULL || !(nh->nh_dev->flags&IFF_UP))
                                continue;
-                        if (nh->nh_dev != dev || __in_dev_get(dev) == NULL)
+                        if (nh->nh_dev != dev || !__in_dev_get_rtnl(dev))
                                continue;
                        alive++;
                        spin_lock_bh(&fib_multipath_lock);
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 50c0519cd70d..0093ea08c7f5 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -286,6 +286,8 @@ static inline void check_tnode(const struct tnode *tn)
 static int halve_threshold = 25;
 static int inflate_threshold = 50;
+static int halve_threshold_root = 15;
+static int inflate_threshold_root = 25; 
 static void __alias_free_mem(struct rcu_head *head)
@@ -449,6 +451,8 @@ static struct node *resize(struct trie *t, struct tnode *tn)
        int i;
        int err = 0;
        struct tnode *old_tn;
+        int inflate_threshold_use;
+        int halve_threshold_use;
        if (!tn)
                return NULL;
@@ -541,10 +545,17 @@ static struct node *resize(struct trie *t, struct tnode *tn)
        check_tnode(tn);
+        /* Keep root node larger  */
+        if(!tn->parent)
+                inflate_threshold_use = inflate_threshold_root;
+        else 
+                inflate_threshold_use = inflate_threshold;
        err = 0;
        while ((tn->full_children > 0 &&
               50 * (tn->full_children + tnode_child_length(tn) - tn->empty_children) >=
-                                inflate_threshold * tnode_child_length(tn))) {
+                                inflate_threshold_use * tnode_child_length(tn))) {
                old_tn = tn;
                tn = inflate(t, tn);
@@ -564,10 +575,18 @@ static struct node *resize(struct trie *t, struct tnode *tn)
         * node is above threshold.
         */
+        /* Keep root node larger  */
+        if(!tn->parent)
+                halve_threshold_use = halve_threshold_root;
+        else 
+                halve_threshold_use = halve_threshold;
        err = 0;
        while (tn->bits > 1 &&
               100 * (tnode_child_length(tn) - tn->empty_children) <
-               halve_threshold * tnode_child_length(tn)) {
+               halve_threshold_use * tnode_child_length(tn)) {
                old_tn = tn;
                tn = halve(t, tn);
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 24eb56ae1b5a..90dca711ac9f 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -188,7 +188,7 @@ struct icmp_err icmp_err_convert[] = {
 /* Control parameters for ECHO replies. */
 int sysctl_icmp_echo_ignore_all;
-int sysctl_icmp_echo_ignore_broadcasts;
+int sysctl_icmp_echo_ignore_broadcasts = 1;
 /* Control parameter - ignore bogus broadcast responses? */
 int sysctl_icmp_ignore_bogus_error_responses;
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 70c44e4c3ceb..8b6d3939e1e6 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -1323,7 +1323,7 @@ static struct in_device * ip_mc_find_dev(struct ip_mreqn *imr)
        }
        if (dev) {
                imr->imr_ifindex = dev->ifindex;
-                idev = __in_dev_get(dev);
+                idev = __in_dev_get_rtnl(dev);
        }
        return idev;
 }
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c
index 4d1502a49852..f9076ef3a1a8 100644
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
@@ -20,7 +20,7 @@ void __inet_twsk_kill(struct inet_timewait_sock *tw, struct inet_hashinfo *hashi
        struct inet_bind_hashbucket *bhead;
        struct inet_bind_bucket *tb;
        /* Unlink from established hashes. */
-        struct inet_ehash_bucket *ehead = &hashinfo->ehash[tw->tw_hashent];
+        struct inet_ehash_bucket *ehead = inet_ehash_bucket(hashinfo, tw->tw_hash);
        write_lock(&ehead->lock);
        if (hlist_unhashed(&tw->tw_node)) {
@@ -60,7 +60,7 @@ void __inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,
 {
        const struct inet_sock *inet = inet_sk(sk);
        const struct inet_connection_sock *icsk = inet_csk(sk);
-        struct inet_ehash_bucket *ehead = &hashinfo->ehash[sk->sk_hashent];
+        struct inet_ehash_bucket *ehead = inet_ehash_bucket(hashinfo, sk->sk_hash);
        struct inet_bind_hashbucket *bhead;
        /* Step 1: Put TW into bind hash. Original socket stays there too.
           Note, that any socket with inet->num != 0 MUST be bound in
@@ -106,7 +106,7 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk, const int stat
                tw->tw_dport        = inet->dport;
                tw->tw_family       = sk->sk_family;
                tw->tw_reuse        = sk->sk_reuse;
-                tw->tw_hashent      = sk->sk_hashent;
+                tw->tw_hash         = sk->sk_hash;
                tw->tw_ipv6only     = 0;
                tw->tw_prot         = sk->sk_prot_creator;
                atomic_set(&tw->tw_refcnt, 1);
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index f0d5740d7e22..896ce3f8f53a 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -1104,10 +1104,10 @@ static int ipgre_open(struct net_device *dev)
                        return -EADDRNOTAVAIL;
                dev = rt->u.dst.dev;
                ip_rt_put(rt);
-                if (__in_dev_get(dev) == NULL)
+                if (__in_dev_get_rtnl(dev) == NULL)
                        return -EADDRNOTAVAIL;
                t->mlink = dev->ifindex;
-                ip_mc_inc_group(__in_dev_get(dev), t->parms.iph.daddr);
+                ip_mc_inc_group(__in_dev_get_rtnl(dev), t->parms.iph.daddr);
        }
        return 0;
 }
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 9dbf5909f3a6..302b7eb507c9 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -149,7 +149,7 @@ struct net_device *ipmr_new_tunnel(struct vifctl *v)
                if (err == 0 && (dev = __dev_get_by_name(p.name)) != NULL) {
                        dev->flags |= IFF_MULTICAST;
-                        in_dev = __in_dev_get(dev);
+                        in_dev = __in_dev_get_rtnl(dev);
                        if (in_dev == NULL && (in_dev = inetdev_init(dev)) == NULL)
                                goto failure;
                        in_dev->cnf.rp_filter = 0;
@@ -278,7 +278,7 @@ static int vif_delete(int vifi)
        dev_set_allmulti(dev, -1);
-        if ((in_dev = __in_dev_get(dev)) != NULL) {
+        if ((in_dev = __in_dev_get_rtnl(dev)) != NULL) {
                in_dev->cnf.mc_forwarding--;
                ip_rt_multicast_event(in_dev);
        }
@@ -421,7 +421,7 @@ static int vif_add(struct vifctl *vifc, int mrtsock)
                return -EINVAL;
        }
-        if ((in_dev = __in_dev_get(dev)) == NULL)
+        if ((in_dev = __in_dev_get_rtnl(dev)) == NULL)
                return -EADDRNOTAVAIL;
        in_dev->cnf.mc_forwarding++;
        dev_set_allmulti(dev, +1);
diff --git a/net/ipv4/ipvs/ip_vs_app.c b/net/ipv4/ipvs/ip_vs_app.c
index 6e092dadb388..b942ff3c8860 100644
--- a/net/ipv4/ipvs/ip_vs_app.c
+++ b/net/ipv4/ipvs/ip_vs_app.c
@@ -604,7 +604,7 @@ static struct file_operations ip_vs_app_fops = {
 /*
 *      Replace a segment of data with a new segment
 */
-int ip_vs_skb_replace(struct sk_buff *skb, int pri,
+int ip_vs_skb_replace(struct sk_buff *skb, unsigned int __nocast pri,
                      char *o_buf, int o_len, char *n_buf, int n_len)
 {
        struct iphdr *iph;
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 2cd7e7d1ac90..a7659728e7a0 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -141,7 +141,7 @@ config IP_NF_PPTP
        tristate  'PPTP protocol support'
        help
          This module adds support for PPTP (Point to Point Tunnelling
-          Protocol, RFC2637) conncection tracking and NAT. 
+          Protocol, RFC2637) connection tracking and NAT. 
        
          If you are running PPTP sessions over a stateful firewall or NAT
          box, you may want to enable this feature.  
diff --git a/net/ipv4/netfilter/ip_conntrack_netbios_ns.c b/net/ipv4/netfilter/ip_conntrack_netbios_ns.c
index 577bac22dcc6..186646eb249f 100644
--- a/net/ipv4/netfilter/ip_conntrack_netbios_ns.c
+++ b/net/ipv4/netfilter/ip_conntrack_netbios_ns.c
@@ -58,7 +58,7 @@ static int help(struct sk_buff **pskb,
                goto out;
        rcu_read_lock();
-        in_dev = __in_dev_get(rt->u.dst.dev);
+        in_dev = __in_dev_get_rcu(rt->u.dst.dev);
        if (in_dev != NULL) {
                for_primary_ifa(in_dev) {
                        if (ifa->ifa_broadcast == iph->daddr) {
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index d54f14d926f6..36339eb39e17 100644
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -240,8 +240,8 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp)
        pmsg->packet_id       = (unsigned long )entry;
        pmsg->data_len        = data_len;
-        pmsg->timestamp_sec   = skb_tv_base.tv_sec + entry->skb->tstamp.off_sec;
+        pmsg->timestamp_sec   = entry->skb->tstamp.off_sec;
-        pmsg->timestamp_usec  = skb_tv_base.tv_usec + entry->skb->tstamp.off_usec;
+        pmsg->timestamp_usec  = entry->skb->tstamp.off_usec;
        pmsg->mark            = entry->skb->nfmark;
        pmsg->hook            = entry->info->hook;
        pmsg->hw_protocol     = entry->skb->protocol;
diff --git a/net/ipv4/netfilter/ipt_REDIRECT.c b/net/ipv4/netfilter/ipt_REDIRECT.c
index 715cb613405c..5245bfd33d52 100644
--- a/net/ipv4/netfilter/ipt_REDIRECT.c
+++ b/net/ipv4/netfilter/ipt_REDIRECT.c
@@ -93,7 +93,7 @@ redirect_target(struct sk_buff **pskb,
                newdst = 0;
                
                rcu_read_lock();
-                indev = __in_dev_get((*pskb)->dev);
+                indev = __in_dev_get_rcu((*pskb)->dev);
                if (indev && (ifa = indev->ifa_list))
                        newdst = ifa->ifa_local;
                rcu_read_unlock();
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index e2c14f3cb2fc..2883ccd8a91d 100644
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -225,8 +225,8 @@ static void ipt_ulog_packet(unsigned int hooknum,
        /* copy hook, prefix, timestamp, payload, etc. */
        pm->data_len = copy_len;
-        pm->timestamp_sec = skb_tv_base.tv_sec + skb->tstamp.off_sec;
+        pm->timestamp_sec = skb->tstamp.off_sec;
-        pm->timestamp_usec = skb_tv_base.tv_usec + skb->tstamp.off_usec;
+        pm->timestamp_usec = skb->tstamp.off_usec;
        pm->mark = skb->nfmark;
        pm->hook = hooknum;
        if (prefix != NULL)
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 8549f26e2495..381dd6a6aebb 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2128,7 +2128,7 @@ int ip_route_input(struct sk_buff *skb, u32 daddr, u32 saddr,
                struct in_device *in_dev;
                rcu_read_lock();
-                if ((in_dev = __in_dev_get(dev)) != NULL) {
+                if ((in_dev = __in_dev_get_rcu(dev)) != NULL) {
                        int our = ip_check_mc(in_dev, daddr, saddr,
                                skb->nh.iph->protocol);
                        if (our
@@ -2443,7 +2443,9 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp)
                err = -ENODEV;
                if (dev_out == NULL)
                        goto out;
-                if (__in_dev_get(dev_out) == NULL) {
+                /* RACE: Check return value of inet_select_addr instead. */
+                if (__in_dev_get_rtnl(dev_out) == NULL) {
                        dev_put(dev_out);
                        goto out;       /* Wrong error code */
                }
diff --git a/net/ipv4/tcp_bic.c b/net/ipv4/tcp_bic.c
index b940346de4e7..6d80e063c187 100644
--- a/net/ipv4/tcp_bic.c
+++ b/net/ipv4/tcp_bic.c
@@ -136,7 +136,7 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd)
                else if (cwnd < ca->last_max_cwnd + max_increment*(BICTCP_B-1))
                        /* slow start */
                        ca->cnt = (cwnd * (BICTCP_B-1))
-                                / cwnd-ca->last_max_cwnd;
+                                / (cwnd - ca->last_max_cwnd);
                else
                        /* linear increase */
                        ca->cnt = cwnd / max_increment;
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 13dfb391cdf1..c85819d8474b 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -130,19 +130,20 @@ static int __tcp_v4_check_established(struct sock *sk, __u16 lport,
        int dif = sk->sk_bound_dev_if;
        INET_ADDR_COOKIE(acookie, saddr, daddr)
        const __u32 ports = INET_COMBINED_PORTS(inet->dport, lport);
-        const int hash = inet_ehashfn(daddr, lport, saddr, inet->dport, tcp_hashinfo.ehash_size);
+        unsigned int hash = inet_ehashfn(daddr, lport, saddr, inet->dport);
-        struct inet_ehash_bucket *head = &tcp_hashinfo.ehash[hash];
+        struct inet_ehash_bucket *head = inet_ehash_bucket(&tcp_hashinfo, hash);
        struct sock *sk2;
        const struct hlist_node *node;
        struct inet_timewait_sock *tw;
+        prefetch(head->chain.first);
        write_lock(&head->lock);
        /* Check TIME-WAIT sockets first. */
        sk_for_each(sk2, node, &(head + tcp_hashinfo.ehash_size)->chain) {
                tw = inet_twsk(sk2);
-                if (INET_TW_MATCH(sk2, acookie, saddr, daddr, ports, dif)) {
+                if (INET_TW_MATCH(sk2, hash, acookie, saddr, daddr, ports, dif)) {
                        const struct tcp_timewait_sock *tcptw = tcp_twsk(sk2);
                        struct tcp_sock *tp = tcp_sk(sk);
@@ -179,7 +180,7 @@ static int __tcp_v4_check_established(struct sock *sk, __u16 lport,
        /* And established part... */
        sk_for_each(sk2, node, &head->chain) {
-                if (INET_MATCH(sk2, acookie, saddr, daddr, ports, dif))
+                if (INET_MATCH(sk2, hash, acookie, saddr, daddr, ports, dif))
                        goto not_unique;
        }
@@ -188,7 +189,7 @@ unique:
         * in hash table socket with a funny identity. */
        inet->num = lport;
        inet->sport = htons(lport);
-        sk->sk_hashent = hash;
+        sk->sk_hash = hash;
        BUG_TRAP(sk_unhashed(sk));
        __sk_add_node(sk, &head->chain);
        sock_prot_inc_use(sk->sk_prot);
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 4e509e52fbc1..a970b4727ce8 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1806,7 +1806,7 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)
        }
        for (dev = dev_base; dev != NULL; dev = dev->next) {
-                struct in_device * in_dev = __in_dev_get(dev);
+                struct in_device * in_dev = __in_dev_get_rtnl(dev);
                if (in_dev && (dev->flags & IFF_UP)) {
                        struct in_ifaddr * ifa;
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 2f589f24c093..563b442ffab8 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -666,7 +666,7 @@ slow_path:
                 */
                fh->nexthdr = nexthdr;
                fh->reserved = 0;
-                if (frag_id) {
+                if (!frag_id) {
                        ipv6_select_ident(skb, fh);
                        frag_id = fh->identification;
                } else
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 519899fb11d5..39a96c768102 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -1393,7 +1393,7 @@ static void mld_sendpack(struct sk_buff *skb)
 static int grec_size(struct ifmcaddr6 *pmc, int type, int gdel, int sdel)
 {
-        return sizeof(struct mld2_grec) + 4*mld_scount(pmc,type,gdel,sdel);
+        return sizeof(struct mld2_grec) + 16 * mld_scount(pmc,type,gdel,sdel);
 }
 static struct sk_buff *add_grhead(struct sk_buff *skb, struct ifmcaddr6 *pmc,
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 555a31347eda..305d9ee6d7db 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1450,7 +1450,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
 static void pndisc_redo(struct sk_buff *skb)
 {
-        ndisc_rcv(skb);
+        ndisc_recv_ns(skb);
        kfree_skb(skb);
 }
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index aa11cf366efa..5027bbe6415e 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -238,8 +238,8 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp)
        pmsg->packet_id       = (unsigned long )entry;
        pmsg->data_len        = data_len;
-        pmsg->timestamp_sec   = skb_tv_base.tv_sec + entry->skb->tstamp.off_sec;
+        pmsg->timestamp_sec   = entry->skb->tstamp.off_sec;
-        pmsg->timestamp_usec  = skb_tv_base.tv_usec + entry->skb->tstamp.off_usec;
+        pmsg->timestamp_usec  = entry->skb->tstamp.off_usec;
        pmsg->mark            = entry->skb->nfmark;
        pmsg->hook            = entry->info->hook;
        pmsg->hw_protocol     = entry->skb->protocol;
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 80643e6b346b..d693cb988b78 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -209,9 +209,11 @@ static __inline__ void __tcp_v6_hash(struct sock *sk)
                lock = &tcp_hashinfo.lhash_lock;
                inet_listen_wlock(&tcp_hashinfo);
        } else {
-                sk->sk_hashent = inet6_sk_ehashfn(sk, tcp_hashinfo.ehash_size);
+                unsigned int hash;
-                list = &tcp_hashinfo.ehash[sk->sk_hashent].chain;
+                sk->sk_hash = hash = inet6_sk_ehashfn(sk);
-                lock = &tcp_hashinfo.ehash[sk->sk_hashent].lock;
+                hash &= (tcp_hashinfo.ehash_size - 1);
+                list = &tcp_hashinfo.ehash[hash].chain;
+                lock = &tcp_hashinfo.ehash[hash].lock;
                write_lock(lock);
        }
@@ -322,13 +324,13 @@ static int __tcp_v6_check_established(struct sock *sk, const __u16 lport,
        const struct in6_addr *saddr = &np->daddr;
        const int dif = sk->sk_bound_dev_if;
        const u32 ports = INET_COMBINED_PORTS(inet->dport, lport);
-        const int hash = inet6_ehashfn(daddr, inet->num, saddr, inet->dport,
+        unsigned int hash = inet6_ehashfn(daddr, inet->num, saddr, inet->dport);
-                                       tcp_hashinfo.ehash_size);
+        struct inet_ehash_bucket *head = inet_ehash_bucket(&tcp_hashinfo, hash);
-        struct inet_ehash_bucket *head = &tcp_hashinfo.ehash[hash];
        struct sock *sk2;
        const struct hlist_node *node;
        struct inet_timewait_sock *tw;
+        prefetch(head->chain.first);
        write_lock(&head->lock);
        /* Check TIME-WAIT sockets first. */
@@ -365,14 +367,14 @@ static int __tcp_v6_check_established(struct sock *sk, const __u16 lport,
        /* And established part... */
        sk_for_each(sk2, node, &head->chain) {
-                if (INET6_MATCH(sk2, saddr, daddr, ports, dif))
+                if (INET6_MATCH(sk2, hash, saddr, daddr, ports, dif))
                        goto not_unique;
        }
 unique:
        BUG_TRAP(sk_unhashed(sk));
        __sk_add_node(sk, &head->chain);
-        sk->sk_hashent = hash;
+        sk->sk_hash = hash;
        sock_prot_inc_use(sk->sk_prot);
        write_unlock(&head->lock);
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 6001948600f3..bf9519341fd3 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -99,7 +99,7 @@ static int udp_v6_get_port(struct sock *sk, unsigned short snum)
                next:;
                }
                result = best;
-                for(;; result += UDP_HTABLE_SIZE) {
+                for(i = 0; i < (1 << 16) / UDP_HTABLE_SIZE; i++, result += UDP_HTABLE_SIZE) {
                        if (result > sysctl_local_port_range[1])
                                result = sysctl_local_port_range[0]
                                        + ((result - sysctl_local_port_range[0]) &
@@ -107,6 +107,8 @@ static int udp_v6_get_port(struct sock *sk, unsigned short snum)
                        if (!udp_lport_inuse(result))
                                break;
                }
+                if (i >= (1 << 16) / UDP_HTABLE_SIZE)
+                        goto fail;
 gotit:
                udp_port_rover = snum = result;
        } else {
@@ -852,10 +854,16 @@ do_append_data:
        else if (!corkreq)
                err = udp_v6_push_pending_frames(sk, up);
-        if (dst && connected)
+        if (dst) {
-                ip6_dst_store(sk, dst,
+                if (connected) {
-                              ipv6_addr_equal(&fl->fl6_dst, &np->daddr) ?
+                        ip6_dst_store(sk, dst,
-                              &np->daddr : NULL);
+                                      ipv6_addr_equal(&fl->fl6_dst, &np->daddr) ?
+                                      &np->daddr : NULL);
+                } else {
+                        dst_release(dst);
+                }
+        }
        if (err > 0)
                err = np->recverr ? net_xmit_errno(err) : 0;
        release_sock(sk);
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c
index 071cd2cefd8a..953e255d2bc8 100644
--- a/net/irda/irlan/irlan_eth.c
+++ b/net/irda/irlan/irlan_eth.c
@@ -310,7 +310,7 @@ void irlan_eth_send_gratuitous_arp(struct net_device *dev)
 #ifdef CONFIG_INET
        IRDA_DEBUG(4, "IrLAN: Sending gratuitous ARP\n");
        rcu_read_lock();
-        in_dev = __in_dev_get(dev);
+        in_dev = __in_dev_get_rcu(dev);
        if (in_dev == NULL)
                goto out;
        if (in_dev->ifa_list)
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 4879743b945a..bbf0f69181ba 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -185,7 +185,7 @@ static int pfkey_release(struct socket *sock)
 }
 static int pfkey_broadcast_one(struct sk_buff *skb, struct sk_buff **skb2,
-                               int allocation, struct sock *sk)
+                               unsigned int __nocast allocation, struct sock *sk)
 {
        int err = -ENOBUFS;
@@ -217,7 +217,7 @@ static int pfkey_broadcast_one(struct sk_buff *skb, struct sk_buff **skb2,
 #define BROADCAST_ONE           1
 #define BROADCAST_REGISTERED    2
 #define BROADCAST_PROMISC_ONLY  4
-static int pfkey_broadcast(struct sk_buff *skb, int allocation,
+static int pfkey_broadcast(struct sk_buff *skb, unsigned int __nocast allocation,
                           int broadcast_flags, struct sock *one_sk)
 {
        struct sock *sk;
@@ -1416,7 +1416,8 @@ static int pfkey_get(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr,
        return 0;
 }
-static struct sk_buff *compose_sadb_supported(struct sadb_msg *orig, int allocation)
+static struct sk_buff *compose_sadb_supported(struct sadb_msg *orig,
+                                              unsigned int __nocast allocation)
 {
        struct sk_buff *skb;
        struct sadb_msg *hdr;
@@ -2153,6 +2154,7 @@ out:
 static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, void **ext_hdrs)
 {
+        unsigned int dir;
        int err;
        struct sadb_x_policy *pol;
        struct xfrm_policy *xp;
@@ -2161,7 +2163,11 @@ static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
        if ((pol = ext_hdrs[SADB_X_EXT_POLICY-1]) == NULL)
                return -EINVAL;
-        xp = xfrm_policy_byid(0, pol->sadb_x_policy_id,
+        dir = xfrm_policy_id2dir(pol->sadb_x_policy_id);
+        if (dir >= XFRM_POLICY_MAX)
+                return -EINVAL;
+        xp = xfrm_policy_byid(dir, pol->sadb_x_policy_id,
                              hdr->sadb_msg_type == SADB_X_SPDDELETE2);
        if (xp == NULL)
                return -ENOENT;
@@ -2173,9 +2179,9 @@ static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
        if (hdr->sadb_msg_type == SADB_X_SPDDELETE2) {
                c.data.byid = 1;
                c.event = XFRM_MSG_DELPOLICY;
-                km_policy_notify(xp, pol->sadb_x_policy_dir-1, &c);
+                km_policy_notify(xp, dir, &c);
        } else {
-                err = key_pol_get_resp(sk, xp, hdr, pol->sadb_x_policy_dir-1);
+                err = key_pol_get_resp(sk, xp, hdr, dir);
        }
        xfrm_pol_put(xp);
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 49a3900e3d32..34d671974a4d 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -195,7 +195,8 @@ nfnetlink_check_attributes(struct nfnetlink_subsystem *subsys,
 int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, int echo)
 {
-        int allocation = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
+        unsigned int __nocast allocation =
+                        in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
        int err = 0;
        NETLINK_CB(skb).dst_group = group;
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index ff5601ceedcb..efcd10f996ba 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -494,8 +494,8 @@ __build_packet_message(struct nfulnl_instance *inst,
        if (skb->tstamp.off_sec) {
                struct nfulnl_msg_packet_timestamp ts;
-                ts.sec = cpu_to_be64(skb_tv_base.tv_sec + skb->tstamp.off_sec);
+                ts.sec = cpu_to_be64(skb->tstamp.off_sec);
-                ts.usec = cpu_to_be64(skb_tv_base.tv_usec + skb->tstamp.off_usec);
+                ts.usec = cpu_to_be64(skb->tstamp.off_usec);
                NFA_PUT(inst->skb, NFULA_TIMESTAMP, sizeof(ts), &ts);
        }
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index f81fe8c52e99..eaa44c49567b 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -492,8 +492,8 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
        if (entry->skb->tstamp.off_sec) {
                struct nfqnl_msg_packet_timestamp ts;
-                ts.sec = cpu_to_be64(skb_tv_base.tv_sec + entry->skb->tstamp.off_sec);
+                ts.sec = cpu_to_be64(entry->skb->tstamp.off_sec);
-                ts.usec = cpu_to_be64(skb_tv_base.tv_usec + entry->skb->tstamp.off_usec);
+                ts.usec = cpu_to_be64(entry->skb->tstamp.off_usec);
                NFA_PUT(skb, NFQA_TIMESTAMP, sizeof(ts), &ts);
        }
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c
index 4e66eef9a034..509afddae569 100644
--- a/net/netrom/nr_dev.c
+++ b/net/netrom/nr_dev.c
@@ -58,7 +58,7 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev)
        /* Spoof incoming device */
        skb->dev      = dev;
-        skb->h.raw    = skb->data;
+        skb->mac.raw  = skb->nh.raw;
        skb->nh.raw   = skb->data;
        skb->pkt_type = PACKET_HOST;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 6a67a87384cc..499ae3df4a44 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -654,8 +654,8 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
                __net_timestamp(skb);
                sock_enable_timestamp(sk);
        }
-        h->tp_sec = skb_tv_base.tv_sec + skb->tstamp.off_sec;
+        h->tp_sec = skb->tstamp.off_sec;
-        h->tp_usec = skb_tv_base.tv_usec + skb->tstamp.off_usec;
+        h->tp_usec = skb->tstamp.off_usec;
        sll = (struct sockaddr_ll*)((u8*)h + TPACKET_ALIGN(sizeof(*h)));
        sll->sll_halen = 0;
diff --git a/net/rxrpc/call.c b/net/rxrpc/call.c
index 5cfd4cadee42..86f777052633 100644
--- a/net/rxrpc/call.c
+++ b/net/rxrpc/call.c
@@ -1923,7 +1923,7 @@ int rxrpc_call_write_data(struct rxrpc_call *call,
                          size_t sioc,
                          struct kvec *siov,
                          u8 rxhdr_flags,
-                          int alloc_flags,
+                          unsigned int __nocast alloc_flags,
                          int dup_data,
                          size_t *size_sent)
 {
diff --git a/net/rxrpc/connection.c b/net/rxrpc/connection.c
index 61463c74f8cc..be4b2be58956 100644
--- a/net/rxrpc/connection.c
+++ b/net/rxrpc/connection.c
@@ -522,7 +522,7 @@ int rxrpc_conn_newmsg(struct rxrpc_connection *conn,
                      uint8_t type,
                      int dcount,
                      struct kvec diov[],
-                      int alloc_flags,
+                      unsigned int __nocast alloc_flags,
                      struct rxrpc_message **_msg)
 {
        struct rxrpc_message *msg;
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index 00eae5f9a01a..cf68a59fdc5a 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -393,10 +393,10 @@ META_COLLECTOR(int_sk_route_caps)
        dst->value = skb->sk->sk_route_caps;
 }
-META_COLLECTOR(int_sk_hashent)
+META_COLLECTOR(int_sk_hash)
 {
        SKIP_NONLOCAL(skb);
-        dst->value = skb->sk->sk_hashent;
+        dst->value = skb->sk->sk_hash;
 }
 META_COLLECTOR(int_sk_lingertime)
@@ -515,7 +515,7 @@ static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = {
                [META_ID(SK_FORWARD_ALLOCS)]    = META_FUNC(int_sk_fwd_alloc),
                [META_ID(SK_ALLOCS)]            = META_FUNC(int_sk_alloc),
                [META_ID(SK_ROUTE_CAPS)]        = META_FUNC(int_sk_route_caps),
-                [META_ID(SK_HASHENT)]           = META_FUNC(int_sk_hashent),
+                [META_ID(SK_HASH)]              = META_FUNC(int_sk_hash),
                [META_ID(SK_LINGERTIME)]        = META_FUNC(int_sk_lingertime),
                [META_ID(SK_ACK_BACKLOG)]       = META_FUNC(int_sk_ack_bl),
                [META_ID(SK_MAX_ACK_BACKLOG)]   = META_FUNC(int_sk_max_ack_bl),
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index e7025be77691..f01d1c9002a1 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -147,7 +147,7 @@ static void sctp_v4_copy_addrlist(struct list_head *addrlist,
        struct sctp_sockaddr_entry *addr;
        rcu_read_lock();
-        if ((in_dev = __in_dev_get(dev)) == NULL) {
+        if ((in_dev = __in_dev_get_rcu(dev)) == NULL) {
                rcu_read_unlock();
                return;
        }
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index f3104035e35d..ade730eaf401 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -719,7 +719,7 @@ static void rpc_async_schedule(void *arg)
 void *
 rpc_malloc(struct rpc_task *task, size_t size)
 {
-        int     gfp;
+        unsigned int __nocast   gfp;
        if (task->tk_flags & RPC_TASK_SWAPPER)
                gfp = GFP_ATOMIC;
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index c5241fcbb966..55538f6b60ff 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -16,6 +16,8 @@
 #include <linux/mm.h>
 #include <linux/sysctl.h>
+#include <net/sock.h>
 #ifdef CONFIG_INET
 #include <net/ip.h>
 #endif
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index fda737d77edc..061b44cc2451 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -163,7 +163,7 @@ static void xfrm_policy_timer(unsigned long data)
        if (xp->dead)
                goto out;
-        dir = xp->index & 7;
+        dir = xfrm_policy_id2dir(xp->index);
        if (xp->lft.hard_add_expires_seconds) {
                long tmo = xp->lft.hard_add_expires_seconds +
@@ -225,7 +225,7 @@ expired:
 * SPD calls.
 */
-struct xfrm_policy *xfrm_policy_alloc(int gfp)
+struct xfrm_policy *xfrm_policy_alloc(unsigned int __nocast gfp)
 {
        struct xfrm_policy *policy;
@@ -417,7 +417,7 @@ struct xfrm_policy *xfrm_policy_byid(int dir, u32 id, int delete)
        struct xfrm_policy *pol, **p;
        write_lock_bh(&xfrm_policy_lock);
-        for (p = &xfrm_policy_list[id & 7]; (pol=*p)!=NULL; p = &pol->next) {
+        for (p = &xfrm_policy_list[dir]; (pol=*p)!=NULL; p = &pol->next) {
                if (pol->index == id) {
                        xfrm_pol_hold(pol);
                        if (delete)